From 8d7a9daf1038cdefd25aa3224b4a742d696ca94b Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Mon, 4 Mar 2019 21:05:14 +0100 Subject: libre/iceape: updated to 2.49.4 --- libre/iceape/PKGBUILD | 72 +++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 31 deletions(-) (limited to 'libre/iceape/PKGBUILD') diff --git a/libre/iceape/PKGBUILD b/libre/iceape/PKGBUILD index 9b3fb7cf1..8d8c3f06a 100644 --- a/libre/iceape/PKGBUILD +++ b/libre/iceape/PKGBUILD @@ -1,4 +1,3 @@ -# $Id$ # Maintainer (Arch): Kyle Keen # Maintainer: Andreas Grapentin # Contributor: André Silva @@ -7,16 +6,15 @@ _pkgname=seamonkey pkgname=iceape epoch=1 -pkgver=2.49.2 +pkgver=2.49.4 pkgrel=4 -_bver=2.48 -_brel=1 +_brandingver=2.49 +_brandingrel=1 pkgdesc="Iceape, the libre internet suite based on SeaMonkey." arch=('x86_64') arch+=('i686' 'armv7h') license=('MPL') -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'gtk3' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification' 'libpulse' 'icu' 'gconf') -depends+=('icu>=63' 'icu<64') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'gtk3' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification' 'libpulse' 'icu') makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13' 'imake' 'python3' 'gst-plugins-base') makedepends+=('mozilla-searchplugins' 'quilt') optdepends=('gst-plugins-base: vorbis decoding, ogg demuxing' @@ -26,36 +24,35 @@ optdepends=('gst-plugins-base: vorbis decoding, ogg demuxing' url="https://wiki.parabola.nu/$pkgname" replaces=("$_pkgname") conflicts=("$_pkgname") -source=(https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz +source=("https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz" mozconfig - $pkgname-2.0-lang.patch - rhbz-966424.patch - mozbug1323209.patch - mozbug1329272.patch + seamonkey-2.0-lang.patch + patch-bug1435212.xz no-crmf.diff) -source+=(https://repo.parabola.nu/other/$pkgname/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig} - libre.patch $pkgname.desktop) -sha256sums=('09fc9f8b1817a901b4e0d7635701ab50236885821d73694ac21615c8d911b575' - '1e88c4f6a1bd8170a714087325c3ba0b88c0b4352c4cd4db58317a3a0d2271c4' +source+=(https://repo.parabola.nu/other/$pkgname/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig} + libre.patch + $pkgname.desktop + xulrunner-27.0-build-arm.patch) +sha256sums=('c8a66774d0a3525698b559fa2c41397186f2de99c5733e35b8eafb0ae5ccc4ee' + '4e55b0fbbec93e4d7f68118722fa7c61c06b55aa888c6f2923710a0b3953115b' 'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e' - '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a' - '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4' - '33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b' + 'dce68858694f820a9a1fc2428038a88ea00b4835cea0778734db794fea3bb21a' 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb' - '2fd3568b07e4dddb0f81201c273c7a5ebb2ba837f49f71683b98f374d03134b4' + 'c6d571ce5fcec98742cc588b56cb543489b73e7e53eeaf0a8f46910f58782ad8' 'SKIP' - '8055e44151f007dd176d2bc545aa3ce282e9b1a59b35ca1f9f93d1c3e21689cd' - '46ac418fe26937460a36a593d71c8f5cef1288c9e747cac4ec4ca92db56da45d') + '5fb5ae632c8c103d8d7be123f32340881372ee1e1b29f19790d058ee8eb16eb0' + '46ac418fe26937460a36a593d71c8f5cef1288c9e747cac4ec4ca92db56da45d' + 'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e') validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin prepare() { cd "$_pkgname-$pkgver" cp ../mozconfig .mozconfig - #patch -Np1 -i ../$pkgname-2.0-lang.patch + #patch -Np1 -i ../seamonkey-2.0-lang.patch # perform branding install -m755 -d $pkgname - mv -v "$srcdir"/$pkgname-$_bver/{branding,extras,patches} $pkgname + mv -v "$srcdir"/$pkgname-$_brandingver/{branding,extras,patches} $pkgname export QUILT_PATCHES=$pkgname/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' @@ -115,14 +112,9 @@ prepare() { # FS#48404 #echo "ac_add_options --enable-gstreamer=1.0" >> .mozconfig - # https://bugs.archlinux.org/task/41689 - #patch -Np1 -d mozilla -i ../../rhbz-966424.patch - - # Support NSS 3.28 - #patch -Np1 -d mozilla -i ../../mozbug1323209.patch - - # Bugfix for icu detection - #patch -Np1 -d mozilla -i ../../mozbug1329272.patch + # ffmpeg 4.0 patch from freebsd + # https://github.com/freebsd/freebsd-ports/blob/master/www/seamonkey/files/patch-bug1435212 + patch -Np1 -d mozilla -i ../../patch-bug1435212 # Don't exit with error when some libs are missing which we have in # system. @@ -137,6 +129,20 @@ prepare() { # work around from FS#54395 patch -Np1 -d mozilla -i ../../no-crmf.diff sed -i "s/'crmf',//" mozilla/security/manager/ssl/moz.build + sed -i 's/^.*-lcrmf/#&/' mozilla/config/external/nss/crmf/moz.build + sed -i 's/ -lcrmf"/"/' mozilla/old-configure.in.orig + sed -i 's/ -lcrmf"/"/' mozilla/old-configure + sed -i 's/SDK_LIBS = crmf/SDK_LIBS = /' mozilla/config/external/nss/Makefile.in + + if [[ $CARCH = i686 ]]; then + LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" + fi + + if [[ $CARCH = arm* ]]; then + echo "ac_add_options --disable-elf-hack" >> .mozconfig + LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" + patch -p2 -d mozilla -i "${srcdir}"/xulrunner-27.0-build-arm.patch + fi } build() { @@ -155,6 +161,10 @@ build() { } package() { + local _icu_ver + _icu_ver=$(pacman -S --print-format='%v' icu) + depends+=("icu>=${_icu_ver}" "icu<$((${_icu_ver%%.*} + 1))") + cd "$_pkgname-$pkgver" make -j1 -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install -- cgit v1.2.3