From dd3931d82e86b7de48280142d82e69829076934d Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Tue, 18 Nov 2003 17:13:32 +0000 Subject: [PATCH] polished fontconfig, added xft and disabled the both in the xfree86 package (where old ones are included ...) - UNTESTED - CURRENT REGRESSION TESTING ... - git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1806 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 3 ++ package/x11/fontconfig/fontconfig.conf | 6 +++ package/x11/fontconfig/fontconfig.desc | 44 +++++++++++++++++++ ...pilse.patch => ppc-card-compile-fix.patch} | 0 package/x11/xfree86/xf_config.sh | 4 ++ package/x11/xft/xft.conf | 6 +++ package/x11/xft/xft.desc | 42 ++++++++++++++++++ 7 files changed, 105 insertions(+) create mode 100644 package/x11/fontconfig/fontconfig.conf create mode 100644 package/x11/fontconfig/fontconfig.desc rename package/x11/xfree86/{ppc-card-compilse.patch => ppc-card-compile-fix.patch} (100%) create mode 100644 package/x11/xft/xft.conf create mode 100644 package/x11/xft/xft.desc diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 94c6e4814..327d23ea4 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -8,6 +8,9 @@ - Juergen Sawinski: fixed python related gnome24 build problems fixed mozilla to create more library sym-links added jsaw/libmusicbrainz + added fontconfig + - polished fontconfig, added xft and disabled the both in the xfree86 + package (where old ones are included ...) *) 2003-11-17 (2.0.0-rc2 - 2.0.0-rc3) diff --git a/package/x11/fontconfig/fontconfig.conf b/package/x11/fontconfig/fontconfig.conf new file mode 100644 index 000000000..6c4f44e13 --- /dev/null +++ b/package/x11/fontconfig/fontconfig.conf @@ -0,0 +1,6 @@ + +if [ $prefix_auto = 1 ] ; then + prefix="usr/x11" + set_confopt +fi + diff --git a/package/x11/fontconfig/fontconfig.desc b/package/x11/fontconfig/fontconfig.desc new file mode 100644 index 000000000..21283e8b2 --- /dev/null +++ b/package/x11/fontconfig/fontconfig.desc @@ -0,0 +1,44 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x11/fontconfig/fontconfig.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] A library for configuring and customizing font access. + +[T] Fontconfig is a library for configuring and customizing font access. It +[T] contains two essential modules, the configuration module which builds an +[T] internal configuration from XML files and the matching module which +[T] accepts font patterns and returns the nearest matching font. + +[U] http://freedesktop.org/software/fontconfig + +[A] Keith Packard +[M] Juergen Sawinski + +[C] extra/font + +[L] Unknown +[S] OpenSource +[V] 2.2.0 +[P] X -----5---9 271.000 + +[D] 0 fontconfig-2.2.0.tar.gz http://pdx.freedesktop.org/software/fontconfig/releases/ + diff --git a/package/x11/xfree86/ppc-card-compilse.patch b/package/x11/xfree86/ppc-card-compile-fix.patch similarity index 100% rename from package/x11/xfree86/ppc-card-compilse.patch rename to package/x11/xfree86/ppc-card-compile-fix.patch diff --git a/package/x11/xfree86/xf_config.sh b/package/x11/xfree86/xf_config.sh index 7a5b0f34c..9ae8dc4a5 100644 --- a/package/x11/xfree86/xf_config.sh +++ b/package/x11/xfree86/xf_config.sh @@ -142,6 +142,10 @@ xf_config() { /* Disable the internal zlib to use the system installed one */ #define HasZlib YES +/* Disable some internal libraries - we (normally) ship a newer one */ +#define BuildFontconfig NO +#define BuildXftLibrary NO + /* Less warnings with recent gccs ... */ #define DefaultCCOptions -ansi GccWarningOptions diff --git a/package/x11/xft/xft.conf b/package/x11/xft/xft.conf new file mode 100644 index 000000000..6c4f44e13 --- /dev/null +++ b/package/x11/xft/xft.conf @@ -0,0 +1,6 @@ + +if [ $prefix_auto = 1 ] ; then + prefix="usr/x11" + set_confopt +fi + diff --git a/package/x11/xft/xft.desc b/package/x11/xft/xft.desc new file mode 100644 index 000000000..06ab13bd0 --- /dev/null +++ b/package/x11/xft/xft.desc @@ -0,0 +1,42 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x11/fontconfig/fontconfig.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] A X11 library for client-side font rendering + +[T] A X11 library for client-side font rendering - using either +[T] the old core protocol or the XRender extension. + +[U] http://freedesktop.org/Software/xlibs/ + +[A] Keith Packard +[M] Rene Rebe + +[C] extra/font + +[L] OpenSource +[S] Stable +[V] 2.1.2 +[P] X -----5---9 271.000 + +[D] 0 xft-2.1.2.tar.gz http://freedesktop.org/~xlibs/release/ +