summaryrefslogtreecommitdiff
path: root/libre/iceweasel
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-08-23 15:37:37 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-08-23 15:56:44 -0400
commit6fd783fe66ce027f8773931b7472e52de6d8667c (patch)
tree7ef2f7dd86b25cccf515ebd97ee1771f75330150 /libre/iceweasel
parent56dc0faf282f93024b8c68a36cc13e5772e94b9c (diff)
downloadabslibre-6fd783fe66ce027f8773931b7472e52de6d8667c.tar.gz
abslibre-6fd783fe66ce027f8773931b7472e52de6d8667c.tar.bz2
abslibre-6fd783fe66ce027f8773931b7472e52de6d8667c.zip
libre/iceweasel: From ff 61.0-1: Drop no-crmf.diff
Diffstat (limited to 'libre/iceweasel')
-rw-r--r--libre/iceweasel/PKGBUILD3
-rw-r--r--libre/iceweasel/no-crmf.diff15
2 files changed, 0 insertions, 18 deletions
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