[arch-commits] Commit in docky/repos/community-any (9 files)

Balló György bgyorgy at archlinux.org
Thu Sep 3 14:54:27 UTC 2015


    Date: Thursday, September 3, 2015 @ 16:54:27
  Author: bgyorgy
Revision: 139136

archrelease: copy trunk to community-any

Added:
  docky/repos/community-any/PKGBUILD
    (from rev 139135, docky/trunk/PKGBUILD)
  docky/repos/community-any/docky.install
    (from rev 139135, docky/trunk/docky.install)
Deleted:
  docky/repos/community-any/PKGBUILD
  docky/repos/community-any/docky.install
  docky/repos/community-any/drop-gnome-desktop-sharp.patch
  docky/repos/community-any/drop-rsvg2-sharp.patch
  docky/repos/community-any/fix-build.patch
  docky/repos/community-any/systemd-support.patch
  docky/repos/community-any/use_dbussharp_2.patch

--------------------------------+
 PKGBUILD                       |   97 +++++------------
 docky.install                  |   46 ++++----
 drop-gnome-desktop-sharp.patch |  155 ---------------------------
 drop-rsvg2-sharp.patch         |  222 ---------------------------------------
 fix-build.patch                |   16 --
 systemd-support.patch          |   66 -----------
 use_dbussharp_2.patch          |   15 --
 7 files changed, 54 insertions(+), 563 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-03 14:54:22 UTC (rev 139135)
+++ PKGBUILD	2015-09-03 14:54:27 UTC (rev 139136)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: dieghen89 <dieghen89 at gmail.com>
-# Contributor: Alessio 'Bl at ster' Biancalana <dottorblaster at gmail.com>
-
-pkgname=docky
-pkgver=2.2.0
-pkgrel=4
-pkgdesc="Full fledged dock application that makes opening common applications and managing windows easier and quicker"
-url="http://wiki.go-docky.com/"
-arch=('any')
-license=('GPL')
-depends=('gconf-sharp' 'gkeyfile-sharp' 'gnome-keyring-sharp' 'librsvg' 'mono-addins' 'notify-sharp' 'wnck-sharp')
-makedepends=('intltool' 'gio-sharp')
-install=$pkgname.install
-source=("http://launchpad.net/$pkgname/2.2/$pkgver/+download/$pkgname-$pkgver.tar.xz"
-         use_dbussharp_2.patch
-         fix-build.patch
-         systemd-support.patch
-         drop-gnome-desktop-sharp.patch
-         drop-rsvg2-sharp.patch)
-md5sums=('519fa5920a590a680afd8a87d0db9db5'
-         '42553efbadb9dcf8c108ee9d8d568b2e'
-         'a78989892dfb660600c5f63a6df90f37'
-         'a9670aef62793386b058a26d78d25005'
-         'c19568dde9351e258e1d2e3ef2e7dddc'
-         '468fd1e7f7cffad8bc4f60c3bc711975')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Fix build
-  patch -Np1 -i ../fix-build.patch
-
-  # Add systemd support for suspend and hibernate
-  patch -Np0 -i ../systemd-support.patch
-
-  # Remove gnome-desktop-sharp dependency
-  patch -Np0 -i ../drop-gnome-desktop-sharp.patch
-
-  # Remove rsvg2-sharp dependency
-  patch -Np0 -i ../drop-rsvg2-sharp.patch
-
-  # dbus-sharp 2.0
-  patch -Np1 -i ../use_dbussharp_2.patch
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -fi
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --disable-schemas-install \
-              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # Remove NetworkManager plugin, because it doesn't work
-  rm "$pkgdir/usr/lib/docky/plugins/NetworkManager.dll"
-}

Copied: docky/repos/community-any/PKGBUILD (from rev 139135, docky/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-09-03 14:54:27 UTC (rev 139136)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: dieghen89 <dieghen89 at gmail.com>
+# Contributor: Alessio 'Bl at ster' Biancalana <dottorblaster at gmail.com>
+
+pkgname=docky
+pkgver=2.2.1.1
+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')
+license=('GPL')
+depends=('gconf-sharp' 'gkeyfile-sharp' 'gnome-keyring-sharp' 'librsvg' 'libwnck' 'mono-addins' 'notify-sharp')
+makedepends=('intltool' 'gio-sharp')
+install=$pkgname.install
+source=("http://launchpad.net/$pkgname/2.2/$pkgver/+download/$pkgname-$pkgver.tar.xz")
+md5sums=('adc261e5fe64d0be6edaf635cd9ce09e')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: docky.install
===================================================================
--- docky.install	2015-09-03 14:54:22 UTC (rev 139135)
+++ docky.install	2015-09-03 14:54:27 UTC (rev 139136)
@@ -1,23 +0,0 @@
-pkgname=docky
-
-post_install() {
-  gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  xdg-icon-resource forceupdate
-}
-

Copied: docky/repos/community-any/docky.install (from rev 139135, docky/trunk/docky.install)
===================================================================
--- docky.install	                        (rev 0)
+++ docky.install	2015-09-03 14:54:27 UTC (rev 139136)
@@ -0,0 +1,23 @@
+pkgname=docky
+
+post_install() {
+  gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  xdg-icon-resource forceupdate
+}
+

Deleted: drop-gnome-desktop-sharp.patch
===================================================================
--- drop-gnome-desktop-sharp.patch	2015-09-03 14:54:22 UTC (rev 139135)
+++ drop-gnome-desktop-sharp.patch	2015-09-03 14:54:27 UTC (rev 139136)
@@ -1,155 +0,0 @@
-=== modified file 'Docky/Docky/ConfigurationWindow.cs'
---- Docky/Docky/ConfigurationWindow.cs	2011-03-14 17:56:02 +0000
-+++ Docky/Docky/ConfigurationWindow.cs	2013-05-12 20:15:37 +0000
-@@ -2,6 +2,7 @@
- //  Copyright (C) 2009 Jason Smith, Robert Dyer
- //  Copyright (C) 2010 Chris Szikszoy
- //  Copyright (C) 2011 Robert Dyer
-+//  Copyright (C) 2013 Rico Tzschichholz
- // 
- //  This program is free software: you can redistribute it and/or modify
- //  it under the terms of the GNU General Public License as published by
-@@ -27,8 +28,8 @@
- using Cairo;
- using Gdk;
- using GLib;
--using Gnome;
- using Gtk;
-+using KeyFile;
- using Mono.Unix;
- 
- using Docky.Interface;
-@@ -508,34 +509,34 @@
- 		}
- 
- 		const string AutoStartKey = "Hidden";
--		DesktopItem autostart_item;
-+		const string DesktopGroup = "Desktop Entry";
-+		GKeyFile autostart_keyfile;
- 		bool AutoStart 
- 		{
- 			get {
--				if (autostart_item == null) {
-+				if (autostart_keyfile == null) {
- 					
- 					GLib.File autostart_file = DockServices.Paths.AutoStartFile;
- 					
- 					try {
--						autostart_item = DesktopItem.NewFromFile (autostart_file.Path, DesktopItemLoadFlags.NoTranslations);
--						if (autostart_item.AttrExists (AutoStartKey))
--							return !String.Equals (autostart_item.GetString (AutoStartKey), "true", StringComparison.OrdinalIgnoreCase);
-+						autostart_keyfile = new GKeyFile (autostart_file.Path, KeyFile.Flags.None);
-+						if (autostart_keyfile.HasKey (DesktopGroup, AutoStartKey))
-+							return !String.Equals (autostart_keyfile.GetString (DesktopGroup, AutoStartKey), "true", StringComparison.OrdinalIgnoreCase);
- 						
- 					} catch (GLib.GException loadException) {
--						Log<ConfigurationWindow>.Info ("Unable to load existing autostart file: {0}", loadException.Message);					
-+						Log<ConfigurationWindow>.Info ("Unable to load existing autostart file: {0}", loadException.Message);
- 						Log<SystemService>.Error ("Could not open autostart file {0}", autostart_file.Path);
- 						
- 						GLib.File desktop_file = DesktopFile;
- 						
- 						if (desktop_file.Exists) {
- 							Log<ConfigurationWindow>.Info ("Writing new autostart file to {0}", autostart_file.Path);
--							autostart_item = DesktopItem.NewFromFile (desktop_file.Path, DesktopItemLoadFlags.NoTranslations);
-+							autostart_keyfile = new GKeyFile (desktop_file.Path, KeyFile.Flags.None);
- 							try {
- 								if (!autostart_file.Parent.Exists)
--									autostart_file.Parent.MakeDirectoryWithParents (null);						
-+									autostart_file.Parent.MakeDirectoryWithParents (null);
- 						
--								autostart_item.Save (autostart_file.StringUri (), true);
--								autostart_item.Location = autostart_file.StringUri ();
-+								autostart_keyfile.Save (autostart_file.Path);
- 								return true;
- 								
- 							} catch (Exception e) {
-@@ -545,16 +546,20 @@
- 						return false;
- 					}
- 				}
--				if (autostart_item.AttrExists (AutoStartKey))
--					return !String.Equals (autostart_item.GetString (AutoStartKey), "true", StringComparison.OrdinalIgnoreCase);
-+				if (autostart_keyfile.HasKey (DesktopGroup, AutoStartKey))
-+					return !String.Equals (autostart_keyfile.GetString (DesktopGroup, AutoStartKey), "true", StringComparison.OrdinalIgnoreCase);
- 				else
- 					return true;
- 			}
- 			set {
--				if (autostart_item != null) {
--					autostart_item.SetBoolean (AutoStartKey, !value);
-+				if (autostart_keyfile != null) {
-+					autostart_keyfile.SetBoolean (DesktopGroup, AutoStartKey, !value);
- 					try {
--						autostart_item.Save (null, true);
-+						GLib.File autostart_file = DockServices.Paths.AutoStartFile;
-+						if (!autostart_file.Parent.Exists)
-+							autostart_file.Parent.MakeDirectoryWithParents (null);
-+
-+						autostart_keyfile.Save (autostart_file.Path);
- 					} catch (Exception e) {
- 						Log<SystemService>.Error ("Failed to update autostart file: {0}", e.Message);
- 					}
-
-=== modified file 'Docky/Makefile.am'
---- Docky/Makefile.am	2010-12-01 21:43:00 +0000
-+++ Docky/Makefile.am	2013-05-12 20:15:37 +0000
-@@ -69,7 +69,7 @@
- 	$(GIO_SHARP_LIBS) \
- 	$(GLIB_SHARP_20_LIBS) \
- 	$(GTK_SHARP_20_LIBS) \
--	$(GNOME_DESKTOP_SHARP_20_LIBS) \
-+	$(GKEYFILE_SHARP_LIBS) \
- 	$(WNCK_SHARP_10_LIBS) \
- 	$(LIBRSVG_SHARP_LIBS) \
- 	$(NOTIFY_SHARP_LIBS) \
-
-=== modified file 'Docky/gtk-gui/gui.stetic'
---- Docky/gtk-gui/gui.stetic	2011-12-22 15:47:35 +0000
-+++ Docky/gtk-gui/gui.stetic	2013-05-12 20:15:37 +0000
-@@ -5,12 +5,8 @@
-     <target-gtk-version>2.12</target-gtk-version>
-   </configuration>
-   <import>
-+    <widget-library name="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a" />
-     <widget-library name="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--    <widget-library name="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--    <widget-library name="../../Docky.Services/bin/Debug/Docky.Services.dll" />
--    <widget-library name="../../Docky.Items/bin/Debug/Docky.Items.dll" />
--    <widget-library name="../../Docky.DBus/bin/Debug/Docky.DBus.dll" />
--    <widget-library name="../../Docky.Widgets/bin/Debug/Docky.Widgets.dll" />
-     <widget-library name="../bin/Debug/Docky.exe" internal="true" />
-   </import>
-   <widget class="Gtk.Bin" id="Docky.Interface.DockPreferences" design-size="500 356">
-@@ -309,7 +305,7 @@
-       </widget>
-     </child>
-   </widget>
--  <widget class="Gtk.Window" id="Docky.ConfigurationWindow" design-size="380 390">
-+  <widget class="Gtk.Window" id="Docky.ConfigurationWindow" design-size="398 390">
-     <property name="MemberName" />
-     <property name="Title" translatable="yes">Docky Settings</property>
-     <property name="Icon">stock:gtk-preferences Menu</property>
-
-=== modified file 'configure.ac'
---- configure.ac	2013-05-02 11:41:59 +0000
-+++ configure.ac	2013-05-12 20:15:37 +0000
-@@ -82,7 +82,7 @@
- done
- AC_SUBST([GIO_SHARP_ASSEMBLIES])
- 
--PKG_CHECK_MODULES([GNOME_DESKTOP_SHARP_20], [gnome-desktop-sharp-2.0])
-+PKG_CHECK_MODULES([GKEYFILE_SHARP], [gkeyfile-sharp])
- PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0])
- PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
- PKG_CHECK_MODULES([LIBRSVG_SHARP], [rsvg2-sharp-2.0])
-@@ -103,7 +103,7 @@
- AC_SUBST([GCONF_SHARP_20_LIBS])
- AC_SUBST([GLIB_SHARP_20_LIBS])
- AC_SUBST([GIO_SHARP_LIBS])
--AC_SUBST([GNOME_DESKTOP_SHARP_20_LIBS])
-+AC_SUBST([GKEYFILE_SHARP_LIBS])
- AC_SUBST([GNOME_KEYRING_SHARP_LIBS])
- AC_SUBST([GTK_SHARP_20_LIBS])
- AC_SUBST([LIBRSVG_SHARP_LIBS])
-

Deleted: drop-rsvg2-sharp.patch
===================================================================
--- drop-rsvg2-sharp.patch	2015-09-03 14:54:22 UTC (rev 139135)
+++ drop-rsvg2-sharp.patch	2015-09-03 14:54:27 UTC (rev 139136)
@@ -1,222 +0,0 @@
-=== modified file 'Docky.CairoHelper/Makefile.am'
---- Docky.CairoHelper/Makefile.am	2010-12-29 08:12:28 +0000
-+++ Docky.CairoHelper/Makefile.am	2013-05-13 19:33:09 +0000
-@@ -17,7 +17,6 @@
- 	System.Core \
- 	$(GLIB_SHARP_20_LIBS) \
- 	$(GTK_SHARP_20_LIBS) \
--	$(MONO_CAIRO_LIBS) \
--	$(LIBRSVG_SHARP_LIBS)
-+	$(MONO_CAIRO_LIBS)
- 
- MCS_FLAGS += -unsafe
-
-=== modified file 'Docky.Items/Makefile.am'
---- Docky.Items/Makefile.am	2011-01-02 12:42:36 +0000
-+++ Docky.Items/Makefile.am	2013-05-13 19:33:09 +0000
-@@ -60,8 +60,7 @@
- 	$(GTK_SHARP_20_LIBS) \
- 	$(GLIB_SHARP_20_LIBS) \
- 	$(GIO_SHARP_LIBS) \
--	$(LIBRSVG_SHARP_LIBS) \
- 	$(WNCK_SHARP_10_LIBS) \
- 	$(NOTIFY_SHARP_LIBS)
--	
-+
- MCS_FLAGS += -unsafe
-
-=== modified file 'Docky.Services/Docky.Services.dll.config'
---- Docky.Services/Docky.Services.dll.config	2011-06-11 06:14:27 +0000
-+++ Docky.Services/Docky.Services.dll.config	2013-05-13 19:49:06 +0000
-@@ -1,7 +1,8 @@
- <configuration>
- 	<dllmap dll="libgobject-2.0" target="libgobject-2.0.so.0"/>
- 	<dllmap dll="libgtk-x11-2.0" target="libgtk-x11-2.0.so.0"/>
--        <dllmap dll="libgdk-x11-2.0" target="libgdk-x11-2.0.so.0"/>
-+	<dllmap dll="libgdk-x11-2.0" target="libgdk-x11-2.0.so.0"/>
-+	<dllmap dll="libgdk_pixbuf-2.0" target="libgdk_pixbuf-2.0.so.0"/>
- 	<dllmap dll="libgio-2.0" target="libgio-2.0.so.0"/>
- 	<dllmap dll="libX11" target="libX11.so.6"/>
- </configuration>
-
-=== modified file 'Docky.Services/Docky.Services/Extensions/GdkPixbufExtension.cs'
---- Docky.Services/Docky.Services/Extensions/GdkPixbufExtension.cs	2010-11-11 23:33:22 +0000
-+++ Docky.Services/Docky.Services/Extensions/GdkPixbufExtension.cs	2013-05-13 19:33:09 +0000
-@@ -129,5 +129,10 @@
- 			
- 			return tmp;
- 		}
-+
-+		public static Pixbuf FromFileAtSize (string filename, int width, int height)
-+		{
-+			return NativeInterop.GdkPixbufNewFromFileAtSize (filename, width, height);
-+		}
- 	}
- }
-
-=== modified file 'Docky.Services/Docky.Services/NativeInterop.cs'
---- Docky.Services/Docky.Services/NativeInterop.cs	2011-06-11 06:14:27 +0000
-+++ Docky.Services/Docky.Services/NativeInterop.cs	2013-05-13 19:33:09 +0000
-@@ -54,6 +54,9 @@
- 		[DllImport("libgtk-x11-2.0", CallingConvention = CallingConvention.Cdecl)]
- 		private static extern IntPtr gtk_icon_theme_lookup_by_gicon (IntPtr icon_theme, IntPtr icon, int size, int flags);
- 
-+		[DllImport("libgdk_pixbuf-2.0")]
-+		private static extern IntPtr gdk_pixbuf_new_from_file_at_size (string filename, int width, int height, out IntPtr error);
-+
- 		#region Workaround for GLib.FileInfo leaks...
- 		
- 		// some attributes must be looked up as bytestrings, not strings
-@@ -108,6 +111,7 @@
- 		const string GIO_NOT_FOUND = "Could not find gio-2.0, please report immediately.";
- 		const string GOBJECT_NOT_FOUND = "Could not find gobject-2.0, please report immediately.";
- 		const string GTK_NOT_FOUND = "Could not find gtk-2.0, please report immediately.";
-+		const string GDK_PIXBUF_NOT_FOUND = "Could not find gdk_pixbuf-2.0, please report immediately.";
- 		
- 		public static string StrUri (File file)
- 		{
-@@ -292,6 +296,19 @@
- 			"Failed to query icon {0}");
- 		}
- 		
-+		public static Gdk.Pixbuf GdkPixbufNewFromFileAtSize (string filename, int width, int height)
-+		{
-+			return NativeHelper<Gdk.Pixbuf> (() =>
-+			{
-+				IntPtr error = IntPtr.Zero;
-+				IntPtr pixbuf = gdk_pixbuf_new_from_file_at_size (filename, width, height, out error);
-+				if (error != IntPtr.Zero)
-+					throw new GLib.GException (error);
-+				return new Gdk.Pixbuf (pixbuf);
-+			}, GDK_PIXBUF_NOT_FOUND,
-+			"Failed to load pixbuf from file {0}");
-+		}
-+
- 		public static void GObjectUnref (IntPtr objectHandle)
- 		{
- 			NativeHelper (() =>
-
-=== modified file 'Docky.Services/Makefile.am'
---- Docky.Services/Makefile.am	2010-10-09 12:54:14 +0000
-+++ Docky.Services/Makefile.am	2013-05-13 19:33:09 +0000
-@@ -52,7 +52,7 @@
- 
- PROJECT_REFERENCES= \
- 	Docky.CairoHelper
--        
-+
- REFERENCES =  \
- 	System \
- 	System.Core \
-@@ -66,8 +66,7 @@
- 	$(GTK_SHARP_20_LIBS) \
- 	$(GNOME_KEYRING_SHARP_LIBS) \
- 	$(NOTIFY_SHARP_LIBS) \
--	$(WNCK_SHARP_10_LIBS) \
--	$(LIBRSVG_SHARP_LIBS)
-+	$(WNCK_SHARP_10_LIBS)
- 
- EXTRA_DIST += Docky.Services.dll.config
- 
-
-=== modified file 'Docky/Makefile.am'
---- Docky/Makefile.am	2013-05-12 20:15:37 +0000
-+++ Docky/Makefile.am	2013-05-13 19:33:09 +0000
-@@ -71,7 +71,6 @@
- 	$(GTK_SHARP_20_LIBS) \
- 	$(GKEYFILE_SHARP_LIBS) \
- 	$(WNCK_SHARP_10_LIBS) \
--	$(LIBRSVG_SHARP_LIBS) \
- 	$(NOTIFY_SHARP_LIBS) \
- 	$(DBUS_SHARP_10_LIBS) \
- 	$(DBUS_SHARP_GLIB_10_LIBS) \
-
-=== modified file 'StandardPlugins/Clock/Makefile.am'
---- StandardPlugins/Clock/Makefile.am	2010-02-22 23:14:53 +0000
-+++ StandardPlugins/Clock/Makefile.am	2013-05-13 19:33:09 +0000
-@@ -26,5 +26,4 @@
- 	Mono.Posix \
- 	$(GIO_SHARP_LIBS) \
- 	$(MONO_CAIRO_LIBS) \
--	$(LIBRSVG_SHARP_LIBS) \
- 	$(GTK_SHARP_20_LIBS)
-
-=== modified file 'StandardPlugins/Clock/src/ClockDockItem.cs'
---- StandardPlugins/Clock/src/ClockDockItem.cs	2011-03-13 16:47:29 +0000
-+++ StandardPlugins/Clock/src/ClockDockItem.cs	2013-05-13 19:33:09 +0000
-@@ -174,7 +174,7 @@
- 			if (!File.Exists (file))
- 				return;
- 			
--			using (Gdk.Pixbuf pbuf = Rsvg.Tool.PixbufFromFileAtSize (file, size, size)) {
-+			using (Gdk.Pixbuf pbuf = GdkPixbufExtension.FromFileAtSize (file, size, size)) {
- 				Gdk.CairoHelper.SetSourcePixbuf (cr, pbuf, 0, 0);
- 				cr.Paint ();
- 			}
-
-=== modified file 'StandardPlugins/Desktop/Makefile.am'
---- StandardPlugins/Desktop/Makefile.am	2010-12-29 08:44:38 +0000
-+++ StandardPlugins/Desktop/Makefile.am	2013-05-13 19:33:09 +0000
-@@ -33,5 +33,4 @@
- 	$(GTK_SHARP_20_LIBS) \
- 	$(GLIB_SHARP_20_LIBS) \
- 	$(GIO_SHARP_LIBS) \
--	$(LIBRSVG_SHARP_LIBS) \
- 	$(WNCK_SHARP_10_LIBS)
-
-=== modified file 'StandardPlugins/NetworkMonitor/Makefile.am'
---- StandardPlugins/NetworkMonitor/Makefile.am	2011-02-24 11:16:13 +0000
-+++ StandardPlugins/NetworkMonitor/Makefile.am	2013-05-13 19:33:09 +0000
-@@ -24,5 +24,4 @@
- 	Mono.Posix \
- 	$(GIO_SHARP_LIBS) \
- 	$(MONO_CAIRO_LIBS) \
--	$(LIBRSVG_SHARP_LIBS) \
- 	$(GTK_SHARP_20_LIBS)
-
-=== modified file 'StandardPlugins/WorkspaceSwitcher/Makefile.am'
---- StandardPlugins/WorkspaceSwitcher/Makefile.am	2010-08-06 08:06:53 +0000
-+++ StandardPlugins/WorkspaceSwitcher/Makefile.am	2013-05-13 19:33:09 +0000
-@@ -25,5 +25,4 @@
- 	$(GTK_SHARP_20_LIBS) \
- 	$(GLIB_SHARP_20_LIBS) \
- 	$(GIO_SHARP_LIBS) \
--	$(LIBRSVG_SHARP_LIBS) \
- 	$(WNCK_SHARP_10_LIBS)
-
-=== modified file 'configure.ac'
---- configure.ac	2013-05-12 20:15:37 +0000
-+++ configure.ac	2013-05-13 19:33:09 +0000
-@@ -64,6 +64,7 @@
- GTK_REQUIRED_VERSION=2.14.3
- GLIB_REQUIRED_VERSION=2.22
- GIO_SHARP_REQUIRED_VERSION=2.22.2
-+GDK_PIXBUF_REQUIRED_VERSION=2.14.3
- DBUS_SHARP_REQUIRED_VERSION=0.7
- DBUS_SHARP_GLIB_REQUIRED_VERSION=0.5
- 
-@@ -85,7 +86,6 @@
- PKG_CHECK_MODULES([GKEYFILE_SHARP], [gkeyfile-sharp])
- PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0])
- PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
--PKG_CHECK_MODULES([LIBRSVG_SHARP], [rsvg2-sharp-2.0])
- PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
- PKG_CHECK_MODULES([MONO_ADDINS_GUI], [mono-addins-gui])
- PKG_CHECK_MODULES([MONO_ADDINS_SETUP], [mono-addins-setup])
-@@ -99,6 +99,7 @@
- PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED_VERSION)
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
- PKG_CHECK_MODULES(GLIB, gobject-2.0 >= $GLIB_REQUIRED_VERSION)
-+PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION)
- 
- AC_SUBST([GCONF_SHARP_20_LIBS])
- AC_SUBST([GLIB_SHARP_20_LIBS])
-@@ -106,7 +107,6 @@
- AC_SUBST([GKEYFILE_SHARP_LIBS])
- AC_SUBST([GNOME_KEYRING_SHARP_LIBS])
- AC_SUBST([GTK_SHARP_20_LIBS])
--AC_SUBST([LIBRSVG_SHARP_LIBS])
- AC_SUBST([MONO_ADDINS_LIBS])
- AC_SUBST([MONO_ADDINS_GUI_LIBS])
- AC_SUBST([MONO_ADDINS_SETUP_LIBS])
-

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2015-09-03 14:54:22 UTC (rev 139135)
+++ fix-build.patch	2015-09-03 14:54:27 UTC (rev 139136)
@@ -1,16 +0,0 @@
-diff -Naur docky-2.2.0.orig/StandardPlugins/WorkspaceSwitcher/src/Desk.cs docky-2.2.0/StandardPlugins/WorkspaceSwitcher/src/Desk.cs
---- docky-2.2.0.orig/StandardPlugins/WorkspaceSwitcher/src/Desk.cs	2010-08-20 11:27:22.000000000 +0200
-+++ docky-2.2.0/StandardPlugins/WorkspaceSwitcher/src/Desk.cs	2014-11-20 04:38:09.829116494 +0100
-@@ -130,7 +130,11 @@
- 					grid [x, y] = desk;
- 				}
- 				if (gridsize.Y - 1 > y) {
--					desk = (grid [0, y] != null ? grid [0, y].GetNeighbor (Wnck.MotionDirection.Down) : null);
-+					if (grid [0, y] != null) {
-+						desk = grid [0, y].GetNeighbor (Wnck.MotionDirection.Down);
-+					} else {
-+						desk = null;
-+					}
- 					grid [0, y+1] = desk;
- 				}
- 			}

Deleted: systemd-support.patch
===================================================================
--- systemd-support.patch	2015-09-03 14:54:22 UTC (rev 139135)
+++ systemd-support.patch	2015-09-03 14:54:27 UTC (rev 139136)
@@ -1,66 +0,0 @@
-=== modified file 'StandardPlugins/SessionManager/src/SystemManager.cs'
---- StandardPlugins/SessionManager/src/SystemManager.cs	2012-12-31 04:25:57 +0000
-+++ StandardPlugins/SessionManager/src/SystemManager.cs	2013-05-02 16:08:57 +0000
-@@ -86,11 +86,15 @@
- 		[Interface (SystemdIface)]
- 		interface ISystemd
- 		{
-+			string CanHibernate ();
-+			string CanSuspend ();
- 			string CanPowerOff ();
- 			string CanReboot ();
- 
- 			void PowerOff (bool interactive);
- 			void Reboot (bool interactive);
-+			void Suspend (bool interactive);
-+			void Hibernate (bool interactive);
- 		}
- 
- 		[Interface (ConsoleKitIface)]
-@@ -212,7 +216,9 @@
- 		
- 		public bool CanHibernate ()
- 		{
--			if (upower != null)
-+			if (systemd != null)
-+				return String.Equals (systemd.CanHibernate (), "yes");
-+			else if (upower != null)
- 				return GetBoolean (upower, UPowerName, "CanHibernate") && upower.HibernateAllowed ();
- 			else if (devicekit != null)
- 				return GetBoolean (devicekit, DeviceKitPowerName, "CanHibernate");
-@@ -223,7 +229,10 @@
- 
- 		public void Hibernate ()
- 		{
--			if (upower != null) {
-+			if (systemd != null) {
-+				if (String.Equals (systemd.CanHibernate (), "yes"))
-+					systemd.Hibernate (true);
-+			} else if (upower != null) {
- 				if (GetBoolean (upower, UPowerName, "CanHibernate") && upower.HibernateAllowed ())
- 					upower.Hibernate ();
- 			} else if (devicekit != null) {
-@@ -236,7 +245,9 @@
- 
- 		public bool CanSuspend ()
- 		{
--			if (upower != null)
-+			if (systemd != null)
-+				return String.Equals (systemd.CanSuspend (), "yes");
-+			else if (upower != null)
- 				return GetBoolean (upower, UPowerName, "CanSuspend") && upower.SuspendAllowed ();
- 			else if (devicekit != null)
- 				return GetBoolean (devicekit, DeviceKitPowerName, "CanSuspend");
-@@ -247,7 +258,10 @@
- 
- 		public void Suspend ()
- 		{
--			if (upower != null) {
-+			if (systemd != null) {
-+				if (String.Equals (systemd.CanSuspend (), "yes"))
-+					systemd.Suspend (true);
-+			} else if (upower != null) {
- 				if (GetBoolean (upower, UPowerName, "CanSuspend") && upower.SuspendAllowed ())
- 					upower.Suspend ();
- 			} else if (devicekit != null) {
-

Deleted: use_dbussharp_2.patch
===================================================================
--- use_dbussharp_2.patch	2015-09-03 14:54:22 UTC (rev 139135)
+++ use_dbussharp_2.patch	2015-09-03 14:54:27 UTC (rev 139136)
@@ -1,15 +0,0 @@
-Index: docky/configure.ac
-===================================================================
---- docky.orig/configure.ac	2013-05-27 15:12:33.118408815 +0100
-+++ docky/configure.ac	2013-10-30 16:59:55.941769908 +0000
-@@ -90,8 +90,8 @@
- PKG_CHECK_MODULES([MONO_ADDINS_GUI], [mono-addins-gui])
- PKG_CHECK_MODULES([MONO_ADDINS_SETUP], [mono-addins-setup])
- PKG_CHECK_MODULES([MONO_CAIRO], [mono-cairo])
--PKG_CHECK_MODULES([DBUS_SHARP_10], [dbus-sharp-1.0 >= $DBUS_SHARP_REQUIRED_VERSION])
--PKG_CHECK_MODULES([DBUS_SHARP_GLIB_10], [dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQUIRED_VERSION])
-+PKG_CHECK_MODULES([DBUS_SHARP_10], [dbus-sharp-2.0 >= $DBUS_SHARP_REQUIRED_VERSION])
-+PKG_CHECK_MODULES([DBUS_SHARP_GLIB_10], [dbus-sharp-glib-2.0 >= $DBUS_SHARP_GLIB_REQUIRED_VERSION])
- PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
- PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0])
- 



More information about the arch-commits mailing list