Date: Wednesday, May 15, 2013 @ 07:40:39 Author: bgyorgy Revision: 90871
upgpkg: docky 2.2.0-1 Update to version 2.2.0 Modified: docky/trunk/PKGBUILD Deleted: docky/trunk/disable-network-check.patch docky/trunk/systemd-support.patch -----------------------------+ PKGBUILD | 18 +--- disable-network-check.patch | 26 ------- systemd-support.patch | 155 ------------------------------------------ 3 files changed, 4 insertions(+), 195 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-05-15 05:23:23 UTC (rev 90870) +++ PKGBUILD 2013-05-15 05:40:39 UTC (rev 90871) @@ -5,8 +5,8 @@ # Contributor: Alessio 'Bl@ster' Biancalana <[email protected]> pkgname=docky -pkgver=2.1.4 -pkgrel=2 +pkgver=2.2.0 +pkgrel=1 pkgdesc="Full fledged dock application that makes opening common applications and managing windows easier and quicker" url="http://wiki.go-docky.com/"; arch=('any') @@ -14,22 +14,12 @@ depends=('gconf-sharp' 'libgnome-desktop-sharp' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp' 'rsvg2-sharp' 'wnck-sharp' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool' 'libgnome-sharp' 'gio-sharp') install=$pkgname.install -source=("http://launchpad.net/$pkgname/2.1/$pkgver/+download/$pkgname-$pkgver.tar.xz"; - disable-network-check.patch - systemd-support.patch) -md5sums=('770fe2872dc64a0211fd9666422e6627' - '2384c070a8a90249fc22247f5f43c455' - '462467fd87d895c150b82ab17d1d3341') +source=("http://launchpad.net/$pkgname/2.2/$pkgver/+download/$pkgname-$pkgver.tar.xz";) +md5sums=('519fa5920a590a680afd8a87d0db9db5') build() { cd "$srcdir/$pkgname-$pkgver" - # https://bugs.launchpad.net/docky/+bug/734490 - patch -Np0 -i "$srcdir/disable-network-check.patch" - - # Add systemd support - patch -Np1 -i "$srcdir/systemd-support.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --disable-schemas-install \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas Deleted: disable-network-check.patch =================================================================== --- disable-network-check.patch 2013-05-15 05:23:23 UTC (rev 90870) +++ disable-network-check.patch 2013-05-15 05:40:39 UTC (rev 90871) @@ -1,26 +0,0 @@ -=== modified file 'Docky.Services/Docky.Services/SystemService.cs' ---- Docky.Services/Docky.Services/SystemService.cs 2010-11-22 07:42:41 +0000 -+++ Docky.Services/Docky.Services/SystemService.cs 2012-04-16 01:55:03 +0000 -@@ -118,10 +118,10 @@ - if (Bus.System.NameHasOwner (NetworkManagerName)) { - try { - network = Bus.System.GetObject<INetworkManager> (NetworkManagerName, new ObjectPath (NetworkManagerPath)); -- NetworkConnected = State == NetworkState.Connected; -+ //NetworkConnected = State == NetworkState.Connected; - network.StateChanged += OnConnectionStatusChanged; - nmTimer = GLib.Timeout.Add (1 * 60 * 1000, () => { -- NetworkConnected = State == NetworkState.Connected; -+ //NetworkConnected = State == NetworkState.Connected; - return true; - }); - } catch (Exception e) { -@@ -153,7 +153,7 @@ - void OnConnectionStatusChanged (uint state) - { - NetworkState newState = (NetworkState) Enum.ToObject (typeof (NetworkState), state); -- NetworkConnected = newState == NetworkState.Connected; -+ //NetworkConnected = newState == NetworkState.Connected; - - if (ConnectionStatusChanged != null) { - Delegate [] handlers = ConnectionStatusChanged.GetInvocationList (); - Deleted: systemd-support.patch =================================================================== --- systemd-support.patch 2013-05-15 05:23:23 UTC (rev 90870) +++ systemd-support.patch 2013-05-15 05:40:39 UTC (rev 90871) @@ -1,155 +0,0 @@ -diff -Naur docky-2.1.4.orig/StandardPlugins/SessionManager/src/SessionActionsProvider.cs docky-2.1.4/StandardPlugins/SessionManager/src/SessionActionsProvider.cs ---- docky-2.1.4.orig/StandardPlugins/SessionManager/src/SessionActionsProvider.cs 2012-12-29 07:06:53.533296000 +0100 -+++ docky-2.1.4/StandardPlugins/SessionManager/src/SessionActionsProvider.cs 2012-12-29 08:47:56.495696980 +0100 -@@ -97,7 +97,7 @@ - restartItem = new SessionManagerActionItem ("system-restart", Catalog.GetString ("_Restart..."), () => { - SessionManagerActionItem.ShowConfirmationDialog (Catalog.GetString ("Restart"), - Catalog.GetString ("Are you sure you want to close all programs and restart the computer?"), -- "system-restart", -+ "system-shutdown", - () => system_manager.Restart ()); - }); - -diff -Naur docky-2.1.4.orig/StandardPlugins/SessionManager/src/SystemManager.cs docky-2.1.4/StandardPlugins/SessionManager/src/SystemManager.cs ---- docky-2.1.4.orig/StandardPlugins/SessionManager/src/SystemManager.cs 2012-12-29 07:06:53.533296000 +0100 -+++ docky-2.1.4/StandardPlugins/SessionManager/src/SystemManager.cs 2012-12-29 09:04:52.535669903 +0100 -@@ -41,6 +41,10 @@ - const string DeviceKitPowerPath = "/org/freedesktop/DeviceKit/Power"; - const string DeviceKitPowerIface = "org.freedesktop.DeviceKit.Power"; - -+ const string SystemdName = "org.freedesktop.login1"; -+ const string SystemdPath = "/org/freedesktop/login1"; -+ const string SystemdIface = "org.freedesktop.login1.Manager"; -+ - const string ConsoleKitName = "org.freedesktop.ConsoleKit"; - const string ConsoleKitPath = "/org/freedesktop/ConsoleKit/Manager"; - const string ConsoleKitIface = "org.freedesktop.ConsoleKit.Manager"; -@@ -79,6 +83,16 @@ - event Action Changed; - } - -+ [Interface (SystemdIface)] -+ interface ISystemd -+ { -+ string CanPowerOff (); -+ string CanReboot (); -+ -+ void PowerOff (bool interactive); -+ void Reboot (bool interactive); -+ } -+ - [Interface (ConsoleKitIface)] - interface IConsoleKit - { -@@ -100,6 +114,7 @@ - - IDeviceKitPower devicekit; - IUPower upower; -+ ISystemd systemd; - IConsoleKit consolekit; - - private static SystemManager instance; -@@ -117,7 +132,7 @@ - SystemBus = Bus.System.GetObject<IBus> ("org.freedesktop.DBus", new ObjectPath ("/org/freedesktop/DBus")); - - SystemBus.NameOwnerChanged += delegate(string name, string old_owner, string new_owner) { -- if (name != UPowerName && name != DeviceKitPowerName && name != ConsoleKitName) -+ if (name != UPowerName && name != DeviceKitPowerName && name != SystemdName && name != ConsoleKitName) - return; - - Log<SystemManager>.Debug ("DBus services changed, reconnecting now"); -@@ -128,6 +143,9 @@ - if (devicekit != null) - devicekit = null; - -+ if (systemd != null) -+ systemd = null; -+ - if (consolekit != null) - consolekit = null; - -@@ -161,7 +179,10 @@ - Log<SystemManager>.Debug ("Using DeviceKit.Power dbus service"); - } - -- if (consolekit == null && Bus.System.NameHasOwner (ConsoleKitName)) { -+ if (systemd == null && Bus.System.NameHasOwner (SystemdName)) { -+ systemd = Bus.System.GetObject<ISystemd> (SystemdName, new ObjectPath (SystemdPath)); -+ Log<SystemManager>.Debug ("Using login1.Manager dbus service"); -+ } else if (consolekit == null && Bus.System.NameHasOwner (ConsoleKitName)) { - consolekit = Bus.System.GetObject<IConsoleKit> (ConsoleKitName, new ObjectPath (ConsoleKitPath)); - Log<SystemManager>.Debug ("Using ConsoleKit.Manager dbus service"); - } -@@ -261,39 +282,49 @@ - - public bool CanRestart () - { -- if (consolekit != null) -+ if (systemd != null) -+ return systemd.CanReboot () == "yes"; -+ else if (consolekit != null) - return consolekit.CanRestart (); - -- Log<SystemManager>.Debug ("No consolekit bus available"); -+ Log<SystemManager>.Debug ("No session bus available"); - return false; - } - - public void Restart () - { -- if (consolekit != null) { -+ if (systemd != null) { -+ if (systemd.CanReboot () == "yes") -+ systemd.Reboot (true); -+ } else if (consolekit != null) { - if (consolekit.CanRestart ()) - consolekit.Restart (); - } else { -- Log<SystemManager>.Debug ("No consolekit bus available"); -+ Log<SystemManager>.Debug ("No session bus available"); - } - } - - public bool CanStop () - { -- if (consolekit != null) -+ if (systemd != null) -+ return systemd.CanPowerOff () == "yes"; -+ else if (consolekit != null) - return consolekit.CanStop (); - -- Log<SystemManager>.Debug ("No consolekit bus available"); -+ Log<SystemManager>.Debug ("No session bus available"); - return false; - } - - public void Stop () - { -- if (consolekit != null) { -+ if (systemd != null) { -+ if (systemd.CanPowerOff () == "yes") -+ systemd.PowerOff (true); -+ } else if (consolekit != null) { - if (consolekit.CanStop ()) - consolekit.Stop (); - } else { -- Log<SystemManager>.Debug ("No consolekit bus available"); -+ Log<SystemManager>.Debug ("No session bus available"); - } - } - -@@ -309,12 +340,12 @@ - - public bool CanLogOut () - { -- return DockServices.System.IsValidExecutable ("gnome-session-save"); -+ return DockServices.System.IsValidExecutable ("gnome-session-quit"); - } - - public void LogOut () - { -- DockServices.System.Execute ("gnome-session-save --logout"); -+ DockServices.System.Execute ("gnome-session-quit --logout --no-prompt"); - } - - public void Dispose ()
