Fix crmf in package()

3 files changed, 37 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3641fdf075c..50b2a7baec5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = icecat
 	pkgdesc = GNU version of the Firefox browser.
 	pkgver = 52.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gnu.org/software/gnuzilla/
 	arch = i686
 	arch = x86_64
@@ -47,6 +47,7 @@ pkgbase = icecat
 	source = icecat-safe.desktop
 	source = vendor.js
 	source = fix-wifi-scanner.diff
+	source = no-crmf.diff
 	validpgpkeys = A57369A8BABC2542B5A0368C3C76EED7D7E04784
 	sha256sums = 0beff2a04fdc1b56d274133cd22ff546fd609c929954132ff6bf1b800a5b24f3
 	sha256sums = SKIP
@@ -55,6 +56,7 @@ pkgbase = icecat
 	sha256sums = 190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303
 	sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4
 	sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8
+	sha256sums = ada119174a2a1779c4195a1b4506e8ae67c49c5306103158805a390237acc1c6
 
 pkgname = icecat
 
diff --git a/PKGBUILD b/PKGBUILD
index 4955a2085f5c..5a812061f15a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=icecat
 pkgver=52.1.0
 _pkgver=${pkgver}-gnu1
 _pkgverbase=${pkgver%%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU version of the Firefox browser."
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/gnuzilla/"
@@ -26,7 +26,7 @@ source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz
 #source=(https://mirrors.kernel.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2      ## Good mirror
 #source=(http://jenkins.trisquel.info/icecat/${pkgname}-${_pkgver}.tar.bz2      ## Official developer (Ruben Rodriguez) site. Probably only has developer releases.
         mozconfig icecat.desktop icecat-safe.desktop vendor.js
-        fix-wifi-scanner.diff)
+        fix-wifi-scanner.diff no-crmf.diff)
 
 sha256sums=('0beff2a04fdc1b56d274133cd22ff546fd609c929954132ff6bf1b800a5b24f3'
             'SKIP'
@@ -34,7 +34,8 @@ sha256sums=('0beff2a04fdc1b56d274133cd22ff546fd609c929954132ff6bf1b800a5b24f3'
             'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
             '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
-            '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8')
+            '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
+            'ada119174a2a1779c4195a1b4506e8ae67c49c5306103158805a390237acc1c6')
 
 validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
 
@@ -49,6 +50,9 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
   patch -Np1 -i ../fix-wifi-scanner.diff
 
+  # https://bugs.archlinux.org/task/54395
+  patch -Np1 -i ../no-crmf.diff
+
   msg2 "Starting build..."
 
   cp -v ${srcdir}/mozconfig .mozconfig
diff --git a/no-crmf.diff b/no-crmf.diff
new file mode 100644
index 000000000000..f30d17cc31c9
--- /dev/null
+++ b/no-crmf.diff
@@ -0,0 +1,27 @@
+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