From 6fd783fe66ce027f8773931b7472e52de6d8667c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Thu, 23 Aug 2018 15:37:37 -0400
Subject: libre/iceweasel: From ff 61.0-1: Drop no-crmf.diff

---
 libre/iceweasel/PKGBUILD     |  3 ---
 libre/iceweasel/no-crmf.diff | 15 ---------------
 2 files changed, 18 deletions(-)
 delete mode 100644 libre/iceweasel/no-crmf.diff

(limited to 'libre')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 82205ed80..d3b3b9a20 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -69,9 +69,6 @@ prepare() {
 
   cd firefox-$pkgver
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
-  patch -Np1 -i ../no-crmf.diff
-
   cat >.mozconfig <<END
 ac_add_options --enable-application=browser
 
diff --git a/libre/iceweasel/no-crmf.diff b/libre/iceweasel/no-crmf.diff
deleted file mode 100644
index 682ba3fc0..000000000
--- a/libre/iceweasel/no-crmf.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git i/old-configure.in w/old-configure.in
-index 12170a47568f..dbbaa0bc9194 100644
---- i/old-configure.in
-+++ w/old-configure.in
-@@ -1808,9 +1808,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
-     AM_PATH_NSS(3.35, [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
-- 
cgit v1.2.3