[arch-commits] Commit in seamonkey/trunk (PKGBUILD mozconfig no-crmf.diff)

[Kyle Keen]

    Date: Sunday, June 18, 2017 @ 00:45:40
  Author: kkeen
Revision: 238003

upgpkg: seamonkey 2.46-4 libevent 2.1 rebuild

Added:
  seamonkey/trunk/no-crmf.diff
Modified:
  seamonkey/trunk/PKGBUILD
  seamonkey/trunk/mozconfig

--------------+
 PKGBUILD     |   14 ++++++++++----
 mozconfig    |    2 +-
 no-crmf.diff |   15 +++++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-18 00:12:42 UTC (rev 238002)
+++ PKGBUILD	2017-06-18 00:45:40 UTC (rev 238003)
@@ -3,7 +3,7 @@
 
 pkgname=seamonkey
 pkgver=2.46
-pkgrel=3
+pkgrel=4
 pkgdesc="SeaMonkey internet suite"
 arch=('i686' 'x86_64')
 license=('MPL')
@@ -19,13 +19,15 @@
         seamonkey-2.0-lang.patch
         rhbz-966424.patch
         mozbug1323209.patch
-        mozbug1329272.patch)
+        mozbug1329272.patch
+	no-crmf.diff)
 sha256sums=('39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912'
-            '9a730ec71744e9e674a7922cd573fe2428f39ee53b0c3c8912053a910975f1d8'
+            '8d3bd1c0f1101a382cf7861aff4a94bad9834ecfc0b240e43aca49d219a80d13'
             'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e'
             '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
             '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4'
-            '33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b')
+            '33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b'
+            'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -53,6 +55,10 @@
 
   # 2.26 build fix from wgnie (blfs ch 37)
   sed -i 's/$(MOZ_ZLIB_CFLAGS)/& $(MOZ_PIXMAN_CFLAGS)/' config/config.mk
+
+  # work around from FS#54395
+  patch -Np1 -d mozilla -i ../../no-crmf.diff
+  sed -i "s/'crmf',//" mozilla/security/manager/ssl/moz.build
 }
 
 build() {

Modified: mozconfig
===================================================================
--- mozconfig	2017-06-18 00:12:42 UTC (rev 238002)
+++ mozconfig	2017-06-18 00:45:40 UTC (rev 238003)
@@ -10,7 +10,7 @@
 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-libevent
 ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite

Added: no-crmf.diff
===================================================================
--- no-crmf.diff	                        (rev 0)
+++ no-crmf.diff	2017-06-18 00:45:40 UTC (rev 238003)
@@ -0,0 +1,15 @@
+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