firefox-hg: remove support for external graphite2 and harfbuzz.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Apr 29 16:27:50 2016 +0200
Changeset:	b2f537e07b97ff8ef8f6ebfaa4150923047961f6

Modified Files:
	firefox-hg/distinfo
	firefox-hg/patches/patch-toolkit_library_moz.build
Removed Files:
	firefox-hg/patches/patch-config_Makefile.in
	firefox-hg/patches/patch-dom_base_moz.build

Log Message:
firefox-hg: remove support for external graphite2 and harfbuzz.

Not used in this package, and hard to upstream.

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

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/patches/patch-config_Makefile.in        | 13 -------------
 firefox-hg/patches/patch-dom_base_moz.build        | 14 --------------
 firefox-hg/patches/patch-toolkit_library_moz.build |  8 +-------
 4 files changed, 4 insertions(+), 39 deletions(-)

diffs:
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index dd7e19e..f94f0fa 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -6,14 +6,12 @@ Size (firefox-31.0.source.tar.bz2) = 147507120 bytes
 SHA1 (patch-aa) = d285a3c63b9ccc5f6a80a8dd5db9744de2478af6
 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
 SHA1 (patch-bf) = 87cd1a9a1d7503e0748569028a3d693124d43208
-SHA1 (patch-browser_extensions_loop_run-all-loop-tests.sh) = c9e7b621f35a7c961ad76197252a3aec43d88744
+SHA1 (patch-browser_extensions_loop_run-all-loop-tests.sh) = 9f4bc8548485912f0b076ad63e4a64473da2e64d
 SHA1 (patch-browser_installer_package-manifest.in) = 5a96a90a2c14c419ccab4de2e68f7bb21e738e3e
-SHA1 (patch-build_autoconf_nss.m4) = 53e8c6844fc0095237ee07df3ab3791edd248fc2
+SHA1 (patch-build_autoconf_nss.m4) = 4241f056d0a046e3d028d823aa5ac54ada0a742b
 SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518
-SHA1 (patch-config_Makefile.in) = 34af9523b3bab1a31392772ed852a6d937be1e70
 SHA1 (patch-config_rules.mk) = debd5acd52f4f7593ea4e54dd0fdad91eeb46839
 SHA1 (patch-config_system-headers) = 24d880987c3e396a044b013b9bc541798e473648
-SHA1 (patch-dom_base_moz.build) = c0d68528c487a9f06fed2a886ceafd7d904cc8a5
 SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 939f25f70f81eb86757696269c7e87c11a789c87
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e104bea7922dac0ce441bca4ba7a6f9b2379d17a
 SHA1 (patch-ios) = 6bd3450174c58c67ca8e091745412b1ebc69e069
@@ -33,7 +31,7 @@ SHA1 (patch-mfbt_Attributes.h) = 4dd9acf3e19dbfaa5f3bbdf4982cfaa821c6d5cd
 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_library_moz.build) = cc0af099f3f8b845aa44048d32db3fde8538d134
 SHA1 (patch-toolkit_toolkit.mozbuild) = a92b9f5114c3eab2c8e9f1d0eb21926235d2203a
 SHA1 (patch-unwind.h) = c7a606c83cb60d0d6bcc7babad8157097d9036a8
 SHA1 (patch-xg) = 2b472858270a109c2b317bb08698c12717174510
diff --git a/firefox-hg/patches/patch-config_Makefile.in b/firefox-hg/patches/patch-config_Makefile.in
deleted file mode 100644
index 0963317..0000000
--- a/firefox-hg/patches/patch-config_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-config_Makefile.in,v 1.1 2014/09/29 10:46:24 thomasklausner Exp $
-
---- config/Makefile.in.orig	2016-04-25 13:39:02.000000000 +0000
-+++ config/Makefile.in
-@@ -46,6 +46,8 @@ export:: $(export-preqs)
- 		-DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \
- 		-DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \
- 		-DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \
-+		-DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
-+		-DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
- 		-DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
- 		-DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
- 		-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
diff --git a/firefox-hg/patches/patch-dom_base_moz.build b/firefox-hg/patches/patch-dom_base_moz.build
deleted file mode 100644
index 97fb7a7..0000000
--- a/firefox-hg/patches/patch-dom_base_moz.build
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-dom_base_moz.build,v 1.1 2014/10/27 22:53:23 thomasklausner Exp $
-
---- dom/base/moz.build.orig	2014-10-27 20:46:28.000000000 +0000
-+++ dom/base/moz.build
-@@ -364,6 +364,9 @@ if CONFIG['INTEL_ARCHITECTURE']:
-     SOURCES += ['nsTextFragmentSSE2.cpp']
-     SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
- 
-+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
-+    SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- EXTRA_COMPONENTS += [
-     'ConsoleAPI.manifest',
-     'ConsoleAPIStorage.js',
diff --git a/firefox-hg/patches/patch-toolkit_library_moz.build b/firefox-hg/patches/patch-toolkit_library_moz.build
index d1be92b..d1205b9 100644
--- a/firefox-hg/patches/patch-toolkit_library_moz.build
+++ b/firefox-hg/patches/patch-toolkit_library_moz.build
@@ -2,16 +2,10 @@ $NetBSD: patch-toolkit_library_moz.build,v 1.1 2014/09/29 10:46:25 thomasklausne
 
 --- toolkit/library/moz.build.orig	2015-10-25 13:54:43.000000000 +0000
 +++ toolkit/library/moz.build
-@@ -229,6 +244,15 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
+@@ -229,6 +244,9 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
  if not CONFIG['MOZ_TREE_PIXMAN']:
      OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
  
-+if CONFIG['MOZ_NATIVE_GRAPHITE2']:
-+    OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
-+    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
-+
 +if CONFIG['MOZ_LIBV4L2_LIBS']:
 +    OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
 +