svn commit: r394045 - in head: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/libxul/files www/seamonkey/files
Jan Beich
jbeich at FreeBSD.org
Wed Aug 12 22:49:23 UTC 2015
Author: jbeich
Date: Wed Aug 12 22:49:21 2015
New Revision: 394045
URL: https://svnweb.freebsd.org/changeset/ports/394045
Log:
Move graphite2 buildfix to where it belongs
Deleted:
head/mail/thunderbird/files/patch-gfx-thebes-moz.build
head/www/firefox-esr/files/patch-gfx-thebes-moz.build
head/www/firefox/files/patch-gfx-thebes-moz.build
head/www/libxul/files/patch-gfx-thebes-moz.build
head/www/seamonkey/files/patch-gfx-thebes-moz.build
Modified:
head/mail/thunderbird/files/patch-bug847568
head/www/firefox-esr/files/patch-bug847568
head/www/firefox/files/patch-bug847568
head/www/libxul/files/patch-bug847568
head/www/seamonkey/files/patch-bug847568
Modified: head/mail/thunderbird/files/patch-bug847568
==============================================================================
--- head/mail/thunderbird/files/patch-bug847568 Wed Aug 12 22:37:45 2015 (r394044)
+++ head/mail/thunderbird/files/patch-bug847568 Wed Aug 12 22:49:21 2015 (r394045)
@@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/theb
index d5852fa..aeeab25 100644
--- mozilla/gfx/thebes/moz.build
+++ mozilla/gfx/thebes/moz.build
-@@ -278,6 +278,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
- CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
- CFLAGS += CONFIG['TK_CFLAGS']
+@@ -294,7 +294,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
+ CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+-DEFINES['GRAPHITE2_STATIC'] = True
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
+if CONFIG['MOZ_NATIVE_GRAPHITE2']:
+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
-+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
- CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
++else:
++ DEFINES['GRAPHITE2_STATIC'] = True
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ DEFINES['OTS_DLL'] = True
diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build
index d736943..41a931f 100644
--- mozilla/intl/unicharutil/util/moz.build
Modified: head/www/firefox-esr/files/patch-bug847568
==============================================================================
--- head/www/firefox-esr/files/patch-bug847568 Wed Aug 12 22:37:45 2015 (r394044)
+++ head/www/firefox-esr/files/patch-bug847568 Wed Aug 12 22:49:21 2015 (r394045)
@@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/theb
index d5852fa..aeeab25 100644
--- gfx/thebes/moz.build
+++ gfx/thebes/moz.build
-@@ -278,6 +278,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
- CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
- CFLAGS += CONFIG['TK_CFLAGS']
+@@ -294,7 +294,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
+ CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+-DEFINES['GRAPHITE2_STATIC'] = True
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
+if CONFIG['MOZ_NATIVE_GRAPHITE2']:
+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
-+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
- CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
++else:
++ DEFINES['GRAPHITE2_STATIC'] = True
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ DEFINES['OTS_DLL'] = True
diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build
index d736943..41a931f 100644
--- intl/unicharutil/util/moz.build
Modified: head/www/firefox/files/patch-bug847568
==============================================================================
--- head/www/firefox/files/patch-bug847568 Wed Aug 12 22:37:45 2015 (r394044)
+++ head/www/firefox/files/patch-bug847568 Wed Aug 12 22:49:21 2015 (r394045)
@@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/theb
index d5852fa..aeeab25 100644
--- gfx/thebes/moz.build
+++ gfx/thebes/moz.build
-@@ -278,6 +278,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
- CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
- CFLAGS += CONFIG['TK_CFLAGS']
+@@ -294,7 +294,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
+ CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+-DEFINES['GRAPHITE2_STATIC'] = True
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
+if CONFIG['MOZ_NATIVE_GRAPHITE2']:
+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
-+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
- CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
++else:
++ DEFINES['GRAPHITE2_STATIC'] = True
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ DEFINES['OTS_DLL'] = True
diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build
index d736943..41a931f 100644
--- intl/unicharutil/util/moz.build
Modified: head/www/libxul/files/patch-bug847568
==============================================================================
--- head/www/libxul/files/patch-bug847568 Wed Aug 12 22:37:45 2015 (r394044)
+++ head/www/libxul/files/patch-bug847568 Wed Aug 12 22:49:21 2015 (r394045)
@@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/theb
index d5852fa..aeeab25 100644
--- gfx/thebes/moz.build
+++ gfx/thebes/moz.build
-@@ -278,6 +278,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
- CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
- CFLAGS += CONFIG['TK_CFLAGS']
+@@ -294,7 +294,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
+ CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+-DEFINES['GRAPHITE2_STATIC'] = True
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
+if CONFIG['MOZ_NATIVE_GRAPHITE2']:
+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
-+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
- CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
++else:
++ DEFINES['GRAPHITE2_STATIC'] = True
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ DEFINES['OTS_DLL'] = True
diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build
index d736943..41a931f 100644
--- intl/unicharutil/util/moz.build
Modified: head/www/seamonkey/files/patch-bug847568
==============================================================================
--- head/www/seamonkey/files/patch-bug847568 Wed Aug 12 22:37:45 2015 (r394044)
+++ head/www/seamonkey/files/patch-bug847568 Wed Aug 12 22:49:21 2015 (r394045)
@@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/theb
index d5852fa..aeeab25 100644
--- mozilla/gfx/thebes/moz.build
+++ mozilla/gfx/thebes/moz.build
-@@ -278,6 +278,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
- CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
- CFLAGS += CONFIG['TK_CFLAGS']
+@@ -294,7 +294,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
+ CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+-DEFINES['GRAPHITE2_STATIC'] = True
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
+if CONFIG['MOZ_NATIVE_GRAPHITE2']:
+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
-+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
- CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
++else:
++ DEFINES['GRAPHITE2_STATIC'] = True
+ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ DEFINES['OTS_DLL'] = True
diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build
index d736943..41a931f 100644
--- mozilla/intl/unicharutil/util/moz.build
More information about the svn-ports-head
mailing list