r16325 - in /desktop/unstable/pango1.0/debian: changelog patches/60_link-pangoxft-to-fontconfig.patch patches/70_automake.patch patches/series

lool at users.alioth.debian.org lool at users.alioth.debian.org
Tue Jun 24 21:02:51 UTC 2008


Author: lool
Date: Tue Jun 24 21:02:50 2008
New Revision: 16325

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16325
Log:
* Link libpangoxft to fontconfig as it calls Fc* functions directly; this
  was pulled by xft in the past; GNOME #540036; thanks Lucas Nussbaum and
  Andreas Metzler; closes: #486991.
  - New patch, 60_link-pangoxft-to-fontconfig, include FONTCONFIG_CFLAGS and
    link libpangoxft to FONTCONFIG_LIBS.
  - New patch, 70_automake, refresh automake generated files.
  - Urgency high for RC bug fix.

Added:
    desktop/unstable/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch
    desktop/unstable/pango1.0/debian/patches/70_automake.patch
Modified:
    desktop/unstable/pango1.0/debian/changelog
    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=16325&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog (original)
+++ desktop/unstable/pango1.0/debian/changelog Tue Jun 24 21:02:50 2008
@@ -1,3 +1,15 @@
+pango1.0 (1.20.3-2) unstable; urgency=high
+
+  * Link libpangoxft to fontconfig as it calls Fc* functions directly; this
+    was pulled by xft in the past; GNOME #540036; thanks Lucas Nussbaum and
+    Andreas Metzler; closes: #486991.
+    - New patch, 60_link-pangoxft-to-fontconfig, include FONTCONFIG_CFLAGS and
+      link libpangoxft to FONTCONFIG_LIBS.
+    - New patch, 70_automake, refresh automake generated files.
+    - Urgency high for RC bug fix.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 24 Jun 2008 22:39:24 +0200
+
 pango1.0 (1.20.3-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Added: 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=16325&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch (added)
+++ desktop/unstable/pango1.0/debian/patches/60_link-pangoxft-to-fontconfig.patch Tue Jun 24 21:02:50 2008
@@ -1,0 +1,23 @@
+GNOME #540036; Debian #486991 – Doesn't link to fontconfig
+
+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
+@@ -24,6 +24,7 @@
+ 	$(PANGO_DEBUG_FLAGS)				\
+ 	$(GLIB_CFLAGS)					\
+ 	$(XFT_CFLAGS)					\
++	$(FONTCONFIG_CFLAGS)				\
+ 	$(CAIRO_CFLAGS)					\
+ 	$(FREETYPE_CFLAGS)				\
+ 	$(X_CFLAGS)
+@@ -242,6 +243,7 @@
+ 	$(GLIB_LIBS)				\
+ 	$(X_LIBS)				\
+ 	$(XFT_LIBS)				\
++	$(FONTCONFIG_LIBS)			\
+ 	$(libm)
+ libpangoxft_1_0_la_DEPENDENCIES =		\
+ 	libpangoft2-$(PANGO_API_VERSION).la	\

Added: desktop/unstable/pango1.0/debian/patches/70_automake.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/70_automake.patch?rev=16325&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/70_automake.patch (added)
+++ desktop/unstable/pango1.0/debian/patches/70_automake.patch Tue Jun 24 21:02:50 2008
@@ -1,0 +1,20 @@
+diff --git a/pango/Makefile.in b/pango/Makefile.in
+index b5edfbb..fe2b652 100644
+--- a/pango/Makefile.in
++++ b/pango/Makefile.in
+@@ -427,6 +427,7 @@ INCLUDES = \
+ 	$(PANGO_DEBUG_FLAGS)				\
+ 	$(GLIB_CFLAGS)					\
+ 	$(XFT_CFLAGS)					\
++	$(FONTCONFIG_CFLAGS)				\
+ 	$(CAIRO_CFLAGS)					\
+ 	$(FREETYPE_CFLAGS)				\
+ 	$(X_CFLAGS)
+@@ -566,6 +567,7 @@ libpangoxft_1_0_la_LIBADD = \
+ 	$(GLIB_LIBS)				\
+ 	$(X_LIBS)				\
+ 	$(XFT_LIBS)				\
++	$(FONTCONFIG_LIBS)			\
+ 	$(libm)
+ 
+ libpangoxft_1_0_la_DEPENDENCIES = \

Modified: desktop/unstable/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/series?rev=16325&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/series (original)
+++ desktop/unstable/pango1.0/debian/patches/series Tue Jun 24 21:02:50 2008
@@ -1,3 +1,5 @@
 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
+70_automake.patch




More information about the pkg-gnome-commits mailing list