Re: [XFree86] [PATCH] [BUG] [REREPORT] fontconfig.pc
On Thu, Sep 04, 2003 at 12:16:19AM +0200, Rene Rebe wrote: >I there a better way to send patches? [EMAIL PROTECTED] seems to be a >/dev/null target (mostly get lost) - and on this list I normally also >do not get responses ... [EMAIL PROTECTED] (aka [EMAIL PROTECTED]) is still monitored. There's also bugs.xfree86.org. Security-related issues should go to [EMAIL PROTECTED], which is also actively monitored. David -- David Dawes X-Oz Technologies www.XFree86.org/~dawes www.x-oz.com ___ XFree86 mailing list [EMAIL PROTECTED] http://XFree86.Org/mailman/listinfo/xfree86
Re: [XFree86] [PATCH] [BUG] [REREPORT] fontconfig.pc
Hi, On: Tue, 2 Sep 2003 19:16:13 -0400, David Dawes <[EMAIL PROTECTED]> wrote: > On Mon, Sep 01, 2003 at 09:26:27PM +0200, Rene Rebe wrote: > > >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. > > Well, not quite -- there's no reason to duplicate files already in the > source tree as your patch does, or to hardcode values that are defined > elsewhere. That's not usually the XFree86 way. Ah yes those do not have an seperate .pc - but still: [EMAIL PROTECTED]:~/src/xc/lib$ find -name config-subst ./Xft/config/config-subst ./fontconfig/config/config-subst ./Xcursor/config-subst and the difinitions what to SUBST in the Imakefile. > Anyway, I've committed a fix for this problem, based on what was in > XFree86 4.3 (rather than relicensing the GPL'd version you sent :-). > > Just a suggestion regarding licensing of patches: The best way to avoid > all possible confusion is to make the licensing unambiguous. I often > go straight to the patch attachments, and that only has a GPL on it. Ok - the next time I rip it off before ... I there a better way to send patches? [EMAIL PROTECTED] seems to be a /dev/null target (mostly get lost) - and on this list I normally also do not get responses ... > Thanks for your report. Thanks for fixing it. > David Sincerely yours, René Rebe - ROCK Linux stable release maintainer -- René Rebe - Europe/Germany/Berlin [EMAIL PROTECTED] [EMAIL PROTECTED] http://www.rocklinux.org http://www.rocklinux.net/people/rene http://gsmp.tfh-berlin.de/gsmp http://gsmp.tfh-berlin.de/rene ___ XFree86 mailing list [EMAIL PROTECTED] http://XFree86.Org/mailman/listinfo/xfree86
Re: [XFree86] [PATCH] [BUG] [REREPORT] fontconfig.pc
On Mon, Sep 01, 2003 at 09:26:27PM +0200, Rene Rebe wrote: >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. Well, not quite -- there's no reason to duplicate files already in the source tree as your patch does, or to hardcode values that are defined elsewhere. That's not usually the XFree86 way. Anyway, I've committed a fix for this problem, based on what was in XFree86 4.3 (rather than relicensing the GPL'd version you sent :-). Just a suggestion regarding licensing of patches: The best way to avoid all possible confusion is to make the licensing unambiguous. I often go straight to the patch attachments, and that only has a GPL on it. Thanks for your report. David -- David Dawes X-Oz Technologies www.XFree86.org/~dawes www.x-oz.com ___ XFree86 mailing list [EMAIL PROTECTED] http://XFree86.Org/mailman/listinfo/xfree86
[XFree86] [PATCH] [BUG] [REREPORT] fontconfig.pc
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
[EMAIL PROTECTED] [EMAIL PROTECTED]
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 <[EMAIL PROTECTED]>
--- xc/lib/fontconfig/Imakefile 2003-06-10 13:04:51.0 +0200
+++ xc-new/lib/fontconfig/Imakefile 2003-08-30 20:02:57.0 +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) < [EMAIL PROTECTED] > $@
+
+InstallNonExecFile(fontconfig.pc,$(USRLIBDIR)/pkgconfig)
+
+
clean::
RemoveFile(fonts.conf)
--- xc/lib/fontconfig/fontconfig.pc.in 1970-01-01 01:00:00.0 +0100
+++ xc-new/lib/fontconfig/fontconfig.pc.in 2003-08-30 19:09:46.0 +0200
@@ -0,0 +1,10 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+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.0 +0100
+++ xc-new/lib/fontconfig/config-subst 2003-08-30 19:43:14.0 +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
