Subject: [alpine-aports] [PATCH] testing/seamonkey: upgrade to version 2.46

From: Marc Vertes <[email-masked]>
Date: Sun, 12 Feb 2017 20:45:33 +0000

---
 testing/seamonkey/APKBUILD                | 42 ++++++-------------------------
 testing/seamonkey/fix-aouth.patch         | 16 ++++++------
 testing/seamonkey/fix-hunspell.patch      | 16 ++++++++++++
 testing/seamonkey/fix-linux-syscall.patch | 25 ++++++++++--------
 testing/seamonkey/mozconfig               | 21 +++++++---------
 5 files changed, 56 insertions(+), 64 deletions(-)
 create mode 100644 testing/seamonkey/fix-hunspell.patch

diff --git a/testing/seamonkey/APKBUILD b/testing/seamonkey/APKBUILD
index df06ded3b2..5a9ce7f11d 100644
--- a/testing/seamonkey/APKBUILD
+++ b/testing/seamonkey/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Marc Vertes <[email-masked]>
 # Maintainer: Marc Vertes <[email-masked]>
 pkgname=seamonkey
-pkgver=2.40
+pkgver=2.46
 pkgrel=2
 pkgdesc="all-in-one internet application suite"
 url="http://www.seamonkey-project.org"
@@ -11,7 +11,7 @@ depends=""
 makedepends="unzip zip gtk+2.0-dev yasm alsa-lib-dev libxt-dev linux-headers
 	hunspell-dev nspr-dev nss-dev jpeg-dev bzip2-dev zlib-dev libpng-dev
 	libevent-dev libvpx-dev sqlite-dev libffi-dev pixman-dev python2-dev
-	startup-notification-dev icu-dev m4 libxcomposite-dev paxmark
+	startup-notification-dev icu-dev m4 libxcomposite-dev paxmark autoconf2.13
 	"
 install=""
 subpackages=""
@@ -19,10 +19,10 @@ source=" https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/
 	mozconfig
 
 	fix-aouth.patch
+	fix-hunspell.patch
 	fix-libgen.patch
 	fix-linux-syscall.patch
 	fix-mallinfo.patch
-	fix-platform-gettid.patch
 	fix-platform-linux.patch
 	fix-siginfo_t.patch
 	fix-stabs.patch
@@ -73,39 +73,13 @@ package() {
 	rm -f "$pkgdir/usr/lib/pkgconfig/seamonkey-nspr.pc"
 }
 
-md5sums="5789df8f96e14577c275f10fdf8462f3  seamonkey-2.40.source.tar.xz
-518a0fba45c84cb47884e18739a2e35c  mozconfig
-f7be9a1bb5639f3f4fc9e5bd06145fdb  fix-aouth.patch
-f471609b5c1ce472cced8844b441e570  fix-libgen.patch
-b7b7f7ea1b9c5f427e40d17155a1ac7a  fix-linux-syscall.patch
-90b7c8ec4f01d98c1e18a2b78c5cb798  fix-mallinfo.patch
-7f66d103a3efa87b50a1bd03b519f134  fix-platform-gettid.patch
-676d4ca1cbabf6d0695edf5620df0b54  fix-platform-linux.patch
-efa62f03c01f6c1da3dc59663b872e97  fix-siginfo_t.patch
-3a72587709ba0f04c782b6c36c597b92  fix-stabs.patch
-5c96430b83fb008750ba943944b96aed  fix-sysctl.patch
-b23f1511dfc54d84fdc8346c595b7499  fix-system-headers.patch
-2a8813b97256180bdbf5eed1a1ec3fab  firefox-gcc-6.0.patch"
-sha256sums="7ecccc039d03f38d197b123b59ea42eac4c0c10e4bdec779b3665d79b435fa01  seamonkey-2.40.source.tar.xz
-61eff85a616ffd4325d75d2d7871fe8bf2f8faa31b0a64b29c6d255ce891a5d5  mozconfig
-b6224ec48fa5250652b4dcbb4c2eae34cd02486f73327774a59652911909f956  fix-aouth.patch
-3c16171ab7205d5be417a739bc3cf6bb4dae154adce5a559c4b060d532ceaa71  fix-libgen.patch
-d779db64ed94de9f8336deea1e3f60a8bb5f7f43165c8aad08fa04fc9b3acbd6  fix-linux-syscall.patch
-8a189a43d4d5ddce8d15eb67e08742f1d07773ee8147803cd4a33490549a61df  fix-mallinfo.patch
-d9f192b4603ac9265476f072549f9752bd0785505c4a0cdf1ae0decd739bb22e  fix-platform-gettid.patch
-cabab41e8003f5445b178d59cb0b594e7c9c0009fb842be275adbd749efa5fcb  fix-platform-linux.patch
-f2cc65f42bd672ff1cbf4904def0ce4d99b7776dc2e2d7cc1c8bd2dcee47ed83  fix-siginfo_t.patch
-04475564fa7df52b90afa5bfbf9381f50f1732a4073246f3cf268aa691f7b38c  fix-stabs.patch
-25493bf4d09b845102a7af9d606612c0ff8d053826da4ed6728c8a4875bdd3c6  fix-sysctl.patch
-a489572c350184e9f6cf639756e602bc96df8681c3d5a4ce4629ac5964009692  fix-system-headers.patch
-4ce72332ef13a176c3406c9541a5d67c10224b2b71b105ef831d880f7046c3ff  firefox-gcc-6.0.patch"
-sha512sums="5a81a25c75af254f1508aa615a082f013d7d06950859822a134c51a0f4c12918081f69e7835dc85114e4285a67bc4be4d509db8374dec848f6381dfce447b696  seamonkey-2.40.source.tar.xz
-05e8818d3a4e2967b7ac3e92e92a125172d870326b9bf1fdd606a44e87ae8254684f2c5e2b0bb8df34c767fe62dc05950bf52447a39b4abf009ab88a8143832e  mozconfig
-b4c2bffec161c53087eec8bd0612095b52e514511d0f556387f1c3244a999c255da1a5f775573d86be82718ba09d3eb5aa7390b8aeb8f67c8b1b9f83e6ab16b6  fix-aouth.patch
+sha512sums="b70a40ad6797c82458436ce8e15d461bec982916a3ad5949610f2830647872f3b54a63fb62b17780c33e74c067054b590d0a5ebd0e836854a10e60feee692491  seamonkey-2.46.source.tar.xz
+24cf618f0bd28cf0aef645db311cb62962f655e29c72b299095731a845361aac8d041e526f0407014ee2dd6825bc4399b74ba8f9e09120a9f4becc7d5eb6f372  mozconfig
+c3b3b5a32f8672a42c051c03c31761414ce52c4a32258f1c7417af7de891e4b5f620ef2762034a18f84e5c7235559d920963aff0f28c2c1f4ae697a38d49b89c  fix-aouth.patch
+ea58a2cf58e7d1d99a2346a6977fcb2acff8052e304f9f0d66e24241d77fe352610537c4d2a886b9085b970368dbe46e5011acc210bebcdf22a88a4b5be960b1  fix-hunspell.patch
 f148a9212b9d1bf62ce99e3ea69233fcdd74ffb0948ab53d17ec417539b4f9533409b2e9c487e3789b76cdfca92da074b9ea0f82452f56f72eced9cfbcd078f1  fix-libgen.patch
-ea6af26228eaa98e6d322cb5dd0723028daa054bc6bff0858f0e83b87c2a7818965d30c35710e431200fd20405c287cdb59d67919ad793bbbcd6db934e82b967  fix-linux-syscall.patch
+fe377b6c0acbbb569f363cde2de8c640837237120bcbc3099cb9d9691f5b576cd76c531b0019e45385f696d7be60bb97141e39f2de742cb6d1a138fbcf217cc5  fix-linux-syscall.patch
 fd6b68082843a17a97a09953f24f74e72090acbcd245e8564ffe41ed5cb0a7afbf3dfc653a6e33a5f0bb0218ec11430f92acedc0c98a32c17dd2a053c3eef855  fix-mallinfo.patch
-60345a6b7ddaa0476a25a885914ad769e3ec4f2fe4bed6365dc00a5309c68a784fd585ff0f94d8bc1796245a2bacff998d244a27fd790784869e5eacd2bb9f3b  fix-platform-gettid.patch
 25bb4f99a2d831a8604444a1071ca946c14b9fe416929660ce6f9d196b3cecbd84b8706a8a16f2653db0d722a8f033fac9dc2f295bf5b59e7f39024d89221d01  fix-platform-linux.patch
 285e9330810b0f57ebba3d15cb371543840a7c6b8a2656d6d6b3ad7e8d2ec840b34bcb75b92c3747b5a1b42625fbde3a5d1bbec7052ce47fe5455e5076ec6268  fix-siginfo_t.patch
 4a7fae85299969618d729021ed79ab312650419dd849800c4e93c2b78a063a91f4003e2ee66c74abefa28b881376cf78f52e99e5ae3c08b85ba11eeae73a5034  fix-stabs.patch
diff --git a/testing/seamonkey/fix-aouth.patch b/testing/seamonkey/fix-aouth.patch
index c7d94e391d..a79c18bccf 100644
--- a/testing/seamonkey/fix-aouth.patch
+++ b/testing/seamonkey/fix-aouth.patch
@@ -1,11 +1,11 @@
---- seamonkey-2.39/mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h.orig
-+++ seamonkey-2.39/mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
-@@ -54,7 +54,7 @@
- #endif
- 
- #ifdef HAVE_A_OUT_H
+--- seamonkey-2.46/mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h.orig
++++ seamonkey-2.46/mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
+@@ -56,7 +56,7 @@
+ #ifdef HAVE_MACH_O_NLIST_H
+ #include <mach-o/nlist.h>
+ #elif defined(HAVE_A_OUT_H)
 -#include <a.out.h>
 +#include <linux/a.out.h>
  #endif
- #ifdef HAVE_MACH_O_NLIST_H
- #include <mach-o/nlist.h>
+ 
+ #include <string>
diff --git a/testing/seamonkey/fix-hunspell.patch b/testing/seamonkey/fix-hunspell.patch
new file mode 100644
index 0000000000..9eb4284e59
--- /dev/null
+++ b/testing/seamonkey/fix-hunspell.patch
@@ -0,0 +1,16 @@
+--- seamonkey-2.46/mozilla/extensions/spellcheck/hunspell/glue/hunspell_alloc_hooks.h.orig
++++ seamonkey-2.46/mozilla/extensions/spellcheck/hunspell/glue/hunspell_alloc_hooks.h
+@@ -50,9 +50,9 @@
+ #include "mozilla/mozalloc.h"
+ #include "mozHunspellAllocator.h"
+ 
+-#define malloc(size) HunspellAllocator::CountingMalloc(size)
+-#define calloc(count, size) HunspellAllocator::CountingCalloc(count, size)
+-#define free(ptr) HunspellAllocator::CountingFree(ptr)
+-#define realloc(ptr, size) HunspellAllocator::CountingRealloc(ptr, size)
++//#define malloc(size) HunspellAllocator::CountingMalloc(size)
++//#define calloc(count, size) HunspellAllocator::CountingCalloc(count, size)
++//#define free(ptr) HunspellAllocator::CountingFree(ptr)
++//#define realloc(ptr, size) HunspellAllocator::CountingRealloc(ptr, size)
+ 
+ #endif
diff --git a/testing/seamonkey/fix-linux-syscall.patch b/testing/seamonkey/fix-linux-syscall.patch
index 0107bbd457..2a0f2c674a 100644
--- a/testing/seamonkey/fix-linux-syscall.patch
+++ b/testing/seamonkey/fix-linux-syscall.patch
@@ -1,11 +1,16 @@
---- seamonkey-2.39/mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig
-+++ seamonkey-2.39/mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
-@@ -2814,7 +2814,7 @@
-     LSS_INLINE _syscall6(void*, mmap,              void*, s,
-                          size_t,                   l, int,               p,
-                          int,                      f, int,               d,
--                         __off64_t,                o)
-+                         off64_t,                o)
+--- seamonkey-2.46/mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig
++++ seamonkey-2.46/mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
+@@ -1506,6 +1506,13 @@
+ /* End of powerpc defininitions                                              */
+ #endif
  
-     LSS_INLINE _syscall4(int, newfstatat,         int,   d,
-                          const char *,            p,
++#ifndef __NR_pread
++#define __NR_pread __NR_pread64
++#endif
++#ifndef __NR_pwrite
++#define __NR_pwrite __NR_pwrite64
++#endif
++
+ 
+ /* After forking, we must make sure to only call system calls.               */
+ #if defined(__BOUNDED_POINTERS__)
diff --git a/testing/seamonkey/mozconfig b/testing/seamonkey/mozconfig
index 69a64e30cd..dbc07455c9 100644
--- a/testing/seamonkey/mozconfig
+++ b/testing/seamonkey/mozconfig
@@ -2,9 +2,6 @@ ac_add_options --enable-application=suite
 
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
-ac_add_options --mandir=/usr/share/man
-ac_add_options --infodir=/usr/share/info
-ac_add_options --localstatedir=/var
 
 # System libraries
 ac_add_options --with-system-nspr
@@ -13,9 +10,9 @@ 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-harfbuzz
 ac_add_options --with-system-icu
 
 ac_add_options --enable-system-hunspell
@@ -31,7 +28,7 @@ ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-startup-notification
 ac_add_options --enable-safe-browsing
 ac_add_options --enable-gio
-ac_add_options --disable-gstreamer
+#ac_add_options --disable-gstreamer
 ac_add_options --enable-optimize
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
@@ -39,19 +36,19 @@ 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-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-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-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-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.11.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Leonardo Arena <[email-masked]>
Date: Mon, 13 Feb 2017 13:39:14 +0100

Hi,

>  testing/seamonkey/APKBUILD                | 42 ++++++---------------

the patch was merged, but it does not build on x86:

make[4]: Entering directory
'/home/buildozer/aports/testing/seamonkey/src/seamonkey-2.46/obj-i686-
pc-linux-gnu/mozglue/misc'
mkdir -p '.deps/'
/usr/bin/g++ -std=gnu++11 -o StackWalk.o -c
-I/home/buildozer/aports/testing/seamonkey/src/seamonkey-2.46/obj-i686-
pc-linux-gnu/dist/stl_wrappers
-I/home/buildozer/aports/testing/seamonkey/src/seamonkey-2.46/obj-i686-
pc-linux-gnu/dist/system_wrappers -include
/home/buildozer/aports/testing/seamonkey/src/seamonkey-
2.46/mozilla/config/gcc_hidden.h -DNDEBUG=1 -DTRIMMED=1 -DIMPL_MFBT
-I/home/buildozer/aports/testing/seamonkey/src/seamonkey-
2.46/mozilla/mozglue/misc
-I/home/buildozer/aports/testing/seamonkey/src/seamonkey-2.46/obj-i686-
pc-linux-gnu/mozglue/misc  -
I/home/buildozer/aports/testing/seamonkey/src/seamonkey-2.46/obj-i686-
pc-linux-gnu/dist/include  -I/usr/include/nspr -I/usr/include/nss    -
I/usr/include/pixman-1   -fPIC  -DMOZILLA_CLIENT -include
/home/buildozer/aports/testing/seamonkey/src/seamonkey-2.46/obj-i686-
pc-linux-gnu/mozilla-config.h -MD -MP -MF .deps/StackWalk.o.pp  -Wall
-Wc++11-compat -Wempty-body -Wignored-qualifiers -Woverloaded-virtual
-Wpointer-arith -Wsign-compare -Wtype-limits -Wunreachable-code
-Wwrite-strings -Wc++14-compat -Wno-invalid-offsetof -Wno-error=maybe-
uninitialized -Wno-error=deprecated-declarations -Wno-error=array-
bounds -Os -fomit-frame-pointer -fno-exceptions -fno-strict-aliasing
-fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-
math-errno -pthread -pipe  -freorder-blocks -Os -fomit-frame-
pointer    /home/buildozer/aports/testing/seamonkey/src/seamonkey-
2.46/mozilla/mozglue/misc/StackWalk.cpp
libdom_inputport.a.desc
rm -f libdom_inputport.a
/home/buildozer/aports/testing/seamonkey/src/seamonkey-2.46/obj-i686-
pc-linux-gnu/_virtualenv/bin/python
/home/buildozer/aports/testing/seamonkey/src/seamonkey-
2.46/mozilla/config/expandlibs_gen.py -o libdom_inputport.a.desc
Unified_cpp_dom_inputport0.o  
/home/buildozer/aports/testing/seamonkey/src/seamonkey-
2.46/mozilla/mozglue/misc/StackWalk.cpp:938:4: error: #error
Unsupported configuration
 #  error Unsupported configuration
    ^~~~~
libmemory_mozalloc.a
rm -f libmemory_mozalloc.a libmemory_mozalloc.a.desc
make[4]: *** [/home/buildozer/aports/testing/seamonkey/src/seamonkey-
2.46/mozilla/config/rules.mk:936: StackWalk.o] Error 1
make[4]: Leaving directory
'/home/buildozer/aports/testing/seamonkey/src/seamonkey-2.46/obj-i686-
pc-linux-gnu/mozglue/misc'
make[3]: *** [/home/buildozer/aports/testing/seamonkey/src/seamonkey-
2.46/mozilla/config/recurse.mk:71: mozglue/misc/target] Error 2
make[3]: *** Waiting for unfinished jobs....

I'll disable x86 for now.

Thanks!

|_eo