From 87cc24a2da463e535ce00f7885d8aff9d6a33b7e Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Tue, 18 Nov 2003 21:15:31 +0000 Subject: [PATCH] ok I give up the dream of clean seperated xft fontconfig builds with XFree86 in it's currentl for this is just not possible - I think we eed to wait some years untils XFree86 is full modulized and xouvert or the freedesktop.org X-Server are ready ... git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1812 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/fontconfig/fontconfig.conf | 9 +--- package/x11/xfree86/local.conf.data | 68 ++++++++++++++++++++++++++ package/x11/xfree86/xf_config.sh | 7 +-- package/x11/xft/xft.conf | 6 --- package/x11/xft/xft.desc | 42 ---------------- 5 files changed, 72 insertions(+), 60 deletions(-) create mode 100644 package/x11/xfree86/local.conf.data delete mode 100644 package/x11/xft/xft.conf delete mode 100644 package/x11/xft/xft.desc diff --git a/package/x11/fontconfig/fontconfig.conf b/package/x11/fontconfig/fontconfig.conf index 052fab8eb..f2b4e59c6 100644 --- a/package/x11/fontconfig/fontconfig.conf +++ b/package/x11/fontconfig/fontconfig.conf @@ -1,9 +1,4 @@ -if [ $prefix_auto = 1 ] ; then - prefix="usr/x11" - set_confopt -fi - -hook_add postmake 5 "cp -fv $confdir/local.conf.data \ - $root/etc/fonts/local.conf" +#hook_add postmake 5 "cp -fv $confdir/local.conf.data \ +# $root/etc/fonts/local.conf" diff --git a/package/x11/xfree86/local.conf.data b/package/x11/xfree86/local.conf.data new file mode 100644 index 000000000..67e43a4aa --- /dev/null +++ b/package/x11/xfree86/local.conf.data @@ -0,0 +1,68 @@ + + + + + + + + + + + + Helvetica + + + Arial + + + + + + Lucida + + + Arial + + + + + + Fixed + + + Andale Mono + + + + + + Charter + + + Agate + + + + + + Clean + + + Andale Mono + + + + + + Times + + + Times New Roman + + + + + diff --git a/package/x11/xfree86/xf_config.sh b/package/x11/xfree86/xf_config.sh index eb1d8b7ef..7a5b0f34c 100644 --- a/package/x11/xfree86/xf_config.sh +++ b/package/x11/xfree86/xf_config.sh @@ -112,6 +112,8 @@ xf_install() { cp -fv $base/package/x11/xfree86/XF86Config.data \ $root/etc/X11/XF86Config.example cp -fv $root/etc/X11/XF86Config{.example,} + cp -fv $base/package/x11/xfree86/local.conf.data \ + $root/etc/fonts/local.conf echo "Fixing compiled keymaps directory ..." mkdir -p $root/var/lib/xkb $root/etc/X11/xkb @@ -140,11 +142,6 @@ 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 -#define BuildXft1Library NO - /* Less warnings with recent gccs ... */ #define DefaultCCOptions -ansi GccWarningOptions diff --git a/package/x11/xft/xft.conf b/package/x11/xft/xft.conf deleted file mode 100644 index 6c4f44e13..000000000 --- a/package/x11/xft/xft.conf +++ /dev/null @@ -1,6 +0,0 @@ - -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 deleted file mode 100644 index 06ab13bd0..000000000 --- a/package/x11/xft/xft.desc +++ /dev/null @@ -1,42 +0,0 @@ - -[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/ -