summarylogtreecommitdiffstats
path: root/0020-Bug-847568-Support-system-harfbuzz.patch
diff options
context:
space:
mode:
Diffstat (limited to '0020-Bug-847568-Support-system-harfbuzz.patch')
-rw-r--r--0020-Bug-847568-Support-system-harfbuzz.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/0020-Bug-847568-Support-system-harfbuzz.patch b/0020-Bug-847568-Support-system-harfbuzz.patch
index 2315b0a7596e..612c2025038d 100644
--- a/0020-Bug-847568-Support-system-harfbuzz.patch
+++ b/0020-Bug-847568-Support-system-harfbuzz.patch
@@ -21,10 +21,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
10 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index 4d2f15e18c1c0755a1e28fd8e20a87f41e2f4eeb..daf1222bdb06aba229ed939212763c79b935366a 100644
+index f0404231eab0ba35391cad2f87ccfbf0afec4d67..53cbde197a2956052d1e0b0da1917716837c20b1 100644
--- a/config/system-headers.mozbuild
+++ b/config/system-headers.mozbuild
-@@ -1235,6 +1235,13 @@ if CONFIG['OS_TARGET'] == 'Android':
+@@ -1240,6 +1240,13 @@ if CONFIG['OS_TARGET'] == 'Android':
'vr/gvr/capi/include/gvr.h',
]
@@ -39,10 +39,10 @@ index 4d2f15e18c1c0755a1e28fd8e20a87f41e2f4eeb..daf1222bdb06aba229ed939212763c79
system_headers += [
'jack/jack.h',
diff --git a/dom/base/moz.build b/dom/base/moz.build
-index 19990d90ff73533898c9cf017e4c52852114e93d..817344b497cb24398ebce2428313596c63d70c02 100644
+index 7c24df79968ccf552ac25e98ae255699c30dc382..0c21e786dc0ad09907694af294baad7e831fe59e 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
-@@ -609,6 +609,9 @@ FINAL_LIBRARY = "xul"
+@@ -608,6 +608,9 @@ FINAL_LIBRARY = "xul"
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
@@ -143,10 +143,10 @@ index 17612ff1b396891c8942f53d3f39fbca8bdca6cb..d6d51948da54c7fbca53662050d33019
+
USE_LIBS += ["icu"]
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
-index 939d4f6a4b8da54c064ebbbda541b412979d5bab..1d964af4f1e237ef419b15c954a5a3b663c9ce92 100644
+index 3faa0370cc1c0025f03f0011c73876c0da8a6e71..fb81f6ceebcb4c6c14d0e2e2df48531b74d174bf 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
-@@ -285,6 +285,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
+@@ -286,6 +286,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
"-lgvr",
]
@@ -157,7 +157,7 @@ index 939d4f6a4b8da54c064ebbbda541b412979d5bab..1d964af4f1e237ef419b15c954a5a3b6
OS_LIBS += CONFIG["MOZ_JPEG_LIBS"]
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 5cf3ef5454a6580e14a06db7e448336d58452586..115febb3d533eb69cecbe0931b00be4e910e20de 100644
+index badeb8dc4b629a9dba166bf270aa24e567288df5..510db578b5e1b15fde924db8d0878588fe2f7526 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -675,6 +675,15 @@ def freetype2_combined_info(fontconfig_info, freetype2_info):