fix for bug #84586

(Portage version: 2.0.51.19)

5 files changed, 128 insertions, 19 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 2fd5fdb2f92d..840bb75674c1 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.92 2005/04/28 19:33:34 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.93 2005/06/25 15:10:57 allanonjl Exp $
+
+*pango-1.8.1-r1 (25 Jun 2005)
+
+  25 Jun 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/pango-1.8.1-fontfix.patch, +pango-1.8.1-r1.ebuild:
+  fix for bug #84586
 
   28 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> pango-1.8.1.ebuild:
   Stable on alpha.
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 2365be87a949..b9c20dee7f02 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,26 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7846c1733c2c43cefc2484ac0c94de16 pango-1.6.0.ebuild 2014
+MD5 0e1f4f526890ae78ffde8498835a8abb pango-1.8.1.ebuild 1909
+MD5 9d84c7745d93323e331db32ca36fa99e pango-1.4.1.ebuild 1136
+MD5 35a6f51a28246b54223da53281849513 pango-1.8.0.ebuild 1899
+MD5 ade7ba065c891d641fe99860ecb64d27 pango-1.8.1-r1.ebuild 1983
 MD5 a4d0ffeb51ccd5e32c1bdecbe004ab3e pango-1.4.1-r1.ebuild 1881
 MD5 1df9d63b8c583b81047504e7122dc1b5 ChangeLog 10283
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 9d84c7745d93323e331db32ca36fa99e pango-1.4.1.ebuild 1136
-MD5 35a6f51a28246b54223da53281849513 pango-1.8.0.ebuild 1899
-MD5 0e1f4f526890ae78ffde8498835a8abb pango-1.8.1.ebuild 1909
+MD5 7846c1733c2c43cefc2484ac0c94de16 pango-1.6.0.ebuild 2014
 MD5 463aede5d5188445dc7786afceb65c3c files/pango-1.6.0-cjk_space_as_char.patch 1232
+MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1-r1 64
+MD5 ee91ace9933dbdbea591e08b6a82bb44 files/pango-1.2.2-slighthint.patch 1124
+MD5 54474022d422b0d0cf4b473cfcf5fffb files/digest-pango-1.8.1-r1 64
+MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
+MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1 64
 MD5 e63307fbf2f7bf46a9b9e363d82e115c files/digest-pango-1.6.0 64
 MD5 d2ae8f868bf8083914d10c79782f8a44 files/digest-pango-1.8.0 64
 MD5 54474022d422b0d0cf4b473cfcf5fffb files/digest-pango-1.8.1 64
+MD5 8de5114d2f4367487b3d70b712115ec4 files/pango-1.8.1-fontfix.patch 1320
 MD5 2c7eef6720e5a5aecb7406200c6ede31 files/pango-1.2.5-lib64.patch 1107
-MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1-r1 64
-MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1 64
-MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
-MD5 ee91ace9933dbdbea591e08b6a82bb44 files/pango-1.2.2-slighthint.patch 1124
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCcTrsKf2g/qXtneoRAoLhAJsE0U7iiuhOJPfc3Pyzu+S3GNCDvQCgldav
-null1XArc9JyTGAa/JX+bcQ=
-=aV3a
------END PGP SIGNATURE-----
diff --git a/x11-libs/pango/files/digest-pango-1.8.1-r1 b/x11-libs/pango/files/digest-pango-1.8.1-r1
new file mode 100644
index 000000000000..01c4a071f380
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.8.1-r1
@@ -0,0 +1 @@
+MD5 88aa6bf1876766db6864f3b93577887c pango-1.8.1.tar.bz2 996389
diff --git a/x11-libs/pango/files/pango-1.8.1-fontfix.patch b/x11-libs/pango/files/pango-1.8.1-fontfix.patch
new file mode 100644
index 000000000000..470ea9770417
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.8.1-fontfix.patch
@@ -0,0 +1,34 @@
+--- pango-1.8.1/pango/pango-context.c	2004-11-21 10:59:15.000000000 -0500
++++ pango-1.8.1.new/pango/pango-context.c	2005-06-25 10:57:27.000000000 -0400
+@@ -783,7 +783,10 @@
+       PangoItem *item = l->data;
+       if (item->analysis.shape_engine)
+ 	break;
+-      item->analysis.font = g_object_ref (font);
++      if (font)
++	item->analysis.font = g_object_ref (font);
++      else
++	item->analysis.font = NULL;
+       item->analysis.shape_engine = shape_engine;
+     }
+ }
+--- pango-1.8.1/pango/ellipsize.c	2004-09-20 13:48:44.000000000 -0400
++++ pango-1.8.1.new/pango/ellipsize.c	2005-06-25 10:57:52.000000000 -0400
+@@ -347,14 +347,15 @@
+ 
+   /* If that fails we use "..." in the first matching font
+    */
+-  if (!_pango_engine_shape_covers (item->analysis.shape_engine, item->analysis.font,
++  if (!item->analysis.font ||
++      !_pango_engine_shape_covers (item->analysis.shape_engine, item->analysis.font,
+ 				   item->analysis.language, g_utf8_get_char (ellipsis_text)))
+     {
+       pango_item_free (item);
+       
+       /* Modify the fallback iter while it is inside the PangoAttrList; Don't try this at home
+        */
+-      ((PangoAttrInt *)fallback)->value = FALSE; 
++      ((PangoAttrInt *)fallback)->value = TRUE; 
+ 
+       ellipsis_text = "...";
+       item = itemize_text (state, ellipsis_text, attrs);
diff --git a/x11-libs/pango/pango-1.8.1-r1.ebuild b/x11-libs/pango/pango-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..1c660366af06
--- /dev/null
+++ b/x11-libs/pango/pango-1.8.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.8.1-r1.ebuild,v 1.1 2005/06/25 15:10:57 allanonjl Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Text rendering and layout library"
+HOMEPAGE="http://www.pango.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2"
+
+LICENSE="LGPL-2 FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static"
+
+RDEPEND="virtual/x11
+	virtual/xft
+	>=dev-libs/glib-2.6
+	>=media-libs/fontconfig-1.0.1
+	>=media-libs/freetype-2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Some enhancements from Redhat
+	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
+	epatch ${FILESDIR}/${PN}-1.2.2-slighthint.patch
+
+	# fix for #84586
+	epatch ${FILESDIR}/pango-1.8.1-fontfix.patch
+
+	# make config file location host specific so that a 32bit and 64bit pango
+	# wont fight with each other on a multilib system
+	use amd64 && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
+	# and this line is just here to make building emul-linux-x86-gtklibs a bit
+	# easier, so even this should be amd64 specific.
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
+
+	epunt_cxx
+
+}
+
+DOCS="AUTHORS ChangeLog README INSTALL NEWS TODO*"
+
+G2CONF="${G2CONF} `use_enable static`"
+
+src_install() {
+
+	gnome2_src_install
+
+	rm ${D}/etc/pango/pango.modules
+	use amd64 && mkdir ${D}/etc/pango/${CHOST}
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && mkdir ${D}/etc/pango/${CHOST}
+
+}
+
+pkg_postinst() {
+
+	if [ "${ROOT}" == "/" ] ; then
+		einfo "Generating modules listing..."
+		use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}"
+		use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}"
+		PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango/}
+		pango-querymodules > /${PANGO_CONFDIR}/pango.modules
+	fi
+
+}
+
+USE_DESTDIR="1"