Add a patch to fix custom CellRenderer classes. Remove old unused files.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

6 files changed, 60 insertions, 133 deletions

diff --git a/dev-dotnet/gtk-sharp/ChangeLog b/dev-dotnet/gtk-sharp/ChangeLog
index 7210e02232cd..ec299a01bd6c 100644
--- a/dev-dotnet/gtk-sharp/ChangeLog
+++ b/dev-dotnet/gtk-sharp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-dotnet/gtk-sharp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.100 2009/09/27 16:26:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.101 2009/10/18 13:52:56 flameeyes Exp $
+
+*gtk-sharp-2.12.9-r1 (18 Oct 2009)
+
+  18 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/gtk-sharp-2.12.0-doc-parallelmake.patch,
+  -files/gtk-sharp-2.12.0-noautomagic.patch,
+  -files/gtk-sharp-2.12.0-parallelmake.patch, +gtk-sharp-2.12.9-r1.ebuild,
+  +files/gtk-sharp-2.12.9-cellrenderer.patch:
+  Add a patch to fix custom CellRenderer classes. Remove old unused files.
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> gtk-sharp-2.12.9.ebuild:
   ppc stable #283739
diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-doc-parallelmake.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-doc-parallelmake.patch
deleted file mode 100644
index 3046e55f64ed..000000000000
--- a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-doc-parallelmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: doc/Makefile.am
-===================================================================
---- doc/Makefile.am	(revision 118618)
-+++ doc/Makefile.am	(working copy)
-@@ -32,7 +32,9 @@
- 
- assemble: gtk-sharp-docs.zip gtk-sharp-docs.tree
- 
--gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
-+gtk-sharp-docs.tree: gtk-sharp-docs.zip
-+
-+gtk-sharp-docs.zip: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
- 	$(MDASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs
- 
- get-assemblies:
diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-noautomagic.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-noautomagic.patch
deleted file mode 100644
index 852662e3ab39..000000000000
--- a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-noautomagic.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -NrU5 gtk-sharp-2.12.6.orig/configure.in gtk-sharp-2.12.6/configure.in
---- gtk-sharp-2.12.6.orig/configure.in	2008-11-24 22:24:07.000000000 +0100
-+++ gtk-sharp-2.12.6/configure.in	2008-11-24 22:35:25.000000000 +0100
-@@ -184,24 +184,38 @@
- 
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- 
-+AC_ARG_ENABLE(glade,
-+	AS_HELP_STRING([--disable-glade], [Don't build glade-sharp]),,
-+	[enable_glade=yes])
-+
- GLADE_REQUIRED_VERSION=2.3.6
--PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no)
--AC_SUBST(GLADE_CFLAGS)
--AC_SUBST(GLADE_LIBS)
-+if test "x$enable_glade" = "xyes"; then
-+	PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no)
-+	AC_SUBST(GLADE_CFLAGS)
-+	AC_SUBST(GLADE_LIBS)
-+fi
-+
-+AC_ARG_ENABLE(monodoc,
-+	AS_HELP_STRING([--disable-monodoc], [Don't build monodocuments]),,
-+	[enable_monodoc=yes])
- 
- AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
- AC_PATH_PROG(MONODOCER, monodocer, no)
--if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
--  enable_monodoc=no
--  doc_sources_dir=
--else
--  enable_monodoc=yes
--  doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`"
-+
-+if test "x$enable_monodoc" = "xyes"; then
-+	if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
-+		enable_monodoc=no
-+		doc_sources_dir=
-+	else
-+		enable_monodoc=yes
-+		doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`"
-+	fi
- fi
-+
- AC_SUBST(MDASSEMBLER)
- AC_SUBST(MONODOCER)
- 
- AM_CONDITIONAL(ENABLE_MONO_CAIRO, test "x$enable_mono_cairo" = "xyes")
- AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes")
diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-parallelmake.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-parallelmake.patch
deleted file mode 100644
index e9195c89bfc3..000000000000
--- a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-parallelmake.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: gtk-sharp-2.12.0/glib/Makefile.am
-===================================================================
---- gtk-sharp-2.12.0.orig/glib/Makefile.am
-+++ gtk-sharp-2.12.0/glib/Makefile.am
-@@ -98,12 +98,11 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.
- 	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
- 	$(GAPI_CDECL_INSERT)
- 
--$(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
--	@for i in $(POLICY_VERSIONS); do	\
--	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
--	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
--	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\
--	done
-+policy.%.config: $(top_builddir)/policy.config
-+	sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
-+
-+$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config gtk-sharp.snk
-+	$(AL) -link:policy.$*.config -out:$@ -keyfile:gtk-sharp.snk
- 
- install-data-local:
- 	@if test -n '$(TARGET)'; then							\
-Index: gtk-sharp-2.12.0/gtkdotnet/Makefile.am
-===================================================================
---- gtk-sharp-2.12.0.orig/gtkdotnet/Makefile.am
-+++ gtk-sharp-2.12.0/gtkdotnet/Makefile.am
-@@ -46,12 +46,11 @@ $(ASSEMBLY): $(build_sources) $(referenc
- 	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(build_references) $(build_sources)
- 	$(GAPI_CDECL_INSERT)
- 
--$(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
--	@for i in $(POLICY_VERSIONS); do	\
--	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
--	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
--	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\
--	done
-+policy.%.config: $(top_builddir)/policy.config
-+	sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
-+
-+$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config gtk-sharp.snk
-+	$(AL) -link:policy.$*.config -out:$@ -keyfile:gtk-sharp.snk
- 
- install-data-local:
- 	@if test -n '$(TARGET)'; then							\
-Index: gtk-sharp-2.12.0/Makefile.include
-===================================================================
---- gtk-sharp-2.12.0.orig/Makefile.include
-+++ gtk-sharp-2.12.0/Makefile.include
-@@ -46,12 +46,11 @@ $(SNK): $(top_srcdir)/$(SNK)
- AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
- 	cp $(top_builddir)/AssemblyInfo.cs .
- 
--$(POLICY_ASSEMBLIES): $(top_builddir)/policy.config $(SNK)
--	@for i in $(POLICY_VERSIONS); do	\
--	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
--	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
--	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:$(SNK);	\
--	done
-+policy.%.config: $(top_builddir)/policy.config
-+	sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
-+
-+$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config $(SNK)
-+	$(AL) -link:policy.$*.config -out:$@ -keyfile:$(SNK)
- 
- build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
- build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.9-cellrenderer.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.9-cellrenderer.patch
new file mode 100644
index 000000000000..43f0cf1696f1
--- /dev/null
+++ b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.9-cellrenderer.patch
@@ -0,0 +1,32 @@
+Index: gtk-sharp-2.12.9/gtk/CellRenderer.custom
+===================================================================
+--- gtk-sharp-2.12.9.orig/gtk/CellRenderer.custom
++++ gtk-sharp-2.12.9/gtk/CellRenderer.custom
+@@ -80,7 +80,7 @@
+ 		}
+ 
+ 		[DllImport("gtksharpglue-2")]
+-		static extern void gtksharp_cellrenderer_base_render (IntPtr handle, IntPtr window, IntPtr widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
++		static extern void gtksharp_cellrenderer_base_render (IntPtr handle, IntPtr window, IntPtr widget, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, ref Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
+ 
+ 		[DllImport("gtksharpglue-2")]
+ 		static extern void gtksharp_cellrenderer_override_render (IntPtr gtype, RenderDelegate cb);
+@@ -112,15 +112,15 @@
+ 		[GLib.DefaultSignalHandler (Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideRender")]
+ 		protected virtual void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
+ 		{
+-			gtksharp_cellrenderer_base_render (Handle, window.Handle, widget.Handle, background_area, cell_area, expose_area, flags);
++			gtksharp_cellrenderer_base_render (Handle, window.Handle, widget.Handle, ref background_area, ref cell_area, ref expose_area, flags);
+ 		}
+ 
+ 		[DllImport("gtksharpglue-2")]
+-		static extern void gtksharp_cellrenderer_invoke_render (IntPtr gtype, IntPtr handle, IntPtr window, IntPtr widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
++		static extern void gtksharp_cellrenderer_invoke_render (IntPtr gtype, IntPtr handle, IntPtr window, IntPtr widget, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, ref Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
+ 
+ 		internal static void InternalRender (GLib.GType gtype, Gtk.CellRenderer cell, Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
+ 		{
+-			gtksharp_cellrenderer_invoke_render (gtype.Val, cell.Handle, window.Handle, widget.Handle, background_area, cell_area, expose_area, flags);
++			gtksharp_cellrenderer_invoke_render (gtype.Val, cell.Handle, window.Handle, widget.Handle, ref background_area, ref cell_area, ref expose_area, flags);
+ 		}
+ 
+ 		[DllImport("gtksharpglue-2")]
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.9-r1.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.9-r1.ebuild
new file mode 100644
index 000000000000..b03fe95c8df9
--- /dev/null
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.9-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.12.9-r1.ebuild,v 1.1 2009/10/18 13:52:56 flameeyes Exp $
+
+EAPI="2"
+
+inherit gtk-sharp-module eutils
+
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cellrenderer.patch
+	gtk-sharp-module_src_prepare
+}