Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv26456
Modified Files:
fontconfig2-dev.info fontconfig2-dev.patch
Log Message:
upstream fix for .pc
Index: fontconfig2-dev.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/fontconfig2-dev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fontconfig2-dev.patch 18 Jul 2012 18:11:06 -0000 1.1
+++ fontconfig2-dev.patch 19 Jul 2012 01:37:49 -0000 1.2
@@ -1,7 +1,15 @@
diff -Nurd -x'*~' fontconfig-2.10.0.orig/fontconfig.pc.in
fontconfig-2.10.0/fontconfig.pc.in
--- fontconfig-2.10.0.orig/fontconfig.pc.in 2012-05-31 22:26:10.000000000
-0400
-+++ fontconfig-2.10.0/fontconfig.pc.in 2012-07-18 12:25:45.000000000 -0400
-@@ -12,5 +12,4 @@
++++ fontconfig-2.10.0/fontconfig.pc.in 2012-07-18 21:32:44.000000000 -0400
+@@ -5,12 +5,11 @@
+ sysconfdir=@sysconfdir@
+ localstatedir=@localstatedir@
+ PACKAGE=@PACKAGE@
+-confdir=@confdir@
++confdir=@baseconfigdir@
+ cachedir=@fc_cachedir@
+
+ Name: Fontconfig
Description: Font configuration and customization library
Version: @VERSION@
Libs: -L${libdir} -lfontconfig
Index: fontconfig2-dev.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/fontconfig2-dev.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fontconfig2-dev.info 18 Jul 2012 18:12:34 -0000 1.2
+++ fontconfig2-dev.info 19 Jul 2012 01:37:49 -0000 1.3
@@ -1,5 +1,4 @@
# TODO before release:
-# fix @confdir@ in .pc
(http://lists.freedesktop.org/archives/fontconfig/2012-July/004200.html)
# is adding "const" to public-function parameter prototype an API break?
Package: fontconfig2-dev
@@ -28,7 +27,7 @@
Source: http://www.fontconfig.org/release/fontconfig-%v.tar.bz2
Source-MD5: 3950e82cf5885b41cba8a2bf466aa6f9
PatchFile: %n.patch
-PatchFile-MD5: c905665ca2aacb5abef935b320abfa45
+PatchFile-MD5: 37769f5928d9d9f14f258652ae368791
SetCFLAGS: -fno-common -g -Os
ConfigureParams: --prefix=%p/lib/fontconfig2 --with-baseconfigdir=%p/etc/fonts
--with-templatedir=%p/etc/fonts/conf.avail --with-xmldir=%p/etc/fonts
--disable-docs --enable-dependency-tracking
--with-cache-dir=%p/var/cache/fontconfig-2.4
--with-default-fonts=/System/Library/Fonts
--with-add-fonts=/Library/Fonts,/Network/Library/Fonts,/System/Library/Fonts,/usr/X11/lib/X11/fonts,/usr/X11R6/lib/X11/fonts,/usr/share/fonts
--disable-silent-rules --disable-static --mandir=%p/share/man --enable-iconv
@@ -186,4 +185,7 @@
if this is a useful or good thing or not, so inertia wins
until someone complains. A bunch of conf dirs are also set to
put various file "where they were in previous versions".
+
+ Fix wrong AC_SUBST token in fontconfig.pc.in. See:
+ http://lists.freedesktop.org/archives/fontconfig/2012-July/004200.html
<<
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
