aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2015-08-13 06:49:21 +0800
committerjbeich <jbeich@FreeBSD.org>2015-08-13 06:49:21 +0800
commit5e1745e9d237ef70e81213a33043138c7e007449 (patch)
tree2e808d5b40504ca4ebb27f25d39c390a62635ffe
parenta6f88ceadaf5b5f08a62a19afa73dc61b79678e5 (diff)
downloadfreebsd-ports-gnome-5e1745e9d237ef70e81213a33043138c7e007449.tar.gz
freebsd-ports-gnome-5e1745e9d237ef70e81213a33043138c7e007449.tar.zst
freebsd-ports-gnome-5e1745e9d237ef70e81213a33043138c7e007449.zip
Move graphite2 buildfix to where it belongs
Diffstat
-rw-r--r--mail/thunderbird/files/patch-bug84756814
-rw-r--r--mail/thunderbird/files/patch-gfx-thebes-moz.build10
-rw-r--r--www/firefox-esr/files/patch-bug84756814
-rw-r--r--www/firefox-esr/files/patch-gfx-thebes-moz.build10
-rw-r--r--www/firefox/files/patch-bug84756814
-rw-r--r--www/firefox/files/patch-gfx-thebes-moz.build11
-rw-r--r--www/libxul/files/patch-bug84756814
-rw-r--r--www/libxul/files/patch-gfx-thebes-moz.build10
-rw-r--r--www/seamonkey/files/patch-bug84756814
-rw-r--r--www/seamonkey/files/patch-gfx-thebes-moz.build10
10 files changed, 40 insertions, 81 deletions
diff --git a/mail/thunderbird/files/patch-bug847568 b/mail/thunderbird/files/patch-bug847568
index 411d21636663..ec922c871c02 100644
--- a/mail/thunderbird/files/patch-bug847568
+++ b/mail/thunderbird/files/patch-bug847568
@@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build
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
diff --git a/mail/thunderbird/files/patch-gfx-thebes-moz.build b/mail/thunderbird/files/patch-gfx-thebes-moz.build
deleted file mode 100644
index b46f76342a21..000000000000
--- a/mail/thunderbird/files/patch-gfx-thebes-moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/gfx/thebes/moz.build.orig 2015-07-07 13:45:40.000000000 -0400
-+++ mozilla/gfx/thebes/moz.build 2015-08-11 19:11:43.406562000 -0400
-@@ -304,7 +304,5 @@
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
-
--DEFINES['GRAPHITE2_STATIC'] = True
--
- if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
- DEFINES['OTS_DLL'] = True
diff --git a/www/firefox-esr/files/patch-bug847568 b/www/firefox-esr/files/patch-bug847568
index 59bef6d9651a..cfd44a71c5f4 100644
--- a/www/firefox-esr/files/patch-bug847568
+++ b/www/firefox-esr/files/patch-bug847568
@@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build
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
diff --git a/www/firefox-esr/files/patch-gfx-thebes-moz.build b/www/firefox-esr/files/patch-gfx-thebes-moz.build
deleted file mode 100644
index 59adf72aeeb6..000000000000
--- a/www/firefox-esr/files/patch-gfx-thebes-moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
---- gfx/thebes/moz.build.orig 2015-08-06 13:40:59.000000000 -0400
-+++ gfx/thebes/moz.build 2015-08-11 19:26:38.799990000 -0400
-@@ -304,7 +304,5 @@
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
-
--DEFINES['GRAPHITE2_STATIC'] = True
--
- if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
- DEFINES['OTS_DLL'] = True
diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
index 0a8740073e93..a6cb58d4879f 100644
--- a/www/firefox/files/patch-bug847568
+++ b/www/firefox/files/patch-bug847568
@@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build
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
diff --git a/www/firefox/files/patch-gfx-thebes-moz.build b/www/firefox/files/patch-gfx-thebes-moz.build
deleted file mode 100644
index 6e9bd419a24c..000000000000
--- a/www/firefox/files/patch-gfx-thebes-moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
---- gfx/thebes/moz.build.orig 2015-08-07 11:54:06.000000000 -0400
-+++ gfx/thebes/moz.build 2015-08-11 19:23:49.961640000 -0400
-@@ -300,8 +300,6 @@
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
-
--DEFINES['GRAPHITE2_STATIC'] = True
--
- if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
- DEFINES['OTS_DLL'] = True
-
diff --git a/www/libxul/files/patch-bug847568 b/www/libxul/files/patch-bug847568
index 59bef6d9651a..cfd44a71c5f4 100644
--- a/www/libxul/files/patch-bug847568
+++ b/www/libxul/files/patch-bug847568
@@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build
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
diff --git a/www/libxul/files/patch-gfx-thebes-moz.build b/www/libxul/files/patch-gfx-thebes-moz.build
deleted file mode 100644
index 59adf72aeeb6..000000000000
--- a/www/libxul/files/patch-gfx-thebes-moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
---- gfx/thebes/moz.build.orig 2015-08-06 13:40:59.000000000 -0400
-+++ gfx/thebes/moz.build 2015-08-11 19:26:38.799990000 -0400
-@@ -304,7 +304,5 @@
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
-
--DEFINES['GRAPHITE2_STATIC'] = True
--
- if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
- DEFINES['OTS_DLL'] = True
diff --git a/www/seamonkey/files/patch-bug847568 b/www/seamonkey/files/patch-bug847568
index 148b2de3df21..568cf87b2ee6 100644
--- a/www/seamonkey/files/patch-bug847568
+++ b/www/seamonkey/files/patch-bug847568
@@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build
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
diff --git a/www/seamonkey/files/patch-gfx-thebes-moz.build b/www/seamonkey/files/patch-gfx-thebes-moz.build
deleted file mode 100644
index b5b1dc06af76..000000000000
--- a/www/seamonkey/files/patch-gfx-thebes-moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/gfx/thebes/moz.build.orig 2015-03-21 22:59:27.000000000 -0400
-+++ mozilla/gfx/thebes/moz.build 2015-08-11 19:36:15.404249000 -0400
-@@ -299,7 +299,5 @@
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
-
--DEFINES['GRAPHITE2_STATIC'] = True
--
- if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
- DEFINES['OTS_DLL'] = True
generated by cgit (git 2.34.1) at 2024-12-02 19:47:35 +0800