r13728 - in /desktop/experimental/pango1.0/debian: changelog patches/30_anymetrics.patch patches/series

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Dec  4 08:37:35 2007
New Revision: 13728

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13728
Log:
* Sync with Debian; Ubuntu changes are:
  - Add patch 30_anymetrics, turns on FC_ANY_METRICS whenever looking up
    fonts with fontconfig; lets fontconfig's configuration know that we
    don't care about getting a font with exactly the same shape as the
    family we asked for and fixes (eg) a firefox vs. evince font metrics
    ugliness issue.

Added:
    desktop/experimental/pango1.0/debian/patches/30_anymetrics.patch
Modified:
    desktop/experimental/pango1.0/debian/changelog
    desktop/experimental/pango1.0/debian/patches/series

Modified: desktop/experimental/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/changelog?rev=13728&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/changelog (original)
+++ desktop/experimental/pango1.0/debian/changelog Tue Dec  4 08:37:35 2007
@@ -1,3 +1,14 @@
+pango1.0 (1.19.1-1ubuntu1) hardy; urgency=low
+
+  * Sync with Debian; Ubuntu changes are:
+    - Add patch 30_anymetrics, turns on FC_ANY_METRICS whenever looking up
+      fonts with fontconfig; lets fontconfig's configuration know that we
+      don't care about getting a font with exactly the same shape as the
+      family we asked for and fixes (eg) a firefox vs. evince font metrics
+      ugliness issue.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 04 Dec 2007 09:27:40 +0100
+
 pango1.0 (1.19.1-1) experimental; urgency=low
 
   * New upstream development release, the new API may still change

Added: desktop/experimental/pango1.0/debian/patches/30_anymetrics.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/30_anymetrics.patch?rev=13728&op=file
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/30_anymetrics.patch (added)
+++ desktop/experimental/pango1.0/debian/patches/30_anymetrics.patch Tue Dec  4 08:37:35 2007
@@ -1,0 +1,38 @@
+diff -Nur pango1.0-1.15.4.orig/pango/pangofc-fontmap.c pango1.0-1.15.4/pango/pangofc-fontmap.c
+--- pango1.0-1.15.4.orig/pango/pangofc-fontmap.c	2007-01-16 21:23:33.000000000 +0100
++++ pango1.0-1.15.4/pango/pangofc-fontmap.c	2007-01-18 12:12:03.000000000 +0100
+@@ -844,6 +844,7 @@
+ #endif
+ 			    FC_SIZE,  FcTypeDouble,  pixel_size * (72. / dpi),
+ 			    FC_PIXEL_SIZE,  FcTypeDouble,  pixel_size,
++			    FC_ANY_METRICS, FcTypeBool, FcTrue,
+ 			    NULL);
+ 
+   families = g_strsplit (pango_font_description_get_family (description), ",", -1);
+@@ -1003,6 +1004,7 @@
+       FcPattern *tmp = FcPatternBuild (NULL,
+ 				       FC_FAMILY, FcTypeString, "Sans",
+ 				       FC_SIZE,   FcTypeDouble, 10.,
++				       FC_ANY_METRICS, FcTypeBool, FcTrue,
+ 				       NULL);
+       if (tmp)
+ 	{
+@@ -1690,6 +1692,7 @@
+   match_pattern = FcPatternBuild (NULL,
+ 				  FC_FAMILY, FcTypeString, fcfamily->family_name,
+ 				  FC_STYLE, FcTypeString, fcface->style,
++				  FC_ANY_METRICS, FcTypeBool, FcTrue,
+ 				  NULL);
+ 
+   g_assert (match_pattern);
+diff -Nur pango1.0-1.15.4.orig/pango/pangoft2.c pango1.0-1.15.4/pango/pangoft2.c
+--- pango1.0-1.15.4.orig/pango/pangoft2.c	2007-01-16 21:18:33.000000000 +0100
++++ pango1.0-1.15.4/pango/pangoft2.c	2007-01-18 12:11:15.000000000 +0100
+@@ -98,6 +98,7 @@
+   sans = FcPatternBuild (NULL,
+ 			 FC_FAMILY,     FcTypeString, "sans",
+ 			 FC_PIXEL_SIZE, FcTypeDouble, (double)ft2font->size / PANGO_SCALE,
++			 FC_ANY_METRICS, FcTypeBool, FcTrue,
+ 			 NULL);
+ 
+   _pango_ft2_font_map_default_substitute (fcfont->fontmap, sans);

Modified: desktop/experimental/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/series?rev=13728&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/series (original)
+++ desktop/experimental/pango1.0/debian/patches/series Tue Dec  4 08:37:35 2007
@@ -1,3 +1,4 @@
 10_scan-module-files-in-dirs.patch
 11_module-files-append-module-files-d.patch
 12_module-files-append-compat-module-files-d.patch
+30_anymetrics.patch