rpms/frysk/FC-4 fontconfig-2.3.93-globaldir.patch, NONE, 1.1 fontconfig-2.3.93-normalize.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 antlr.patch, 1.2, 1.3 frysk.spec, 1.3, 1.4 sources, 1.1, 1.2 update.sh, 1.2, 1.3

Mon Jan 30 15:46:50 UTC 2006

Author: cagney

Update of /cvs/dist/rpms/frysk/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31023

Modified Files:
	.cvsignore antlr.patch frysk.spec sources update.sh 
Added Files:
	fontconfig-2.3.93-globaldir.patch 
	fontconfig-2.3.93-normalize.patch 
Log Message:
* Sat Jan 28 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.28-0.EL4.2

- Check for previous definitions of frysk_gcc_prefix, and
  frysk_gcc_suffix to allow overriding from ~/.rpmmacros.

* Sat Jan 28 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.28-0.EL4.1

- Import frysk 0.0.1.2006.01.28; includes some 32/64 bit fixes.
- Backport glib2 2.9.5, gtk 2 2.8.11, and fontconfig 2.3.93.cvs20060124.


fontconfig-2.3.93-globaldir.patch:
 fccache.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fontconfig-2.3.93-globaldir.patch ---
--- fontconfig-2.3.93/src/fccache.c.globaldir	2006-01-11 16:32:09.000000000 +0100
+++ fontconfig-2.3.93/src/fccache.c	2006-01-11 16:32:57.000000000 +0100
@@ -309,7 +309,7 @@
 	if (strncmp (d->name, dir, strlen(dir)) == 0)
 	{
 	    lseek (cache->fd, d->offset, SEEK_SET);
-	    if (!FcDirCacheConsume (cache->fd, dir, set, config))
+	    if (!FcDirCacheConsume (cache->fd, d->name, set, config))
 		return FcFalse;
             if (strcmp (d->name, dir) == 0)
 		ret = FcTrue;

fontconfig-2.3.93-normalize.patch:
 fc-cache.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE fontconfig-2.3.93-normalize.patch ---
--- fontconfig-2.3.93.20060110.orig/fc-cache/fc-cache.c	2006-01-11 13:23:52.000000000 +0100
+++ fontconfig-2.3.93.20060110/fc-cache/fc-cache.c	2006-01-12 12:47:54.000000000 +0100
@@ -122,7 +122,7 @@
      * Now scan all of the directories into separate databases
      * and write out the results
      */
-    while ((dir = FcStrListNext (list)))
+    while ((dir = FcConfigNormalizeFontDir(config, FcStrListNext (list))))
     {
 	if (verbose)
 	{
@@ -275,7 +275,7 @@
 
     if (systemOnly)
 	FcConfigEnableHome (FcFalse);
-    config = FcInitLoadConfig ();
+    config = FcInitLoadConfigAndFonts ();
     if (!config)
     {
 	fprintf (stderr, "%s: Can't init font config library\n", argv[0]);




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Jan 2006 00:33:58 -0000	1.1
+++ .cvsignore	30 Jan 2006 15:46:46 -0000	1.2
@@ -1,17 +1,16 @@
-glib-2.9.4.tar.bz2
+glib-2.9.5.tar.bz2
 glib-java-0.2.2.tar.gz
-fontconfig-2.3.93.tar.gz
+fontconfig-2.3.93.cvs20060124.tar.gz
 cairo-1.0.2.tar.gz
 cairo-java-1.0.2.tar.gz
 pango-1.11.2.tar.bz2
 update-scripts.tar.gz
-gtk+-2.8.10.tar.bz2
+gtk+-2.8.11.tar.bz2
 atk-1.11.2.tar.bz2
 libgtk-java-2.8.2.tar.gz
 libglade-2.5.1.tar.bz2
 libglade-java-2.12.1.tar.gz
 libvte-java-0.11.11.tar.gz
-frysk-0.0.1.2006.01.13.tar.bz2
+frysk-0.0.1.2006.01.28.tar.bz2
 antlr-2.7.5.tar.gz
 jdom-1.0.tar.gz
-frysk-0.0.1.2006.01.22.tar.bz2

antlr.patch:
 .cvsignore           |    1 
 ChangeLog            |   40 +
 Makefile.in          |   22 -
 antlr/Makefile.in    |    7 
 configure            |   28 -
 configure.in         |   28 -
 scripts/config.guess | 1120 +++++++++++++++++++++++++++------------------------
 scripts/config.sub   |  498 ++++++++++++++++------
 scripts/cpp.sh.in    |    4 
 scripts/cxx.sh.in    |    4 
 scripts/jar.sh.in    |    4 
 scripts/javac.sh.in  |    4 
 scripts/lib.sh.in    |    6 
 scripts/link.sh.in   |    4 
 14 files changed, 1079 insertions(+), 691 deletions(-)

Index: antlr.patch
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/antlr.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- antlr.patch	27 Jan 2006 21:10:44 -0000	1.2
+++ antlr.patch	30 Jan 2006 15:46:46 -0000	1.3
@@ -1,12 +1,12 @@
 Index: frysk-imports/antlr/.cvsignore
 diff -u /dev/null frysk-imports/antlr/.cvsignore:1.1
---- /dev/null  Mon Jan 23 17:26:35 2006
+--- /dev/null	Mon Jan 23 17:26:35 2006
 +++ frysk-imports/antlr/.cvsignore	Sat Nov 26 14:17:25 2005
 @@ -0,0 +1 @@
 +autom4te.cache
 Index: frysk-imports/antlr/ChangeLog
 diff -u /dev/null frysk-imports/antlr/ChangeLog:1.7
---- /dev/null  Mon Jan 23 17:26:35 2006
+--- /dev/null	Mon Jan 23 17:26:35 2006
 +++ frysk-imports/antlr/ChangeLog	Fri Jan 27 04:46:36 2006
 @@ -0,0 +1,40 @@
 +2006-01-26  Andrew Cagney  <cagney at redhat.com>


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/frysk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- frysk.spec	28 Jan 2006 03:22:19 -0000	1.3
+++ frysk.spec	30 Jan 2006 15:46:46 -0000	1.4
@@ -1,9 +1,12 @@
 # Path to the directory that contains the GCC tools used to build
 # frysk; and any version suffix.  If you're using a custom compiler
-# modify this.
+# enable and then modify this:
 
-%define frysk_gcc_prefix /usr/bin/
-%define frysk_gcc_suffix %{nil}
+#define frysk_gcc_prefix /usr/bin/
+#define frysk_gcc_suffix 4
+
+%define gcc_prefix %{?frysk_gcc_prefix:%{frysk_gcc_prefix}}%{!?frysk_gcc_prefix:/usr/bin}
+%define gcc_suffix %{?frysk_gcc_suffix:%{frysk_gcc_suffix}}%{!?frysk_gcc_suffix:4}
 
 # Sometimes just the libraries are wanted; sometimes not everything
 # builds.  Provide fine grained control.
@@ -36,9 +39,9 @@
 
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.01.22
-Release:	0.FC4.9
-License:	GPL + EXPLICIT EXCEPTION
+Version:	0.0.1.2006.01.28
+Release:	0.FC4.2
+License:	GPL
 Group:		Development/System
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 URL:		http://sourceware.org/frysk
@@ -65,16 +68,19 @@
 # frysk local: frysk-2022: allow overriding of datadir (containing .jars)
 Patch499:	cairo-java-pkg-dir.patch
 
-%define fontconfig_version 2.3.93
+%define fontconfig_version 2.3.93.cvs20060124
 %define fontconfig fontconfig-%{fontconfig_version}
 Source500:	%{fontconfig}.tar.gz
 # see -install
 Source501:	40-blacklist-fonts.conf
 Source502:	50-no-hint-fonts.conf
-Patch501:	fontconfig-2.3.93-defaultconfig.patch
-Patch502:	fontconfig-2.3.91-crosscheck.patch
+Patch501: fontconfig-2.3.93-defaultconfig.patch
+# fix globar dir handling (Mike Fabian)
+Patch502: fontconfig-2.3.93-globaldir.patch
+# normalize path in fc-cache (Mike Fabian)
+Patch504: fontconfig-2.3.93-normalize.patch
 
-%define glib2_version 2.9.4
+%define glib2_version 2.9.5
 %define glib2 glib-%{glib2_version}
 Source600:	%{glib2}.tar.bz2
 Source602:	glib2.sh
@@ -88,15 +94,15 @@
 # frysk local: frysk-2022: allow overriding of datadir (containing .jars)
 Patch799:	glib-java-pkg-dir.patch
 
-%define gtk2_version 2.8.10
+%define gtk2_version 2.8.11
 %define gtk2 gtk+-%{gtk2_version}
 Source800:	%{gtk2}.tar.bz2
 # Biarch changes
 Patch800:	gtk+-2.4.1-lib64.patch
 # Backported from 2.10
 Patch801:	gtk+-2.8.6-inputmethod.patch
-Patch802:	gtk+-2.8.10-abicheck.patch
 Patch803:	gtk+-2.8.10-set-invisible-char-to-bullet.patch
+
 # frysk local: just assume glib and pango
 Patch890:	gtk+-skip-glib-check.patch
 Patch891:	gtk+-skip-pango-check.patch
@@ -186,8 +192,8 @@
 BuildRequires: vte-devel libgnomeui-devel libgnomecanvas
 Requires: vte
 
-# Limit build to i386 ...
-ExclusiveArch: %{ix86}
+# Limit build to platforms that build: i386 ...
+ExclusiveArch: %{ix86} x86_64 ppc64
 
 %description
 Frysk is an execution-analysis technology implemented using native Java and C++.
@@ -225,6 +231,7 @@
 %setup -n %{fontconfig} -q -T -b500
 %patch501 -p1 -b .defaultconfig
 %patch502 -p1 -b .crosscheck
+%patch504 -p1 -b .normalize
 
 %setup -n %{atk} -q -T -b200
 
@@ -246,7 +253,6 @@
 %setup -n %{gtk2} -q -T -b800
 %patch800 -p1 -b .lib64
 %patch801 -p1 -b .inputmethod
-%patch802 -p1 -b .abicheck
 %patch803 -p1 -b .set-invisible-char-to-bullet
 # %patch890 -p2 -b .skip-glib-check
 %patch891 -p0 -b .skip-pango-check
@@ -356,8 +362,8 @@
 
 EXPORT ()
 {
-	local p=%{frysk_gcc_prefix}
-	local s=%{frysk_gcc_suffix}
+	local p=%{gcc_prefix}
+	local s=%{gcc_suffix}
 %ifarch ppc64
 	local c=" -mminimal-toc -m64"
 %else
@@ -941,6 +947,14 @@
 %endif
 
 %changelog
+* Sat Jan 28 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.28-0.EL4.2
+- Check for previous definitions of frysk_gcc_prefix, and
+  frysk_gcc_suffix to allow overriding from ~/.rpmmacros.
+
+* Sat Jan 28 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.28-0.EL4.1
+- Import frysk 0.0.1.2006.01.28; includes some 32/64 bit fixes.
+- Backport glib2 2.9.5, gtk 2 2.8.11, and fontconfig 2.3.93.cvs20060124.
+
 * Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.9
 - For pango and gtk, store the config file in a path containing _host
   but canonicalized using config.sub.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Jan 2006 00:33:58 -0000	1.1
+++ sources	30 Jan 2006 15:46:46 -0000	1.2
@@ -1,16 +1,16 @@
-467d473c2fd43e124bcab02b6548c135  glib-2.9.4.tar.bz2
+d92467e6a644341d704a5d0e3af8c06f  glib-2.9.5.tar.bz2
 46052b2c2aed6698275c54b7bd51cb38  glib-java-0.2.2.tar.gz
-0d80f23213a9ca0ea60dc4879efffec3  fontconfig-2.3.93.tar.gz
+b365d99c503ed19dbe2019f3df90945d  fontconfig-2.3.93.cvs20060124.tar.gz
 d0b7111a14f90ec3afa777ec40c44984  cairo-1.0.2.tar.gz
 cc2c90fec19cdcafd177463e85595120  cairo-java-1.0.2.tar.gz
 3e1a72b0324a03f8710b9cd13f98c81f  pango-1.11.2.tar.bz2
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-c2c0318d4dcd64315486850907b8e78d  gtk+-2.8.10.tar.bz2
+921ba85da341e52f0994f8fb569f1c61  gtk+-2.8.11.tar.bz2
 fd1f2349ece8a63257c7ffedfa6316af  atk-1.11.2.tar.bz2
 76e5048d11a71060a7cc08df8ef7018e  libgtk-java-2.8.2.tar.gz
 e4734a59f1f2308d7714dc0ebf8163f1  libglade-2.5.1.tar.bz2
 44a223d1c6d66f15288360bbd2ed0c22  libglade-java-2.12.1.tar.gz
 a81b9d7ca9a5dfbcbbb7524ca900cf69  libvte-java-0.11.11.tar.gz
+33147ede6bf8335e69471077442f6723  frysk-0.0.1.2006.01.28.tar.bz2
 1ef201f29283179c8e5ab618529cac78  antlr-2.7.5.tar.gz
 ce29ecc05d63fdb419737fd00c04c281  jdom-1.0.tar.gz
-958178e1427c8fdde93a891e7fc1e526  frysk-0.0.1.2006.01.22.tar.bz2


Index: update.sh
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/update.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- update.sh	28 Jan 2006 03:22:19 -0000	1.2
+++ update.sh	30 Jan 2006 15:46:46 -0000	1.3
@@ -23,4 +23,4 @@
 
 sed < ../RHEL-4/frysk.spec > frysk.spec \
     -e 's,^\(Release:.*\).EL4.\(.*\)$,\1.FC4.\2,' \
-    -e 's,^\(%define frysk_gcc_suffix\).*,\1 %{nil},'
+    -e 's,^# *\(define frysk_gcc_suffix\).*,%\1 %{nil},'


