summaryrefslogtreecommitdiff
path: root/libre/icedove/no-crmf.diff
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2018-01-31 17:25:25 +0100
committerAndreas Grapentin <andreas@grapentin.org>2018-01-31 21:30:12 +0100
commit053755d6cabfc82cc3cf83042ea7b09e91d83bde (patch)
tree3db78a488d04056c638f5f1c5bf1b46a7a9176cd /libre/icedove/no-crmf.diff
parent492e722dd76bdeeee538f769ed25d49c3834f396 (diff)
downloadabslibre-053755d6cabfc82cc3cf83042ea7b09e91d83bde.tar.gz
abslibre-053755d6cabfc82cc3cf83042ea7b09e91d83bde.tar.bz2
abslibre-053755d6cabfc82cc3cf83042ea7b09e91d83bde.zip
libre/icedove: updated to 52.6.0
Diffstat (limited to 'libre/icedove/no-crmf.diff')
-rw-r--r--libre/icedove/no-crmf.diff39
1 files changed, 39 insertions, 0 deletions
diff --git a/libre/icedove/no-crmf.diff b/libre/icedove/no-crmf.diff
new file mode 100644
index 000000000..4d74a1af2
--- /dev/null
+++ b/libre/icedove/no-crmf.diff
@@ -0,0 +1,39 @@
+diff -u -rN thunderbird-52.1.1/mozilla/config/external/nss/crmf/moz.build thunderbird-52.1.1-nocrmf/mozilla/config/external/nss/crmf/moz.build
+--- thunderbird-52.1.1/mozilla/config/external/nss/crmf/moz.build 2017-05-09 23:35:13.000000000 +0200
++++ thunderbird-52.1.1-nocrmf/mozilla/config/external/nss/crmf/moz.build 2017-06-14 01:51:36.686773132 +0200
+@@ -8,7 +8,6 @@
+
+ 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
+diff -u -rN thunderbird-52.1.1/mozilla/old-configure thunderbird-52.1.1-nocrmf/mozilla/old-configure
+--- thunderbird-52.1.1/mozilla/old-configure 2017-05-09 23:35:35.000000000 +0200
++++ thunderbird-52.1.1-nocrmf/mozilla/old-configure 2017-06-14 01:50:28.726873231 +0200
+@@ -10693,9 +10693,7 @@
+
+ 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 -u -rN thunderbird-52.1.1/mozilla/old-configure.in thunderbird-52.1.1-nocrmf/mozilla/old-configure.in
+--- thunderbird-52.1.1/mozilla/old-configure.in 2017-05-09 23:35:22.000000000 +0200
++++ thunderbird-52.1.1-nocrmf/mozilla/old-configure.in 2017-06-14 01:50:50.953507079 +0200
+@@ -2126,9 +2126,7 @@
+ 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
+