Page MenuHomeFreeBSD
Differential D18432 Diff 52134 www/firefox/files/patch-bug847568

Changeset View

Standalone View

View Options

www/firefox/files/patch-bug847568

Show First 20 Lines • Show All 207 Lines • ▼ Show 20 Lines
+ +
dnl ======================================================== dnl ========================================================
dnl Check for pixman and cairo dnl Check for pixman and cairo
dnl ======================================================== dnl ========================================================
diff --git toolkit/library/moz.build toolkit/library/moz.build diff --git toolkit/library/moz.build toolkit/library/moz.build
index 24f940e1ed7e..079a575adec3 100644 index 24f940e1ed7e..079a575adec3 100644
--- toolkit/library/moz.build --- toolkit/library/moz.build
+++ toolkit/library/moz.build +++ toolkit/library/moz.build
@@ -223,6 +223,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']: @@ -226,6 +226,12 @@ if CONFIG['MOZ_SYSTEM_PNG']:
if CONFIG['MOZ_SYSTEM_PNG']: if CONFIG['MOZ_SYSTEM_WEBP']:
OS_LIBS += CONFIG['MOZ_PNG_LIBS'] OS_LIBS += CONFIG['MOZ_WEBP_LIBS']
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: +if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] + OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
+ +
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
+ +
if CONFIG['MOZ_SYSTEM_LIBEVENT']: if CONFIG['MOZ_SYSTEM_LIBEVENT']:
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
diff --git toolkit/moz.configure toolkit/moz.configure diff --git toolkit/moz.configure toolkit/moz.configure
index 9297e4d6f501..d8e273887e4b 100644 index 9297e4d6f501..d8e273887e4b 100644
--- toolkit/moz.configure --- toolkit/moz.configure
+++ toolkit/moz.configure +++ toolkit/moz.configure
@@ -883,6 +883,26 @@ add_old_configure_assignment('FT2_LIBS', @@ -894,6 +894,26 @@ add_old_configure_assignment('FT2_LIBS',
add_old_configure_assignment('FT2_CFLAGS', add_old_configure_assignment('FT2_CFLAGS',
ft2_info.cflags) ft2_info.cflags)
+# Graphite2 +# Graphite2
+# ============================================================== +# ==============================================================
+option('--with-system-graphite2', +option('--with-system-graphite2',
+ help="Use system graphite2 (located with pkgconfig)") + help="Use system graphite2 (located with pkgconfig)")
+ +
+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', +system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2',
+ when='--with-system-graphite2') + when='--with-system-graphite2')
+ +
+set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True)) +set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True))
+ +
+# HarfBuzz +# HarfBuzz
+# ============================================================== +# ==============================================================
+option('--with-system-harfbuzz', +option('--with-system-harfbuzz',
+ help="Use system harfbuzz (located with pkgconfig)") + help="Use system harfbuzz (located with pkgconfig)")
+ +
+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.9.0', +system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.9.0',
+ when='--with-system-harfbuzz') + when='--with-system-harfbuzz')
+ +
+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
+ +
# Mortar # Marionette remote protocol
# ============================================================== # ==============================================================
option('--enable-mortar', help='Enable mortar extension') #