[docky] updating patches and adding dbus-sharp dep

lzap lzap at fedoraproject.org
Fri Jul 27 10:56:04 UTC 2012


commit 93e2899ef4b378c053e29e9d0c380c12197ab3b8
Author: Lukas Zapletal <lzap+git at redhat.com>
Date:   Mon Apr 16 12:54:02 2012 +0200

    updating patches and adding dbus-sharp dep

 docky-nozoom.patch           |   29 ++++++++++-------------------
 docky-startscript-path.patch |   16 +++++++---------
 docky.spec                   |    8 ++++----
 3 files changed, 21 insertions(+), 32 deletions(-)
---
diff --git a/docky-nozoom.patch b/docky-nozoom.patch
index b39619a..183059f 100644
--- a/docky-nozoom.patch
+++ b/docky-nozoom.patch
@@ -1,30 +1,21 @@
-diff -uNr docky-2.0.7-orig/Docky/Docky/Interface/DockPreferences.cs docky-2.0.7/Docky/Docky/Interface/DockPreferences.cs
---- docky-2.0.7-orig/Docky/Docky/Interface/DockPreferences.cs	2010-08-24 20:00:47.446278995 +0200
-+++ docky-2.0.7/Docky/Docky/Interface/DockPreferences.cs	2010-11-11 08:32:33.885838852 +0100
-@@ -204,9 +204,7 @@
+diff -rupN docky-2.1.4.orig/Docky/Docky/Interface/DockPreferences.cs docky-2.1.4/Docky/Docky/Interface/DockPreferences.cs
+--- docky-2.1.4.orig/Docky/Docky/Interface/DockPreferences.cs	2012-04-03 17:15:28.359056371 +0200
++++ docky-2.1.4/Docky/Docky/Interface/DockPreferences.cs	2012-04-03 17:16:32.629057114 +0200
+@@ -202,9 +202,7 @@ namespace Docky.Interface
  		bool? zoom_enabled;
  		public bool ZoomEnabled {
  			get {
 -				if (!zoom_enabled.HasValue)
 -					zoom_enabled = GetOption<bool?> ("ZoomEnabled", true);
 -				return zoom_enabled.Value; 
-+				return false;
++        return false;
  			}
  			set {
  				if (zoom_enabled == value)
-@@ -347,6 +345,8 @@
- 			zoom_checkbutton.Toggled += ZoomCheckbuttonToggled;
- 			autohide_box.Changed += AutohideBoxChanged;
- 			fade_on_hide_check.Toggled += FadeOnHideToggled;
-+
-+			zoom_checkbutton.Active = false;
- 			
- 			DefaultProvider.ItemsChanged += HandleDefaultProviderItemsChanged;
- 			
-diff -uNr docky-2.0.7-orig/Docky/Docky/Interface/DockWindow.cs docky-2.0.7/Docky/Docky/Interface/DockWindow.cs
---- docky-2.0.7-orig/Docky/Docky/Interface/DockWindow.cs	2010-10-01 09:00:03.733783001 +0200
-+++ docky-2.0.7/Docky/Docky/Interface/DockWindow.cs	2010-11-11 08:15:05.463742691 +0100
-@@ -1759,28 +1759,8 @@
+diff -rupN docky-2.1.4.orig/Docky/Docky/Interface/DockWindow.cs docky-2.1.4/Docky/Docky/Interface/DockWindow.cs
+--- docky-2.1.4.orig/Docky/Docky/Interface/DockWindow.cs	2012-04-03 17:15:28.359056371 +0200
++++ docky-2.1.4/Docky/Docky/Interface/DockWindow.cs	2012-04-03 17:16:10.890718631 +0200
+@@ -1858,28 +1858,8 @@ namespace Docky.Interface
  				else
  					centerPosition += offset;
  				
@@ -52,4 +43,4 @@ diff -uNr docky-2.0.7-orig/Docky/Docky/Interface/DockWindow.cs docky-2.0.7/Docky
 -				}
  				
  				// now we undo our transforms to the point
- 				if (VerticalDock) {
+				if (Preferences.IsVertical) {
diff --git a/docky-startscript-path.patch b/docky-startscript-path.patch
index 0624552..d438fbb 100644
--- a/docky-startscript-path.patch
+++ b/docky-startscript-path.patch
@@ -1,12 +1,10 @@
-diff -uNr docky-2.0.7-orig/Docky/docky.in docky-2.0.7/Docky/docky.in
---- docky-2.0.7-orig/Docky/docky.in	2010-08-24 20:45:24.696278997 +0200
-+++ docky-2.0.7/Docky/docky.in	2010-11-10 22:43:36.274427881 +0100
-@@ -1,14 +1,4 @@
- #!/bin/sh
+diff -rupN docky-2.1.4.orig/Docky/docky.in docky-2.1.4/Docky/docky.in
+--- docky-2.1.4.orig/Docky/docky.in	2012-04-03 17:15:28.359056371 +0200
++++ docky-2.1.4/Docky/docky.in	2012-04-03 17:53:37.908012201 +0200
+@@ -3,12 +3,5 @@
+ SCRIPT_PATH=`dirname $0`
+ SCRIPT_PATH=`cd $SCRIPT_PATH; pwd`
  
--SCRIPT_PATH=`dirname $0`
--SCRIPT_PATH=`cd $SCRIPT_PATH; pwd`
--
 -if [ "x$SCRIPT_PATH" = "x at abs_srcdir@/bin/Debug" ] ||
 -   [ "x$SCRIPT_PATH" = "x at abs_srcdir@" ] ; then
 -    echo "*** Running uninstalled ***"
@@ -16,4 +14,4 @@ diff -uNr docky-2.0.7-orig/Docky/docky.in docky-2.0.7/Docky/docky.in
 -fi
 -
 +DOCKY_EXE="@expanded_libdir@/@PACKAGE@/Docky.exe"
- exec mono "$DOCKY_EXE" "$@"
+ exec mono @MONO_DEBUG_ARGS@ "$DOCKY_EXE" @DOCKY_DEBUG_ARGS@ "$@"
diff --git a/docky.spec b/docky.spec
index 7b8918f..6055762 100644
--- a/docky.spec
+++ b/docky.spec
@@ -17,18 +17,18 @@ Patch1:         %{name}-startscript-path.patch
 
 Requires:       gnome-sharp gtk-sharp2 gnome-desktop-sharp
 Requires:       gnome-keyring-sharp gtk-sharp2-gapi mono-addins
-Requires:       mono-core ndesk-dbus notify-sharp gtk2
+Requires:       mono-core ndesk-dbus notify-sharp gtk2 GConf2
 Requires:       hicolor-icon-theme
 # Docky does not use gio-sharp library yet (it has its own for now)
-#Requires:       gio-sharp
+Requires:       gio-sharp dbus-sharp
 
 # sharp deps
 BuildRequires:  gnome-sharp-devel gtk-sharp2-devel gnome-desktop-sharp-devel
 BuildRequires:  gnome-keyring-sharp-devel gtk-sharp2-gapi mono-addins-devel
 BuildRequires:  mono-devel ndesk-dbus-devel ndesk-dbus-glib-devel
-BuildRequires:  notify-sharp-devel
+BuildRequires:  notify-sharp-devel GConf2-devel
 # Docky does not use gio-sharp library yet (it has its own for now)
-#BuildRequires:  gio-sharp-devel
+BuildRequires:  gio-sharp-devel dbus-sharp-devel
 # native deps
 BuildRequires:  python2-devel
 BuildRequires:  glib2-devel gtk2-devel


More information about the scm-commits mailing list