r16834 - in /desktop/unstable/pango1.0/debian: changelog patches/20_indic_rendering.patch patches/60_link-pangoxft-to-fontconfig.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Aug 29 21:52:14 2008
New Revision: 16834

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16834
Log:
* 20_indic_rendering.patch: patch from upstream SVN. Fixes rendering 
  of Malayalam fonts. Closes: #493975.
* 60_link-pangoxft-to-fontconfig.patch: make the patch apply with -p1.

Added:
    desktop/unstable/pango1.0/debian/patches/20_indic_rendering.patch
Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch
    desktop/unstable/pango1.0/debian/patches/series

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=16834&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog (original)
+++ desktop/unstable/pango1.0/debian/changelog Fri Aug 29 21:52:14 2008
@@ -1,3 +1,11 @@
+pango1.0 (1.20.5-2) UNRELEASED; urgency=low
+
+  * 20_indic_rendering.patch: patch from upstream SVN. Fixes rendering 
+    of Malayalam fonts. Closes: #493975.
+  * 60_link-pangoxft-to-fontconfig.patch: make the patch apply with -p1.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 29 Aug 2008 23:46:43 +0200
+
 pango1.0 (1.20.5-1) unstable; urgency=low
 
   * New upstream release, fixing libtool versioning.

Added: desktop/unstable/pango1.0/debian/patches/20_indic_rendering.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/20_indic_rendering.patch?rev=16834&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/20_indic_rendering.patch (added)
+++ desktop/unstable/pango1.0/debian/patches/20_indic_rendering.patch Fri Aug 29 21:52:14 2008
@@ -1,0 +1,15 @@
+Debian #493975
+GNOME #441654
+Upstream commit r2682
+
+--- trunk/modules/indic/mprefixups.c	2008/06/22 15:18:49	2657
++++ trunk/modules/indic/mprefixups.c	2008/08/06 08:40:12	2682
+@@ -81,7 +81,7 @@
+ 	pango_ot_buffer_get_glyphs (buffer, &glyphs, &n_glyphs);
+ 
+ 	for (i = 0; i < n_glyphs; i++) {
+-	    if (baseGlyph < 0 && glyphs[i].cluster == baseIndex)
++	    if ((baseIndex >= glyphs[i].cluster) && (baseIndex-glyphs[i].cluster) % 2 == 0) /* bug 441654 */
+ 		baseGlyph = i;
+ 	    if (glyphs[i].cluster == mpreIndex) {
+ 		    if (mpreGlyph < 0)

Modified: desktop/unstable/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch?rev=16834&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch (original)
+++ desktop/unstable/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch Fri Aug 29 21:52:14 2008
@@ -3,8 +3,8 @@
 pango/Makefile.am: Explicitely include FONTCONFIG_CFLAGS and link to
 FONTCONFIG_LIBS as libpangoxft calls Fc* functions directly.
 
---- pango/Makefile.am.orig	2008-05-03 19:23:01.000000000 +0200
-+++ pango/Makefile.am	2008-06-24 22:57:24.000000000 +0200
+--- a/pango/Makefile.am.orig	2008-05-03 19:23:01.000000000 +0200
++++ b/pango/Makefile.am	2008-06-24 22:57:24.000000000 +0200
 @@ -24,6 +24,7 @@
  	$(PANGO_DEBUG_FLAGS)				\
  	$(GLIB_CFLAGS)					\

Modified: desktop/unstable/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/series?rev=16834&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/series (original)
+++ desktop/unstable/pango1.0/debian/patches/series Fri Aug 29 21:52:14 2008
@@ -1,5 +1,6 @@
 10_scan-module-files-in-dirs.patch
 11_module-files-append-module-files-d.patch
 12_module-files-append-compat-module-files-d.patch
-60_link-pangoxft-to-fontconfig.patch -p0
+20_indic_rendering.patch
+60_link-pangoxft-to-fontconfig.patch
 70_automake.patch