OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
Browse Source

more fontconfig "fixes" 

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1830 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 21 years ago
parent
4eb2e9bb93
commit
6d6b4701a6
1 changed files with 59 additions and 35 deletions
Split View
  1. +59
    -35
      package/x11/xfree86/fontconfig-update.patch

+ 59
- 35
package/x11/xfree86/fontconfig-update.patch
View File

@ -30,9 +30,22 @@ 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
diff -urN xc/extras/fontconfig/Imakefile xc-fontconfig/extras/fontconfig/Imakefile
--- xc/extras/fontconfig/Imakefile 2003-09-25 13:01:13.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/Imakefile 2003-11-21 01:42:41.000000000 +0100
@@ -7,6 +7,9 @@
SUBDIRS=fontconfig $(LINTSUBDIRS)
+SOFONTCONFIGREV=2.2
+#define SoRev SOFONTCONFIGREV
+
FONTCONFIG_REVISION=1
#ifndef FontconfigFontsConfDir
diff -urN xc/extras/fontconfig/configure xc-fontconfig/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
+++ xc-fontconfig/extras/fontconfig/configure 2003-11-21 01:35:12.000000000 +0100
@@ -1248,7 +1248,7 @@
fi
@ -42,9 +55,9 @@ diff -urN xc/extras/fontconfig/configure xc-new/extras/fontconfig/configure
# 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
diff -urN xc/extras/fontconfig/configure.in xc-fontconfig/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
+++ xc-fontconfig/extras/fontconfig/configure.in 2003-11-21 01:35:12.000000000 +0100
@@ -43,7 +43,7 @@
AC_PROG_LN_S
AC_PATH_X
@ -56,7 +69,7 @@ diff -urN xc/extras/fontconfig/configure.in xc-new/extras/fontconfig/configure.i
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
+++ xc-fontconfig/extras/fontconfig/fc-cache/fc-cache.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/fc-cache/fc-cache.c,v 1.2 2003/09/13 21:33:00 dawes Exp $
@ -181,7 +194,7 @@ diff -urN xc/extras/fontconfig/fc-cache/fc-cache.c xc-fontconfig/extras/fontconf
{
diff -urN xc/extras/fontconfig/fc-lang/fc-lang.c xc-fontconfig/extras/fontconfig/fc-lang/fc-lang.c
--- xc/extras/fontconfig/fc-lang/fc-lang.c 2003-06-04 18:29:38.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/fc-lang/fc-lang.c 2003-11-19 22:35:16.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/fc-lang/fc-lang.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
@ -318,7 +331,7 @@ diff -urN xc/extras/fontconfig/fc-lang/fc-lang.c xc-fontconfig/extras/fontconfig
diff -urN xc/extras/fontconfig/fc-lang/fclang.h xc-fontconfig/extras/fontconfig/fc-lang/fclang.h
--- xc/extras/fontconfig/fc-lang/fclang.h 2003-06-04 18:29:38.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/fc-lang/fclang.h 2003-11-19 22:35:13.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/fc-lang/fclang.h 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
@ -2086,7 +2099,7 @@ diff -urN xc/extras/fontconfig/fc-lang/fclang.h xc-fontconfig/extras/fontconfig/
-#define NUM_COUNTRY_SET 1
diff -urN xc/extras/fontconfig/fc-lang/fclang.tmpl.h xc-fontconfig/extras/fontconfig/fc-lang/fclang.tmpl.h
--- xc/extras/fontconfig/fc-lang/fclang.tmpl.h 2003-09-25 13:01:18.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/fc-lang/fclang.tmpl.h 2003-11-19 22:35:14.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/fc-lang/fclang.tmpl.h 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/fc-lang/fclang.tmpl.h,v 1.1.1.1 2003/06/04 02:56:47 dawes Exp $
@ -2099,7 +2112,7 @@ diff -urN xc/extras/fontconfig/fc-lang/fclang.tmpl.h xc-fontconfig/extras/fontco
* documentation for any purpose is hereby granted without fee, provided that
diff -urN xc/extras/fontconfig/fc-list/fc-list.c xc-fontconfig/extras/fontconfig/fc-list/fc-list.c
--- xc/extras/fontconfig/fc-list/fc-list.c 2003-09-25 13:01:21.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/fc-list/fc-list.c 2003-11-19 21:35:22.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/fc-list/fc-list.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
@ -2187,7 +2200,7 @@ diff -urN xc/extras/fontconfig/fc-list/fc-list.c xc-fontconfig/extras/fontconfig
usage (argv[0]);
diff -urN xc/extras/fontconfig/fontconfig/fcfreetype.h xc-fontconfig/extras/fontconfig/fontconfig/fcfreetype.h
--- xc/extras/fontconfig/fontconfig/fcfreetype.h 2003-09-25 13:01:21.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/fontconfig/fcfreetype.h 2003-11-19 21:35:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/fontconfig/fcfreetype.h 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/fontconfig/fcfreetype.h,v 1.1.1.1 2003/06/04 02:57:42 dawes Exp $
@ -2210,7 +2223,7 @@ diff -urN xc/extras/fontconfig/fontconfig/fcfreetype.h xc-fontconfig/extras/font
FcResult
diff -urN xc/extras/fontconfig/fontconfig/fcprivate.h xc-fontconfig/extras/fontconfig/fontconfig/fcprivate.h
--- xc/extras/fontconfig/fontconfig/fcprivate.h 2003-06-04 18:29:39.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/fontconfig/fcprivate.h 2003-11-19 21:35:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/fontconfig/fcprivate.h 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
@ -2230,7 +2243,7 @@ diff -urN xc/extras/fontconfig/fontconfig/fcprivate.h xc-fontconfig/extras/fontc
#define _FCPRIVATE_H_
diff -urN xc/extras/fontconfig/fontconfig/fontconfig.h xc-fontconfig/extras/fontconfig/fontconfig/fontconfig.h
--- xc/extras/fontconfig/fontconfig/fontconfig.h 2003-09-25 13:01:21.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/fontconfig/fontconfig.h 2003-11-19 21:35:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/fontconfig/fontconfig.h 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/fontconfig/fontconfig.h,v 1.1.1.1 2003/06/04 02:57:42 dawes Exp $
@ -2354,9 +2367,9 @@ diff -urN xc/extras/fontconfig/fontconfig/fontconfig.h xc-fontconfig/extras/font
int
FcStrCmpIgnoreCase (const FcChar8 *s1, const FcChar8 *s2);
diff -urN xc/extras/fontconfig/local.def xc-new/extras/fontconfig/local.def
diff -urN xc/extras/fontconfig/local.def xc-fontconfig/extras/fontconfig/local.def
--- xc/extras/fontconfig/local.def 2003-09-25 13:01:14.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/local.def 2003-11-20 17:53:09.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/local.def 2003-11-21 01:35:12.000000000 +0100
@@ -41,7 +41,7 @@
#endif
@ -2368,7 +2381,7 @@ diff -urN xc/extras/fontconfig/local.def xc-new/extras/fontconfig/local.def
ProjectUnsharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGSRC),BuildLibDir)
diff -urN xc/extras/fontconfig/src/Imakefile xc-fontconfig/extras/fontconfig/src/Imakefile
--- xc/extras/fontconfig/src/Imakefile 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/Imakefile 2003-11-19 21:32:40.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/Imakefile 2003-11-21 01:35:12.000000000 +0100
@@ -16,7 +16,7 @@
#define DoProfileLib ProfileLibFontconfig
#define HasSharedData YES
@ -2380,7 +2393,7 @@ diff -urN xc/extras/fontconfig/src/Imakefile xc-fontconfig/extras/fontconfig/src
#include <Threads.tmpl>
diff -urN xc/extras/fontconfig/src/fcatomic.c xc-fontconfig/extras/fontconfig/src/fcatomic.c
--- xc/extras/fontconfig/src/fcatomic.c 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcatomic.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcatomic.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fcatomic.c,v 1.1.1.1 2003/06/04 02:57:42 dawes Exp $
@ -2468,7 +2481,7 @@ diff -urN xc/extras/fontconfig/src/fcatomic.c xc-fontconfig/extras/fontconfig/sr
void
diff -urN xc/extras/fontconfig/src/fcblanks.c xc-fontconfig/extras/fontconfig/src/fcblanks.c
--- xc/extras/fontconfig/src/fcblanks.c 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcblanks.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcblanks.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fcblanks.c,v 1.1.1.1 2003/06/04 02:57:42 dawes Exp $
@ -2481,7 +2494,7 @@ diff -urN xc/extras/fontconfig/src/fcblanks.c xc-fontconfig/extras/fontconfig/sr
* documentation for any purpose is hereby granted without fee, provided that
diff -urN xc/extras/fontconfig/src/fccache.c xc-fontconfig/extras/fontconfig/src/fccache.c
--- xc/extras/fontconfig/src/fccache.c 2003-11-02 05:40:29.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fccache.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fccache.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
@ -2802,7 +2815,7 @@ diff -urN xc/extras/fontconfig/src/fccache.c xc-fontconfig/extras/fontconfig/src
return file + ((cache_slash + 1) - cache);
diff -urN xc/extras/fontconfig/src/fccfg.c xc-fontconfig/extras/fontconfig/src/fccfg.c
--- xc/extras/fontconfig/src/fccfg.c 2003-06-04 18:29:39.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fccfg.c 2003-11-19 22:37:49.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fccfg.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
@ -3183,7 +3196,7 @@ diff -urN xc/extras/fontconfig/src/fccfg.c xc-fontconfig/extras/fontconfig/src/f
break;
diff -urN xc/extras/fontconfig/src/fccharset.c xc-fontconfig/extras/fontconfig/src/fccharset.c
--- xc/extras/fontconfig/src/fccharset.c 2003-06-04 18:29:39.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fccharset.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fccharset.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
@ -3991,7 +4004,7 @@ diff -urN xc/extras/fontconfig/src/fccharset.c xc-fontconfig/extras/fontconfig/s
-
diff -urN xc/extras/fontconfig/src/fcdbg.c xc-fontconfig/extras/fontconfig/src/fcdbg.c
--- xc/extras/fontconfig/src/fcdbg.c 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcdbg.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcdbg.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fcdbg.c,v 1.1.1.1 2003/06/04 02:57:52 dawes Exp $
@ -4108,7 +4121,7 @@ diff -urN xc/extras/fontconfig/src/fcdbg.c xc-fontconfig/extras/fontconfig/src/f
}
diff -urN xc/extras/fontconfig/src/fcdefault.c xc-fontconfig/extras/fontconfig/src/fcdefault.c
--- xc/extras/fontconfig/src/fcdefault.c 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcdefault.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcdefault.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fcdefault.c,v 1.1.1.1 2003/06/04 02:57:52 dawes Exp $
@ -4131,7 +4144,7 @@ diff -urN xc/extras/fontconfig/src/fcdefault.c xc-fontconfig/extras/fontconfig/s
FcPatternAddBool (pattern, FcBoolDefaults[i].field, FcBoolDefaults[i].value);
diff -urN xc/extras/fontconfig/src/fcdir.c xc-fontconfig/extras/fontconfig/src/fcdir.c
--- xc/extras/fontconfig/src/fcdir.c 2003-06-04 18:29:39.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcdir.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcdir.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
@ -4237,7 +4250,7 @@ diff -urN xc/extras/fontconfig/src/fcdir.c xc-fontconfig/extras/fontconfig/src/f
diff -urN xc/extras/fontconfig/src/fcfreetype.c xc-fontconfig/extras/fontconfig/src/fcfreetype.c
--- xc/extras/fontconfig/src/fcfreetype.c 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcfreetype.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcfreetype.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fcfreetype.c,v 1.1.1.1 2003/06/04 02:57:52 dawes Exp $
@ -5534,7 +5547,7 @@ diff -urN xc/extras/fontconfig/src/fcfreetype.c xc-fontconfig/extras/fontconfig/
+}
diff -urN xc/extras/fontconfig/src/fcfs.c xc-fontconfig/extras/fontconfig/src/fcfs.c
--- xc/extras/fontconfig/src/fcfs.c 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcfs.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcfs.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fcfs.c,v 1.1.1.1 2003/06/04 02:57:52 dawes Exp $
@ -5547,7 +5560,7 @@ diff -urN xc/extras/fontconfig/src/fcfs.c xc-fontconfig/extras/fontconfig/src/fc
* documentation for any purpose is hereby granted without fee, provided that
diff -urN xc/extras/fontconfig/src/fcinit.c xc-fontconfig/extras/fontconfig/src/fcinit.c
--- xc/extras/fontconfig/src/fcinit.c 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcinit.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcinit.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fcinit.c,v 1.1.1.1 2003/06/04 02:57:52 dawes Exp $
@ -5560,7 +5573,7 @@ diff -urN xc/extras/fontconfig/src/fcinit.c xc-fontconfig/extras/fontconfig/src/
* documentation for any purpose is hereby granted without fee, provided that
diff -urN xc/extras/fontconfig/src/fcint.h xc-fontconfig/extras/fontconfig/src/fcint.h
--- xc/extras/fontconfig/src/fcint.h 2003-11-02 05:40:29.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcint.h 2003-11-19 21:34:45.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcint.h 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fcint.h,v 1.2 2003/10/22 17:15:22 tsi Exp $
@ -5689,7 +5702,7 @@ diff -urN xc/extras/fontconfig/src/fcint.h xc-fontconfig/extras/fontconfig/src/f
#endif /* _FC_INT_H_ */
diff -urN xc/extras/fontconfig/src/fclang.c xc-fontconfig/extras/fontconfig/src/fclang.c
--- xc/extras/fontconfig/src/fclang.c 2003-06-04 18:29:39.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fclang.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fclang.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
@ -5983,7 +5996,7 @@ diff -urN xc/extras/fontconfig/src/fclang.c xc-fontconfig/extras/fontconfig/src/
+}
diff -urN xc/extras/fontconfig/src/fclist.c xc-fontconfig/extras/fontconfig/src/fclist.c
--- xc/extras/fontconfig/src/fclist.c 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fclist.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fclist.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fclist.c,v 1.1.1.1 2003/06/04 02:58:01 dawes Exp $
@ -6005,7 +6018,7 @@ diff -urN xc/extras/fontconfig/src/fclist.c xc-fontconfig/extras/fontconfig/src/
}
diff -urN xc/extras/fontconfig/src/fcmatch.c xc-fontconfig/extras/fontconfig/src/fcmatch.c
--- xc/extras/fontconfig/src/fcmatch.c 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcmatch.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcmatch.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fcmatch.c,v 1.1.1.1 2003/06/04 02:58:01 dawes Exp $
@ -6119,7 +6132,7 @@ diff -urN xc/extras/fontconfig/src/fcmatch.c xc-fontconfig/extras/fontconfig/src
case 'o':
diff -urN xc/extras/fontconfig/src/fcmatrix.c xc-fontconfig/extras/fontconfig/src/fcmatrix.c
--- xc/extras/fontconfig/src/fcmatrix.c 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcmatrix.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcmatrix.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fcmatrix.c,v 1.1.1.1 2003/06/04 02:58:01 dawes Exp $
@ -6129,7 +6142,7 @@ diff -urN xc/extras/fontconfig/src/fcmatrix.c xc-fontconfig/extras/fontconfig/sr
*
diff -urN xc/extras/fontconfig/src/fcname.c xc-fontconfig/extras/fontconfig/src/fcname.c
--- xc/extras/fontconfig/src/fcname.c 2003-09-25 13:01:22.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcname.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcname.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/extras/fontconfig/src/fcname.c,v 1.1.1.1 2003/06/04 02:58:01 dawes Exp $
@ -6213,7 +6226,7 @@ diff -urN xc/extras/fontconfig/src/fcname.c xc-fontconfig/extras/fontconfig/src/
*result = FcTrue;
diff -urN xc/extras/fontconfig/src/fcpat.c xc-fontconfig/extras/fontconfig/src/fcpat.c
--- xc/extras/fontconfig/src/fcpat.c 2003-06-04 18:29:39.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcpat.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcpat.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
@ -6248,7 +6261,7 @@ diff -urN xc/extras/fontconfig/src/fcpat.c xc-fontconfig/extras/fontconfig/src/f
diff -urN xc/extras/fontconfig/src/fcstr.c xc-fontconfig/extras/fontconfig/src/fcstr.c
--- xc/extras/fontconfig/src/fcstr.c 2003-06-04 18:29:39.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcstr.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcstr.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
@ -6374,7 +6387,7 @@ diff -urN xc/extras/fontconfig/src/fcstr.c xc-fontconfig/extras/fontconfig/src/f
return FcStrCopy (slash + 1);
diff -urN xc/extras/fontconfig/src/fcxml.c xc-fontconfig/extras/fontconfig/src/fcxml.c
--- xc/extras/fontconfig/src/fcxml.c 2003-06-04 18:29:39.000000000 +0200
+++ xc-fontconfig/extras/fontconfig/src/fcxml.c 2003-11-19 21:34:42.000000000 +0100
+++ xc-fontconfig/extras/fontconfig/src/fcxml.c 2003-11-21 01:35:12.000000000 +0100
@@ -1,5 +1,7 @@
/*
- * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
@ -6686,3 +6699,14 @@ diff -urN xc/extras/fontconfig/src/fcxml.c xc-fontconfig/extras/fontconfig/src/f
break;
case FcElementUnknown:
break;
diff -urN xc/lib/fontconfig/Imakefile xc-fontconfig/lib/fontconfig/Imakefile
--- xc/lib/fontconfig/Imakefile 2003-11-02 05:43:36.000000000 +0100
+++ xc-fontconfig/lib/fontconfig/Imakefile 2003-11-21 01:42:00.000000000 +0100
@@ -11,6 +11,7 @@
#else
#define LibName fontcfg
#endif
+SOFONTCONFIGREV=2.2
#define SoRev SOFONTCONFIGREV
#define IncSubdir fontconfig

Write Preview
|||||||
100:0
Loading…
Cancel
Save