From 00191495e4aa958e3ef3ac0eb3f51626c948e964 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Sat, 18 Apr 2020 09:03:33 +0200 Subject: libre/iceape: rebuilt against new libffi --- libre/iceape/PKGBUILD | 11 +++++++++-- libre/iceape/gettid.patch | 13 +++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 libre/iceape/gettid.patch diff --git a/libre/iceape/PKGBUILD b/libre/iceape/PKGBUILD index 69272ed54..08fc5207a 100644 --- a/libre/iceape/PKGBUILD +++ b/libre/iceape/PKGBUILD @@ -8,7 +8,7 @@ pkgname=iceape epoch=1 pkgver=2.49.4 pkgrel=5 -pkgrel+=.parabola3 +pkgrel+=.parabola5 _brandingver=2.49 _brandingrel=1 pkgdesc="Iceape, the libre internet suite based on SeaMonkey." @@ -29,6 +29,7 @@ source=("https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/ mozconfig seamonkey-2.0-lang.patch patch-bug1435212 + gettid.patch no-crmf.diff) source+=(https://repo.parabola.nu/other/$pkgname/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig} libre.patch @@ -38,6 +39,7 @@ sha256sums=('c8a66774d0a3525698b559fa2c41397186f2de99c5733e35b8eafb0ae5ccc4ee' '4e55b0fbbec93e4d7f68118722fa7c61c06b55aa888c6f2923710a0b3953115b' 'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e' 'a24204acc1149f92b96feb33cdb8668f1b938ab907cbcf6fdf8306cb3939976e' + '923154d052f041af15a2495ceb1f76f7c8619fd8bfc66a0bbedfeab2514adf0b' 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb' 'c6d571ce5fcec98742cc588b56cb543489b73e7e53eeaf0a8f46910f58782ad8' 'SKIP' @@ -117,6 +119,9 @@ prepare() { # https://github.com/freebsd/freebsd-ports/blob/master/www/seamonkey/files/patch-bug1435212 patch -Np1 -d mozilla -i ../../patch-bug1435212 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1533969 + patch -Np1 -i ../gettid.patch + # Don't exit with error when some libs are missing which we have in # system. sed -i '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' suite/installer/Makefile.in @@ -158,6 +163,9 @@ build() { CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" + # GCC 9 + CXXFLAGS+=" -Wno-format-overflow" + make -j1 -f client.mk build } @@ -191,4 +199,3 @@ package() { rm -f "$pkgdir/usr/lib/pkgconfig/"$pkgname-ns{s,pr}.pc #rm -r "$pkgdir"/usr/{include,lib/$pkgname-devel-$pkgver,share/idl} } - diff --git a/libre/iceape/gettid.patch b/libre/iceape/gettid.patch new file mode 100644 index 000000000..27a1b017e --- /dev/null +++ b/libre/iceape/gettid.patch @@ -0,0 +1,13 @@ +--- seamonkey-2.49.4/mozilla/tools/profiler/core/platform.h.orig 2020-04-09 05:40:25.587372314 +0300 ++++ seamonkey-2.49.4/mozilla/tools/profiler/core/platform.h 2020-04-09 05:41:24.195387788 +0300 +@@ -65,10 +65,6 @@ + #include + #if !defined(__BIONIC__) + #include +-static inline pid_t gettid() +-{ +- return (pid_t) syscall(SYS_gettid); +-} + #endif + #endif + -- cgit v1.2.3