diff options
| -rw-r--r-- | x11-libs/pango/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/pango/Manifest | 5 | ||||
| -rw-r--r-- | x11-libs/pango/files/digest-pango-1.6.0 | 1 | ||||
| -rw-r--r-- | x11-libs/pango/files/pango-1.6.0-cjk_space_as_char.patch | 28 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.6.0.ebuild | 72 |
5 files changed, 111 insertions, 2 deletions
diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog index 722116782094..d3d42bcc0ab7 100644 --- a/x11-libs/pango/ChangeLog +++ b/x11-libs/pango/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/pango # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.74 2004/08/22 23:01:58 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.75 2004/09/14 11:38:41 foser Exp $ + +*pango-1.6.0 (14 Sep 2004) + + 14 Sep 2004; foser <foser@gentoo.org> pango-1.6.0.ebuild : + Gnome 2.8 release, added minor cjk bugfixing patch 22 Aug 2004; Travis Tilley <lv@gentoo.org> pango-1.4.1-r1.ebuild: made arch specific config file patch apply on x86 when CONF_LIBDIR=lib32. this diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest index c02baee901a7..172b97c9965b 100644 --- a/x11-libs/pango/Manifest +++ b/x11-libs/pango/Manifest @@ -1,11 +1,14 @@ MD5 b754ba96451c7a53a9c7ac57db9b3e47 pango-1.4.1.ebuild 1135 MD5 0d8448ba534b03d0c00997fd4906cc45 pango-1.4.0.ebuild 1080 MD5 4708ad353d961d103d12237782da2456 pango-1.4.1-r1.ebuild 1848 -MD5 b5ac6b8b35f818b85cee839cffc033f7 ChangeLog 8545 +MD5 a76e393cccdb296358f1907073c7ceb7 ChangeLog 8691 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 dd7dfb72f4a770bb6c26e23701d5937a pango-1.6.0.ebuild 2021 +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 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560 MD5 e9f4296ef1d6b9bb32c33badffec7dc1 files/digest-pango-1.4.0 64 MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1 64 +MD5 e63307fbf2f7bf46a9b9e363d82e115c files/digest-pango-1.6.0 64 MD5 2c7eef6720e5a5aecb7406200c6ede31 files/pango-1.2.5-lib64.patch 1107 diff --git a/x11-libs/pango/files/digest-pango-1.6.0 b/x11-libs/pango/files/digest-pango-1.6.0 new file mode 100644 index 000000000000..640caec01a5b --- /dev/null +++ b/x11-libs/pango/files/digest-pango-1.6.0 @@ -0,0 +1 @@ +MD5 6c732bbc5fba5a0f1f8086e8aa4f490d pango-1.6.0.tar.bz2 951911 diff --git a/x11-libs/pango/files/pango-1.6.0-cjk_space_as_char.patch b/x11-libs/pango/files/pango-1.6.0-cjk_space_as_char.patch new file mode 100644 index 000000000000..a258b98a495f --- /dev/null +++ b/x11-libs/pango/files/pango-1.6.0-cjk_space_as_char.patch @@ -0,0 +1,28 @@ +Index: pango/pango-context.c +=================================================================== +RCS file: /cvs/gnome/pango/pango/pango-context.c,v +retrieving revision 1.71 +diff -u -p -r1.71 pango-context.c +--- pango/pango-context.c 10 Jul 2004 21:41:37 -0000 1.71 ++++ pango/pango-context.c 13 Sep 2004 14:24:49 -0000 +@@ -1057,7 +1057,19 @@ itemize_state_process_run (ItemizeState + PangoEngineShape *shape_engine; + PangoFont *font; + +- if (!g_unichar_isgraph (wc)) ++ /* We don't want space characters to affect font selection; in general, ++ * it's always wrong to select a font just to render a space. ++ * To make this really work well, we'd need to emulate missing ++ * space characters, which we don't yet do, so we sometimes ++ * will get hex boxes. ++ * ++ * The exception of U+3000 (IDEOGRAPHIC SPACE) here is because we ++ * want to choose an ideographic space that matches ideographic text ++ * in cell width. Even if we were emulating missing spaces, an ++ * emulated ideographic space for the primary font wouldn't be the ++ * right size. ++ */ ++ if (!g_unichar_isgraph (wc) && wc != 0x3000) + { + shape_engine = NULL; + font = NULL; diff --git a/x11-libs/pango/pango-1.6.0.ebuild b/x11-libs/pango/pango-1.6.0.ebuild new file mode 100644 index 000000000000..e774cc27790a --- /dev/null +++ b/x11-libs/pango/pango-1.6.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.6.0.ebuild,v 1.1 2004/09/14 11:38:41 foser 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="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64" +IUSE="doc" + +RDEPEND="virtual/x11 + virtual/xft + >=dev-libs/glib-2.4 + >=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 + + cd ${S}/pango + # Fix cjk issue (http://mail.gnome.org/archives/desktop-devel-list/2004-September/msg00160.html) + epatch ${FILESDIR}/${P}-cjk_space_as_char.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 + +} + +DOCS="AUTHORS ChangeLog README INSTALL NEWS TODO*" + +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" |