libre/iceape: updated to 2.48

2 files changed, 25 insertions, 56 deletions

diff --git a/libre/iceape/PKGBUILD b/libre/iceape/PKGBUILD
index afc408510..fb7cc6385 100644
--- a/libre/iceape/PKGBUILD
+++ b/libre/iceape/PKGBUILD
@@ -2,28 +2,34 @@
 # Contributor: André Silva <emulatorman@riseup.net>
 # Contributor: Márcio Silva <coadde@riseup.net>
 
-_pkgname=seamonkey
 pkgname=iceape
+_oldname=seamonkey
+
 epoch=1
-_brandingver=2.39
-_brandingrel=3
-pkgver=2.46
-pkgrel=4
-pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
+pkgver=2.48
+pkgrel=1
+_brandingver=2.48
+_brandingrel=1
+
 arch=(i686 x86_64 armv7h)
 license=(MPL GPL LGPL)
+
+url="https://wiki.parabola.nu/$pkgname"
+pkgdesc="Iceape, the libre internet suite based on SeaMonkey."
+
 depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gtk3 hunspell libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification libpulse icu=59.1 gconf)
 makedepends=(unzip zip pkg-config python2 librsvg wireless_tools yasm mesa autoconf2.13 quilt imake python3 gst-plugins-base)
 optdepends=('gst-plugins-base: vorbis decoding, ogg demuxing'
             'gst-plugins-bad: aac, vp8 and opus decoding'
             'gst-plugins-good: webm and mp4 demuxing'
             'gst-plugins-ugly: h.264 decoding')
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
-provides=("$_pkgname")
+
+replaces=("$_oldname")
+conflicts=("$_oldname")
+provides=("$_oldname")
 install=$pkgname.install
-url="https://wiki.parabola.nu/$pkgname"
-source=("https://archive.mozilla.org/pub/mozilla.org/$_pkgname/releases/$pkgver/source/$_pkgname-$pkgver.source.tar.xz"
+
+source=("https://archive.mozilla.org/pub/mozilla.org/$_oldname/releases/$pkgver/source/$_oldname-$pkgver.source.tar.xz"
         "https://repo.parabola.nu/other/$pkgname/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz"
         "https://repo.parabola.nu/other/$pkgname/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig"
         mozconfig
@@ -32,10 +38,9 @@ source=("https://archive.mozilla.org/pub/mozilla.org/$_pkgname/releases/$pkgver/
         libre.patch
         rhbz-966424.patch
         no-crmf.patch
-        xulrunner-27.0-build-arm.patch
-        add-bracket-for-sed-4.3-compliance.patch)
-sha256sums=('39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912'
-            'ed6f0aab804235a8ea32631b8d8d664329e9507f7aa6fb016c87042bace51a44'
+        xulrunner-27.0-build-arm.patch)
+sha256sums=('6f9a07c86ba6474b44e5083f9d1315d01778c097937f7da4c5701debffab2631'
+            '2fd3568b07e4dddb0f81201c273c7a5ebb2ba837f49f71683b98f374d03134b4'
             'SKIP'
             'f0ce3865e2798a0575a29b49181ce1f058de2af8b7c5bae38670fda3d643d9e1'
             '46ac418fe26937460a36a593d71c8f5cef1288c9e747cac4ec4ca92db56da45d'
@@ -43,19 +48,15 @@ sha256sums=('39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912'
             '8055e44151f007dd176d2bc545aa3ce282e9b1a59b35ca1f9f93d1c3e21689cd'
             '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
             'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb'
-            'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e'
-            '705223f37b0016fe9fcf4e89d7cbed4ae0c192a5e3e1b7055ba0a9577da14077')
-validpgpkeys=(
-              'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
-              '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva
-)
+            'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e')
+validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 
 if [[ "$CARCH" == arm* ]]; then
   highmem=1
 fi
 
 prepare() {
-  cd "$_pkgname-$pkgver"
+  cd "$_oldname-$pkgver"
 
   install -m755 -d $pkgname
   mv -v "$srcdir"/$pkgname-$_brandingver/{branding,extras,patches} $pkgname
@@ -142,9 +143,6 @@ prepare() {
   # 2.26 build fix from wgnie (blfs ch 37)
   sed -i 's/$(MOZ_ZLIB_CFLAGS)/& $(MOZ_PIXMAN_CFLAGS)/' config/config.mk
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1329272
-  patch -Np1 -i ../add-bracket-for-sed-4.3-compliance.patch
-
   # ARM-specific changes
   if [[ "$CARCH" == arm* ]]; then
     cat >> .mozconfig <<- EOF
@@ -157,7 +155,7 @@ prepare() {
 }
 
 build() {
-  cd "$_pkgname-$pkgver"
+  cd "$_oldname-$pkgver"
 
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname-$pkgver"
   export MOZ_MAKE_FLAGS="$MAKEFLAGS"
@@ -172,7 +170,7 @@ build() {
 }
 
 package() {
-  cd "$_pkgname-$pkgver"
+  cd "$_oldname-$pkgver"
 
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
diff --git a/libre/iceape/add-bracket-for-sed-4.3-compliance.patch b/libre/iceape/add-bracket-for-sed-4.3-compliance.patch
deleted file mode 100644
index 6f23d2eb6..000000000
--- a/libre/iceape/add-bracket-for-sed-4.3-compliance.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 66fc64a75617ffc68f16780f60e39c1f368dfd41 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 9 Jan 2017 14:37:33 +0100
-Subject: [PATCH] bug 1329272: add bracket for sed 4.3 compliance, r=glandium
-
----
- mozilla/build/autoconf/icu.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mozilla/build/autoconf/icu.m4 b/mozilla/build/autoconf/icu.m4
-index 4f46345f435a..794ddcdf4e52 100644
---- a/mozilla/build/autoconf/icu.m4
-+++ b/mozilla/build/autoconf/icu.m4
-@@ -67,11 +67,11 @@ if test -n "$USE_ICU"; then
-         if test ! -d "$icudir"; then
-             AC_MSG_ERROR([Cannot find the ICU directory])
-         fi
-     fi
- 
--    version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
-+    version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
-     if test x"$version" = x; then
-        AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
-     fi
-     MOZ_ICU_VERSION="$version"
- 
--- 
-2.11.0
-