diff options
| -rw-r--r-- | libre/icecat/PKGBUILD | 11 | ||||
| -rw-r--r-- | libre/icecat/mozconfig | 2 | ||||
| -rw-r--r-- | libre/icecat/no-crmf.patch | 28 |
3 files changed, 37 insertions, 4 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 0d796640a..1b01e7d9c 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -16,12 +16,12 @@ _pgo=false pkgname=icecat _pkgver=52.1.0-gnu1 pkgver=${_pkgver//-/_} -pkgrel=1 +pkgrel=2 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 armv7h) license=(MPL GPL LGPL) -depends=(alsa-lib dbus-glib desktop-file-utils ffmpeg gtk2 gtk3 hicolor-icon-theme hunspell icu=59.1 libevent libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font) +depends=(alsa-lib dbus-glib desktop-file-utils ffmpeg gtk2 gtk3 hicolor-icon-theme hunspell icu=59.1 libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font) makedepends=(autoconf2.13 diffutils gconf imake inetutils libpulse mesa mozilla-searchplugins python2 unzip yasm zip) options=(!emptydirs !makeflags debug) if $_pgo; then @@ -43,10 +43,11 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{ $pkgname-fixed-loading-icon.png disable-crypto-hardening-settings.patch disable-spoofSource-referer.patch + no-crmf.patch no-neon.patch) sha256sums=('0beff2a04fdc1b56d274133cd22ff546fd609c929954132ff6bf1b800a5b24f3' 'SKIP' - '88f14b86e4f2cd0772415365463514ce381c1081d8ac965c4181607c27595bf9' + '04952e0910c7c0d24faaa1ffa486dc3dae9f2c52548ff977858bec08ccb400f3' '76a657a90371e637e7c4b371b71a15c85acafcece6277455e9ede84ffe104d3e' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745' @@ -55,6 +56,7 @@ sha256sums=('0beff2a04fdc1b56d274133cd22ff546fd609c929954132ff6bf1b800a5b24f3' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' '0166aa368420f0bf0aab064b2188e3d852b241efeeb27dee66df2bc15e84b83a' 'c50043266e69f5844e6dce9ea7193af79587dcaa66806932d7867281a176f03e' + 'cf224d69e89f37f92202061669014b99fbf7b1fec38fd8ba9f957711fa095729' '6d0c1c9ca28b20d206ce24ca84f4d4e3f5d062a2e9cb7445fcb6c2cfea959b4a') validpgpkeys=( 'A57369A8BABC2542B5A0368C3C76EED7D7E04784' # Ruben Rodriguez @@ -109,6 +111,9 @@ prepare() { # https://labs.parabola.nu/issues/1073 patch -Np1 -i "$srcdir/disable-spoofSource-referer.patch" + # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 + patch -Np1 -i "$srcdir/no-crmf.patch" + # ARM-specific changes: if [[ "$CARCH" == arm* ]]; then sed -i '/ac_add_options --enable-rust/d' .mozconfig diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index c3a9f1b5a..2021d1553 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -5,6 +5,7 @@ ac_add_options --libdir=/usr/lib ac_add_options --enable-release ac_add_options --enable-gold ac_add_options --enable-pie +ac_add_options --enable-optimize="-O2" ac_add_options --enable-default-toolkit=cairo-gtk3 @@ -22,7 +23,6 @@ ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --with-system-png -ac_add_options --with-system-libevent ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite diff --git a/libre/icecat/no-crmf.patch b/libre/icecat/no-crmf.patch new file mode 100644 index 000000000..3edb053ef --- /dev/null +++ b/libre/icecat/no-crmf.patch @@ -0,0 +1,28 @@ +diff --git i/old-configure.in w/old-configure.in +index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644 +--- i/old-configure.in ++++ w/old-configure.in +@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + +-if test -n "$MOZ_SYSTEM_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" +-else ++if test -z "$MOZ_SYSTEM_NSS"; then + NSS_CFLAGS="-I${DIST}/include/nss" + case "${OS_ARCH}" in + # Only few platforms have been tested with GYP +diff --git a/config/external/nss/crmf/moz.build b/config/external/nss/crmf/moz.build +index 9b8005f..4bfcc81 100644 +--- a/config/external/nss/crmf/moz.build ++++ b/config/external/nss/crmf/moz.build +@@ -8,7 +8,6 @@ Library('crmf') + + if CONFIG['MOZ_NATIVE_NSS']: + OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')] +- OS_LIBS += ['-lcrmf'] + else: + USE_LIBS += [ + # The dependency on nss is not real, but is required to force the + |