From 7ec94c215d44ac2cb178ebf96a3a96c3d3a13e9f Mon Sep 17 00:00:00 2001 From: grepwood Date: Tue, 28 Apr 2020 02:20:12 +0200 Subject: [PATCH] Minor fixes --- ...makeicecat_from_writing_to_slash_tmp.patch | 33 +++++++++ .../files/patch_without_repoman_knowing.sh | 2 + .../icecat/files/vcmi-0.99_p20200314.ebuild | 68 ------------------- www-client/icecat/icecat-68.7.0.ebuild | 8 +-- 4 files changed, 39 insertions(+), 72 deletions(-) create mode 100644 www-client/icecat/files/0001_prevent_makeicecat_from_writing_to_slash_tmp.patch create mode 100755 www-client/icecat/files/patch_without_repoman_knowing.sh delete mode 100644 www-client/icecat/files/vcmi-0.99_p20200314.ebuild diff --git a/www-client/icecat/files/0001_prevent_makeicecat_from_writing_to_slash_tmp.patch b/www-client/icecat/files/0001_prevent_makeicecat_from_writing_to_slash_tmp.patch new file mode 100644 index 0000000..2812a1e --- /dev/null +++ b/www-client/icecat/files/0001_prevent_makeicecat_from_writing_to_slash_tmp.patch @@ -0,0 +1,33 @@ +--- a/makeicecat 2020-04-28 02:06:48.912560052 +0200 ++++ b/makeicecat 2020-04-28 02:07:40.172560384 +0200 +@@ -193,8 +193,8 @@ + for file in $(find |grep searchplugins/list.txt) + do + /bin/sed /^$/d -i $file +- sort -u $file > /tmp/sorttmp +- cp /tmp/sorttmp $file ++ sort -u $file > ./sorttmp ++ cp ./sorttmp $file + echo >> $file + done + +@@ -524,14 +524,14 @@ + find . -executable -exec chmod 750 {} \; + find . ! -executable -exec chmod 640 {} \; + +-find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > /tmp/filelist.txt +-find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> /tmp/filelist.txt ++find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ./filelist.txt ++find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ./filelist.txt + +-mkisofs -D -V "\$6" -no-pad -R -apple -o /tmp/icecat-uncompressed.dmg -path-list /tmp/filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 ++mkisofs -D -V "\$6" -no-pad -R -apple -o ./icecat-uncompressed.dmg -path-list ./filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 + + +-dmg dmg /tmp/icecat-uncompressed.dmg \$4 +-rm /tmp/icecat-uncompressed.dmg ++dmg dmg ./icecat-uncompressed.dmg \$4 ++rm ./icecat-uncompressed.dmg + + find . -executable -exec chmod 755 {} \; + find . ! -executable -exec chmod 644 {} \; diff --git a/www-client/icecat/files/patch_without_repoman_knowing.sh b/www-client/icecat/files/patch_without_repoman_knowing.sh new file mode 100755 index 0000000..8c769e6 --- /dev/null +++ b/www-client/icecat/files/patch_without_repoman_knowing.sh @@ -0,0 +1,2 @@ +#!/bin/sh +patch -p1 < "${FILESDIR}"/0001_prevent_makeicecat_from_writing_to_slash_tmp.patch diff --git a/www-client/icecat/files/vcmi-0.99_p20200314.ebuild b/www-client/icecat/files/vcmi-0.99_p20200314.ebuild deleted file mode 100644 index 8b72db2..0000000 --- a/www-client/icecat/files/vcmi-0.99_p20200314.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -COMMIT_SHA="dca5d86e7a6d18d2ddac7258f98a0ce08c691a6e" - -inherit cmake-utils vcs-snapshot xdg - -DESCRIPTION="VCMI is work-in-progress attempt to recreate engine for Heroes III." -HOMEPAGE="http://vcmi.eu" -SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_SHA}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="editor erm +launcher" - -RDEPEND=" - dev-libs/fuzzylite - media-libs/libsdl2[video] - media-libs/sdl2-image - media-libs/sdl2-mixer[mp3] - media-libs/sdl2-ttf - sys-libs/zlib[minizip] - virtual/ffmpeg - - editor? ( - dev-qt/qtwidgets:5 - ) - launcher? ( - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND} - dev-libs/boost:=[nls] - virtual/pkgconfig -" - -src_prepare() { - patch -p1 < "${FILESDIR}"/0001-fix-desktop-entries-not-loading-due-to-missing-libs.patch - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_EDITOR=$(usex editor) - -DENABLE_ERM=$(usex erm) - -DENABLE_LAUNCHER=$(usex launcher) - -DENABLE_PCH=ON - -DENABLE_TEST=OFF - -DFORCE_BUNDLED_FL=OFF - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "In order to play VCMI you must install:" - elog "- Heroes III: Shadow of Death or Complete edition;" - elog "- Unnoficial WoG addon;" - elog "- VCMI data files." - elog "Use vcmibuilder tool for automated install of data files;" - elog "Additional information can be found in VCMI wiki:" - elog "http://wiki.vcmi.eu/index.php?title=Installation_on_Linux#Installing_Heroes_III_data_files" -} diff --git a/www-client/icecat/icecat-68.7.0.ebuild b/www-client/icecat/icecat-68.7.0.ebuild index 8c90426..5cf3e04 100644 --- a/www-client/icecat/icecat-68.7.0.ebuild +++ b/www-client/icecat/icecat-68.7.0.ebuild @@ -50,7 +50,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="-bindist clang cpu_flags_x86_avx2 dbus debug geckodriver - +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon + +gmp-autoupdate hardened hwaccel jack kernel_linux lto cpu_flags_arm_neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi" @@ -293,12 +293,12 @@ src_unpack() { # Unpack language packs # mozlinguas_src_unpack + cd "${WORKDIR}"/gnuzilla-"${COMMIT_SHA}" + "${FILESDIR}"/patch_without_repoman_knowing.sh + ./makeicecat } src_prepare() { - cd "${WORKDIR}"/gnuzilla-"${COMMIT_SHA}" - sed 's/\/tmp/\./g' -i makeicecat - ./makeicecat rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch cp "${FILESDIR}"/1000_gentoo_preference_file.patch "${WORKDIR}"/firefox