From 67f92c63675f18137d62a8eb8e7cbc13cd6d0ee4 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Mon, 1 Sep 2003 19:21:45 +0000 Subject: [PATCH] copy patch since I'm about to send the fontconfig patch upstream ... git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1274 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/xfree86/fontconfig.pc.patch | 22 +++++++++++++++++++ .../xfree86/macintosh-xkb-us-de-tweak.patch-x | 2 +- package/x11/xfree86/twm-defaults.patch | 12 +++++----- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/package/x11/xfree86/fontconfig.pc.patch b/package/x11/xfree86/fontconfig.pc.patch index 5c20f7969..19912f947 100644 --- a/package/x11/xfree86/fontconfig.pc.patch +++ b/package/x11/xfree86/fontconfig.pc.patch @@ -1,3 +1,25 @@ +# --- 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 ...) diff --git a/package/x11/xfree86/macintosh-xkb-us-de-tweak.patch-x b/package/x11/xfree86/macintosh-xkb-us-de-tweak.patch-x index 2a46c5ced..357dd920d 100644 --- a/package/x11/xfree86/macintosh-xkb-us-de-tweak.patch-x +++ b/package/x11/xfree86/macintosh-xkb-us-de-tweak.patch-x @@ -5,7 +5,7 @@ # 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/macintosh-xkb-us-de-tweak.patch +# ROCK Linux: rock-src/package/x11/xfree86/macintosh-xkb-us-de-tweak.patch-x # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf # # This program is free software; you can redistribute it and/or modify diff --git a/package/x11/xfree86/twm-defaults.patch b/package/x11/xfree86/twm-defaults.patch index 3d131b6bb..aa685d9e7 100644 --- a/package/x11/xfree86/twm-defaults.patch +++ b/package/x11/xfree86/twm-defaults.patch @@ -1,24 +1,24 @@ # --- 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/startwm.patch +# +# ROCK Linux: rock-src/package/x11/xfree86/twm-defaults.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 --- Some twm configs Clifford likes more ...