[icedove]: sync with arch v68 (broken)

1 files changed, 20 insertions, 22 deletions

diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 4895bbdf4..8d5afb25c 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -19,45 +19,40 @@
 _pkgname=thunderbird
 pkgname=icedove
 replaces=("$_pkgname")
-epoch=1
-pkgver=60.6.1
-pkgrel=3
+pkgver=68.1.0
+pkgrel=1
 pkgrel+=.parabola1
 _brandingver=60.5
 _brandingrel=1
 pkgdesc="Libre standalone mail and news reader based on Mozilla Thunderbird"
+url="https://wiki.parabola.nu/$pkgname"
 arch=(x86_64)
 arch+=(i686 armv7h)
 license=(MPL GPL LGPL)
-url="https://wiki.parabola.nu/$pkgname"
-depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib
+
+depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib
          nss hunspell sqlite ttf-font icu)  # libvpx
-makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils xorg-server-xvfb
-             autoconf2.13 rust clang llvm)
+makedepends=(unzip zip diffutils python python2 yasm nasm mesa imake libpulse inetutils xorg-server-xvfb
+             autoconf2.13 rust clang llvm gtk2 cbindgen nodejs)
 makedepends+=(quilt mozilla-searchplugins python2-blessings imagemagick)
 optdepends=('libcanberra: sound support')
 options=(!emptydirs !makeflags)
-source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
-        rust-1.33.patch
+source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz{,.asc}
         $pkgname.desktop
         https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig}
-        mozilla-1238661.patch
         libre-searchengines.patch)
-sha256sums=('17aef9232a76bdc812422883c02b01b4ecb7633c3ee9870da5e4ec0e20ba5f67'
-            '97bdb978d59cf5f0f967750e9d8dfbc8fc73367b08437838c44a308fe2ee5442'
+sha256sums=('de0e5c7d1d5576f451e386e4779f155b7af97621a4e22caac0c6dee3c9d76eef'
+            'SKIP'
             'af8199a12ebe09189d143458bd1e2d0071aff3410ed121dc2329a448a56632f0'
             '590862b39ba7baf60e47240e33de5839a8e85b6831c839ea57481968c9020241'
             'SKIP'
-            '97b1d3bb2916cd1a297682b3ae4dc679a5afce28610140c73e454b931116028e'
             '9ef9dd18ac1f76ccc3d5d2ace866bb40199fd00a1192da83aef376c585be2ec3')
-validpgpkeys=(BFA8008A8265677063B11BF47171986E4B745536) # Andreas Grapentin
+validpgpkeys=(14F26682D0916CDD81E37B6D61B7B526D98F0353) # Mozilla Software Releases <release@mozilla.com>
+validpgpkeys+=(BFA8008A8265677063B11BF47171986E4B745536) # Andreas Grapentin
 
 prepare() {
   cd $_pkgname-$pkgver
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1539901 (Patch from Fedora)
-  patch -Np1 -i ../rust-1.33.patch
-
   cat >.mozconfig <<END
 ac_add_options --enable-application=comm/mail
 ac_add_options --enable-calendar
@@ -67,7 +62,10 @@ ac_add_options --enable-release
 ac_add_options --enable-linker=gold
 ac_add_options --enable-hardening
 ac_add_options --enable-optimize
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
 #ac_add_options --enable-rust-simd
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
+ac_add_options --disable-elf-hack
 
 # Branding
 ac_add_options --disable-official-branding
@@ -80,7 +78,7 @@ ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --with-system-icu
 ac_add_options --with-system-jpeg
-# FIXME: does not build against libvpx-1.8.0
+# FIXME: does not build against libvpx-1.8.0 or libvpx-1.8.1
 # ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
@@ -94,6 +92,8 @@ ac_add_options --disable-jack
 ac_add_options --enable-startup-notification
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
+ac_add_options --disable-gconf
+# tests require network access.
 ac_add_options --disable-tests
 END
 
@@ -102,9 +102,6 @@ END
     sed -i '/--enable-hardening/d' .mozconfig
     sed -i '/--enable-optimize/d' .mozconfig
 
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1238661
-    patch -Np1 -i "$srcdir"/mozilla-1238661.patch
-
     cat >> .mozconfig <<END
 ac_add_options --disable-webrtc
 ac_add_options --disable-elf-hack
@@ -209,8 +206,9 @@ pref("social.directories", "");
 // Disable the GeoLocation API for content
 pref("geo.enabled", false);
 
+// TODO: this "whats new" page should be in the branding package or abslibre
 // Pointing the "Help -> What's new" menu entry to mozilla.debian.net
-pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew45");
+//pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew45");
 END
 
   _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"