Browse Source

copyright tags - and comment

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1825 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 21 years ago
parent
commit
90eba014c4
3 changed files with 79 additions and 1 deletions
  1. +56
    -0
      package/x11/xfree86/fontconfig-update.patch
  2. +1
    -1
      package/x11/xfree86/fontconfig.pc.patch-disabled
  3. +22
    -0
      package/x11/xfree86/ftconfig-h-hotfix.patch

+ 56
- 0
package/x11/xfree86/fontconfig-update.patch

@ -1,3 +1,59 @@
# --- 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-update.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 ---
This updates the fontconfig version included inside XFree to Keith's
external and official 2.2.1 release.
The patch matches the license of these projects (X11/BSD/...) and
is intended for inclusion into XFree. The GPL license above is only
the ROCK Linux license as it.
- Rene Rebe <rene@rocklinux.org>
- Juergen Sawinski <george@mpimf-heidelberg.mpg.de>
diff -urN xc/extras/fontconfig/configure xc-new/extras/fontconfig/configure
--- xc/extras/fontconfig/configure 2003-09-25 13:01:14.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/configure 2003-11-20 17:51:55.000000000 +0100
@@ -1248,7 +1248,7 @@
fi
-PACKAGE_VERSION=1.0.1
+PACKAGE_VERSION=2.2.1
# Set major version
PACKAGE_MAJOR=`echo $PACKAGE_VERSION | awk -F . '{ print $1 }'`
diff -urN xc/extras/fontconfig/configure.in xc-new/extras/fontconfig/configure.in
--- xc/extras/fontconfig/configure.in 2003-09-25 13:01:14.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/configure.in 2003-11-20 17:51:41.000000000 +0100
@@ -43,7 +43,7 @@
AC_PROG_LN_S
AC_PATH_X
-PACKAGE_VERSION=1.0.1
+PACKAGE_VERSION=2.2.1
# Set major version
PACKAGE_MAJOR=`echo $PACKAGE_VERSION | awk -F . '{ print $1 }'`
diff -urN xc/extras/fontconfig/fc-cache/fc-cache.c xc-fontconfig/extras/fontconfig/fc-cache/fc-cache.c
--- xc/extras/fontconfig/fc-cache/fc-cache.c 2003-09-25 13:01:15.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/fc-cache/fc-cache.c 2003-11-19 21:35:04.000000000 +0100

+ 1
- 1
package/x11/xfree86/fontconfig.pc.patch-disabled

@ -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/fontconfig.pc.patch
# ROCK Linux: rock-src/package/x11/xfree86/fontconfig.pc.patch-disabled
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify

+ 22
- 0
package/x11/xfree86/ftconfig-h-hotfix.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/ftconfig-h-hotfix.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 ---
--- xc/lib/font/FreeType/ftconfig.h.orig 2003-11-02 05:43:24.000000000 +0100
+++ xc/lib/font/FreeType/ftconfig.h 2003-11-06 20:22:06.000000000 +0100
@@ -63,7 +63,7 @@

Loading…
Cancel
Save