Author: jbeich
Date: Sat Feb 22 13:35:08 2014
New Revision: 1509
Log:
explicitly enable system graphite2
Modified:
trunk/Mk/bsd.gecko.mk
trunk/mail/thunderbird/files/patch-z-bug847568
trunk/www/firefox-esr/files/patch-z-bug847568
trunk/www/firefox-nightly/files/patch-bug847568
trunk/www/firefox/files/patch-bug847568
trunk/www/libxul/files/patch-z-bug847568
trunk/www/seamonkey/files/patch-bug847568
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Sat Feb 22 03:06:14 2014 (r1508)
+++ trunk/Mk/bsd.gecko.mk Sat Feb 22 13:35:08 2014 (r1509)
@@ -582,7 +582,7 @@
ffi_EXTRACT_AFTER_ARGS= --exclude mozilla*/js/src/ctypes/libffi
harfbuzz_LIB_DEPENDS= harfbuzz:${PORTSDIR}/print/harfbuzz
-harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz
+harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz --with-system-graphite2
#harfbuzz_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/harfbuzz \
# --exclude
mozilla*/gfx/graphite2
Modified: trunk/mail/thunderbird/files/patch-z-bug847568
==============================================================================
--- trunk/mail/thunderbird/files/patch-z-bug847568 Sat Feb 22 03:06:14
2014 (r1508)
+++ trunk/mail/thunderbird/files/patch-z-bug847568 Sat Feb 22 13:35:08
2014 (r1509)
@@ -33,7 +33,7 @@
index bbc7b40..1747206 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -7830,6 +7830,39 @@ if test "$USE_FC_FREETYPE"; then
+@@ -7830,6 +7830,38 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
@@ -47,7 +47,6 @@
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.16)
-+ MOZ_NATIVE_GRAPHITE2=1
+else
+
MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
+fi
@@ -107,18 +106,6 @@
# gcc requires -msse2 for this file since it uses SSE2 intrinsics. (See bug
# 585538 comment 12.)
ifneq (,$(INTEL_ARCHITECTURE))
-diff --git gfx/harfbuzz/src/Makefile.in gfx/harfbuzz/src/Makefile.in
-index b285844..92c87ea 100644
---- mozilla/gfx/harfbuzz/src/Makefile.in
-+++ mozilla/gfx/harfbuzz/src/Makefile.in
-@@ -29,3 +29,7 @@ include $(topsrcdir)/config/rules.mk
- # Cancel the effect of the -DDEBUG macro if present,
- # because harfbuzz uses that name for its own purposes
- COMPILE_CXXFLAGS += -UDEBUG
-+
-+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE_CFLAGS)
-+endif
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
--- mozilla/gfx/moz.build
Modified: trunk/www/firefox-esr/files/patch-z-bug847568
==============================================================================
--- trunk/www/firefox-esr/files/patch-z-bug847568 Sat Feb 22 03:06:14
2014 (r1508)
+++ trunk/www/firefox-esr/files/patch-z-bug847568 Sat Feb 22 13:35:08
2014 (r1509)
@@ -33,7 +33,7 @@
index bbc7b40..1747206 100644
--- configure.in
+++ configure.in
-@@ -7830,6 +7830,39 @@ if test "$USE_FC_FREETYPE"; then
+@@ -7830,6 +7830,38 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
@@ -47,7 +47,6 @@
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.16)
-+ MOZ_NATIVE_GRAPHITE2=1
+else
+
MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
+fi
@@ -107,18 +106,6 @@
# gcc requires -msse2 for this file since it uses SSE2 intrinsics. (See bug
# 585538 comment 12.)
ifneq (,$(INTEL_ARCHITECTURE))
-diff --git gfx/harfbuzz/src/Makefile.in gfx/harfbuzz/src/Makefile.in
-index b285844..92c87ea 100644
---- gfx/harfbuzz/src/Makefile.in
-+++ gfx/harfbuzz/src/Makefile.in
-@@ -29,3 +29,7 @@ include $(topsrcdir)/config/rules.mk
- # Cancel the effect of the -DDEBUG macro if present,
- # because harfbuzz uses that name for its own purposes
- COMPILE_CXXFLAGS += -UDEBUG
-+
-+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE_CFLAGS)
-+endif
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
--- gfx/moz.build
Modified: trunk/www/firefox-nightly/files/patch-bug847568
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug847568 Sat Feb 22 03:06:14
2014 (r1508)
+++ trunk/www/firefox-nightly/files/patch-bug847568 Sat Feb 22 13:35:08
2014 (r1509)
@@ -33,7 +33,7 @@
index bbc7b40..1747206 100644
--- configure.in
+++ configure.in
-@@ -7830,6 +7830,35 @@ if test "$USE_FC_FREETYPE"; then
+@@ -7848,6 +7848,34 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
@@ -47,7 +47,6 @@
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25)
-+ MOZ_NATIVE_GRAPHITE2=1
+fi
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
+AC_SUBST(MOZ_HARFBUZZ_CFLAGS)
@@ -84,18 +83,6 @@
# gcc requires -msse2 for this file since it uses SSE2 intrinsics. (See bug
# 585538 comment 12.)
ifneq (,$(INTEL_ARCHITECTURE))
-diff --git gfx/harfbuzz/src/Makefile.in gfx/harfbuzz/src/Makefile.in
-index b285844..92c87ea 100644
---- gfx/harfbuzz/src/Makefile.in
-+++ gfx/harfbuzz/src/Makefile.in
-@@ -29,3 +29,7 @@ include $(topsrcdir)/config/rules.mk
- # Cancel the effect of the -DDEBUG macro if present,
- # because harfbuzz uses that name for its own purposes
- COMPILE_CXXFLAGS += -UDEBUG
-+
-+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
-+endif
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
--- gfx/moz.build
Modified: trunk/www/firefox/files/patch-bug847568
==============================================================================
--- trunk/www/firefox/files/patch-bug847568 Sat Feb 22 03:06:14 2014
(r1508)
+++ trunk/www/firefox/files/patch-bug847568 Sat Feb 22 13:35:08 2014
(r1509)
@@ -33,7 +33,7 @@
index bbc7b40..1747206 100644
--- configure.in
+++ configure.in
-@@ -7830,6 +7830,35 @@ if test "$USE_FC_FREETYPE"; then
+@@ -7848,6 +7848,34 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
@@ -47,7 +47,6 @@
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25)
-+ MOZ_NATIVE_GRAPHITE2=1
+fi
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
+AC_SUBST(MOZ_HARFBUZZ_CFLAGS)
@@ -84,18 +83,6 @@
# gcc requires -msse2 for this file since it uses SSE2 intrinsics. (See bug
# 585538 comment 12.)
ifneq (,$(INTEL_ARCHITECTURE))
-diff --git gfx/harfbuzz/src/Makefile.in gfx/harfbuzz/src/Makefile.in
-index b285844..92c87ea 100644
---- gfx/harfbuzz/src/Makefile.in
-+++ gfx/harfbuzz/src/Makefile.in
-@@ -29,3 +29,7 @@ include $(topsrcdir)/config/rules.mk
- # Cancel the effect of the -DDEBUG macro if present,
- # because harfbuzz uses that name for its own purposes
- COMPILE_CXXFLAGS += -UDEBUG
-+
-+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
-+endif
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
--- gfx/moz.build
Modified: trunk/www/libxul/files/patch-z-bug847568
==============================================================================
--- trunk/www/libxul/files/patch-z-bug847568 Sat Feb 22 03:06:14 2014
(r1508)
+++ trunk/www/libxul/files/patch-z-bug847568 Sat Feb 22 13:35:08 2014
(r1509)
@@ -33,7 +33,7 @@
index bbc7b40..1747206 100644
--- configure.in
+++ configure.in
-@@ -7830,6 +7830,39 @@ if test "$USE_FC_FREETYPE"; then
+@@ -7830,6 +7830,38 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
@@ -47,7 +47,6 @@
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.16)
-+ MOZ_NATIVE_GRAPHITE2=1
+else
+
MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
+fi
@@ -107,18 +106,6 @@
# gcc requires -msse2 for this file since it uses SSE2 intrinsics. (See bug
# 585538 comment 12.)
ifneq (,$(INTEL_ARCHITECTURE))
-diff --git gfx/harfbuzz/src/Makefile.in gfx/harfbuzz/src/Makefile.in
-index b285844..92c87ea 100644
---- gfx/harfbuzz/src/Makefile.in
-+++ gfx/harfbuzz/src/Makefile.in
-@@ -29,3 +29,7 @@ include $(topsrcdir)/config/rules.mk
- # Cancel the effect of the -DDEBUG macro if present,
- # because harfbuzz uses that name for its own purposes
- COMPILE_CXXFLAGS += -UDEBUG
-+
-+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE_CFLAGS)
-+endif
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
--- gfx/moz.build
Modified: trunk/www/seamonkey/files/patch-bug847568
==============================================================================
--- trunk/www/seamonkey/files/patch-bug847568 Sat Feb 22 03:06:14 2014
(r1508)
+++ trunk/www/seamonkey/files/patch-bug847568 Sat Feb 22 13:35:08 2014
(r1509)
@@ -33,7 +33,7 @@
index bbc7b40..1747206 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -7830,6 +7830,35 @@ if test "$USE_FC_FREETYPE"; then
+@@ -7848,6 +7848,34 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
@@ -47,7 +47,6 @@
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25)
-+ MOZ_NATIVE_GRAPHITE2=1
+fi
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
+AC_SUBST(MOZ_HARFBUZZ_CFLAGS)
@@ -84,18 +83,6 @@
# gcc requires -msse2 for this file since it uses SSE2 intrinsics. (See bug
# 585538 comment 12.)
ifneq (,$(INTEL_ARCHITECTURE))
-diff --git gfx/harfbuzz/src/Makefile.in gfx/harfbuzz/src/Makefile.in
-index b285844..92c87ea 100644
---- mozilla/gfx/harfbuzz/src/Makefile.in
-+++ mozilla/gfx/harfbuzz/src/Makefile.in
-@@ -29,3 +29,7 @@ include $(topsrcdir)/config/rules.mk
- # Cancel the effect of the -DDEBUG macro if present,
- # because harfbuzz uses that name for its own purposes
- COMPILE_CXXFLAGS += -UDEBUG
-+
-+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
-+endif
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
--- mozilla/gfx/moz.build
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
