firefox-hg: remove support for graphite2 from pkgsrc.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: firefox-hg: remove support for graphite2 from pkgsrc.
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Mon, 21 Mar 2016 13:18:18 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Mar 21 14:18:18 2016 +0100
Changeset:	e167a21354a9e5202bd3c834e9555544cc5ba036

Modified Files:
	firefox-hg/distinfo
	firefox-hg/mozilla-common.mk
	firefox-hg/patches/patch-aa
	firefox-hg/patches/patch-build_moz.configure_old.configure
	firefox-hg/patches/patch-config_system-headers
	firefox-hg/patches/patch-gfx_moz.build

Log Message:
firefox-hg: remove support for graphite2 from pkgsrc.

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

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                       |  2 --
 firefox-hg/patches/patch-aa                        | 30 +---------------------
 .../patch-build_moz.configure_old.configure        |  3 +--
 firefox-hg/patches/patch-config_system-headers     |  6 +----
 firefox-hg/patches/patch-gfx_moz.build             |  8 ++----
 6 files changed, 9 insertions(+), 48 deletions(-)

diffs:
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index 0df0d3a..3cd49b4 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -3,20 +3,20 @@ $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) = a6b0393a1fd77892fbebc29e22de5c625c3fba0c
+SHA1 (patch-aa) = a6bba851443683cb57ecafcd7856538093c77479
 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-build_moz.configure_old.configure) = 9311d41ee8766f04f1925c970928747dd166b2e5
+SHA1 (patch-build_moz.configure_old.configure) = 67844b1c12620949a519014cd12d0069fe45e464
 SHA1 (patch-config_Makefile.in) = 3e9d4267eaddd35a9f865ff47cc6f79da7ccf7a1
 SHA1 (patch-config_rules.mk) = debd5acd52f4f7593ea4e54dd0fdad91eeb46839
-SHA1 (patch-config_system-headers) = 8324b6229bd88453ff6426b013b58bf7c6216faf
+SHA1 (patch-config_system-headers) = 2e0c48fdcf6f36e4613b4ec4bce537a86070b32c
 SHA1 (patch-dom_base_moz.build) = c0d68528c487a9f06fed2a886ceafd7d904cc8a5
 SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 939f25f70f81eb86757696269c7e87c11a789c87
-SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9
+SHA1 (patch-gfx_moz.build) = c2c9b10c1a9ebd4a8ef16456d5721a305cd292fc
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e104bea7922dac0ce441bca4ba7a6f9b2379d17a
 SHA1 (patch-ios) = 6bd3450174c58c67ca8e091745412b1ebc69e069
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 910f9b3daa21c22c49d4a7badf0139abdcfca384
diff --git a/firefox-hg/mozilla-common.mk b/firefox-hg/mozilla-common.mk
index d427b11..06a1c8b 100644
--- a/firefox-hg/mozilla-common.mk
+++ b/firefox-hg/mozilla-common.mk
@@ -46,7 +46,6 @@ CONFIGURE_ARGS+=	--with-system-icu
 CONFIGURE_ARGS+=	--with-system-jpeg
 CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--with-system-bz2
-CONFIGURE_ARGS+=	--with-system-graphite2
 CONFIGURE_ARGS+=	--with-system-harfbuzz
 CONFIGURE_ARGS+=	--with-system-libevent=${BUILDLINK_PREFIX.libevent}
 #configure: error: System SQLite library is not compiled with SQLITE_ENABLE_DBSTAT_VTAB.
@@ -172,7 +171,6 @@ BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
 .include "../../graphics/MesaLib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.10.2nb4
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/graphite2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.3.0
 .include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
diff --git a/firefox-hg/patches/patch-aa b/firefox-hg/patches/patch-aa
index 6085d43..800e06d 100644
--- a/firefox-hg/patches/patch-aa
+++ b/firefox-hg/patches/patch-aa
@@ -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)
-@@ -6937,6 +6936,48 @@ if test "$USE_FC_FREETYPE"; then
+@@ -6937,6 +6936,20 @@ if test "$USE_FC_FREETYPE"; then
  fi
  
  dnl ========================================================
@@ -43,34 +43,6 @@ $NetBSD: patch-aa,v 1.8 2015/08/17 07:30:48 thomasklausner Exp $
 +
 +AC_SUBST(MOZ_NATIVE_HARFBUZZ)
 +
-+dnl ========================================================
-+dnl Check for graphite2
-+dnl ========================================================
-+MOZ_ARG_WITH_BOOL(system-graphite2,
-+[  --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
-+MOZ_NATIVE_GRAPHITE2=1,
-+MOZ_NATIVE_GRAPHITE2=)
-+
-+if test -n "$MOZ_NATIVE_GRAPHITE2"; then
-+    PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2)
-+
-+    dnl graphite2.pc has bogus version, check manually
-+    AC_TRY_COMPILE([ #include <graphite2/Font.h>
-+                     #define GR2_VERSION_REQUIRE(major,minor,bugfix)  \
-+                             ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \
-+                               * 100 + GR2_VERSION_BUGFIX >= \
-+                               (major) * 10000 + (minor) * 100 + (bugfix) )
-+                   ], [
-+                     #if !GR2_VERSION_REQUIRE(1,2,4)
-+                     #error "Insufficient graphite2 version."
-+                     #endif
-+                   ], [],
-+                   [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_GRAPHITE2)
-+
-+dnl ========================================================
  dnl Check for pixman and cairo
  dnl ========================================================
  
diff --git a/firefox-hg/patches/patch-build_moz.configure_old.configure b/firefox-hg/patches/patch-build_moz.configure_old.configure
index 867ac01..fc0f974 100644
--- a/firefox-hg/patches/patch-build_moz.configure_old.configure
+++ b/firefox-hg/patches/patch-build_moz.configure_old.configure
@@ -2,11 +2,10 @@ $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):
+@@ -343,6 +343,7 @@ 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',
diff --git a/firefox-hg/patches/patch-config_system-headers b/firefox-hg/patches/patch-config_system-headers
index dd9c622..fe9c7d0 100644
--- a/firefox-hg/patches/patch-config_system-headers
+++ b/firefox-hg/patches/patch-config_system-headers
@@ -2,14 +2,10 @@ $NetBSD: patch-config_system-headers,v 1.1 2014/09/29 10:46:24 thomasklausner Ex
 
 --- config/system-headers.orig	2015-11-21 10:14:06.000000000 +0000
 +++ config/system-headers
-@@ -1342,3 +1342,11 @@ unicode/utypes.h
+@@ -1342,3 +1342,7 @@ unicode/utypes.h
  #endif
  libutil.h
  unwind.h
-+#if MOZ_NATIVE_GRAPHITE2==1
-+graphite2/Font.h
-+graphite2/Segment.h
-+#endif
 +#if MOZ_NATIVE_HARFBUZZ==1
 +harfbuzz/hb-ot.h
 +harfbuzz/hb.h
diff --git a/firefox-hg/patches/patch-gfx_moz.build b/firefox-hg/patches/patch-gfx_moz.build
index d263456..5bd9157 100644
--- a/firefox-hg/patches/patch-gfx_moz.build
+++ b/firefox-hg/patches/patch-gfx_moz.build
@@ -2,24 +2,20 @@ $NetBSD: patch-gfx_moz.build,v 1.1 2014/09/29 10:46:24 thomasklausner Exp $
 
 --- gfx/moz.build.orig	2014-03-15 05:19:16.000000000 +0000
 +++ gfx/moz.build
-@@ -7,6 +7,12 @@
+@@ -7,6 +7,9 @@
  if CONFIG['MOZ_TREE_CAIRO']:
      DIRS += ['cairo']
  
-+if not CONFIG['MOZ_NATIVE_GRAPHITE2']:
-+    DIRS += ['graphite2/src' ]
-+
 +if not CONFIG['MOZ_NATIVE_HARFBUZZ']:
 +    DIRS += ['harfbuzz/src']
 +
  DIRS += [
      '2d',
      'ycbcr',
-@@ -15,8 +21,6 @@ DIRS += [
+@@ -15,8 +21,7 @@ DIRS += [
      'qcms',
      'gl',
      'layers',
--    'graphite2/src',
 -    'harfbuzz/src',
      'ots/src',
      'thebes',
Prev by Date: firefox-hg: remove support for harfbuzz from pkgsrc.
Next by Date: Create broken package Jitsi
Previous by Thread: firefox-hg: remove support for harfbuzz from pkgsrc.
Next by Thread: Create broken package Jitsi
Indexes:
Home | Main Index | Thread Index | Old Index