~alpine/aports

[alpine-aports] [PATCH] testing/seamonkey: upgrade to 2.48

Marc Vertes <mvertes@free.fr>
Details
Message ID
<20170903134307.11790-1-mvertes@free.fr>
Sender timestamp
1504446187
DKIM signature
missing
Download raw message
Patch: +23 -17
In addition to version upgrade, following changes are applied:
- the support of gcc6 is now correct, fixing email account wizard
- libevent dependency is taken from system instead of internal
- cairo dependency is taken from system instead of internal
---
 testing/seamonkey/APKBUILD           | 17 ++++++++++-------
 testing/seamonkey/fix-libevent.patch | 11 +++++++++++
 testing/seamonkey/mozconfig          | 12 ++----------
 3 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 testing/seamonkey/fix-libevent.patch

diff --git a/testing/seamonkey/APKBUILD b/testing/seamonkey/APKBUILD
index 73ef1de16a..b79ca297bf 100644
--- a/testing/seamonkey/APKBUILD
+++ b/testing/seamonkey/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Marc Vertes <mvertes@free.fr>
# Maintainer: Marc Vertes <mvertes@free.fr>
pkgname=seamonkey
pkgver=2.46
pkgrel=6
pkgver=2.48
pkgrel=0
pkgdesc="all-in-one internet application suite"
url="http://www.seamonkey-project.org"
arch="x86_64"
@@ -21,6 +21,7 @@ source=" https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/

	fix-aouth.patch
	fix-hunspell.patch
	fix-libevent.patch
	fix-libgen.patch
	fix-linux-syscall.patch
	fix-mallinfo.patch
@@ -39,12 +40,13 @@ build() {
	cp ../../mozconfig .mozconfig
	export MOZ_MAKE_FLAGS="$MAKEFLAGS"
	export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver"
	# Needed for mozilla/python/mach/mach/mixin/process.py
	export SHELL="/bin/ash"
	# Disable null pointer gcc6 optimization in gcc6 (rhbz#1328045)
	MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks"
	unset MAKEFLAGS CPPFLAGS

	# Disable some optimizations in gcc6 (rhbz#1328045)
	CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
	CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"

	make -f client.mk build || return 1
}

@@ -74,10 +76,11 @@ package() {
	rm -f "$pkgdir/usr/lib/pkgconfig/seamonkey-nspr.pc"
}

sha512sums="b70a40ad6797c82458436ce8e15d461bec982916a3ad5949610f2830647872f3b54a63fb62b17780c33e74c067054b590d0a5ebd0e836854a10e60feee692491  seamonkey-2.46.source.tar.xz
24cf618f0bd28cf0aef645db311cb62962f655e29c72b299095731a845361aac8d041e526f0407014ee2dd6825bc4399b74ba8f9e09120a9f4becc7d5eb6f372  mozconfig
sha512sums="b1992a1dbaeb045aea10ff02aa214ec0c1725e3ad0844d2dffd1c0d0c26754fbd98b5fb5df25a2a490ebcb7a47037c61599b0a2e9240338b4e769e529faa33cf  seamonkey-2.48.source.tar.xz
1f451422013fcf58ae6ff70b9802f9b83db235610767e0ee0616c3ef8d7317a32200fe7594797692c93be448b3f704beb8449ba63fb23c228f907216abaf80b9  mozconfig
c3b3b5a32f8672a42c051c03c31761414ce52c4a32258f1c7417af7de891e4b5f620ef2762034a18f84e5c7235559d920963aff0f28c2c1f4ae697a38d49b89c  fix-aouth.patch
ea58a2cf58e7d1d99a2346a6977fcb2acff8052e304f9f0d66e24241d77fe352610537c4d2a886b9085b970368dbe46e5011acc210bebcdf22a88a4b5be960b1  fix-hunspell.patch
c2a83214cadc827dd6d37c635ea92ff0779849e55e524b831f1a82ca09dc985770212a81377c2519c3470d752e922fa360d6e49fdfc1f6e9ee581f30ad1885f1  fix-libevent.patch
f148a9212b9d1bf62ce99e3ea69233fcdd74ffb0948ab53d17ec417539b4f9533409b2e9c487e3789b76cdfca92da074b9ea0f82452f56f72eced9cfbcd078f1  fix-libgen.patch
fe377b6c0acbbb569f363cde2de8c640837237120bcbc3099cb9d9691f5b576cd76c531b0019e45385f696d7be60bb97141e39f2de742cb6d1a138fbcf217cc5  fix-linux-syscall.patch
fd6b68082843a17a97a09953f24f74e72090acbcd245e8564ffe41ed5cb0a7afbf3dfc653a6e33a5f0bb0218ec11430f92acedc0c98a32c17dd2a053c3eef855  fix-mallinfo.patch
diff --git a/testing/seamonkey/fix-libevent.patch b/testing/seamonkey/fix-libevent.patch
new file mode 100644
index 0000000000..2d410237cd
--- /dev/null
+++ b/testing/seamonkey/fix-libevent.patch
@@ -0,0 +1,11 @@
--- seamonkey-2.48/mozilla/ipc/chromium/src/base/message_pump_libevent.cc.orig
+++ seamonkey-2.48/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
@@ -23,7 +23,7 @@
 // This macro checks that the _EVENT_SIZEOF_* constants defined in
 // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct.
 #define CHECK_EVENT_SIZEOF(TYPE, type) \
-    static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \
+    static_assert(EVENT__SIZEOF_##TYPE == sizeof(type), \
     "bad _EVENT_SIZEOF_"#TYPE);
 
 CHECK_EVENT_SIZEOF(LONG,      long);
diff --git a/testing/seamonkey/mozconfig b/testing/seamonkey/mozconfig
index dbc07455c9..7c99ec5a4b 100644
--- a/testing/seamonkey/mozconfig
+++ b/testing/seamonkey/mozconfig
@@ -10,16 +10,14 @@ ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-bz2
ac_add_options --with-system-png
#ac_add_options --with-system-libevent
ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
#ac_add_options --with-system-harfbuzz
ac_add_options --with-system-icu

ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-ffi
# Use internal cairo due to reports of unstable execution with system cairo
#ac_add_options --enable-system-cairo
ac_add_options --enable-system-cairo
ac_add_options --with-pthreads
ac_add_options --enable-system-pixman

@@ -36,19 +34,13 @@ ac_add_options --enable-official-branding
ac_add_options --enable-safe-browsing
ac_add_options --enable-url-classifier

#ac_add_options --disable-gnomevfs
ac_add_options --disable-pulseaudio
ac_add_options --disable-gconf
ac_add_options --disable-elf-hack
#ac_add_options --disable-cpp-exceptions
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
ac_add_options --disable-tests
#ac_add_options --disable-pedantic
ac_add_options --disable-necko-wifi
#ac_add_options --disable-mochitest
#ac_add_options --disable-installer
#ac_add_options --disable-javaxpcom
ac_add_options --disable-icf
ac_add_options --disable-dbus
ac_add_options --disable-gnomeui
-- 
2.14.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)