[icecat]: wip - upgrade to v78

2 files changed, 42 insertions, 34 deletions

diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD
index 0bb951fe3..ccaa4aa78 100644
--- a/libre/icecat-l10n/PKGBUILD
+++ b/libre/icecat-l10n/PKGBUILD
@@ -67,7 +67,7 @@ _package() {
   install -vDm644 $srcdir/region.properties $1/browser/chrome/$1/locale/browser-region
   rm -rv $1/chrome/$1/locale/$1/global-platform/{mac,win}
   rm -rv $1/browser/chrome/$1/locale/browser/searchplugins
-  cp -av /usr/lib/mozilla/searchplugins  $1/browser/chrome/$1/locale/browser
+  cp -av /usr/lib/mozilla/searchplugins $1/browser/chrome/$1/locale/browser
 
   cd $1
   zip -r langpack-$1@icecat.mozilla.org.xpi .
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 5590185cb..76e8bd32a 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,47 +1,50 @@
-# Maintainer (Arch:firefox): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor (Arch:firefox): Ionut Biru <ibiru@archlinux.org>
-# Contributor (Arch:firefox): Jakub Schmidtke <sjakub@gmail.com>
-
-# Contributor (ConnochaetOS:iceweasel): Henry Jensen <hjensen@connochaetos.org>
-
-# Maintainer: Andreas Grapentin <andreas@grapentin.org>
-# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
-# Contributor: André Silva <emulatorman@hyperbola.info>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Contributor: vando <facundo@esdebian.org>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
+# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Contributor: Figue <ffigue at gmail>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
+# Contributor: vando <facundo@esdebian.org>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor: Henry Jensen <hjensen@connochaetos.org>
+# Contributor: Luke Shumaker <lukeshu@parabola.nu>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
+# Maintainer: Andreas Grapentin <andreas@grapentin.org>
+
+
+# NOTE: this is a not a release
+# it is a WIP, based on an untested, pre-release source-ball
+# which is published only for the sake of those who want to help
+
 
 pkgname=icecat
-_pkgver=60.7.0-gnu1
-pkgver=${_pkgver//-/_}
+_upstream_ver=78.4.0-gnu1
+pkgver=${_upstream_ver//-/_}
 pkgrel=3
-pkgdesc="GNU IceCat - a libre standalone web browser based on Mozilla Firefox."
+pkgdesc="GNU IceCat - a libre standalone web browser based on Mozilla Firefox ESR"
 arch=(x86_64 i686 armv7h)
 license=(MPL GPL LGPL)
-url="http://www.gnu.org/software/gnuzilla/"
-depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib
-         ffmpeg nss ttf-font libpulse sqlite icu)
-makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils
-             xorg-server-xvfb autoconf2.13 rust=1:1.39.0 clang llvm9 jack gtk2
-             mozilla-searchplugins)
-# FIXME: rust=1:1.39.0 and llvm9 are special constraints for the 60.7.0-gnu1-2 rebuild
+url=http://www.gnu.org/software/gnuzilla/
+depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)
+makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
+             autoconf2.13 rust clang llvm jack gtk2 nodejs cbindgen nasm
+             python-setuptools python-psutil lld)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
             'speech-dispatcher: Text-to-Speech'
             'hunspell-en_US: Spell checking, American English')
 options=(!emptydirs !makeflags !debug)
-source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig}
+# source=(http://ftp.gnu.org/gnu/gnuzilla/${_upstream_ver%-*}/${pkgname}-${_upstream_ver}.tar.bz2{,.sig}
+source=(https://repo.parabola.nu/other/wip/${pkgname}-${_upstream_ver}-pre.tar.bz2{,.sig}
         $pkgname.desktop
         gnu_headshadow.png
-        libre-searchengines.patch
+#         libre-searchengines.patch
         libre.patch
-        mozilla-1463035.patch
-        deny_missing_docs.patch
-        fix-double-definition-of-gettid.patch)
+        mozilla-1463035.patch)
+#         deny_missing_docs.patch
+#         fix-double-definition-of-gettid.patch)
 sha256sums=('6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827'
             'SKIP'
             '2f9d117c1524312fb45f3e953cb0de02c525fd385a9b2b6d47308c8aaab0aedd'
@@ -51,21 +54,26 @@ sha256sums=('6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827'
             '6c3781e13d3e8343aa2435bdb78d2e2666891154c7abd847388e5331e0424edb'
             'cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4'
             '3ea006eafe4cee790955024faca3b3d7ac6cd6968b50635b9da3c254a07f4791')
-validpgpkeys=('318C679D94F17700CC847DE646A70073E4E50D4E') # Ruben Rodriguez
+validpgpkeys=('318C679D94F17700CC847DE646A70073E4E50D4E'  # Ruben Rodriguez
+              '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
 
 prepare() {
   cd "$srcdir/$pkgname-${pkgver%_*}"
 
-  patch -Np1 -i ../deny_missing_docs.patch
+#  echo "applying deny_missing_docs.patch"
+#  patch -Np1 -i ../deny_missing_docs.patch
 
-  patch -Np1 -i ../fix-double-definition-of-gettid.patch
+#  echo "applying fix-double-definition-of-gettid.patch"
+#  patch -Np1 -i ../fix-double-definition-of-gettid.patch
 
   # needed for 60.7-esr
   export CXXFLAGS="$CXXFLAGS -fpermissive"
 
-  # Patch to move files directly to /usr/lib/icecat. No more symlinks.
-  sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
-  sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk
+  # Move files directly to /usr/lib/icecat (no more symlinks)
+  local sed_rx='s;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g'
+  sed -e "${sed_rx}" -i config/baseconfig.mk
+  sed_rx='s;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g'
+  sed -e "${sed_rx}" -i config/baseconfig.mk
 
   cat >.mozconfig <<END
 ac_add_options --enable-application=browser