pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

firefox-hg: adapt to upstream changes

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Mar 19 16:36:05 2016 +0100
Changeset:	653b5545062dac384767912a80a004d6654c88f1

Modified Files:
	firefox-hg/distinfo
	firefox-hg/mozilla-common.mk
	firefox-hg/options.mk
	firefox-hg/patches/patch-aa
	firefox-hg/patches/patch-config_Makefile.in
	firefox-hg/patches/patch-js_src_jit_AtomicOperations.h
Added Files:
	firefox-hg/patches/patch-build_moz.configure_old.configure
	firefox-hg/patches/patch-security_pkix_lib_pkixnames.cpp

Log Message:
firefox-hg: adapt to upstream changes

configure script was replaced with python configure script which
does not accept many of the old options.
Adapt patches.
Add one for a missing prototype.

Does not build with
ld: libxul.so: hidden symbol `hb_ot_layout_table_choose_script' isn't defined
and lots of missing symbols hb_*; perhaps the harfbuzz patches are not
sufficient any longer.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=653b5545062dac384767912a80a004d6654c88f1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 firefox-hg/distinfo                                       |  8 +++++---
 firefox-hg/mozilla-common.mk                              | 14 +-------------
 firefox-hg/options.mk                                     |  6 ++----
 firefox-hg/patches/patch-aa                               | 12 ++++++------
 .../patches/patch-build_moz.configure_old.configure       | 13 +++++++++++++
 firefox-hg/patches/patch-config_Makefile.in               | 14 +++++++-------
 firefox-hg/patches/patch-js_src_jit_AtomicOperations.h    | 14 +++++++-------
 firefox-hg/patches/patch-security_pkix_lib_pkixnames.cpp  | 15 +++++++++++++++
 8 files changed, 56 insertions(+), 40 deletions(-)

diffs:
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index 5bebb38..57e952b 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -3,14 +3,15 @@ $NetBSD: distinfo,v 1.159 2014/08/13 22:33:44 joerg Exp $
 SHA1 (firefox-31.0.source.tar.bz2) = a6c3e25ee3aeb7da42db2aaeb50a385d63532beb
 RMD160 (firefox-31.0.source.tar.bz2) = 8512ed164920c9fdad492ba2b47b46aae4894564
 Size (firefox-31.0.source.tar.bz2) = 147507120 bytes
-SHA1 (patch-aa) = 78a03a1df778094851bda16fdc550fef4b90cb35
+SHA1 (patch-aa) = a6b0393a1fd77892fbebc29e22de5c625c3fba0c
 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
 SHA1 (patch-bf) = 87cd1a9a1d7503e0748569028a3d693124d43208
 SHA1 (patch-browser_extensions_loop_run-all-loop-tests.sh) = c9e7b621f35a7c961ad76197252a3aec43d88744
 SHA1 (patch-browser_installer_package-manifest.in) = 5a96a90a2c14c419ccab4de2e68f7bb21e738e3e
 SHA1 (patch-build_autoconf_nss.m4) = 53e8c6844fc0095237ee07df3ab3791edd248fc2
 SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518
-SHA1 (patch-config_Makefile.in) = 816e6dc2ffe5ce5e817ce9494a55938ec0a7be5e
+SHA1 (patch-build_moz.configure_old.configure) = 9311d41ee8766f04f1925c970928747dd166b2e5
+SHA1 (patch-config_Makefile.in) = 7ba9f8760ef6f3b22a78946ab336ef6cdb35eee3
 SHA1 (patch-config_rules.mk) = debd5acd52f4f7593ea4e54dd0fdad91eeb46839
 SHA1 (patch-config_system-headers) = 8324b6229bd88453ff6426b013b58bf7c6216faf
 SHA1 (patch-dom_base_moz.build) = c0d68528c487a9f06fed2a886ceafd7d904cc8a5
@@ -24,7 +25,7 @@ SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 2c0621c2002bfb77159f2f8f678532
 SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = c91e03a142d38e68f1bcaa4c3d0d0231445232b3
 SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105
 SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475
-SHA1 (patch-js_src_jit_AtomicOperations.h) = 547ba525c1b3c11104590f5525cb7af1be369351
+SHA1 (patch-js_src_jit_AtomicOperations.h) = 6baf712644b290173b874910246eab6da438b7de
 SHA1 (patch-js_src_jit_none_AtomicOperations-sparc.h) = c2b7bc27a7e54476b00e142e79b456cbbe9d5d8c
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 57650470a96312fb1c4a2634711ede69e36666ff
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 9ff1dcf200feaf67bf576f07beb612e0ec91d7d1
@@ -32,6 +33,7 @@ SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__captur
 SHA1 (patch-mfbt_Alignment.h) = 1d97ee858b62c31112fe90ebb2d8fe430c95ed56
 SHA1 (patch-mfbt_Attributes.h) = b587038d2f41d3cd4dbc346ac591088b2f36750c
 SHA1 (patch-ostream) = 593a114a31a0117af6c00cd12e3aed4565571288
+SHA1 (patch-security_pkix_lib_pkixnames.cpp) = 8f127128664049f28cb1d905a0528cf22dca12e0
 SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform_macros.h) = 4abe361ffcab9f923e9ae7b9bdc0dfdb9ddce820
 SHA1 (patch-toolkit_library_moz.build) = 57017a6766a7d7a075bcd01d713c34cab5f45f2a
 SHA1 (patch-toolkit_toolkit.mozbuild) = a92b9f5114c3eab2c8e9f1d0eb21926235d2203a
diff --git a/firefox-hg/mozilla-common.mk b/firefox-hg/mozilla-common.mk
index b6fa0ae..d427b11 100644
--- a/firefox-hg/mozilla-common.mk
+++ b/firefox-hg/mozilla-common.mk
@@ -5,7 +5,7 @@
 # used by www/firefox/Makefile
 # used by www/seamonkey/Makefile
 
-GNU_CONFIGURE=		yes
+HAS_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config perl gmake unzip zip
 USE_LANGUAGES+=		c99 c++
 UNLIMIT_RESOURCES+=	datasize
@@ -35,15 +35,8 @@ CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
 
 CONFIGURE_ARGS+=	--disable-tests
-CONFIGURE_ARGS+=	--disable-pedantic
-CONFIGURE_ARGS+=	--enable-crypto
 CONFIGURE_ARGS+=	--with-pthreads
 CONFIGURE_ARGS+=	--enable-default-toolkit=cairo-gtk2
-CONFIGURE_ARGS+=	--enable-gstreamer=1.0
-#CONFIGURE_ARGS+=	--disable-gstreamer
-CONFIGURE_ARGS+=	--enable-svg
-CONFIGURE_ARGS+=	--enable-mathml
-CONFIGURE_ARGS+=	--enable-pango
 CONFIGURE_ARGS+=	--enable-system-cairo
 CONFIGURE_ARGS+=	--enable-system-pixman
 CONFIGURE_ARGS+=	--with-system-libvpx
@@ -59,20 +52,15 @@ CONFIGURE_ARGS+=	--with-system-libevent=${BUILDLINK_PREFIX.libevent}
 #configure: error: System SQLite library is not compiled with SQLITE_ENABLE_DBSTAT_VTAB.
 #CONFIGURE_ARGS+=	--enable-system-sqlite
 CONFIGURE_ARGS+=	--disable-crashreporter
-CONFIGURE_ARGS+=	--disable-libnotify
 CONFIGURE_ARGS+=	--disable-necko-wifi
 CONFIGURE_ARGS+=	--enable-chrome-format=flat
 CONFIGURE_ARGS+=	--disable-libjpeg-turbo
 
 CONFIGURE_ARGS+=	--disable-elf-hack
-CONFIGURE_ARGS+=	--disable-elf-dynstr-gc
 CONFIGURE_ARGS+=	--disable-gconf
 CONFIGURE_ARGS+=	--enable-gio
 CONFIGURE_ARGS+=	--enable-extensions=gio
-CONFIGURE_ARGS+=	--disable-mochitest
-CONFIGURE_ARGS+=	--enable-canvas
 #CONFIGURE_ARGS+=	--enable-readline
-CONFIGURE_ARGS+=	--disable-installer
 CONFIGURE_ARGS+=	--enable-url-classifier
 #CONFIGURE_ARGS+=	--enable-startup-notification
 # Disabled from https://bugzilla.mozilla.org/show_bug.cgi?id=977400
diff --git a/firefox-hg/options.mk b/firefox-hg/options.mk
index 12112e1..5156a55 100644
--- a/firefox-hg/options.mk
+++ b/firefox-hg/options.mk
@@ -45,13 +45,11 @@ CONFIGURE_ARGS+=	--with-system-nss
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-gnomevfs --enable-dbus --enable-gnomeui
-CONFIGURE_ARGS+=	--enable-libnotify
+CONFIGURE_ARGS+=	--enable-dbus --enable-gnomeui
 CONFIGURE_ARGS+=	--enable-extensions=gnomevfs
 PLIST_SRC+=		PLIST.gnome
 .else
-CONFIGURE_ARGS+=	--disable-gnomevfs --disable-dbus --disable-gnomeui
-CONFIGURE_ARGS+=	--disable-libnotify
+CONFIGURE_ARGS+=	--disable-dbus --disable-gnomeui
 .endif
 
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
diff --git a/firefox-hg/patches/patch-aa b/firefox-hg/patches/patch-aa
index cf835f0..6085d43 100644
--- a/firefox-hg/patches/patch-aa
+++ b/firefox-hg/patches/patch-aa
@@ -1,8 +1,8 @@
 $NetBSD: patch-aa,v 1.8 2015/08/17 07:30:48 thomasklausner Exp $
 
---- configure.in.orig	2015-12-29 06:56:12.000000000 +0000
-+++ configure.in
-@@ -3553,11 +3553,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+--- old-configure.in.orig	2016-03-18 22:27:07.000000000 +0000
++++ old-configure.in
+@@ -2722,11 +2722,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.8 2015/08/17 07:30:48 thomasklausner Exp $
 -                     #endif
 -                     ],
 +                     #endif ],
-                    MOZ_NATIVE_JPEG=1,
+                    MOZ_SYSTEM_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -5039,6 +5035,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -4014,6 +4010,9 @@ if test -n "$MOZ_WEBRTC"; then
      MOZ_RAW=1
      MOZ_VPX_ERROR_CONCEALMENT=1
  
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.8 2015/08/17 07:30:48 thomasklausner Exp $
  dnl enable once Signaling lands
      MOZ_WEBRTC_SIGNALING=1
      AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -8051,6 +8050,48 @@ if test "$USE_FC_FREETYPE"; then
+@@ -6937,6 +6936,48 @@ if test "$USE_FC_FREETYPE"; then
  fi
  
  dnl ========================================================
diff --git a/firefox-hg/patches/patch-build_moz.configure_old.configure b/firefox-hg/patches/patch-build_moz.configure_old.configure
new file mode 100644
index 0000000..867ac01
--- /dev/null
+++ b/firefox-hg/patches/patch-build_moz.configure_old.configure
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- build/moz.configure/old.configure.orig	2016-03-18 22:27:08.000000000 +0000
++++ build/moz.configure/old.configure
+@@ -343,6 +343,8 @@ def old_configure_options(*options):
+     '--with-sixgill',
+     '--with-soft-float',
+     '--with-system-bz2',
++    '--with-system-graphite2',
++    '--with-system-harfbuzz',
+     '--with-system-icu',
+     '--with-system-jpeg',
+     '--with-system-libevent',
diff --git a/firefox-hg/patches/patch-config_Makefile.in b/firefox-hg/patches/patch-config_Makefile.in
index f5e1dd1..8a8055d 100644
--- a/firefox-hg/patches/patch-config_Makefile.in
+++ b/firefox-hg/patches/patch-config_Makefile.in
@@ -1,13 +1,13 @@
 $NetBSD: patch-config_Makefile.in,v 1.1 2014/09/29 10:46:24 thomasklausner Exp $
 
---- config/Makefile.in.orig	2015-10-25 13:54:45.000000000 +0000
+--- config/Makefile.in.orig	2016-03-18 22:27:09.000000000 +0000
 +++ config/Makefile.in
-@@ -73,6 +73,8 @@ export:: $(export-preqs)
- 		-DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
- 		-DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
- 		-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
+@@ -73,6 +73,8 @@ $(STL_WRAPPERS_SENTINEL): $(srcdir)/make
+ 	$(PYTHON) $(srcdir)/nsinstall.py -t stl_wrappers $(DIST)
+ 	touch $(STL_WRAPPERS_SENTINEL)
+ 
 +		-DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
 +		-DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
- 		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
- 	$(INSTALL) system_wrappers $(DIST)
+ export:: $(STL_WRAPPERS_SENTINEL)
  
+ GARBAGE += $(STL_WRAPPERS_SENTINEL)
diff --git a/firefox-hg/patches/patch-js_src_jit_AtomicOperations.h b/firefox-hg/patches/patch-js_src_jit_AtomicOperations.h
index e8d5a71..4e554bd 100644
--- a/firefox-hg/patches/patch-js_src_jit_AtomicOperations.h
+++ b/firefox-hg/patches/patch-js_src_jit_AtomicOperations.h
@@ -3,14 +3,14 @@ $NetBSD$
 # See https://bugzilla.mozilla.org/show_bug.cgi?id=1232150
 
 diff -r c5da92c5b490 js/src/jit/AtomicOperations.h
---- js/src/jit/AtomicOperations.h	Thu Jan 21 14:38:56 2016 -0500
-+++ js/src/jit/AtomicOperations.h	Fri Jan 22 08:52:19 2016 +0100
-@@ -316,6 +316,8 @@
-     || defined(__ppc64le__) || defined(__PPC64LE__) \
-     || defined(__ppc__) || defined(__PPC__)
+--- js/src/jit/AtomicOperations.h.orig	2016-03-18 22:27:02.000000000 +0000
++++ js/src/jit/AtomicOperations.h
+@@ -325,6 +325,8 @@ AtomicOperations::isLockfree(int32_t siz
+ # include "jit/mips-shared/AtomicOperations-mips-shared.h"
+ #elif defined(__ppc__) || defined(__PPC__)
  # include "jit/none/AtomicOperations-ppc.h"
 +#elif defined(__sparc__)
 +# include "jit/none/AtomicOperations-sparc.h"
  #elif defined(JS_CODEGEN_NONE)
- # include "jit/none/AtomicOperations-none.h"
- #elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
+   // You can disable the JIT with --disable-ion but you must still
+   // provide the atomic operations that will be used by the JS engine.
diff --git a/firefox-hg/patches/patch-security_pkix_lib_pkixnames.cpp b/firefox-hg/patches/patch-security_pkix_lib_pkixnames.cpp
new file mode 100644
index 0000000..b664619
--- /dev/null
+++ b/firefox-hg/patches/patch-security_pkix_lib_pkixnames.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+For memmove().
+
+--- security/pkix/lib/pkixnames.cpp.orig	2016-03-19 10:59:41.602327520 +0000
++++ security/pkix/lib/pkixnames.cpp
+@@ -37,6 +37,8 @@
+ #include "pkixcheck.h"
+ #include "pkixutil.h"
+ 
++#include <string.h>
++
+ namespace mozilla { namespace pkix {
+ 
+ namespace {
Home | Main Index | Thread Index | Old Index