Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv14262/experimental/dmacks/finkinfo
Added Files:
fontconfig2-dev.info fontconfig2-dev.patch
Log Message:
checkpoint for new version (pending upstream bug-report)
--- NEW FILE: fontconfig2-dev.patch ---
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 @@
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.10.0.orig/fonts.conf.in
fontconfig-2.10.0/fonts.conf.in
--- fontconfig-2.10.0.orig/fonts.conf.in 2012-05-31 22:26:10.000000000
-0400
+++ fontconfig-2.10.0/fonts.conf.in 2012-07-18 12:30:47.000000000 -0400
@@ -66,16 +66,27 @@
</match>
<!--
+ Load per-user customization file
+-->
+ <include ignore_missing="yes">~/.fonts.conf</include>
+
+<!--
Load local system customization file
-->
<include ignore_missing="yes">@CONFIGDIR@</include>
+
+<!--
+ Load local (apple) system customization file
+-->
+ <include
ignore_missing="yes">/usr/X11/lib/X11/fonts/local.conf</include>
+ <include ignore_missing="yes">/etc/fonts/local.conf</include>
<!-- 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>
<config>
<!--
--- NEW FILE: fontconfig2-dev.info ---
# TODO before release:
# fix @confdir@ in .pc
# is adding "const" to public-function parameter prototype an API break?
Package: fontconfig2-dev
Version: 2.10.0
Revision: 1
Description: Font configuration library
License: Restrictive/Distributable
Maintainer: The Gnome Core Team <[email protected]>
Depends: <<
dpkg-base-files,
fontconfig2-shlibs (= %v-%r),
expat1-shlibs
<<
BuildDepends: <<
expat1,
fink (>= 0.24.12-1),
fink-package-precedence,
freetype219 (>= 2.4.6-1),
libiconv-dev,
pkgconfig,
x11-dev
<<
BuildDependsOnly: true
Source: http://www.fontconfig.org/release/fontconfig-%v.tar.bz2
Source-MD5: 3950e82cf5885b41cba8a2bf466aa6f9
PatchFile: %n.patch
PatchFile-MD5: c905665ca2aacb5abef935b320abfa45
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
CompileScript: <<
%{default_script}
fink-package-precedence --prohibit-bdep %n .
<<
InstallScript: <<
#!/bin/sh -ev
make -j1 install DESTDIR=%d
mkdir -p %i/share/man/man1
install -m 0644 fc-*/*.1 %i/share/man/man1
mkdir -p %i/share/man/man3
install -m 0644 doc/*.3 %i/share/man/man3
mkdir -p %i/share/man/man5
install -m 0644 doc/*.5 %i/share/man/man5
# everything is buried in a private hierarchy...
# now symlink from the default places
# must not symlink dirs...risk of confusing dpkg
pushd %i/lib/fontconfig2
# 1. clone actual directory structure
# NB: will fail miserably if space in %i or %p
# but fink hopelessly can't handle that anyway
/usr/bin/find . -type d -print0 | /usr/bin/xargs -0 -n 1 -I" "
mkdir -pv "%i/ "
# 2. symlink the individual files
/usr/bin/find . \( -type f -o -type l \) -print0 |
/usr/bin/xargs -0 -n 1 -I" " ln -sv "%p/lib/fontconfig2/ " "%i/ "
# adjust to emit paths pointing to the default places
#must edit actual files...perl-pie replaces symlink
#with actual file (!= acting through the symlink)
perl -pi -e 's,%p/lib/fontconfig2,%p,g' lib/pkgconfig/*
# lib/*.la #Scared of libtool!
popd
# only keep the main ld file, not all the underlying pieces
rm %i/lib/libfontconfig.1.*
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
SplitOff: <<
Package: fontconfig2-shlibs
Description: Fontconfig 2, shared libs
Depends: <<
fontconfig-config (= %v-%r),
expat1-shlibs,
freetype219-shlibs (>= 2.4.6-1),
libiconv
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
Files: <<
bin
lib/fontconfig2/bin
lib/fontconfig2/lib/libfontconfig.1*dylib
share/man/man1
<<
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
<<
# %p/lib/fontconfig2/etc
# %p/lib/fontconfig2/share
ConfFiles: <<
%p/etc/fonts/fonts.conf
%p/etc/fonts/fonts.dtd
%p/etc/fonts/conf.avail/10-autohint.conf
%p/etc/fonts/conf.avail/10-no-sub-pixel.conf
%p/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
%p/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
%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/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
%p/etc/fonts/conf.avail/30-urw-aliases.conf
%p/etc/fonts/conf.avail/40-nonlatin.conf
%p/etc/fonts/conf.avail/45-latin.conf
%p/etc/fonts/conf.avail/49-sansserif.conf
%p/etc/fonts/conf.avail/50-user.conf
%p/etc/fonts/conf.avail/51-local.conf
%p/etc/fonts/conf.avail/60-latin.conf
%p/etc/fonts/conf.avail/65-fonts-persian.conf
%p/etc/fonts/conf.avail/65-nonlatin.conf
%p/etc/fonts/conf.avail/69-unifont.conf
%p/etc/fonts/conf.avail/70-no-bitmaps.conf
%p/etc/fonts/conf.avail/70-yes-bitmaps.conf
%p/etc/fonts/conf.avail/80-delicious.conf
%p/etc/fonts/conf.avail/90-synthetic.conf
<<
<<
PreInstScript: <<
[ -L "%p/lib/fontconfig2/include/fontconfig" ] && rm
"%p/lib/fontconfig2/include/fontconfig"
<<
Homepage: http://www.fontconfig.org
DescDetail: <<
A library for font customization and configuration.
This version is meant to coexist peacefully with the libfontconfig
provided in Apple's X11. It has its own configuration files in
%p/etc/fonts, but is also configured to use a configuration in
/usr/X11/lib/X11/fonts/local.conf and /etc/fonts/local.conf if they
exist.
<<
DescPackaging: <<
This package is not intended to replace the system fontconfig. It is,
however, patched to use its own cache and configuration directories,
but to still be capable of loading the user font configuration, as
well as /etc/fonts/local.conf on 10.4 (or Leopard upgrades), which is
the accepted way of modifying the behavior of /etc/fonts/fonts.conf.
If a user has an edited /etc/fonts/fonts.conf, that edit will not
affect any Fink apps using this fontconfig package.
The same applies for /usr/X11/lib/X11/fonts/local.conf on Leopard.
Just copy included manpages instead of regenerating from sgml sources
to avoid needing dockbook chain as BuildDepends
Formerly maintained by Benjamin Reed <[email protected]>
Previously, the package on OS X 10.5/10.6 was just symlinks to the
components supplied by system X11. Upgrading back to a real
fink-supplied package, we need to replace those symlinks with real
files and directories, but dpkg cannot cope with "replace symlink with
dir of same name". Remove the symlink in *this* PreInst, so installing
this package's actual files doesn't follow it and install in system
location.
No longer supply static (as of 2.8.0-5), therefore no longer
need to propagate linking against libs that are not in public
ABI.
Not sure if we should Requires: or Requires.private: freetype2
(we remove it from Libs.private: because no benefit to forcing
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".
<<
------------------------------------------------------------------------------
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
