Add new patch to handle pangox and pangoxft.

Package-Manager: portage-2.0.53_rc7

diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 43062c55f2f1ccbe6d00fe4cb5975816bfea2306..39eff7d208bc45d69a6d8e435245930a1e714ed9 100644 (file)
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 3ebbb0a5889756cf1db3425d1e611081 ChangeLog 34764
 MD5 7847d262e628dcac303586fe02f2e8c4 files/1.5/firefox-cairo-canvas.patch 446
 MD5 91661761f2f232b08b74f5adc4f1eff0 files/1.5/firefox-nopangoxft.patch 839
@@ -25,6 +28,7 @@ MD5 f49aab1950ec54d7e8b2a51909dc6a5e files/icon/deerpark-icon.png 2963
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
 MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168
 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
+MD5 8e54237e0ff2f2a224ff5b34644b96ec files/mozilla-1.7.12-gtk2-needs-pangox-and-pangoxft.patch 866
 MD5 bedafc238f92edd9cb98fae3d1af96df files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620
 MD5 c09fc82d7c3c339a4f8ed2bb0834c215 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 481
 MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412
@@ -51,3 +55,10 @@ MD5 8a30120dc035d60c58db0a9dc8c3b91b mozilla-firefox-1.0.6-r7.ebuild 9771
 MD5 7ec6e77c0014718ffae4a55c76acd1db mozilla-firefox-1.0.7-r2.ebuild 8564
 MD5 b686423c9050edfcfd7ff72ea4081f09 mozilla-firefox-1.0.7-r3.ebuild 9734
 MD5 fb004be4c8879ec04eba4c399c016947 mozilla-firefox-1.5_beta2-r1.ebuild 9282
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaRqs1ZcsMnZjRyIRAhJ9AJ9QWv1nzmk+w4Two7sW4CjPyqS1+wCgwL42
+LOUSBPCiytrLmYkUJ+HhlsI=
+=mBv+
+-----END PGP SIGNATURE-----

diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2-needs-pangox-and-pangoxft.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2-needs-pangox-and-pangoxft.patch
new file mode 100644 (file)
index 0000000..d5a36c2
--- /dev/null
+++ b/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2-needs-pangox-and-pangoxft.patch
@@ -0,0 +1,27 @@
+--- mozilla/configure.in       2005-11-02 21:55:31.000000000 +0200
++++ mozilla.az/configure.in    2005-11-02 21:53:46.000000000 +0200
+@@ -3249,7 +3249,10 @@
+ 
+ if test "$MOZ_ENABLE_GTK2"
+ then
+-    PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= 1.3.7)
++    dnl xlfd_from_pango_font_description() in gfx/src/gtk/nsDeviceContextGTK.cpp
++    dnl uses pango_x_font_map_for_display() with or without xft, so we need to
++    dnl add pangox here.
++    PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= 1.3.7 pangox >= 1.1.0)
+ fi
+ 
+ if test "$MOZ_ENABLE_XLIB"
+@@ -3464,9 +3467,10 @@
+ if test "$MOZ_ENABLE_XFT"
+ then
+     AC_DEFINE(MOZ_ENABLE_XFT)
+-    PKG_CHECK_MODULES(MOZ_XFT, xft)
+     if test "$MOZ_ENABLE_GTK2"; then
+-        PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0)
++        PKG_CHECK_MODULES(MOZ_XFT, xft pangoxft >= 1.1.0)
++    else
++        PKG_CHECK_MODULES(MOZ_XFT, xft)
+     fi
+ fi
+