Browse Source
- removed fontconfig
- updated xfree86 (4.3.99.15) - merged fontconfig (2.2.1) into xfree86 git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1815 c5f82cb5-29bc-0310-9cd0-bff59a50e3bcrocklinux
Rene Rebe
21 years ago
10 changed files with 4717 additions and 219 deletions
Split View
Diff Options
-
+3 -0Documentation/Developers/CHANGELOG-RENE
-
+0 -4package/x11/fontconfig/fontconfig.conf
-
+0 -44package/x11/fontconfig/fontconfig.desc
-
+0 -68package/x11/fontconfig/local.conf.data
-
+0 -55package/x11/xfree86/4.3.11-config.patch
-
+4700 -0package/x11/xfree86/fontconfig-update.patch
-
+0 -0package/x11/xfree86/fontconfig.pc.patch-disabled
-
+0 -39package/x11/xfree86/ppc-card-compile-fix.patch
-
+3 -3package/x11/xfree86/xfree86.desc
-
+11 -6package/x11/xfree86/xterm-ls.patch
@ -1,4 +0,0 @@ |
|||
|
|||
#hook_add postmake 5 "cp -fv $confdir/local.conf.data \ |
|||
# $root/etc/fonts/local.conf" |
|||
|
|||
@ -1,44 +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 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 <keithp@keithp.com> |
|||
[M] Juergen Sawinski <jsaw@gmx.net> |
|||
|
|||
[C] extra/font |
|||
|
|||
[L] OpenSource |
|||
[S] Stable |
|||
[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/ |
|||
|
|||
@ -1,68 +0,0 @@ |
|||
<?xml version="1.0"?> |
|||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> |
|||
<!-- /etc/fonts.conf file to configure system font access --> |
|||
<fontconfig> |
|||
|
|||
<!-- ROCK Linux system-wide font corrections, defaults. |
|||
Maintained by Rene Rebe <rene@rocklinux.org> |
|||
--> |
|||
|
|||
<!-- Overwrite (currently) broken fonts. |
|||
--> |
|||
|
|||
<match target="pattern"> |
|||
<test qual="any" name="family"> |
|||
<string>Helvetica</string> |
|||
</test> |
|||
<edit name="family" mode="assign"> |
|||
<string>Arial</string> |
|||
</edit> |
|||
</match> |
|||
|
|||
<match target="pattern"> |
|||
<test qual="any" name="family"> |
|||
<string>Lucida</string> |
|||
</test> |
|||
<edit name="family" mode="assign"> |
|||
<string>Arial</string> |
|||
</edit> |
|||
</match> |
|||
|
|||
<match target="pattern"> |
|||
<test qual="any" name="family"> |
|||
<string>Fixed</string> |
|||
</test> |
|||
<edit name="family" mode="assign"> |
|||
<string>Andale Mono</string> |
|||
</edit> |
|||
</match> |
|||
|
|||
<match target="pattern"> |
|||
<test qual="any" name="family"> |
|||
<string>Charter</string> |
|||
</test> |
|||
<edit name="family" mode="assign"> |
|||
<string>Agate</string> |
|||
</edit> |
|||
</match> |
|||
|
|||
<match target="pattern"> |
|||
<test qual="any" name="family"> |
|||
<string>Clean</string> |
|||
</test> |
|||
<edit name="family" mode="assign"> |
|||
<string>Andale Mono</string> |
|||
</edit> |
|||
</match> |
|||
|
|||
<match target="pattern"> |
|||
<test qual="any" name="family"> |
|||
<string>Times</string> |
|||
</test> |
|||
<edit name="family" mode="assign"> |
|||
<string>Times New Roman</string> |
|||
</edit> |
|||
</match> |
|||
|
|||
</fontconfig> |
|||
|
|||
@ -1,55 +0,0 @@ |
|||
# --- 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/4.3.11-config.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 --- |
|||
|
|||
|
|||
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v |
|||
retrieving revision 3.272 |
|||
retrieving revision 3.273 |
|||
diff -u -r3.272 -r3.273
|
|||
--- xc/programs/Xserver/hw/xfree86/common/xf86Config.c 24 Aug 2003 20:52:30 -0000 3.272
|
|||
+++ xc/programs/Xserver/hw/xfree86/common/xf86Config.c 27 Aug 2003 02:50:25 -0000 3.273
|
|||
@@ -1,4 +1,4 @@
|
|||
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.272 2003/08/24 20:52:30 dawes Exp $ */
|
|||
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.273 2003/08/27 02:50:25 dawes Exp $ */
|
|||
|
|||
|
|||
/* |
|||
@@ -1451,7 +1451,7 @@
|
|||
indp[count - 1].extraOptions = xf86addNewOption(NULL, "CorePointer", NULL); |
|||
indp[count].identifier = NULL; |
|||
servlayoutp->inputs = indp; |
|||
- } else {
|
|||
+ } else if (!havePointer) {
|
|||
/* This should never happen. */ |
|||
xf86Msg(X_ERROR, "Cannot locate a core pointer device.\n"); |
|||
return FALSE; |
|||
@@ -1473,7 +1473,7 @@
|
|||
indp[count - 1].extraOptions = xf86addNewOption(NULL, "CoreKeyboard", NULL); |
|||
indp[count].identifier = NULL; |
|||
servlayoutp->inputs = indp; |
|||
- } else {
|
|||
+ } else if (!haveKeyboard) {
|
|||
/* This should never happen. */ |
|||
xf86Msg(X_ERROR, "Cannot locate a core keyboard device\n"); |
|||
return FALSE; |
|||
|
|||
|
|||
+ 4700
- 0
package/x11/xfree86/fontconfig-update.patch
File diff suppressed because it is too large
View File
@ -1,39 +0,0 @@ |
|||
# --- 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/ppc-card-compilse.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 --- |
|||
|
|||
|
|||
|
|||
Enable the nvidia driver. |
|||
|
|||
- Rene Rebe <rene@rocklinux.org> |
|||
|
|||
--- xc/config/cf/xfree86.cf.orig 2003-08-24 12:09:33.000000000 +0000
|
|||
+++ xc/config/cf/xfree86.cf 2003-09-14 23:34:27.000000000 +0000
|
|||
@@ -928,7 +928,7 @@
|
|||
|
|||
/* Pure PCI drivers should go first */ |
|||
# ifndef XF86CardDrivers |
|||
-# define XF86CardDrivers ati mga glint s3 s3virge sis savage\
|
|||
+# define XF86CardDrivers ati mga glint nv s3 s3virge sis savage\
|
|||
trident chips tdfx fbdev \ |
|||
DevelDrivers vga \ |
|||
XF86OSCardDrivers XF86ExtraCardDrivers |
|||