[SVN-Commit] r1504 - in trunk: Mk mail/thunderbird/files www/firefox-esr/files www/libxul/files
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Thu Feb 20 05:24:24 UTC 2014
Author: jbeich
Date: Thu Feb 20 05:24:15 2014
New Revision: 1504
Log:
actually use system harfbuzz and fixup esr24 ports
Modified:
trunk/Mk/bsd.gecko.mk
trunk/mail/thunderbird/files/patch-z-bug847568
trunk/www/firefox-esr/files/patch-z-bug847568
trunk/www/libxul/files/patch-z-bug847568
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Thu Feb 20 01:36:33 2014 (r1503)
+++ trunk/Mk/bsd.gecko.mk Thu Feb 20 05:24:15 2014 (r1504)
@@ -567,7 +567,7 @@
.endif
# Standard depends
-_ALL_DEPENDS= cairo event ffi hunspell icu jpeg nspr nss png sqlite vpx zip
+_ALL_DEPENDS= cairo event ffi harfbuzz hunspell icu jpeg nspr nss png sqlite vpx zip
cairo_LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo
cairo_MOZ_OPTIONS= --enable-system-cairo --enable-system-pixman
@@ -583,8 +583,8 @@
harfbuzz_LIB_DEPENDS= harfbuzz:${PORTSDIR}/print/harfbuzz
harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz
-harfbuzz_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/harfbuzz \
- --exclude mozilla*/gfx/graphite2
+#harfbuzz_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/harfbuzz \
+# --exclude mozilla*/gfx/graphite2
hunspell_LIB_DEPENDS= hunspell-1.3:${PORTSDIR}/textproc/hunspell
hunspell_MOZ_OPTIONS= --enable-system-hunspell
Modified: trunk/mail/thunderbird/files/patch-z-bug847568
==============================================================================
--- trunk/mail/thunderbird/files/patch-z-bug847568 Thu Feb 20 01:36:33 2014 (r1503)
+++ trunk/mail/thunderbird/files/patch-z-bug847568 Thu Feb 20 05:24:15 2014 (r1504)
@@ -33,7 +33,7 @@
index bbc7b40..1747206 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -7830,6 +7830,35 @@ if test "$USE_FC_FREETYPE"; then
+@@ -7830,6 +7830,39 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
@@ -48,6 +48,8 @@
+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
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
+AC_SUBST(MOZ_HARFBUZZ_CFLAGS)
@@ -59,16 +61,37 @@
+MOZ_NATIVE_GRAPHITE2= )
+
+if test -n "$MOZ_NATIVE_GRAPHITE2"; then
-+ PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2 >= 1.2.3)
++ PKG_CHECK_MODULES(MOZ_GRAPHITE, graphite2 >= 1.2.3)
++else
++ MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
+fi
+AC_SUBST(MOZ_NATIVE_GRAPHITE2)
-+AC_SUBST(MOZ_GRAPHITE2_CFLAGS)
-+AC_SUBST(MOZ_GRAPHITE2_LIBS)
++AC_SUBST(MOZ_GRAPHITE_CFLAGS)
++AC_SUBST(MOZ_GRAPHITE_LIBS)
+
+dnl ========================================================
dnl Check for pixman and cairo
dnl ========================================================
+@@ -8379,18 +8412,6 @@ QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFI
+ AC_SUBST(QCMS_LIBS)
+
+ dnl ========================================================
+-dnl HarfBuzz
+-dnl ========================================================
+-MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
+-AC_SUBST(MOZ_HARFBUZZ_LIBS)
+-
+-dnl ========================================================
+-dnl SIL Graphite
+-dnl ========================================================
+-MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
+-AC_SUBST(MOZ_GRAPHITE_LIBS)
+-
+-dnl ========================================================
+ dnl OTS
+ dnl ========================================================
+ MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
diff --git content/base/src/Makefile.in content/base/src/Makefile.in
index a618096..596901a 100644
--- mozilla/content/base/src/Makefile.in
@@ -94,7 +117,7 @@
COMPILE_CXXFLAGS += -UDEBUG
+
+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
++CXXFLAGS += $(MOZ_GRAPHITE_CFLAGS)
+endif
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
@@ -146,7 +169,7 @@
CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
++CXXFLAGS += $(MOZ_GRAPHITE_CFLAGS)
+endif
+
+ifdef MOZ_NATIVE_HARFBUZZ
@@ -168,6 +191,29 @@
+ifdef MOZ_NATIVE_HARFBUZZ
+nsUnicodePropertyData.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
+endif
+diff --git layout/media/Makefile.in layout/media/Makefile.in
+index 1cacbd7..a8cd156 100644
+--- mozilla/layout/media/Makefile.in
++++ mozilla/layout/media/Makefile.in
+@@ -18,10 +18,16 @@ endif
+ SHARED_LIBRARY_LIBS = \
+ $(MOZ_OTS_LIBS) \
+ $(QCMS_LIBS) \
+- $(MOZ_GRAPHITE_LIBS) \
+- $(MOZ_HARFBUZZ_LIBS) \
+ $(NULL)
+
++ifndef MOZ_NATIVE_GRAPHITE2
++SHARED_LIBRARY_LIBS += $(MOZ_GRAPHITE_LIBS)
++endif
++
++ifndef MOZ_NATIVE_HARFBUZZ
++SHARED_LIBRARY_LIBS += $(MOZ_HARFBUZZ_LIBS)
++endif
++
+ ifdef MOZ_TREE_CAIRO
+ SHARED_LIBRARY_LIBS += $(MOZ_CAIRO_LIBS)
+ endif
diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in
index 1cacbd7..a8cd156 100644
--- mozilla/netwerk/dns/Makefile.in
@@ -189,7 +235,7 @@
endif
+ifdef MOZ_NATIVE_GRAPHITE2
-+EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE2_LIBS)
++EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE_LIBS)
+endif
+
+ifdef MOZ_NATIVE_HARFBUZZ
Modified: trunk/www/firefox-esr/files/patch-z-bug847568
==============================================================================
--- trunk/www/firefox-esr/files/patch-z-bug847568 Thu Feb 20 01:36:33 2014 (r1503)
+++ trunk/www/firefox-esr/files/patch-z-bug847568 Thu Feb 20 05:24:15 2014 (r1504)
@@ -33,7 +33,7 @@
index bbc7b40..1747206 100644
--- configure.in
+++ configure.in
-@@ -7830,6 +7830,35 @@ if test "$USE_FC_FREETYPE"; then
+@@ -7830,6 +7830,39 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
@@ -48,6 +48,8 @@
+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
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
+AC_SUBST(MOZ_HARFBUZZ_CFLAGS)
@@ -59,16 +61,37 @@
+MOZ_NATIVE_GRAPHITE2= )
+
+if test -n "$MOZ_NATIVE_GRAPHITE2"; then
-+ PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2 >= 1.2.3)
++ PKG_CHECK_MODULES(MOZ_GRAPHITE, graphite2 >= 1.2.3)
++else
++ MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
+fi
+AC_SUBST(MOZ_NATIVE_GRAPHITE2)
-+AC_SUBST(MOZ_GRAPHITE2_CFLAGS)
-+AC_SUBST(MOZ_GRAPHITE2_LIBS)
++AC_SUBST(MOZ_GRAPHITE_CFLAGS)
++AC_SUBST(MOZ_GRAPHITE_LIBS)
+
+dnl ========================================================
dnl Check for pixman and cairo
dnl ========================================================
+@@ -8379,18 +8412,6 @@ QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFI
+ AC_SUBST(QCMS_LIBS)
+
+ dnl ========================================================
+-dnl HarfBuzz
+-dnl ========================================================
+-MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
+-AC_SUBST(MOZ_HARFBUZZ_LIBS)
+-
+-dnl ========================================================
+-dnl SIL Graphite
+-dnl ========================================================
+-MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
+-AC_SUBST(MOZ_GRAPHITE_LIBS)
+-
+-dnl ========================================================
+ dnl OTS
+ dnl ========================================================
+ MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
diff --git content/base/src/Makefile.in content/base/src/Makefile.in
index a618096..596901a 100644
--- content/base/src/Makefile.in
@@ -94,7 +117,7 @@
COMPILE_CXXFLAGS += -UDEBUG
+
+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
++CXXFLAGS += $(MOZ_GRAPHITE_CFLAGS)
+endif
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
@@ -146,7 +169,7 @@
CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
++CXXFLAGS += $(MOZ_GRAPHITE_CFLAGS)
+endif
+
+ifdef MOZ_NATIVE_HARFBUZZ
@@ -168,6 +191,29 @@
+ifdef MOZ_NATIVE_HARFBUZZ
+nsUnicodePropertyData.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
+endif
+diff --git layout/media/Makefile.in layout/media/Makefile.in
+index 1cacbd7..a8cd156 100644
+--- layout/media/Makefile.in
++++ layout/media/Makefile.in
+@@ -18,10 +18,16 @@ endif
+ SHARED_LIBRARY_LIBS = \
+ $(MOZ_OTS_LIBS) \
+ $(QCMS_LIBS) \
+- $(MOZ_GRAPHITE_LIBS) \
+- $(MOZ_HARFBUZZ_LIBS) \
+ $(NULL)
+
++ifndef MOZ_NATIVE_GRAPHITE2
++SHARED_LIBRARY_LIBS += $(MOZ_GRAPHITE_LIBS)
++endif
++
++ifndef MOZ_NATIVE_HARFBUZZ
++SHARED_LIBRARY_LIBS += $(MOZ_HARFBUZZ_LIBS)
++endif
++
+ ifdef MOZ_TREE_CAIRO
+ SHARED_LIBRARY_LIBS += $(MOZ_CAIRO_LIBS)
+ endif
diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in
index 1cacbd7..a8cd156 100644
--- netwerk/dns/Makefile.in
@@ -189,7 +235,7 @@
endif
+ifdef MOZ_NATIVE_GRAPHITE2
-+EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE2_LIBS)
++EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE_LIBS)
+endif
+
+ifdef MOZ_NATIVE_HARFBUZZ
Modified: trunk/www/libxul/files/patch-z-bug847568
==============================================================================
--- trunk/www/libxul/files/patch-z-bug847568 Thu Feb 20 01:36:33 2014 (r1503)
+++ trunk/www/libxul/files/patch-z-bug847568 Thu Feb 20 05:24:15 2014 (r1504)
@@ -33,7 +33,7 @@
index bbc7b40..1747206 100644
--- configure.in
+++ configure.in
-@@ -7830,6 +7830,35 @@ if test "$USE_FC_FREETYPE"; then
+@@ -7830,6 +7830,39 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
@@ -48,6 +48,8 @@
+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
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
+AC_SUBST(MOZ_HARFBUZZ_CFLAGS)
@@ -59,16 +61,37 @@
+MOZ_NATIVE_GRAPHITE2= )
+
+if test -n "$MOZ_NATIVE_GRAPHITE2"; then
-+ PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2 >= 1.2.3)
++ PKG_CHECK_MODULES(MOZ_GRAPHITE, graphite2 >= 1.2.3)
++else
++ MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
+fi
+AC_SUBST(MOZ_NATIVE_GRAPHITE2)
-+AC_SUBST(MOZ_GRAPHITE2_CFLAGS)
-+AC_SUBST(MOZ_GRAPHITE2_LIBS)
++AC_SUBST(MOZ_GRAPHITE_CFLAGS)
++AC_SUBST(MOZ_GRAPHITE_LIBS)
+
+dnl ========================================================
dnl Check for pixman and cairo
dnl ========================================================
+@@ -8379,18 +8412,6 @@ QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFI
+ AC_SUBST(QCMS_LIBS)
+
+ dnl ========================================================
+-dnl HarfBuzz
+-dnl ========================================================
+-MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
+-AC_SUBST(MOZ_HARFBUZZ_LIBS)
+-
+-dnl ========================================================
+-dnl SIL Graphite
+-dnl ========================================================
+-MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
+-AC_SUBST(MOZ_GRAPHITE_LIBS)
+-
+-dnl ========================================================
+ dnl OTS
+ dnl ========================================================
+ MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
diff --git content/base/src/Makefile.in content/base/src/Makefile.in
index a618096..596901a 100644
--- content/base/src/Makefile.in
@@ -94,7 +117,7 @@
COMPILE_CXXFLAGS += -UDEBUG
+
+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
++CXXFLAGS += $(MOZ_GRAPHITE_CFLAGS)
+endif
diff --git gfx/moz.build gfx/moz.build
index 519aa46..6929751 100644
@@ -146,7 +169,7 @@
CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+ifdef MOZ_NATIVE_GRAPHITE2
-+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
++CXXFLAGS += $(MOZ_GRAPHITE_CFLAGS)
+endif
+
+ifdef MOZ_NATIVE_HARFBUZZ
@@ -168,6 +191,29 @@
+ifdef MOZ_NATIVE_HARFBUZZ
+nsUnicodePropertyData.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
+endif
+diff --git layout/media/Makefile.in layout/media/Makefile.in
+index 1cacbd7..a8cd156 100644
+--- layout/media/Makefile.in
++++ layout/media/Makefile.in
+@@ -18,10 +18,16 @@ endif
+ SHARED_LIBRARY_LIBS = \
+ $(MOZ_OTS_LIBS) \
+ $(QCMS_LIBS) \
+- $(MOZ_GRAPHITE_LIBS) \
+- $(MOZ_HARFBUZZ_LIBS) \
+ $(NULL)
+
++ifndef MOZ_NATIVE_GRAPHITE2
++SHARED_LIBRARY_LIBS += $(MOZ_GRAPHITE_LIBS)
++endif
++
++ifndef MOZ_NATIVE_HARFBUZZ
++SHARED_LIBRARY_LIBS += $(MOZ_HARFBUZZ_LIBS)
++endif
++
+ ifdef MOZ_TREE_CAIRO
+ SHARED_LIBRARY_LIBS += $(MOZ_CAIRO_LIBS)
+ endif
diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in
index 1cacbd7..a8cd156 100644
--- netwerk/dns/Makefile.in
@@ -189,7 +235,7 @@
endif
+ifdef MOZ_NATIVE_GRAPHITE2
-+EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE2_LIBS)
++EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE_LIBS)
+endif
+
+ifdef MOZ_NATIVE_HARFBUZZ
More information about the freebsd-gecko
mailing list