-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Costabel wrote:
> The xquartz X11 update packages have switched from
> /usr/X11/lib/X11/fonts/fonts.conf for the fontconfig conf file to
> /usr/X11/lib/X11/fontconfig/fonts.conf
>
> Don't ask me why, probably because of a general "backward comaptibility
> is so boring" attitude. See the thread from
> <http://lists.macosforge.org/pipermail/xquartz-dev/2008-September/001064.html>
> to
> <http://lists.macosforge.org/pipermail/xquartz-dev/2008-September/001072.html>
> on the xquartz-dev mailing list.
>
> The change happened already several months ago, I think in
> xquartz-2.2.0. And since Fink is now recommending to install the xquartz
> updates as a cure to the incompatibilities between Apple's stock X11 and
> Apple's stock xcode tools, the fontconfig-path package needs to adapt to
> this situation. Note that stock 10.5.5 X11 still uses the old directory
> for fonts.conf.
>
> I don't know the fontconfig xml based lingo, so I don't know if the
> <include> directive in /sw/share/fontconfig-path/fontconfig-path.conf
> can be conditionalized on the existence of one fonts.conf file or
> another. It is probably easier to do this in a PostInst script.
>
> In any case, the current situation is broken. If you run any executable
> that uses X11 fonts and fontconfig on an xquartz-updated X11
> installation, you get
>
> Fontconfig error: Cannot load config file
> "/usr/X11/lib/X11/fonts/fonts.conf"
>
> and the fonts are not loaded.
>
I've attached a modification to the .info and .patch file.
Essentially this works just as Martin suggests:  there are now
fontconfig-path.conf.oldx and fontconfig-path.conf.newx, and a
symbolic link to the appropriate version is generated at install time.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAklajzMACgkQB8UpO3rKjQ8mugCeLy77gDKS8mXf7PCfs7Q/AGyZ
K/wAnjc6UXeWLsL2WfNDDNotGn4YIdTU
=K87e
-----END PGP SIGNATURE-----

Package: fontconfig-path
Version: 20071103
Revision: 3
Distribution: 10.5
Type: nosource
NoSourceDirectory: true
BuildDepends: fink (>= 0.24.12)
PatchFile: %n-10.5.patch
PatchFile-MD5: 840e5c8ff200084a64a6bb90cb8f9334
PatchScript: sed 's|@PREFIX@|%p|' %{PatchFile} | patch -p1
CompileScript: echo "No compile needed"
InstallScript: <<
mkdir -p %i/share/%n
cp %n.conf* %i/share/%n
mkdir -p %i/etc/profile.d
chmod a+x %n.*sh
cp %n.*sh %i/etc/profile.d
<<
PostInstScript: <<
#!/bin/sh -ev
  cd %p/share/%n        
  OLD_FONTCONFIG_FILE=/usr/X11/lib/X11/fonts/fonts.conf
  NEW_FONTCONFIG_FILE=/usr/X11/lib/X11/fontconfig/fonts.conf
  if [ -e $OLD_FONTCONFIG_FILE ] ; then 
        ln %n.conf.oldx %n.conf
  else ln %n.conf.newx %n.conf
  fi
<<
PostRmScript: <<
#!/bin/sh -ev
  OLD_FONTCONFIG_FILE=/usr/X11/lib/X11/fonts/fonts.conf
  NEW_FONTCONFIG_FILE=/usr/X11/lib/X11/fontconfig/fonts.conf
  if [[ "$1" == "remove" || "$1" == "purge" ]]; then
    rm -rf %p/share/fontconfig-path
    if [ -e $OLD_FONTCONFIG_FILE ] ; then 
        FONTCONFIG_FILE=$OLD_FONTCONFIG_FILE fc-cache || echo Ignoring errors...
        else FONTCONFIG_FILE=$NEW_FONTCONFIG_FILE fc-cache || echo Ignoring 
errors...
        fi
  fi
<<
DocFiles: README
Description: Add custom directories to fontconfig search
DescUsage: <<
 If fontconfig is having trouble finding fonts, update fontconf-path to the
 latest version and then try "fink reinstall fontconfig-path", followed by
 "fink reinstall fc-ghostscript-fonts" (if fc-ghostscript fonts was installed.
<<
License: Public Domain
Maintainer: Matthias Neeracher <neerac...@mac.com>


diff -ruN fontconfig-path-orig/README fontconfig-path/README
--- fontconfig-path-orig/README Wed Dec 31 16:00:00 1969
+++ fontconfig-path/README      Sat Jan 29 00:15:27 2005
@@ -0,0 +1,16 @@
+fontconfig-path is a simple package to add additional font directories, e.g. 
the ghostscript fonts,
+to the fontconfig search path. 
+
+To use fontconfig-path, add the following lines to your package
+
+Depend: fontconfig-path
+Install: <<
+  mkdir -p %i/share/fontconfig-path
+  ln -s your-font-directory %i/share/fontconfig-path/your-package-name
+<<
+PostInstScript: fc-cache
+PostRmScript: fc-cache
+
+fontconfig-path is in the public domain.
+
+Matthias Neeracher
diff -ruN fontconfig-path-orig/fontconfig-path.conf.oldx 
fontconfig-path/fontconfig-path.conf.oldx
--- fontconfig-path-orig/fontconfig-path.conf.oldx      Wed Dec 31 16:00:00 1969
+++ fontconfig-path/fontconfig-path.conf.oldx   Fri Jan 28 23:52:42 2005
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts.conf file to configure system font access -->
+<fontconfig>
+       <dir>@PREFIX@/share/fontconfig-path</dir>
+
+<!--
+  Load regular configuration file
+-->
+       <include>/usr/X11/lib/X11/fonts/fonts.conf</include>
+
+</fontconfig>
diff -ruN fontconfig-path-orig/fontconfig-path.csh 
fontconfig-path/fontconfig-path.csh
--- fontconfig-path-orig/fontconfig-path.csh    Wed Dec 31 16:00:00 1969
+++ fontconfig-path/fontconfig-path.csh Fri Jan 28 23:55:05 2005
@@ -0,0 +1 @@
+setenv FONTCONFIG_FILE @PREFIX@/share/fontconfig-path/fontconfig-path.conf
diff -ruN fontconfig-path-orig/fontconfig-path.sh 
fontconfig-path/fontconfig-path.sh
--- fontconfig-path-orig/fontconfig-path.sh     Wed Dec 31 16:00:00 1969
+++ fontconfig-path/fontconfig-path.sh  Sat Jan 29 00:15:37 2005
@@ -0,0 +1 @@
+export fontconfig_fi...@prefix@/share/fontconfig-path/fontconfig-path.conf
diff -ruN fontconfig-path-orig/fontconfig-path.conf.newx 
fontconfig-path/fontconfig-path.conf.newx
--- fontconfig-path-orig/fontconfig-path.conf.newx      Wed Dec 31 16:00:00 1969
+++ fontconfig-path/fontconfig-path.conf.newx   Fri Jan 28 23:52:42 2005
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts.conf file to configure system font access -->
+<fontconfig>
+       <dir>@PREFIX@/share/fontconfig-path</dir>
+
+<!--
+  Load regular configuration file
+-->
+       <include>/usr/X11/lib/X11/fontconfig/fonts.conf</include>
+
+</fontconfig>

Attachment: fontconfig-path-10.5.info.sig
Description: video/flv

Attachment: fontconfig-path-10.5.patch.sig
Description: video/flv

------------------------------------------------------------------------------
_______________________________________________
Fink-devel mailing list
Fink-devel@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.devel

Reply via email to