From ad582ecc880b9a5a5f7bfaaf48be7348692b0242 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Tue, 29 Jan 2019 02:14:12 +0100
Subject: libre/icecat: updated to 60.3.0_gnu1

---
 libre/icecat/no-crmf.diff | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 libre/icecat/no-crmf.diff

(limited to 'libre/icecat/no-crmf.diff')

diff --git a/libre/icecat/no-crmf.diff b/libre/icecat/no-crmf.diff
deleted file mode 100644
index 0d9d46590..000000000
--- a/libre/icecat/no-crmf.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git i/old-configure.in w/old-configure.in
-index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
---- i/old-configure.in
-+++ w/old-configure.in
-@@ -2126,9 +2126,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
-     AM_PATH_NSS(3.28.6, [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"
- fi
- 
-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_SYSTEM_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
-
-- 
cgit v1.2.3