Menu
▾
▴
[cvs] dists/10.7/stable/main/finkinfo/x11 fontconfig2-dev.info, 1.4, 1.5 fontconfig2-dev.patch, 1.2, 1.3
|
From: Daniel M. <dm...@us...> - 2012-07-31 17:11:11
|
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv28442
Modified Files:
fontconfig2-dev.info fontconfig2-dev.patch
Log Message:
new version from 10.6, tested on 10.7
Index: fontconfig2-dev.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/fontconfig2-dev.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fontconfig2-dev.patch 21 Jul 2011 00:34:13 -0000 1.2
+++ fontconfig2-dev.patch 31 Jul 2012 17:11:08 -0000 1.3
@@ -1,16 +1,16 @@
-diff -Nurd -x'*~' fontconfig-2.8.0.orig/fontconfig.pc.in fontconfig-2.8.0/fontconfig.pc.in
---- fontconfig-2.8.0.orig/fontconfig.pc.in 2009-11-16 12:24:52.000000000 -0500
-+++ fontconfig-2.8.0/fontconfig.pc.in 2011-04-23 11:56:24.000000000 -0400
-@@ -7,5 +7,4 @@
+diff -Nurd -x'*~' fontconfig-2.10.1.orig/fontconfig.pc.in fontconfig-2.10.1/fontconfig.pc.in
+--- fontconfig-2.10.1.orig/fontconfig.pc.in 2012-07-23 22:01:32.000000000 -0400
++++ fontconfig-2.10.1/fontconfig.pc.in 2012-07-29 16:12:53.000000000 -0400
+@@ -12,5 +12,4 @@
Description: Font configuration and customization library
Version: @VERSION@
Libs: -L${libdir} -lfontconfig
-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
Cflags: -I${includedir}
-diff -Nurd -x'*~' fontconfig-2.8.0.orig/fonts.conf.in fontconfig-2.8.0/fonts.conf.in
---- fontconfig-2.8.0.orig/fonts.conf.in 2009-06-28 13:48:47.000000000 -0400
-+++ fontconfig-2.8.0/fonts.conf.in 2010-02-08 05:21:00.000000000 -0500
-@@ -64,14 +64,25 @@
+diff -Nurd -x'*~' fontconfig-2.10.1.orig/fonts.conf.in fontconfig-2.10.1/fonts.conf.in
+--- fontconfig-2.10.1.orig/fonts.conf.in 2012-07-23 22:01:32.000000000 -0400
++++ fontconfig-2.10.1/fonts.conf.in 2012-07-29 16:12:53.000000000 -0400
+@@ -66,16 +66,27 @@
</match>
<!--
@@ -21,7 +21,7 @@
+<!--
Load local system customization file
-->
- <include ignore_missing="yes">conf.d</include>
+ <include ignore_missing="yes">@CONFIGDIR@</include>
+
+<!--
+ Load local (apple) system customization file
@@ -32,6 +32,8 @@
<!-- Font cache directory list -->
<cachedir>@FC_CACHEDIR@</cachedir>
+ <cachedir prefix="xdg">fontconfig</cachedir>
+ <!-- the following element will be removed in the future -->
- <cachedir>~/.fontconfig</cachedir>
+ <cachedir>~/.fontconfig-2.4</cachedir>
Index: fontconfig2-dev.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/fontconfig2-dev.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fontconfig2-dev.info 28 Mar 2012 12:30:22 -0000 1.4
+++ fontconfig2-dev.info 31 Jul 2012 17:11:08 -0000 1.5
@@ -1,6 +1,6 @@
Package: fontconfig2-dev
-Version: 2.8.0
-Revision: 8
+Version: 2.10.1
+Revision: 1
Description: Font configuration library
License: Restrictive/Distributable
Maintainer: The Gnome Core Team <fin...@li...>
@@ -21,13 +21,13 @@
<<
BuildDependsOnly: true
-Source: http://www.fontconfig.org/release/fontconfig-%v.tar.gz
-Source-MD5: 77e15a92006ddc2adbb06f840d591c0e
+Source: http://www.fontconfig.org/release/fontconfig-%v.tar.bz2
+Source-MD5: e9b9142080b7cd6b43890344fec7fbd8
PatchFile: %n.patch
-PatchFile-MD5: b016bb5e79e60d05dcfdd964c0ed68a7
+PatchFile-MD5: 1771b0afe73ec8fdf666a7c5b332a073
SetCFLAGS: -fno-common -g -Os
-ConfigureParams: --prefix=%p/lib/fontconfig2 --with-confdir=%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
+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
CompileScript: <<
%{default_script}
fink-package-precedence --prohibit-bdep %n .
@@ -74,7 +74,7 @@
Depends: <<
fontconfig-config (= %v-%r),
expat1-shlibs,
- freetype219-shlibs (>= 2.4.4-1),
+ freetype219-shlibs (>= 2.4.6-1),
libiconv
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
@@ -84,14 +84,18 @@
lib/fontconfig2/lib/libfontconfig.1*dylib
share/man/man1
<<
- Shlibs: %p/lib/fontconfig2/lib/libfontconfig.1.dylib 6.0.0 %n (>= 2.8.0-1)
+ Shlibs: %p/lib/fontconfig2/lib/libfontconfig.1.dylib 8.0.0 %n (>= 2.10.0-1)
PostInstScript: %p/bin/fc-cache --force >/tmp/fc-cache.log 2>&1 || :
<<
SplitOff2: <<
Package: fontconfig-config
Description: configuration files for fontconfig
DocFiles: AUTHORS COPYING ChangeLog NEWS README
- Files: %p/etc/fonts
+ Files: <<
+ %p/etc/fonts
+ <<
+# %p/lib/fontconfig2/etc
+# %p/lib/fontconfig2/share
ConfFiles: <<
%p/etc/fonts/fonts.conf
%p/etc/fonts/fonts.dtd
@@ -102,7 +106,9 @@
%p/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
%p/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
%p/etc/fonts/conf.avail/10-unhinted.conf
- %p/etc/fonts/conf.avail/20-fix-globaladvance.conf
+ %p/etc/fonts/conf.avail/11-lcdfilter-default.conf
+ %p/etc/fonts/conf.avail/11-lcdfilter-legacy.conf
+ %p/etc/fonts/conf.avail/11-lcdfilter-light.conf
%p/etc/fonts/conf.avail/20-unhint-small-vera.conf
%p/etc/fonts/conf.avail/25-unhint-nonlatin.conf
%p/etc/fonts/conf.avail/30-metric-aliases.conf
@@ -170,4 +176,13 @@
others to link libft). It's in fcfreetype.h public header, so
would help make sure others don't need to know to pass ft's
special -I flag.
+
+ Older versions defaulted to including iconv use. Default
+ changed, so now explicitly specify it for consistency. No idea
+ 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
<<
|