tags 350458 patch thanks Attached is a patch to add the freetype cflags back into the xft.pc file. The previous patch was also apparently not tested for static linking, since it depended on variables that weren't defined anywhere in the .pc file... :) Let me know if you'd like an NMU for this bug. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. vorlon@debian.org http://www.debian.org/
diff -u xft-2.1.8.2/debian/patches/001_no_export_freetype.diff xft-2.1.8.2/debian/patches/001_no_export_freetype.diff
--- xft-2.1.8.2/debian/patches/001_no_export_freetype.diff
+++ xft-2.1.8.2/debian/patches/001_no_export_freetype.diff
@@ -1,14 +1,22 @@
-Index: xft/xft.pc.in
+Index: xft-2.1.8.2/xft.pc.in
===================================================================
---- xft.orig/xft.pc.in 2006-01-24 19:20:32.000000000 -0500
-+++ xft/xft.pc.in 2006-01-24 21:50:25.000000000 -0500
-@@ -6,7 +6,7 @@
+--- xft-2.1.8.2.orig/xft.pc.in 2006-02-05 04:51:32.000000000 -0800
++++ xft-2.1.8.2/xft.pc.in 2006-02-05 04:54:25.000000000 -0800
+@@ -2,11 +2,14 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++freetypelibs="@FREETYPE_LIBS@"
++freetypecflags="@FREETYPE_CFLAGS@"
++xrenderlibs="@XRENDER_LIBS@"
+
Name: Xft
Description: X FreeType library
Version: @VERSION@
-Requires: xproto, xrender, fontconfig, freetype2
-Requires.private: xrender, fontconfig, freetype2
+-Cflags: -I${includedir}
+Requires: xproto, fontconfig
- Cflags: -I${includedir}
++Cflags: -I${includedir} ${freetypecflags}
Libs: -L${libdir} -lXft
+Libs.private: -lX11 ${xrenderlibs} ${freetypelibs}
diff -u xft-2.1.8.2/debian/patches/002_no_xproto_dep.diff xft-2.1.8.2/debian/patches/002_no_xproto_dep.diff
--- xft-2.1.8.2/debian/patches/002_no_xproto_dep.diff
+++ xft-2.1.8.2/debian/patches/002_no_xproto_dep.diff
@@ -1,13 +1,13 @@
-Index: xft/xft.pc.in
+Index: xft-2.1.8.2/xft.pc.in
===================================================================
---- xft.orig/xft.pc.in 2006-01-24 21:50:25.000000000 -0500
-+++ xft/xft.pc.in 2006-01-24 21:50:45.000000000 -0500
+--- xft-2.1.8.2.orig/xft.pc.in 2006-02-05 04:46:17.000000000 -0800
++++ xft-2.1.8.2/xft.pc.in 2006-02-05 04:46:43.000000000 -0800
@@ -6,7 +6,7 @@
Name: Xft
Description: X FreeType library
Version: @VERSION@
-Requires: xproto, fontconfig
+Requires: fontconfig
- Cflags: -I${includedir}
+ Cflags: -I${includedir} ${freetypecflags}
Libs: -L${libdir} -lXft
Libs.private: -lX11 ${xrenderlibs} ${freetypelibs}
diff -u xft-2.1.8.2/debian/changelog xft-2.1.8.2/debian/changelog
--- xft-2.1.8.2/debian/changelog
+++ xft-2.1.8.2/debian/changelog
@@ -1,3 +1,13 @@
+xft (2.1.8.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Make sure freetype cflags are included in the .pc file as originally
+ requested in 349318, since freetype headers are included in xft's
+ headers. Also, don't use variables in the .pc file that haven't been
+ defined anywhere. Closes: #350458.
+
+ -- Steve Langasek <vorlon@debian.org> Sun, 5 Feb 2006 04:43:01 -0800
+
xft (2.1.8.2-2) unstable; urgency=low
* Add 002_no_xproto_dep.diff so that the .pc file doesn't depend on xproto,
Attachment:
signature.asc
Description: Digital signature