[gnome-do] - Rebuilt against Mono 2.8 - Add patch for compiling against Mono 2.8 - Add patch to not set DGDK_DI

chkr chkr at fedoraproject.org
Thu Oct 28 22:34:00 UTC 2010 

commit bccb51a6784239afcb2cfbd6cc27937578ff0d35
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Fri Oct 29 00:33:58 2010 +0200

    - Rebuilt against Mono 2.8
    - Add patch for compiling against Mono 2.8
    - Add patch to not set DGDK_DISABLE_DEPRECATED

 gnome-do-0.8.3.1-gdk-build-fix.patch |   22 +++++++++++
 gnome-do-0.8.3.1-mono-2.8.patch      |   70 ++++++++++++++++++++++++++++++++++
 gnome-do.spec                        |   13 ++++++-
 3 files changed, 104 insertions(+), 1 deletions(-)
---
diff --git a/gnome-do-0.8.3.1-gdk-build-fix.patch b/gnome-do-0.8.3.1-gdk-build-fix.patch
new file mode 100644
index 0000000..0e15bc7
--- /dev/null
+++ b/gnome-do-0.8.3.1-gdk-build-fix.patch
@@ -0,0 +1,22 @@
+diff -uNr gnome-do-0.8.3.1.old/libdo/Makefile.am gnome-do-0.8.3.1/libdo/Makefile.am
+--- gnome-do-0.8.3.1.old/libdo/Makefile.am	2009-06-29 02:19:29.000000000 +0200
++++ gnome-do-0.8.3.1/libdo/Makefile.am	2010-10-29 00:17:40.000000000 +0200
+@@ -3,7 +3,6 @@
+ AM_CFLAGS = -DG_LOG_DOMAIN=\"libdo\"	\
+ 	    -DEGG_COMPILATION 		\
+ 	    -DGTK_DISABLE_DEPRECATED 	\
+-	    -DGDK_DISABLE_DEPRECATED 	\
+ 	    -DG_DISABLE_DEPRECATED	\
+ 	    $(LIBDO_CFLAGS)
+ 
+diff -uNr gnome-do-0.8.3.1.old/libdo/Makefile.in gnome-do-0.8.3.1/libdo/Makefile.in
+--- gnome-do-0.8.3.1.old/libdo/Makefile.in	2009-12-09 01:17:17.000000000 +0100
++++ gnome-do-0.8.3.1/libdo/Makefile.in	2010-10-29 00:17:34.000000000 +0200
+@@ -281,7 +281,6 @@
+ AM_CFLAGS = -DG_LOG_DOMAIN=\"libdo\"	\
+ 	    -DEGG_COMPILATION 		\
+ 	    -DGTK_DISABLE_DEPRECATED 	\
+-	    -DGDK_DISABLE_DEPRECATED 	\
+ 	    -DG_DISABLE_DEPRECATED	\
+ 	    $(LIBDO_CFLAGS)
+ 
diff --git a/gnome-do-0.8.3.1-mono-2.8.patch b/gnome-do-0.8.3.1-mono-2.8.patch
new file mode 100644
index 0000000..2e492a8
--- /dev/null
+++ b/gnome-do-0.8.3.1-mono-2.8.patch
@@ -0,0 +1,70 @@
+https://bugs.launchpad.net/do/+bug/634556
+https://bugs.launchpad.net/do/+bug/634550
+
+Patches by Andrew Jorgensen
+
+--- Do.Interface.Linux.Docky/src/Docky.Interface/TextRenderContext.cs	2009-06-28 18:19:29.000000000 -0600
++++ Do.Interface.Linux.Docky/src/Docky.Interface/TextRenderContext.cs	2010-09-01 13:11:53.000000000 -0600
+@@ -45,12 +45,12 @@
+ 		
+ 		public TextRenderContext (Cairo.Context cr, string text, int width)
+ 		{
+-			Context = cr;
+-			Text = text;
+-			Alignment = Alignment.Left;
+-			MaximumWidth = width;
+-			WrapMode = WrapMode.WordChar;
+-			EllipsizeMode = EllipsizeMode.End;
++			this.Context = cr;
++			this.Text = text;
++			this.Alignment = Alignment.Left;
++			this.MaximumWidth = width;
++			this.WrapMode = WrapMode.WordChar;
++			this.EllipsizeMode = EllipsizeMode.End;
+ 		}
+ 	}
+ }
+--- Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs	2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs	2010-09-01 13:58:26.000000000 -0600
+@@ -57,7 +57,7 @@
+             Stetic.Gui.Initialize(this);
+             // Widget Do.UI.ColorConfigurationWidget
+             Stetic.BinContainer.Attach(this);
+-            this.Name = "Do.UI.ColorConfigurationWidget";
++            base.Name = "Do.UI.ColorConfigurationWidget";
+             // Container child Do.UI.ColorConfigurationWidget.Gtk.Container+ContainerChild
+             this.vbox2 = new Gtk.VBox();
+             this.vbox2.Name = "vbox2";
+--- Do/gtk-gui/Do.UI.GeneralPreferencesWidget.cs	2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.GeneralPreferencesWidget.cs	2010-09-01 13:58:43.000000000 -0600
+@@ -33,7 +33,7 @@
+             Stetic.Gui.Initialize(this);
+             // Widget Do.UI.GeneralPreferencesWidget
+             Stetic.BinContainer.Attach(this);
+-            this.Name = "Do.UI.GeneralPreferencesWidget";
++            base.Name = "Do.UI.GeneralPreferencesWidget";
+             // Container child Do.UI.GeneralPreferencesWidget.Gtk.Container+ContainerChild
+             this.alignment4 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
+             this.alignment4.Name = "alignment4";
+--- Do/gtk-gui/Do.UI.KeybindingsPreferencesWidget.cs	2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.KeybindingsPreferencesWidget.cs	2010-09-01 13:59:08.000000000 -0600
+@@ -27,7 +27,7 @@
+             Stetic.Gui.Initialize(this);
+             // Widget Do.UI.KeybindingsPreferencesWidget
+             Stetic.BinContainer.Attach(this);
+-            this.Name = "Do.UI.KeybindingsPreferencesWidget";
++            base.Name = "Do.UI.KeybindingsPreferencesWidget";
+             // Container child Do.UI.KeybindingsPreferencesWidget.Gtk.Container+ContainerChild
+             this.vbox2 = new Gtk.VBox();
+             this.vbox2.Name = "vbox2";
+--- Do/gtk-gui/Do.UI.ManagePluginsPreferencesWidget.cs	2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.ManagePluginsPreferencesWidget.cs	2010-09-01 13:59:19.000000000 -0600
+@@ -43,7 +43,7 @@
+             Stetic.Gui.Initialize(this);
+             // Widget Do.UI.ManagePluginsPreferencesWidget
+             Stetic.BinContainer.Attach(this);
+-            this.Name = "Do.UI.ManagePluginsPreferencesWidget";
++            base.Name = "Do.UI.ManagePluginsPreferencesWidget";
+             // Container child Do.UI.ManagePluginsPreferencesWidget.Gtk.Container+ContainerChild
+             this.vbox3 = new Gtk.VBox();
+             this.vbox3.Name = "vbox3";
diff --git a/gnome-do.spec b/gnome-do.spec
index f35b5f0..15d6d82 100644
--- a/gnome-do.spec
+++ b/gnome-do.spec
@@ -3,7 +3,7 @@
 
 Name:			gnome-do
 Version:		0.8.3.1
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -14,6 +14,10 @@ Source0:		http://launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.t
 
 # The "Icon Magnification" was removed from "Docky" due to a potential violation of US Patent 7434177
 Patch0:			gnome-do-0.8.2-nozoom.patch
+# https://bugs.launchpad.net/do/+bug/634556
+# https://bugs.launchpad.net/do/+bug/634550
+Patch1:			gnome-do-0.8.3.1-mono-2.8.patch
+Patch2:			gnome-do-0.8.3.1-gdk-build-fix.patch
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,6 +65,8 @@ Development files for GNOME Do
 %prep
 %setup -q
 %patch0 -p1 -b .nozoom
+%patch1 -p0 -b .mono28-fix
+%patch2 -p1 -b .gdkbuild-fix
 
 %build
 %configure
@@ -137,6 +143,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Oct 29 2010 Christian Krause <chkr at fedoraproject.org> - 0.8.3.1-3
+- Rebuilt against Mono 2.8
+- Add patch for compiling against Mono 2.8 
+- Add patch to not set DGDK_DISABLE_DEPRECATED
+
 * Fri Jun 04 2010 Christian Krause <chkr at fedoraproject.org> - 0.8.3.1-2
 - Rebuilt against new mono-addins

More information about the scm-commits mailing list