Re: [patch] mono patch

[guenther <guenther rudersport de>]

On Thu, 2005-10-13 at 03:44 +0200, guenther wrote:
> Attached is a patch file against GARNOME 2.12.1 to apply Josephs various
> mono tweaks [1], bumps [2] and fixes [3] in one fell swoop. Hope you
> like it, Joseph... :)
> 
> Caveat: I did *not* test this patch yet. Currently building. My machine
> will get to mono while I'm sleeping...

Don't know how, but I screwed up. The md5sums where not updated, thus
the previous patch is broken. Attached the corrected one.

Again, not entirely tested, currently building. While tracking down some
other mono weirdness...

...guenther


-- 
char *t="\10pse\0r\0dtu\0  ghno\x4e\xc8\x79\xf4\xab\x51\x8a\x10\xf4\xf4\xc4";
main(){ char h,m=h=*t++,*x=t+2*h,c,i,l=*x,s=0; for (i=0;i<l;i++){ i%8? c<<=1:
(c=*++x); c&128 && (s+=h); if (!(h>>=1)||!t[s+h]){ putchar(t[s]);h=m;s=0; }}}

diff -Nru mono/gecko-sharp2.0/Makefile mono/gecko-sharp2.0/Makefile
--- mono/gecko-sharp2.0/Makefile	2005-09-13 20:35:33.000000000 +0200
+++ mono/gecko-sharp2.0/Makefile	2005-10-13 02:29:50.000000000 +0200
@@ -5,7 +5,7 @@
 
 MASTER_SITES = http://go-mono.com/sources/gecko-sharp-2.0/
 
-LIBDEPS = mono/gtk-sharp1.0
+LIBDEPS = mono/gtk-sharp1.0 mono/monodoc
 LIBDEPS += $(shell if test ! "`ls $(shell echo $(PKG_CONFIG_PATH) | sed -e "s/:/ /g") 2>&1 /dev/null | grep mozilla-gtkmozembed.pc || ls $(shell echo $(PKG_CONFIG_PATH) | sed -e "s/:/ /g") 2>&1 /dev/null | grep firefox-gtkmozembed.pc`" ; then echo bootstrap/firefox ; fi )
 
 DESCRIPTION = gecko-sharp
diff -Nru mono/gtk-sharp2.0/checksums mono/gtk-sharp2.0/checksums
--- mono/gtk-sharp2.0/checksums	2005-09-13 20:37:11.000000000 +0200
+++ mono/gtk-sharp2.0/checksums	2005-10-13 13:31:21.000000000 +0200
@@ -1,2 +1 @@
-fc1ac020b2a9d9ff0fbfa4c00ffdb20c  download/gtk-sharp-2.5.91.tar.gz
-69281eb577a0029c4e0cd9be9493b839  download/garnome-fixes.diff
+90156b3ee48fa270e7cadbae0e75b768  download/gtk-sharp-2.5.92.tar.gz
diff -Nru mono/gtk-sharp2.0/Makefile mono/gtk-sharp2.0/Makefile
--- mono/gtk-sharp2.0/Makefile	2005-09-13 20:39:21.000000000 +0200
+++ mono/gtk-sharp2.0/Makefile	2005-10-13 02:28:53.000000000 +0200
@@ -1,5 +1,5 @@
 GARNAME = gtk-sharp
-GARVERSION = 2.5.91
+GARVERSION = 2.5.92
 CATEGORIES = mono
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 
diff -Nru mono/gtksourceview-sharp1.0/Makefile mono/gtksourceview-sharp1.0/Makefile
--- mono/gtksourceview-sharp1.0/Makefile	2005-07-25 04:17:36.000000000 +0200
+++ mono/gtksourceview-sharp1.0/Makefile	2005-10-13 02:30:25.000000000 +0200
@@ -3,7 +3,7 @@
 CATEGORIES = mono
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 
-LIBDEPS = mono/gtk-sharp1.0 desktop/gtksourceview
+LIBDEPS = mono/gtk-sharp1.0 desktop/gtksourceview mono/monodoc
 
 DESCRIPTION = gtksourceview-sharp
 MAINTAINER = Joseph Sacco <joseph_sacco comcast net>
diff -Nru mono/gtksourceview-sharp2.0/Makefile mono/gtksourceview-sharp2.0/Makefile
--- mono/gtksourceview-sharp2.0/Makefile	2005-06-27 09:56:55.000000000 +0200
+++ mono/gtksourceview-sharp2.0/Makefile	2005-10-13 02:30:40.000000000 +0200
@@ -5,7 +5,7 @@
 
 MASTER_SITES = http://go-mono.com/sources/gtksourceview-sharp-2.0/
 
-LIBDEPS = mono/gtk-sharp1.0 desktop/gtksourceview
+LIBDEPS = mono/gtk-sharp1.0 desktop/gtksourceview mono/monodoc
 
 DESCRIPTION = gtksourceview-sharp
 MAINTAINER = Joseph Sacco <joseph_sacco comcast net>
diff -Nru mono/mono/checksums mono/mono/checksums
--- mono/mono/checksums	2005-09-13 20:32:13.000000000 +0200
+++ mono/mono/checksums	2005-10-13 13:29:27.000000000 +0200
@@ -1 +1 @@
-de159531bc8f00c058fb5f4ee1d5ebe3  download/mono-1.1.9.tar.gz
+edc4adaa92594a8eea8018bb3701b639  download/mono-1.1.9.2.tar.gz
diff -Nru mono/mono/Makefile mono/mono/Makefile
--- mono/mono/Makefile	2005-09-13 21:04:12.000000000 +0200
+++ mono/mono/Makefile	2005-10-13 02:27:56.000000000 +0200
@@ -1,5 +1,5 @@
 GARNAME = mono
-GARVERSION = 1.1.9
+GARVERSION = 1.1.9.2
 CATEGORIES = mono
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 
diff -Nru mono/muine/checksums mono/muine/checksums
--- mono/muine/checksums	2005-05-17 08:15:16.000000000 +0200
+++ mono/muine/checksums	2005-08-18 22:14:35.000000000 +0200
@@ -1 +1,2 @@
 4e21eeb8e809bebf1e13540e44a6259d  download/muine-0.8.3.tar.gz
+35cecaa522a4ba31c08318f327baf3ce  download/upstream-fixes.diff
diff -Nru mono/muine/files/upstream-fixes.diff mono/muine/files/upstream-fixes.diff
--- mono/muine/files/upstream-fixes.diff	1970-01-01 01:00:00.000000000 +0100
+++ mono/muine/files/upstream-fixes.diff	2005-08-18 22:13:35.000000000 +0200
@@ -0,0 +1,11 @@
+--- muine-0.8.3/src/PlaylistWindow.cs-	2005-08-18 16:10:29.000000000 -0400
++++ muine-0.8.3/src/PlaylistWindow.cs	2005-08-18 16:11:45.000000000 -0400
+@@ -431,7 +431,7 @@
+ 		public void RestorePlaylist ()
+ 		{
+ 			// Load last playlist
+-			if (!File.Exists (FileUtils.PlaylistFile))
++			if (!System.IO.File.Exists (FileUtils.PlaylistFile))
+ 				return;
+ 
+ 			OpenPlaylistInternal (FileUtils.PlaylistFile,
diff -Nru mono/muine/Makefile mono/muine/Makefile
--- mono/muine/Makefile	2005-06-27 09:57:42.000000000 +0200
+++ mono/muine/Makefile	2005-10-13 02:40:22.000000000 +0200
@@ -2,10 +2,11 @@
 GARVERSION = 0.8.3
 CATEGORIES = mono
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = upstream-fixes.diff
 
 MASTER_SITES = http://muine.gooeylinux.org/
 
-LIBDEPS = mono/mono mono/gtk-sharp2.0 desktop/gstreamer
+LIBDEPS = mono/mono mono/gtk-sharp2.0 desktop/gstreamer mono/monodoc
 
 DESCRIPTION = muine
 MAINTAINER = Joseph Sacco <joseph_sacco comcast net>
@@ -18,5 +19,6 @@
 INSTALL_SCRIPTS = $(WORKSRC)/Makefile
 
 CONFIGURE_ARGS = $(DIRPATHS)
+BUILD_ARGS = -j1
 
 include ../category.mk