forked from Lainports/opnsense-ports
216 lines
7.2 KiB
Text
216 lines
7.2 KiB
Text
# Allow building against system-wide graphite2/harfbuzz.
|
|
|
|
--- config/Makefile.in.orig 2017-11-14 14:36:13 UTC
|
|
+++ config/Makefile.in
|
|
@@ -78,6 +78,8 @@ export:: $(export-preqs)
|
|
-DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
|
|
-DMOZ_NATIVE_LIBWEBP=$(MOZ_NATIVE_LIBWEBP) \
|
|
-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
|
|
+ -DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
|
|
+ -DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
|
|
$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
|
|
$(INSTALL) system_wrappers $(DIST)
|
|
|
|
--- config/system-headers.orig 2017-11-14 14:36:13 UTC
|
|
+++ config/system-headers
|
|
@@ -1359,3 +1359,11 @@ unicode/utypes.h
|
|
#endif
|
|
libutil.h
|
|
unwind.h
|
|
+#if MOZ_NATIVE_GRAPHITE2==1
|
|
+graphite2/Font.h
|
|
+graphite2/Segment.h
|
|
+#endif
|
|
+#if MOZ_NATIVE_HARFBUZZ==1
|
|
+harfbuzz/hb-ot.h
|
|
+harfbuzz/hb.h
|
|
+#endif
|
|
--- configure.in.orig 2017-11-14 14:36:13 UTC
|
|
+++ configure.in
|
|
@@ -7746,6 +7746,49 @@ if test "$USE_FC_FREETYPE"; then
|
|
fi
|
|
|
|
dnl ========================================================
|
|
+dnl Check for harfbuzz
|
|
+dnl ========================================================
|
|
+
|
|
+MOZ_ARG_WITH_BOOL(system-harfbuzz,
|
|
+[ --with-system-harfbuzz Use system harfbuzz (located with pkgconfig)],
|
|
+MOZ_NATIVE_HARFBUZZ=1,
|
|
+MOZ_NATIVE_HARFBUZZ=)
|
|
+
|
|
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
|
|
+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.4.3)
|
|
+fi
|
|
+
|
|
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
|
|
+
|
|
+dnl ========================================================
|
|
+dnl Check for graphite2
|
|
+dnl ========================================================
|
|
+
|
|
+MOZ_ARG_WITH_BOOL(system-graphite2,
|
|
+[ --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
|
|
+MOZ_NATIVE_GRAPHITE2=1,
|
|
+MOZ_NATIVE_GRAPHITE2=)
|
|
+
|
|
+if test -n "$MOZ_NATIVE_GRAPHITE2"; then
|
|
+ PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2)
|
|
+
|
|
+ dnl graphite2.pc has bogus version, check manually
|
|
+ AC_TRY_COMPILE([ #include <graphite2/Font.h>
|
|
+ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \
|
|
+ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \
|
|
+ * 100 + GR2_VERSION_BUGFIX >= \
|
|
+ (major) * 10000 + (minor) * 100 + (bugfix) )
|
|
+ ], [
|
|
+ #if !GR2_VERSION_REQUIRE(1,3,10)
|
|
+ #error "Insufficient graphite2 version."
|
|
+ #endif
|
|
+ ], [],
|
|
+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
|
|
+fi
|
|
+
|
|
+AC_SUBST(MOZ_NATIVE_GRAPHITE2)
|
|
+
|
|
+dnl ========================================================
|
|
dnl Check for pixman and cairo
|
|
dnl ========================================================
|
|
|
|
--- dom/base/moz.build.orig 2017-11-14 14:36:13 UTC
|
|
+++ dom/base/moz.build
|
|
@@ -366,6 +366,9 @@ if CONFIG['INTEL_ARCHITECTURE']:
|
|
SOURCES += ['nsTextFragmentSSE2.cpp']
|
|
SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
|
|
|
|
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
|
|
+ SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
|
+
|
|
EXTRA_COMPONENTS += [
|
|
'ConsoleAPI.manifest',
|
|
'ConsoleAPIStorage.js',
|
|
--- gfx/graphite2/moz-gr-update.sh.orig 2017-11-14 14:36:13 UTC
|
|
+++ gfx/graphite2/moz-gr-update.sh
|
|
@@ -37,6 +37,9 @@ echo "See" $0 "for update procedure." >> gfx/graphite2
|
|
#find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
|
|
#find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
|
|
|
|
+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \
|
|
+ if /GR2_VERSION_REQUIRE/" configure.in
|
|
+
|
|
# summarize what's been touched
|
|
echo Updated to $RELEASE.
|
|
echo Here is what changed in the gfx/graphite2 directory:
|
|
--- gfx/harfbuzz/README-mozilla.orig 2017-11-14 14:36:13 UTC
|
|
+++ gfx/harfbuzz/README-mozilla
|
|
@@ -19,3 +19,8 @@ the mozilla tree.
|
|
|
|
If the collection of source files changes, manual updates to moz.build may be
|
|
needed, as we don't use the upstream makefiles.
|
|
+
|
|
+The in-tree copy may be omitted during build by --with-system-harfbuzz.
|
|
+Make sure to keep pkg-config version check within configure.in in sync
|
|
+with checkout version or increment latest tag by one if it's not based
|
|
+on upstream release.
|
|
--- gfx/moz.build.orig 2017-11-14 14:36:13 UTC
|
|
+++ gfx/moz.build
|
|
@@ -7,6 +7,12 @@
|
|
if CONFIG['MOZ_TREE_CAIRO']:
|
|
DIRS += ['cairo']
|
|
|
|
+if not CONFIG['MOZ_NATIVE_GRAPHITE2']:
|
|
+ DIRS += ['graphite2/src' ]
|
|
+
|
|
+if not CONFIG['MOZ_NATIVE_HARFBUZZ']:
|
|
+ DIRS += ['harfbuzz/src']
|
|
+
|
|
DIRS += [
|
|
'2d',
|
|
'ycbcr',
|
|
@@ -15,8 +21,6 @@ DIRS += [
|
|
'qcms',
|
|
'gl',
|
|
'layers',
|
|
- 'graphite2/src',
|
|
- 'harfbuzz/src',
|
|
'ots/src',
|
|
'thebes',
|
|
'ipc',
|
|
--- gfx/skia/generate_mozbuild.py.orig 2017-11-14 14:36:13 UTC
|
|
+++ gfx/skia/generate_mozbuild.py
|
|
@@ -157,6 +157,9 @@ if CONFIG['CLANG_CXX']:
|
|
'-Wno-unused-private-field',
|
|
]
|
|
|
|
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
|
|
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
|
+
|
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
|
|
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
|
|
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
|
|
--- gfx/skia/moz.build.orig 2017-11-14 14:36:13 UTC
|
|
+++ gfx/skia/moz.build
|
|
@@ -987,6 +987,9 @@ if CONFIG['CLANG_CXX']:
|
|
'-Wno-unused-private-field',
|
|
]
|
|
|
|
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
|
|
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
|
+
|
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
|
|
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
|
|
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
|
|
--- gfx/thebes/moz.build.orig 2017-11-14 14:36:13 UTC
|
|
+++ gfx/thebes/moz.build
|
|
@@ -298,7 +298,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
|
|
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']
|
|
+else:
|
|
+ DEFINES['GRAPHITE2_STATIC'] = True
|
|
|
|
if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
|
|
DEFINES['OTS_DLL'] = True
|
|
--- intl/unicharutil/util/moz.build.orig 2017-11-14 14:36:13 UTC
|
|
+++ intl/unicharutil/util/moz.build
|
|
@@ -38,5 +38,8 @@ if CONFIG['_MSC_VER']:
|
|
if CONFIG['ENABLE_INTL_API']:
|
|
CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
|
|
|
|
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
|
|
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
|
+
|
|
if CONFIG['GNU_CXX']:
|
|
FAIL_ON_WARNINGS = True
|
|
--- netwerk/dns/moz.build.orig 2017-11-14 14:36:13 UTC
|
|
+++ netwerk/dns/moz.build
|
|
@@ -68,5 +68,8 @@ LOCAL_INCLUDES += [
|
|
'/netwerk/base',
|
|
]
|
|
|
|
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
|
|
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
|
+
|
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19':
|
|
CXXFLAGS += ['-I%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']]
|
|
--- toolkit/library/moz.build.orig 2017-11-14 14:36:13 UTC
|
|
+++ toolkit/library/moz.build
|
|
@@ -230,6 +230,12 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
|
|
if not CONFIG['MOZ_TREE_PIXMAN']:
|
|
OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
|
|
|
|
+if CONFIG['MOZ_NATIVE_GRAPHITE2']:
|
|
+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
|
|
+
|
|
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
|
|
+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
|
|
+
|
|
if CONFIG['MOZ_ALSA']:
|
|
OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
|
|
|