diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest index 6aaf12a..90d1ed0 100644 --- a/www-client/icecat/Manifest +++ b/www-client/icecat/Manifest @@ -1,4 +1,4 @@ -DIST firefox-78esr-patches-12.tar.xz 67840 BLAKE2B d85abdbb54a252852badac50866cf5b5009c050ec4aa80ae2454eef2719e80f3442f5a74ec58d3c36531539042830427cd85507b708c1d5b36ea44dd0cef60b7 SHA512 4445c0880fc234c3838394483ce986e4e222260a99427069ba9c55b56fcd49a485ec916ee6aa2629f922390e92bfcd78028e30cc2e62fad9bc080ae45b26ba2e DIST firefox-78esr-patches-14.tar.xz 82976 BLAKE2B 08cc3618c8069f4169b7647e7eb699153d558bb89f8a4f1ed74d5ccd339f77119cd8f253df011f0c2f255ad889b65e843171d7559f469788463ca7e9aa2e96aa SHA512 1611c6f9d2c7d586e7b53810c1cfdb2682f5d289b1b019b71694b1ab2d8bbdfe827a73cfaf59f7e4808c0b90409ca4fa57e27655d8cdf0c578ffdbad33659f26 -DIST icecat-78.10.0-gnu1.tar.bz2 513140961 BLAKE2B e008b4bebc6dbec78eecd18c14f37c155c5f883279120584c2a774e1e8fc4a6d1d24369ef1799224ec309fde6f4a8c276cf205eea5ecbfd061bea55a089e6e9b SHA512 682d194c1404b039d60c1916648d319bb428ce5fb3058a8e5989437de7a80d2184aefd69004e22e0a8e639f026df4f6d7445a2cce551d929323b6193cbedad94 +DIST firefox-78esr-patches-15.tar.xz 65604 BLAKE2B 86e421e555ffd5f7f201d0f1a1c446c649739c67cdf8dca536efa115e09d9c357ce1551b7270c77e8bfe7dd53e0f3e6386496283879cf5e0c59b3c864951ebb3 SHA512 b229e895f083a0404cda1da0d8ae937429d5975ac52ab20e8b15611d9c737381a1076ebfa8c8a127dacac0e12a2a905ffd579facde2d80c6facc911e5739e34b DIST icecat-78.11.0-gnu1.tar.bz2 514067936 BLAKE2B 88b0b76a1e08d3c6114d55e3613097e778eeae11d271c722552fd90da51b50c6abf621b11c6ba15702d737510dbd5a72397c1078722dcf149b165435fc349794 SHA512 8969c4c6726364cb96dc9735942e39b1532ef1d591202e098b0a3bd269f12168c7efdd813373fc11e0dada1c6db964794db21ac0f08add6a0cc82daf183e136e +DIST icecat-78.12.0-gnu1.tar.bz2 514309065 BLAKE2B 6b875778692a41efa568d66d35ea6c98dcb93baee6189711ef6b7eff81588508f0ceb78ce7065b3532af8b6a1cd5af9a7e0b42591af5ce7543067ad6393bce27 SHA512 bb7cbe72ced79abc3cbbea35e8ff841a8e79991d17b21fbd0a4d16f7ef7158f923818f9af74a5792d6a36360f3a7b28a884373dbe2a6c32b8016a4a5e023b6bf diff --git a/www-client/icecat/icecat-78.10.0.ebuild b/www-client/icecat/icecat-78.12.0.ebuild similarity index 95% rename from www-client/icecat/icecat-78.10.0.ebuild rename to www-client/icecat/icecat-78.12.0.ebuild index adda4ff..3841947 100644 --- a/www-client/icecat/icecat-78.10.0.ebuild +++ b/www-client/icecat/icecat-78.12.0.ebuild @@ -6,9 +6,9 @@ EAPI="7" # Using Gentoos firefox patches as system libraries and lto are quite nice -FIREFOX_PATCHSET="firefox-78esr-patches-12.tar.xz" +FIREFOX_PATCHSET="firefox-78esr-patches-15.tar.xz" -LLVM_MAX_SLOT=11 +LLVM_MAX_SLOT=12 PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE="ncurses,sqlite,ssl" @@ -17,8 +17,8 @@ WANT_AUTOCONF="2.1" VIRTUALX_REQUIRED="pgo" -inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \ - multiprocessing pax-utils python-any-r1 toolchain-funcs \ +inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \ + llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \ virtualx xdg PATCH_URIS=( @@ -26,7 +26,7 @@ PATCH_URIS=( ) SRC_URI=" - !buildtarball? ( icecat-"${PV}"-gnu1.tar.bz2 ) + !buildtarball? ( icecat-${PV}-gnu1.tar.bz2 ) ${PATCH_URIS[@]} " @@ -54,6 +54,14 @@ BDEPEND="${PYTHON_DEPS} virtual/pkgconfig >=virtual/rust-1.41.0 || ( + ( + sys-devel/clang:12 + sys-devel/llvm:12 + clang? ( + =sys-devel/lld-12* + pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) + ) + ) ( sys-devel/clang:11 sys-devel/llvm:11 @@ -79,10 +87,10 @@ BDEPEND="${PYTHON_DEPS} !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) - )" + ) + buildtarball? ( ~www-client/makeicecat-"${PV}"[buildtarball] )" CDEPEND=" - buildtarball? ( ~www-client/makeicecat-"${PV}"[buildtarball] ) >=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk @@ -164,19 +172,19 @@ S="${WORKDIR}/${PN}-${PV%_*}" llvm_check_deps() { if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then - ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 return 1 fi if use clang ; then if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then - ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 return 1 fi if use pgo ; then if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then - ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 return 1 fi fi @@ -457,6 +465,7 @@ pkg_setup() { # Ensure we use C locale when building, bug #746215 export LC_ALL=C fi + linux-info_pkg_setup } src_unpack() { @@ -568,6 +577,9 @@ src_configure() { # Initialize MOZCONFIG mozconfig_add_options_ac '' --enable-application=browser + # Set Gentoo defaults + export MOZILLA_OFFICIAL=1 + mozconfig_add_options_ac 'Gentoo default' \ --allow-addon-sideload \ --disable-cargo-incremental \ @@ -886,6 +898,12 @@ src_install() { # Set installDistroAddons to true so that language packs work cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set extensions.installDistroAddons pref" pref("extensions.installDistroAddons", true); + pref("extensions.langpacks.signatures.required", false); + EOF + + # Disable signatures for language packs so that unsigned just built language packs work + cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable langpacks signatures" + pref("extensions.langpacks.signatures.required", false); EOF # Force hwaccel prefs if USE=hwaccel is enabled @@ -905,7 +923,7 @@ src_install() { # Install language packs local langpacks=( $(find "${BUILD_DIR}"/dist/linux-x86_64/xpi -type f -name '*.xpi') ) if [[ -n "${langpacks}" ]] ; then - moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}" + moz_install_xpi "${MOZILLA_FIVE_HOME}/browser/extensions" "${langpacks[@]}" fi # Install geckodriver @@ -1038,6 +1056,12 @@ pkg_preinst() { pkg_postinst() { xdg_pkg_postinst + elog "Cloudflare browser checks are broken with GNU IceCats anti fingerprinting measures." + elog "You can fix cloudflare browser checks by undoing them in about:config like below:" + elog " general.appversion.override: 78.0 (X11)" + elog " general.oscpu.override: Linux x86_64" + elog " general.platform.override: Linux x86_64" + if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then elog "Apulse was detected at merge time on this system and so it will always be" elog "used for sound. If you wish to use pulseaudio instead please unmerge"