Updates on Garnome

[Stef van der Made <svdmade planet nl>]

Dear Paul,

Here is a new patch with some fixes for GCC-4.0.0 users (firefox and dia)

and a bunch of version updates and 1 downgrade of gmime to 2.1.3 to fix 
an compile issue with beagle 0.10.1 the next version of beagle will need 
gmime 2.1.5

I hope the patches are usefull once more ;-) I'll await the next 
snapshot to start testing once more. And please note that the gnome 
servers might be down due to relocation of the servers 28 - 29 - 30 June 
2005.

Cheers,

Stef

diff -ruN garnome-2.11-20050616.1615/fifth-toe/gimp/Makefile garnome-2.11-20050616.1615stef/fifth-toe/gimp/Makefile
--- garnome-2.11-20050616.1615/fifth-toe/gimp/Makefile	2005-05-17 08:02:40.000000000 +0200
+++ garnome-2.11-20050616.1615stef/fifth-toe/gimp/Makefile	2005-06-16 21:28:00.000000000 +0200
@@ -1,5 +1,5 @@
 GARNAME = gimp
-GARVERSION = 2.3.0
+GARVERSION = 2.3.1
 CATEGORIES = fifth-toe
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 
diff -ruN garnome-2.11-20050616.1615/fifth-toe/gimp/checksums garnome-2.11-20050616.1615stef/fifth-toe/gimp/checksums
--- garnome-2.11-20050616.1615/fifth-toe/gimp/checksums	2005-05-17 08:02:40.000000000 +0200
+++ garnome-2.11-20050616.1615stef/fifth-toe/gimp/checksums	2005-06-16 21:28:00.000000000 +0200
@@ -1 +1 @@
-88e536ba0e4882958eb98bc0eadc8dd4  download/gimp-2.3.0.tar.bz2
+eff5c193e9e8a0699d99b1df95b70003  download/gimp-2.3.1.tar.bz2
diff -ruN garnome-2.11-20050616.1615/mono/gecko-sharp/Makefile garnome-2.11-20050616.1615stef/mono/gecko-sharp/Makefile
--- garnome-2.11-20050616.1615/mono/gecko-sharp/Makefile	2005-03-24 01:57:49.000000000 +0100
+++ garnome-2.11-20050616.1615stef/mono/gecko-sharp/Makefile	2005-06-17 21:41:18.000000000 +0200
@@ -3,7 +3,7 @@
 CATEGORIES = mono
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 
-LIBDEPS = mono/gtk-sharp
+LIBDEPS = mono/gtk-sharp2.0
 LIBDEPS += $(shell if test ! -e "`pkg-config --exists firefox-gtkmozembed || pkg-config --exists gtkmozembed 2> /dev/null`"; then echo bootstrap/firefox; fi )
 
 DESCRIPTION = gecko-sharp
diff -ruN garnome-2.11-20050616.1615/mono/mono/Makefile garnome-2.11-20050616.1615stef/mono/mono/Makefile
--- garnome-2.11-20050616.1615/mono/mono/Makefile	2005-06-16 07:41:31.000000000 +0200
+++ garnome-2.11-20050616.1615stef/mono/mono/Makefile	2005-06-17 21:12:51.000000000 +0200
@@ -1,8 +1,8 @@
 GARNAME = mono
-GARVERSION = 1.1.7
+GARVERSION = 1.1.8
 CATEGORIES = mono
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = garnome-fixes.diff
+#PATCHFILES = garnome-fixes.diff
 
 LIBDEPS = platform/glib platform/gtk+ desktop/gtkhtml desktop/librsvg
 
diff -ruN garnome-2.11-20050616.1615/mono/mono/checksums garnome-2.11-20050616.1615stef/mono/mono/checksums
--- garnome-2.11-20050616.1615/mono/mono/checksums	2005-06-16 07:41:47.000000000 +0200
+++ garnome-2.11-20050616.1615stef/mono/mono/checksums	2005-06-17 18:22:36.000000000 +0200
@@ -1,2 +1,2 @@
-f81c6b02ef0c5d5ef7ab827d28eb9731  download/mono-1.1.7.tar.gz
+c16afcb6e14cf542674284c8e83cc6d3  download/mono-1.1.8.tar.gz
 a5a9700524352af8d8066443a5a45d8c  download/garnome-fixes.diff
diff -ruN garnome-2.11-20050616.1615/platform/gnome-vfs/Makefile garnome-2.11-20050616.1615stef/platform/gnome-vfs/Makefile
--- garnome-2.11-20050616.1615/platform/gnome-vfs/Makefile	2005-06-16 04:29:23.000000000 +0200
+++ garnome-2.11-20050616.1615stef/platform/gnome-vfs/Makefile	2005-06-17 18:48:35.000000000 +0200
@@ -2,7 +2,7 @@
 GARVERSION = 2.11.2
 CATEGORIES = platform
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-PATCHFILES = garnome-fixes.diff upstream-fixes.diff
+#PATCHFILES = garnome-fixes.diff upstream-fixes.diff
 
 LIBDEPS = bootstrap/gamin platform/libbonobo platform/GConf platform/libxml2 platform/gnome-mime-data
 
diff -ruN garnome-2.11-20050616.1615/platform/gtk+/Makefile garnome-2.11-20050616.1615stef/platform/gtk+/Makefile
--- garnome-2.11-20050616.1615/platform/gtk+/Makefile	2005-06-16 07:29:45.000000000 +0200
+++ garnome-2.11-20050616.1615stef/platform/gtk+/Makefile	2005-06-17 17:30:24.000000000 +0200
@@ -4,7 +4,7 @@
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 PATCHFILES = garnome-fixes.diff
 
-LIBDEPS = platform/glib platform/atk platform/pango platform/gnome-mime-data
+LIBDEPS = bootstrap/fontconfig bootstrap/xft platform/glib platform/atk platform/pango platform/gnome-mime-data
 
 DESCRIPTION = gtk+
 define BLURB
diff -ruN garnome-2.11-20050620.1710/bootstrap/firefox/Makefile garnome-2.11-20050620.1710stef/bootstrap/firefox/Makefile
--- garnome-2.11-20050620.1710/bootstrap/firefox/Makefile	2005-05-17 04:21:12.000000000 +0200
+++ garnome-2.11-20050620.1710stef/bootstrap/firefox/Makefile	2005-06-20 20:59:44.000000000 +0200
@@ -2,7 +2,7 @@
 GARVERSION = 1.0.4
 CATEGORIES = bootstrap
 DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2 mozconfig-firefox
-PATCHFILES = gar-base.diff firefox-1.0-freetype-fixes.patch firefox-1.0-pango-renderer.patch
+PATCHFILES = gar-base.diff firefox-1.0-freetype-fixes.patch firefox-1.0-pango-renderer.patch gcc400.diff
 
 MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)/source/
 
diff -ruN garnome-2.11-20050620.1710/bootstrap/firefox/checksums garnome-2.11-20050620.1710stef/bootstrap/firefox/checksums
--- garnome-2.11-20050620.1710/bootstrap/firefox/checksums	2005-05-17 04:31:37.000000000 +0200
+++ garnome-2.11-20050620.1710stef/bootstrap/firefox/checksums	2005-06-20 21:08:53.000000000 +0200
@@ -3,3 +3,4 @@
 01415612ca0405121b663bbe3edca84f  download/gar-base.diff
 27512ec7432e3dddd65e3622bf6504f5  download/firefox-1.0-freetype-fixes.patch
 42a1aa28bed4d1a72a260ddd88c7cd1a  download/firefox-1.0-pango-renderer.patch
+8f0fcc809ab6bd4dcac38a8fdcfc1291  download/gcc400.diff
diff -ruN garnome-2.11-20050620.1710/bootstrap/firefox/files/gcc400.diff garnome-2.11-20050620.1710stef/bootstrap/firefox/files/gcc400.diff
--- garnome-2.11-20050620.1710/bootstrap/firefox/files/gcc400.diff	1970-01-01 01:00:00.000000000 +0100
+++ garnome-2.11-20050620.1710stef/bootstrap/firefox/files/gcc400.diff	2005-06-21 20:15:21.000000000 +0200
@@ -0,0 +1,74 @@
+Index: oiddata.c
+===================================================================
+RCS file: mozilla/security/nss/lib/pki1/oiddata.c,v
+retrieving revision 1.4
+diff -u -r1.4 mozilla/security/nss/lib/pki1/oiddata.c
+--- mozilla/security/nss/lib/pki1/oiddata.c	4 Mar 2005 18:30:12 -0000	1.4
++++ mozilla/security/nss/lib/pki1/oiddata.c	5 Mar 2005 15:16:07 -0000
+@@ -182,7 +182,7 @@
+     "ucl",
+     "RFC 1327 ucl",
+ #endif /* DEBUG */
+-    { "\x09\x92\x26\x86\xe8\xc4\xb5\xbe\x7f", 9 }
++    { "\x09\x92\x26\x86\xe8\xc4\xb5\xbe\x2c", 9 }
+   },
+   {
+ #ifdef DEBUG
+Index: oiddata.h
+===================================================================
+RCS file: mozilla/security/nss/lib/pki1/oiddata.h,v
+retrieving revision 1.3
+diff -u -r1.3 mozilla/security/nss/lib/pki1/oiddata.h
+--- mozilla/security/nss/lib/pki1/oiddata.h	2 Feb 2005 22:28:24 -0000	1.3
++++ mozilla/security/nss/lib/pki1/oiddata.h	5 Mar 2005 15:16:07 -0000
+@@ -46,12 +46,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ extern const NSSOID *NSS_OID_RFC1274_UID;
+ extern const NSSOID *NSS_OID_RFC1274_EMAIL;
+ extern const NSSOID *NSS_OID_RFC2247_DC;
+Index: oidgen.perl
+===================================================================
+RCS file: mozilla/security/nss/lib/pki1/oidgen.perl,v
+retrieving revision 1.5
+diff -u -r1.5 mozilla/security/nss/lib/pki1/oidgen.perl
+--- mozilla/security/nss/lib/pki1/oidgen.perl	2 Feb 2005 22:28:24 -0000	1.5
++++ mozilla/security/nss/lib/pki1/oidgen.perl	5 Mar 2005 15:16:08 -0000
+@@ -244,12 +244,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ EOD
+     ;
+ 
+Index: pki1.h
+===================================================================
+RCS file: mozilla/security/nss/lib/pki1/pki1.h,v
+retrieving revision 1.4
+diff -u -r1.4 mozilla/security/nss/lib/pki1/pki1.h
+--- mozilla/security/nss/lib/pki1/pki1.h	20 Jan 2005 02:25:49 -0000	1.4
++++ mozilla/security/nss/lib/pki1/pki1.h	5 Mar 2005 15:16:10 -0000
+@@ -58,7 +58,9 @@
+ 
+ PR_BEGIN_EXTERN_C
+ 
+-/* fgmr 19990505 moved these here from oiddata.h */
++extern const NSSOID nss_builtin_oids[];
++extern const PRUint32 nss_builtin_oid_count;
++
+ extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
+ extern const PRUint32 nss_attribute_type_alias_count;
+ 
diff -ruN garnome-2.11-20050620.1710/desktop/gstreamer/Makefile garnome-2.11-20050620.1710stef/desktop/gstreamer/Makefile
--- garnome-2.11-20050620.1710/desktop/gstreamer/Makefile	2005-05-05 03:59:18.000000000 +0200
+++ garnome-2.11-20050620.1710stef/desktop/gstreamer/Makefile	2005-06-20 20:46:16.000000000 +0200
@@ -1,5 +1,5 @@
 GARNAME = gstreamer
-GARVERSION = 0.8.10
+GARVERSION = 0.9.1
 CATEGORIES = desktop
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 
diff -ruN garnome-2.11-20050620.1710/desktop/gstreamer/checksums garnome-2.11-20050620.1710stef/desktop/gstreamer/checksums
--- garnome-2.11-20050620.1710/desktop/gstreamer/checksums	2005-05-05 03:59:18.000000000 +0200
+++ garnome-2.11-20050620.1710stef/desktop/gstreamer/checksums	2005-06-20 20:46:32.000000000 +0200
@@ -1 +1 @@
-3de474d993e23c901e9dfdd1fea486e0  download/gstreamer-0.8.10.tar.bz2
+afaa6f729c8a3a776d71f4efdfc5ea1b  download/gstreamer-0.9.1.tar.bz2
diff -ruN garnome-2.11-20050620.1710/fifth-toe/bluefish/Makefile garnome-2.11-20050620.1710stef/fifth-toe/bluefish/Makefile
--- garnome-2.11-20050620.1710/fifth-toe/bluefish/Makefile	2005-02-11 11:15:03.000000000 +0100
+++ garnome-2.11-20050620.1710stef/fifth-toe/bluefish/Makefile	2005-06-22 20:10:36.000000000 +0200
@@ -1,5 +1,5 @@
 GARNAME = bluefish
-GARVERSION = 1.0
+GARVERSION = 1.0.1
 CATEGORIES = fifth-toe
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 
diff -ruN garnome-2.11-20050620.1710/fifth-toe/bluefish/checksums garnome-2.11-20050620.1710stef/fifth-toe/bluefish/checksums
--- garnome-2.11-20050620.1710/fifth-toe/bluefish/checksums	2005-01-14 05:14:57.000000000 +0100
+++ garnome-2.11-20050620.1710stef/fifth-toe/bluefish/checksums	2005-06-22 20:10:52.000000000 +0200
@@ -1 +1 @@
-a3cf8abd282d850407e8c7eed38d15e7  download/bluefish-1.0.tar.bz2
+5ffabef54fc83f5e540e08e23e3f5671  download/bluefish-1.0.1.tar.bz2
diff -ruN garnome-2.11-20050620.1710/geektoys/gmime/Makefile garnome-2.11-20050620.1710stef/geektoys/gmime/Makefile
--- garnome-2.11-20050620.1710/geektoys/gmime/Makefile	2005-06-20 04:10:18.000000000 +0200
+++ garnome-2.11-20050620.1710stef/geektoys/gmime/Makefile	2005-06-22 20:01:48.000000000 +0200
@@ -1,5 +1,5 @@
 GARNAME = gmime
-GARVERSION = 2.1.15
+GARVERSION = 2.1.13
 CATEGORIES = geektoys
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 
diff -ruN garnome-2.11-20050620.1710/geektoys/gmime/checksums garnome-2.11-20050620.1710stef/geektoys/gmime/checksums
--- garnome-2.11-20050620.1710/geektoys/gmime/checksums	2005-06-20 04:10:18.000000000 +0200
+++ garnome-2.11-20050620.1710stef/geektoys/gmime/checksums	2005-06-22 20:02:54.000000000 +0200
@@ -1 +1 @@
-c6df963c6e502f2da57ebb33143b40af  download/gmime-2.1.15.tar.gz
+b850375426c98e70e4834db70407bc3f  download/gmime-2.1.13.tar.gz
diff -ruN garnome-2.11-20050620.1710/office/dia/Makefile garnome-2.11-20050620.1710stef/office/dia/Makefile
--- garnome-2.11-20050620.1710/office/dia/Makefile	2004-09-16 10:37:31.000000000 +0200
+++ garnome-2.11-20050620.1710stef/office/dia/Makefile	2005-06-22 21:21:59.000000000 +0200
@@ -2,7 +2,7 @@
 GARVERSION = 0.94
 CATEGORIES = office
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-
+PATCHFILES= gcc400.diff
 LIBDEPS = platform/libgnomeui
 
 DESCRIPTION = dia
diff -ruN garnome-2.11-20050620.1710/office/dia/checksums garnome-2.11-20050620.1710stef/office/dia/checksums
--- garnome-2.11-20050620.1710/office/dia/checksums	2004-09-16 10:37:31.000000000 +0200
+++ garnome-2.11-20050620.1710stef/office/dia/checksums	2005-06-22 21:25:30.000000000 +0200
@@ -1 +1,2 @@
 63584224912dab49fed8d2cf87ea2d85  download/dia-0.94.tar.bz2
+6865808b9702805795be5076549c7ae5  download/gcc400.diff
diff -ruN garnome-2.11-20050620.1710/office/fribidi/Makefile garnome-2.11-20050620.1710stef/office/fribidi/Makefile
--- garnome-2.11-20050620.1710/office/fribidi/Makefile	2005-06-10 03:14:22.000000000 +0200
+++ garnome-2.11-20050620.1710stef/office/fribidi/Makefile	2005-06-21 22:11:48.000000000 +0200
@@ -1,5 +1,5 @@
 GARNAME = fribidi
-GARVERSION = 0.10.5
+GARVERSION = 0.10.4
 CATEGORIES = office
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 
diff -ruN garnome-2.11-20050620.1710/office/fribidi/checksums garnome-2.11-20050620.1710stef/office/fribidi/checksums
--- garnome-2.11-20050620.1710/office/fribidi/checksums	2005-06-10 03:14:22.000000000 +0200
+++ garnome-2.11-20050620.1710stef/office/fribidi/checksums	2005-06-21 22:12:03.000000000 +0200
@@ -1 +1 @@
-4f187c7e6bbb9d03bd1cd7ddc12d3069  download/fribidi-0.10.5.tar.gz
+4efd9240584a4f43aeba26c88f03bba5  download/fribidi-0.10.4.tar.gz
diff -ruN garnome-2.11-20050620.1710/platform/pango/Makefile garnome-2.11-20050620.1710stef/platform/pango/Makefile
--- garnome-2.11-20050620.1710/platform/pango/Makefile	2005-03-31 04:50:29.000000000 +0200
+++ garnome-2.11-20050620.1710stef/platform/pango/Makefile	2005-06-20 21:00:20.000000000 +0200
@@ -3,7 +3,7 @@
 CATEGORIES = platform
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 
-LIBDEPS = platform/glib
+LIBDEPS = bootstrap/fontconfig bootstrap/xft platform/glib
 
 DESCRIPTION = pango
 define BLURB