[Pkg-cli-apps-commits] [gnome-do] 01/01: Drop libgnome-desktop2 dependency.

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository gnome-do.

commit fec7a687b8d65e694198033953f65156c29a1ebf
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Mon Sep 7 10:20:28 2015 +1000

    Drop libgnome-desktop2 dependency.
    
    Pull in upstream changes dropping most of the gnome-desktop2 bindings and replacing
    the rest with gnome-desktop-3.
    
    Closes: 708038
---
 debian/control                              |  4 +-
 debian/patches/05_drop_gnome_desktop_2.diff | 83 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index b6400fe..4d1ce90 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,6 @@ Build-Depends: debhelper (>= 7.0.50),
                libgnome-vfs2.0-cil-dev,
                libgconf2.0-cil-dev,
                libgconf2-dev,
-               libgnomedesktop2.0-cil-dev,
                libgnome-keyring1.0-cil-dev,
                libmono-addins-cil-dev,
                libmono-addins-gui-cil-dev,
@@ -34,7 +33,8 @@ Build-Depends: debhelper (>= 7.0.50),
                libglib2.0-dev,
                libgtk2.0-dev,
                librsvg2-2.0-cil-dev,
-               libwnck1.0-cil-dev
+               libwnck1.0-cil-dev,
+               libgnome-desktop-3-dev,
 Standards-Version: 3.9.5
 Homepage: http://do.cooperteam.net
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/gnome-do.git
diff --git a/debian/patches/05_drop_gnome_desktop_2.diff b/debian/patches/05_drop_gnome_desktop_2.diff
new file mode 100644
index 0000000..97f6b86
--- /dev/null
+++ b/debian/patches/05_drop_gnome_desktop_2.diff
@@ -0,0 +1,83 @@
+Description: Drop unnecessary gnome-desktop-2 bindings, switch to gnome-desktop-3
+Author: Christopher James Halse Rogers <raof at ubuntu.com>
+Bug-Debian: https://bugs.debian.org/708038
+Forwarded: not-needed
+
+--- gnome-do-0.95.3.orig/Do.Platform.Linux/src/Do.Universe/Desktop.cs
++++ gnome-do-0.95.3/Do.Platform.Linux/src/Do.Universe/Desktop.cs
+@@ -9,36 +9,7 @@ namespace Gnome {
+ #region Autogenerated code
+ 	public class Desktop {
+ 
+-		[DllImport("gnome-desktop-2")]
+-		static extern void gnome_desktop_prepend_terminal_to_vector(out int argc, IntPtr argv);
+-
+-		public static int PrependTerminalToVector(string argv) {
+-			int argc;
+-			gnome_desktop_prepend_terminal_to_vector(out argc, GLib.Marshaller.StringToPtrGStrdup(argv));
+-			return argc;
+-		}
+-
+-		[DllImport("gnome-desktop-2")]
+-		static extern bool gnome_desktop_thumbnail_has_uri(IntPtr pixbuf, IntPtr uri);
+-
+-		public static bool ThumbnailHasUri(Gdk.Pixbuf pixbuf, string uri) {
+-			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
+-			bool raw_ret = gnome_desktop_thumbnail_has_uri(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, native_uri);
+-			bool ret = raw_ret;
+-			GLib.Marshaller.Free (native_uri);
+-			return ret;
+-		}
+-
+-		[DllImport("gnome-desktop-2")]
+-		static extern IntPtr gnome_desktop_thumbnail_scale_down_pixbuf(IntPtr pixbuf, int dest_width, int dest_height);
+-
+-		public static Gdk.Pixbuf ThumbnailScaleDownPixbuf(Gdk.Pixbuf pixbuf, int dest_width, int dest_height) {
+-			IntPtr raw_ret = gnome_desktop_thumbnail_scale_down_pixbuf(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, dest_width, dest_height);
+-			Gdk.Pixbuf ret = GLib.Object.GetObject(raw_ret) as Gdk.Pixbuf;
+-			return ret;
+-		}
+-
+-		[DllImport("gnome-desktop-2")]
++		[DllImport("gnome-desktop-3")]
+ 		static extern IntPtr gnome_desktop_thumbnail_path_for_uri(IntPtr uri, int size);
+ 
+ 		public static string ThumbnailPathForUri(string uri, Gnome.DesktopThumbnailSize size) {
+@@ -48,29 +19,6 @@ namespace Gnome {
+ 			GLib.Marshaller.Free (native_uri);
+ 			return ret;
+ 		}
+-
+-		[DllImport("gnome-desktop-2")]
+-		static extern bool gnome_desktop_thumbnail_is_valid(IntPtr pixbuf, IntPtr uri, IntPtr mtime);
+-
+-		public static bool ThumbnailIsValid(Gdk.Pixbuf pixbuf, string uri, System.DateTime mtime) {
+-			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
+-			bool raw_ret = gnome_desktop_thumbnail_is_valid(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, native_uri, GLib.Marshaller.DateTimeTotime_t (mtime));
+-			bool ret = raw_ret;
+-			GLib.Marshaller.Free (native_uri);
+-			return ret;
+-		}
+-
+-		[DllImport("gnome-desktop-2")]
+-		static extern IntPtr gnome_desktop_thumbnail_md5(IntPtr uri);
+-
+-		public static string ThumbnailMd5(string uri) {
+-			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
+-			IntPtr raw_ret = gnome_desktop_thumbnail_md5(native_uri);
+-			string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
+-			GLib.Marshaller.Free (native_uri);
+-			return ret;
+-		}
+-
+ #endregion
+ 	}
+ }
+--- gnome-do-0.95.3.orig/Do.Platform.Linux/Do.Platform.Linux.dll.config.in
++++ gnome-do-0.95.3/Do.Platform.Linux/Do.Platform.Linux.dll.config.in
+@@ -1,4 +1,4 @@
+ <configuration>
+ 	<dllmap dll="libdo" target="@expanded_libdir@/@PACKAGE@/libdo.so"/>
+-	<dllmap dll="gnome-desktop-2" target="libgnome-desktop-2.so.17"/>
++	<dllmap dll="gnome-desktop-3" target="libgnome-desktop-3.so.10"/>
+ </configuration>
diff --git a/debian/patches/series b/debian/patches/series
index d04ea3b..73b2993 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 03_dbus_sharp_2.diff
 04_simplify_buggy_launcher_script.diff
 Disable-About-button-when-url-attribute-is-missing.patch
+05_drop_gnome_desktop_2.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/gnome-do.git