Hi,
as mentioned weeks ago, current XFree CVS does not install a
fontconfig.pc anymore (it did up to 4.3.99.6 or so when the fontconfig
merge happend).
This time a patch is attached (hereby relicensed to BSD, X11 whatever
you like - as usual).
In my personal project I would do it cleaner - but it is in the
XFree86-way like implemented in Xcursor and Xft.
Sincerely yours,
René Rebe
- ROCK Linux stable release maintainer
--
René Rebe - Europe/Germany/Berlin
rene@xxxxxxxxxxxxx rene.rebe@xxxxxxx
http://www.rocklinux.org http://www.rocklinux.net/people/rene
http://gsmp.tfh-berlin.de/gsmp http://gsmp.tfh-berlin.de/rene
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/x11/xfree86/fontconfig.pc.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
Add the missing fontconfig.pc* files, support and code in the style of
Xcursor (I would do it cleaner - but it this is the XFree86-way ...)
- Rene Rebe <rene@xxxxxxxxxxxxx>
--- xc/lib/fontconfig/Imakefile 2003-06-10 13:04:51.000000000 +0200
+++ xc-new/lib/fontconfig/Imakefile 2003-08-30 20:02:57.000000000 +0200
@@ -17,6 +17,12 @@
HEADERS=fcfreetype.h fcprivate.h fontconfig.h
+SUBSTVARS=prefix="$(PROJECTROOT)" \
+ exec_prefix="$(BINDIR)" \
+ libdir="$(USRLIBDIR)" \
+ includedir="$(INCROOT)" \
+ PACKAGE_VERSION="1.0.1"
+
BuildIncludes($(HEADERS),IncSubdir,..)
InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir,$(INSTINCFLAGS))
@@ -91,12 +97,19 @@
InstallNonExecFileBackup(fonts.conf,$(FONTCONFIGFONTSCONFDIR))
InstallNonExecFile(fonts.dtd,$(FONTCONFIGFONTSCONFDIR))
-all:: fonts.conf
+all:: fonts.conf fontconfig.pc
fonts.conf: fonts.conf.in setfontdirs findfonts
RemoveFile($@)
sh ./setfontdirs $(FONTDIRS)
+fontconfig.pc: fontconfig.pc.in
+ RemoveFile($@)
+ sh config-subst $(SUBSTVARS) < $@.in > $@
+
+InstallNonExecFile(fontconfig.pc,$(USRLIBDIR)/pkgconfig)
+
+
clean::
RemoveFile(fonts.conf)
--- xc/lib/fontconfig/fontconfig.pc.in 1970-01-01 01:00:00.000000000 +0100
+++ xc-new/lib/fontconfig/fontconfig.pc.in 2003-08-30 19:09:46.000000000 +0200
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Fontconfig
+Description: Font configuration and customization library
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lfontconfig
+Cflags: -I${includedir}
--- xc/lib/fontconfig/config-subst 1970-01-01 01:00:00.000000000 +0100
+++ xc-new/lib/fontconfig/config-subst 2003-08-30 19:43:14.000000000 +0200
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -x
+script=config-subst.$$
+trap "rm $script" 0
+rm -f $script
+for i in ${1+"$@"}; do
+ var="`echo "$i" | sed 's/=.*$//'`"
+ val="`echo "$i" | sed 's/^[^=]*=//'`"
+ echo "s;@$var@;$val;" >> $script
+done
+sed -f $script
