enhancement

4 files changed, 163 insertions, 7 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index e276c695336c..011925efa6e6 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.16 2002/11/13 00:07:40 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.17 2002/11/21 20:41:35 azarah Exp $
+
+  21 Nov 2002; Martin Schlemmer <azarah@gentoo.org> pango-1.1.3.ebuild :
+  Add some enhancement patches from Redhat.
 
 *pango-1.1.3 (12 Nov 2002)
 
diff --git a/x11-libs/pango/files/pango-1.0.99.020606-xfonts.patch b/x11-libs/pango/files/pango-1.0.99.020606-xfonts.patch
new file mode 100644
index 000000000000..6db868a22a4d
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.0.99.020606-xfonts.patch
@@ -0,0 +1,98 @@
+--- pango-1.0.99.020606/examples/pangox.aliases.xfonts	Mon Jun 24 20:19:34 2002
++++ pango-1.0.99.020606/examples/pangox.aliases	Mon Jun 24 20:26:34 2002
+@@ -4,6 +4,7 @@
+ 
+ sans normal normal normal normal \
+   "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -22,6 +23,7 @@
+ 
+ sans italic normal normal normal \
+   "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-medium-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -40,6 +42,7 @@
+ 
+ sans normal normal bold normal \
+   "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -58,6 +61,7 @@
+ 
+ sans italic normal bold normal \
+   "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-bold-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -78,6 +82,7 @@
+ serif normal normal normal normal \
+   "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -96,6 +101,7 @@
+ serif italic normal normal normal \
+   "-*-times-medium-i-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -114,6 +120,7 @@
+ serif normal normal bold normal \
+   "-*-times-bold-r-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -132,6 +139,7 @@
+ serif italic normal bold normal \
+   "-*-times-bold-i-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -150,6 +158,7 @@
+ monospace normal normal normal normal \
+   "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -168,6 +177,7 @@
+ monospace italic normal normal normal \
+   "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -186,6 +196,7 @@
+ monospace normal normal bold normal \
+   "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -204,6 +215,7 @@
+ monospace italic normal bold normal \
+   "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
diff --git a/x11-libs/pango/files/pango-1.1.0-slighthint.patch b/x11-libs/pango/files/pango-1.1.0-slighthint.patch
new file mode 100644
index 000000000000..4cbcb454997c
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.1.0-slighthint.patch
@@ -0,0 +1,46 @@
+--- pango-1.1.0/pango/pangoft2.c.slighthint	Thu Aug  8 19:13:38 2002
++++ pango-1.1.0/pango/pangoft2.c	Tue Aug 13 00:42:17 2002
+@@ -205,6 +205,8 @@
+   FcPattern *pattern;
+   FcChar8 *filename;
+   FcBool hinting, autohint;
++  FT_ULong hint_flags;
++  int hintstyle;
+   int id;
+ 
+   pattern = ft2font->font_pattern;
+@@ -220,8 +222,22 @@
+       if (FcPatternGetBool (pattern, FC_HINTING, 0, &hinting) != FcResultMatch)
+ 	hinting = FcTrue;
+ 
+-      if (!hinting)
+-        ft2font->load_flags |= FT_LOAD_NO_HINTING;
++      if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch)
++	hintstyle = FC_HINT_FULL;
++
++      if (!hinting || hintstyle == FC_HINT_NONE)
++          ft2font->load_flags |= FT_LOAD_NO_HINTING;
++      
++      switch (hintstyle) {
++      case FC_HINT_SLIGHT:
++ 	hint_flags = FT_HINT_NO_INTEGER_STEM | FT_HINT_NO_VSTEM_ALIGN;
++ 	break;
++      case FC_HINT_MEDIUM:
++ 	hint_flags = FT_HINT_NO_INTEGER_STEM;
++ 	break;
++      default:
++ 	hint_flags = 0;
++      }
+ 
+       /* force autohinting if requested */
+       if (FcPatternGetBool (pattern, FC_AUTOHINT, 0, &autohint) != FcResultMatch)
+@@ -243,6 +259,9 @@
+ 	bail0:
+ 	  load_fallback_face (ft2font, filename);
+ 	}
++
++      FT_Set_Hint_Flags (ft2font->face, hint_flags);
++      
+       ft2font->face->generic.data = 0;
+     }
+ 
diff --git a/x11-libs/pango/pango-1.1.3.ebuild b/x11-libs/pango/pango-1.1.3.ebuild
index 1060f330cae3..939065aed4c5 100644
--- a/x11-libs/pango/pango-1.1.3.ebuild
+++ b/x11-libs/pango/pango-1.1.3.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.1.3.ebuild,v 1.1 2002/11/13 00:07:40 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.1.3.ebuild,v 1.2 2002/11/21 20:41:35 azarah Exp $
 
 IUSE="doc"
 
-inherit libtool debug
+inherit eutils libtool debug
 
 SLOT="1"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
 
-S=${WORKDIR}/${P}
+S="${WORKDIR}/${P}"
 DESCRIPTION="Text rendering and Layout library"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.1/${P}.tar.bz2"
 HOMEPAGE="http://www.pango.org/"
@@ -18,21 +18,30 @@ LICENSE="LGPL-2.1"
 RDEPEND="virtual/x11
 	virtual/xft
 	>=dev-libs/glib-2
-	>=media-libs/fontconfig-2.0"
+	>=media-libs/fontconfig-2.0
+	>=media-libs/freetype-2.1.2-r2"
 	
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	doc? ( >=dev-util/gtk-doc-0.9 )"
 
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Some enhancements from Redhat
+	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
+	epatch ${FILESDIR}/pango-1.1.0-slighthint.patch
+}
+
 src_compile() {
 	elibtoolize
-	local myconf
+	local myconf=""
 	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
 	if [ -n "$DEBUG" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
-				
 	
 	econf ${myconf} --without-qt  || die
 	make || die "serial make failed"