summaryrefslogtreecommitdiff
path: root/nonprism
diff options
context:
space:
mode:
Diffstat (limited to 'nonprism')
-rw-r--r--nonprism/icedove/PKGBUILD32
-rw-r--r--nonprism/icedove/no-crmf.patch39
2 files changed, 57 insertions, 14 deletions
diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index 733c3e8c9..b3aa61360 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Andreas Grapentin <andreas@grapnentin.org>
+# Maintainer: Andreas Grapentin <andreas@grapentin.org>
# Contributor: André Silva <emulatorman@riseup.net>
# Contributor: Márcio Silva <coadde@riseup.net>
# Contributor: Luke R. <g4jc@openmailbox.org>
@@ -8,8 +8,8 @@ _oldname=thunderbird
pkgname=icedove
epoch=1
-pkgver=52.1.1
-pkgrel=2.nonprism1
+pkgver=52.2.0
+pkgrel=1.nonprism1
_brandingver=52.1
_brandingrel=1
@@ -46,8 +46,9 @@ source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname
rust-fix-rusty-cheddar-crate-setup.patch
rust-target-i586-to-i686.patch
libre-searchengines.patch
- no-neon.patch)
-sha256sums=('88211d0d57dfdae9232617244f9c5406520a538e9e7be6ceec79fdfed175ba84'
+ no-neon.patch
+ no-crmf.patch)
+sha256sums=('c65c66244ac113996002bcfa9e387f14291163cfb7009a9126e3a8d4a970e72d'
'246418976524fbead5b99e6227f97322f8d4c45e0edf9ce75561ae8eccdefc65'
'SKIP'
'd552b793e17fb1c09637d6fdf4680eee32b849941f7181d104e42fbe17e5d593'
@@ -58,7 +59,8 @@ sha256sums=('88211d0d57dfdae9232617244f9c5406520a538e9e7be6ceec79fdfed175ba84'
'e03cdc40e4ea39560aa230ef7a9c494f3a343c0feb8f43b68a47769f88f6b315'
'069fab4b99dd51d7d004124d0052ea7b864cf060ea943348d290ba6aae50b0ab'
'0db12bef46e0ad68dbdf6ce0c767956d6758b073531012a850e7975eda3fc7fe'
- '59f40d8b2480aa67bf76f4f119826b6828a6a59cc040caf1ab5a6e19eef44c6e')
+ '59f40d8b2480aa67bf76f4f119826b6828a6a59cc040caf1ab5a6e19eef44c6e'
+ 'a7317caba56e89932bd9e3b9352d94701dd9a419685057f238b1ded8dc0adcd7')
validpgpkeys=(
'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin
)
@@ -68,10 +70,10 @@ prepare() {
local brandingdir="$srcdir/$pkgname-$_brandingver"
- # prepare branding for icedove
+ # Prepare branding for the Icedove packages
mkdir -v mail/branding/$pkgname
- # copy the branding filev
+ # copy the branding files
cp -va $brandingdir/$pkgname-branding/* mail/branding/$pkgname
# patch
@@ -81,7 +83,7 @@ prepare() {
quilt push -av
- # copy the icons
+ # install the icons
for i in 16 22 24 32 48 64 128 256; do
install -Dm644 $brandingdir/app-icons/$pkgname$i.png \
mail/branding/$pkgname/mailicon$i.png
@@ -95,11 +97,14 @@ prepare() {
# install to /usr/lib/icedove
patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
- # fix rust build
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
+ patch -Np1 -i "$srcdir/no-crmf.patch"
+
+ # Fix rust build
patch -Np1 -i "$srcdir/rust-fix-rusty-cheddar-crate-setup.patch"
patch -Np1 -i "$srcdir/rust-target-i586-to-i686.patch"
- # fix freedom issues
+ # Fix freedom issues
patch -Np1 -i "$srcdir/libre-searchengines.patch"
# Remove url-classifier from package-manifest.in to build and disable Phishing Protection
@@ -145,7 +150,7 @@ prepare() {
# Load our searchplugins
rm -rv mail/locales/en-US/searchplugins
- cp -av /usr/lib/mozilla/searchplugins mail/locales/en-US
+ cp -av /usr/lib/mozilla/searchplugins mail/locales/en-US/
# ARM-specific changes:
if [[ "$CARCH" == arm* ]]; then
@@ -153,7 +158,6 @@ prepare() {
sed -i 's/\^\[:space:\]\*/^[[:space:]]*/' mozilla/{,js/src/}configure
patch -Np0 -i ../no-neon.patch
- patch -p2 -d mozilla < ../mozilla-1253216.patch
sed -i '/ac_add_options --enable-gold/d' .mozconfig
cat >> .mozconfig <<- EOF
ac_add_options --disable-elf-hack
@@ -190,7 +194,7 @@ package() {
make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
- install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js"
+ install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js"
local brandingdir="$srcdir/$pkgname-$_brandingver"
diff --git a/nonprism/icedove/no-crmf.patch b/nonprism/icedove/no-crmf.patch
new file mode 100644
index 000000000..73e545de0
--- /dev/null
+++ b/nonprism/icedove/no-crmf.patch
@@ -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
+@@ -10692,9 +10692,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.4, [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
+