diff options
Diffstat (limited to 'www/firefox/files/patch-bug847568')
| -rw-r--r-- | www/firefox/files/patch-bug847568 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568 index fa8c7f3b8353..d6d5373e9609 100644 --- a/www/firefox/files/patch-bug847568 +++ b/www/firefox/files/patch-bug847568 @@ -29,10 +29,10 @@ index 18e8703..bdc5f82 100644 +harfbuzz/hb-ot.h +harfbuzz/hb.h +#endif -diff --git configure.in configure.in +diff --git old-configure.in configure.in index ac38f40..87536b7 100644 ---- configure.in -+++ configure.in +--- old-configure.in ++++ old-configure.in @@ -7989,6 +7989,49 @@ if test "$USE_FC_FREETYPE"; then fi @@ -46,7 +46,7 @@ index ac38f40..87536b7 100644 +MOZ_NATIVE_HARFBUZZ=) + +if test -n "$MOZ_NATIVE_HARFBUZZ"; then -+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.1.3) ++ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.2.2) +fi + +AC_SUBST(MOZ_NATIVE_HARFBUZZ) @@ -70,7 +70,7 @@ index ac38f40..87536b7 100644 + * 100 + GR2_VERSION_BUGFIX >= \ + (major) * 10000 + (minor) * 100 + (bugfix) ) + ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,7) ++ #if !GR2_VERSION_REQUIRE(1,3,8) + #error "Insufficient graphite2 version." + #endif + ], [], @@ -115,7 +115,7 @@ index f3d76ea..a9e7fb6 100644 +# chase version for --with-system-graphite2 +perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ -+ if /GR2_VERSION_REQUIRE/" configure.in ++ if /GR2_VERSION_REQUIRE/" old-configure.in + # summarize what's been touched echo Updated to $RELEASE. @@ -123,7 +123,7 @@ index f3d76ea..a9e7fb6 100644 echo -hg stat gfx/graphite2 -+hg stat configure.in gfx/graphite2 ++hg stat old-configure.in gfx/graphite2 echo echo If gfx/graphite2/src/files.mk has changed, please make corresponding @@ -137,7 +137,7 @@ index ca57d16..1ce21fe 100644 specific makefile that is maintained by hand. + +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 ++Make sure to keep pkg-config version check within old-configure.in in sync +with checkout version or increment latest tag by one if it's not based +on upstream release. diff --git gfx/moz.build gfx/moz.build |