Add pangox to pango enabled build.

Package-Manager: portage-2.0.53_rc7

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index f5b775da24d0229739c08487de69d31190b1dc5b..e00256e38d404f2050ce74b9858021f302e2193d 100644 (file)
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.99 2005/10/22 14:17:35 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.100 2005/11/02 15:49:13 azarah Exp $
+
+  02 Nov 2005; Martin Schlemmer <azarah@gentoo.org>
+  files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch,
+  +files/mozilla-1.7.12-pango-needs-pangox.patch:
+  Add pangox to pango enabled build.
 
   23 Oct 2005; <anarchy@gentoo.org> -files/1.5/embed-typeaheadfind.patch,
   mozilla-firefox-1.5_beta2-r1.ebuild:

diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index e316e34750638ca46625bc23520d5a7f09ff9606..a2f6b3538c2dae7be6c917155cf1e22b222a8f36 100644 (file)
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,4 +1,7 @@
-MD5 958e43f74f7cfbc9cf281d436f456e16 ChangeLog 34572
+-----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
 MD5 362f9e0b0f25b964f7120b68fb629ee0 files/1.5/firefox-visibility.patch 689
@@ -26,8 +29,9 @@ MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
 MD5 a0bcbedb1d99931658cb5e781442aed8 files/icon/mozillafirefox.desktop 169
 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
 MD5 bedafc238f92edd9cb98fae3d1af96df files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620
-MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465
+MD5 c09fc82d7c3c339a4f8ed2bb0834c215 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 481
 MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412
+MD5 d4ba480f8bafa408a67909300780ed4f files/mozilla-1.7.12-pango-needs-pangox.patch 426
 MD5 730bebc28f073d8c08d32c78252445d5 files/mozilla-1.7.12-rpath.patch 1752
 MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
 MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
@@ -50,3 +54,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 85e5525bf433144d760ebf87f8eb5769 mozilla-firefox-1.5_beta2-r1.ebuild 9283
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaODQ1ZcsMnZjRyIRAtM3AJ49MQOsWF9vQUnBGLdxhNm0mIwLMACgvpw5
+jo7zkFGlVWf4h017Auhjr5o=
+=O/xV
+-----END PGP SIGNATURE-----

diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch
index 3b2b58a549cf7804d986a3f16062440184118238..112151e94978e8577ba406c0bfa8c8edc3cdcc55 100644 (file)
--- a/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch
+++ b/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch
@@ -7,7 +7,7 @@
 -    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)
++        PKG_CHECK_MODULES(MOZ_XFT, xft pangox >= 1.1.0 pangoxft >= 1.1.0)
 +    else
 +        PKG_CHECK_MODULES(MOZ_XFT, xft)
      fi

diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.12-pango-needs-pangox.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-pango-needs-pangox.patch
new file mode 100644 (file)
index 0000000..6302df2
--- /dev/null
+++ b/www-client/mozilla-firefox/files/mozilla-1.7.12-pango-needs-pangox.patch
@@ -0,0 +1,11 @@
+--- mozilla/configure.in       2005-11-02 17:47:07.000000000 +0200
++++ mozilla.az/configure.in    2005-11-02 17:47:18.000000000 +0200
+@@ -3486,7 +3486,7 @@
+ if test "$MOZ_ENABLE_PANGO"
+ then
+     AC_DEFINE(MOZ_ENABLE_PANGO)
+-    PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.5.0)
++    PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.5.0 pangox >= 1.5.0)
+ 
+     dnl Make sure that the pango version is _actually_ new enough
+     _SAVE_CFLAGS=$CFLAGS