Date: Saturday, January 13, 2018 @ 12:03:16
Author: bgyorgy
Revision: 281807
archrelease: copy trunk to community-x86_64
Added:
gnome-do/repos/community-x86_64/03_dbus_sharp_2.diff
(from rev 281806, gnome-do/trunk/03_dbus_sharp_2.diff)
gnome-do/repos/community-x86_64/PKGBUILD
(from rev 281806, gnome-do/trunk/PKGBUILD)
gnome-do/repos/community-x86_64/drop-gnome-destkop.patch
(from rev 281806, gnome-do/trunk/drop-gnome-destkop.patch)
gnome-do/repos/community-x86_64/fix-build.patch
(from rev 281806, gnome-do/trunk/fix-build.patch)
Deleted:
gnome-do/repos/community-x86_64/03_dbus_sharp_2.diff
gnome-do/repos/community-x86_64/PKGBUILD
gnome-do/repos/community-x86_64/drop-gnome-destkop.patch
gnome-do/repos/community-x86_64/fix-build.patch
--------------------------+
03_dbus_sharp_2.diff | 26 +--
PKGBUILD | 132 +++++++++----------
drop-gnome-destkop.patch | 298 ++++++++++++++++++++++-----------------------
fix-build.patch | 24 +--
4 files changed, 240 insertions(+), 240 deletions(-)
Deleted: 03_dbus_sharp_2.diff
===================================================================
--- 03_dbus_sharp_2.diff 2018-01-13 12:03:08 UTC (rev 281806)
+++ 03_dbus_sharp_2.diff 2018-01-13 12:03:16 UTC (rev 281807)
@@ -1,13 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,8 +97,8 @@
- AC_SUBST([GKEYFILE_SHARP_LIBS])
-
- dnl -- Use D-Bus# where available.
--PKG_CHECK_MODULES([DBUS_SHARP], [dbus-sharp-1.0], HAVE_DBUS_SHARP=yes,
HAVE_DBUS_SHARP=no)
--PKG_CHECK_MODULES([DBUS_SHARP_GLIB], [dbus-sharp-glib-1.0],
HAVE_DBUS_SHARP_GLIB=yes, HAVE_DBUS_SHARP_GLIB=no)
-+PKG_CHECK_MODULES([DBUS_SHARP], [dbus-sharp-2.0], HAVE_DBUS_SHARP=yes,
HAVE_DBUS_SHARP=no)
-+PKG_CHECK_MODULES([DBUS_SHARP_GLIB], [dbus-sharp-glib-2.0],
HAVE_DBUS_SHARP_GLIB=yes, HAVE_DBUS_SHARP_GLIB=no)
-
- if test "x$HAVE_DBUS_SHARP" = "xyes" ; then
- DBUS_BUILD_DEFINES=-define:USE_DBUS_SHARP
Copied: gnome-do/repos/community-x86_64/03_dbus_sharp_2.diff (from rev 281806,
gnome-do/trunk/03_dbus_sharp_2.diff)
===================================================================
--- 03_dbus_sharp_2.diff (rev 0)
+++ 03_dbus_sharp_2.diff 2018-01-13 12:03:16 UTC (rev 281807)
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -97,8 +97,8 @@
+ AC_SUBST([GKEYFILE_SHARP_LIBS])
+
+ dnl -- Use D-Bus# where available.
+-PKG_CHECK_MODULES([DBUS_SHARP], [dbus-sharp-1.0], HAVE_DBUS_SHARP=yes,
HAVE_DBUS_SHARP=no)
+-PKG_CHECK_MODULES([DBUS_SHARP_GLIB], [dbus-sharp-glib-1.0],
HAVE_DBUS_SHARP_GLIB=yes, HAVE_DBUS_SHARP_GLIB=no)
++PKG_CHECK_MODULES([DBUS_SHARP], [dbus-sharp-2.0], HAVE_DBUS_SHARP=yes,
HAVE_DBUS_SHARP=no)
++PKG_CHECK_MODULES([DBUS_SHARP_GLIB], [dbus-sharp-glib-2.0],
HAVE_DBUS_SHARP_GLIB=yes, HAVE_DBUS_SHARP_GLIB=no)
+
+ if test "x$HAVE_DBUS_SHARP" = "xyes" ; then
+ DBUS_BUILD_DEFINES=-define:USE_DBUS_SHARP
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-13 12:03:08 UTC (rev 281806)
+++ PKGBUILD 2018-01-13 12:03:16 UTC (rev 281807)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Allan McRae <al...@archlinux.org>
-# Contributor: Doehni <do...@gmx.de>
-
-pkgname=gnome-do
-pkgver=0.95.3
-pkgrel=5
-pkgdesc="Quickly search for many items present on your desktop or the web, and
perform useful actions on those items"
-arch=('i686' 'x86_64')
-url="http://do.cooperteam.net/";
-license=('GPL3')
-depends=('gconf-sharp' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp'
'gkeyfile-sharp')
-makedepends=('intltool' 'gio-sharp')
-source=(https://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc}
- fix-build.patch
- 03_dbus_sharp_2.diff
- drop-gnome-destkop.patch)
-validpgpkeys=('972401D296309DE91E713C6F18B3F50FE5923C18') # Christopher James
Halse Rogers
-sha256sums=('282343285c818f2bb8198e7876f9ec895327415c8ddadc20c299fbe2c8deedfb'
- 'SKIP'
- 'f5206a5d5cf86c72e713dbdca69a95969c71789c03a1b7a5c685cd60c0e97ad7'
- 'ef839c281fe1b3c9b8624b48cdd7ae9b240e7284c03a4852708db686a573ebfa'
- '5ab8f6c342a4f291356d9bf94cc8678ba8a4b3e71b596be2cef6024da8db55f8')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Fix build
- patch -Np1 -i ../fix-build.patch
-
- # Use dbus-sharp-2
- patch -Np1 -i ../03_dbus_sharp_2.diff
-
- # Remove gnome-desktop2 dependency
- patch -Np1 -i ../drop-gnome-destkop.patch
-
- # Use <Super>space is already mapped in GNOME, use <Control><Super>space
instead
- sed -i 's/<Super>space/<Control><Super>space/'
data/gnome-do.schemas.in
- sed -i 's/<Super>space/<Control><Super>space/' Do/src/CorePreferences.cs
Do/src/Do.Core/Controller.cs
-
- # Disable broken network service
- sed -i '/Do.Platform.Linux.NetworkService/d'
Do.Platform.Linux/Resources/Do.Platform.Linux.addin.xml
-
- autoreconf -fi
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --disable-schemas-install \
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- # Don't install autostart file system-wide
- rm -r "$pkgdir"/etc
-}
Copied: gnome-do/repos/community-x86_64/PKGBUILD (from rev 281806,
gnome-do/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-13 12:03:16 UTC (rev 281807)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Allan McRae <al...@archlinux.org>
+# Contributor: Doehni <do...@gmx.de>
+
+pkgname=gnome-do
+pkgver=0.95.3
+pkgrel=6
+pkgdesc="Quickly search for many items present on your desktop or the web, and
perform useful actions on those items"
+arch=('x86_64')
+url="https://do.cooperteam.net/";
+license=('GPL3')
+depends=('gconf-sharp' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp'
'gkeyfile-sharp')
+makedepends=('intltool' 'gio-sharp')
+source=(https://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc}
+ fix-build.patch
+ 03_dbus_sharp_2.diff
+ drop-gnome-destkop.patch)
+validpgpkeys=('972401D296309DE91E713C6F18B3F50FE5923C18') # Christopher James
Halse Rogers
+sha256sums=('282343285c818f2bb8198e7876f9ec895327415c8ddadc20c299fbe2c8deedfb'
+ 'SKIP'
+ 'f5206a5d5cf86c72e713dbdca69a95969c71789c03a1b7a5c685cd60c0e97ad7'
+ 'ef839c281fe1b3c9b8624b48cdd7ae9b240e7284c03a4852708db686a573ebfa'
+ '5ab8f6c342a4f291356d9bf94cc8678ba8a4b3e71b596be2cef6024da8db55f8')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix build
+ patch -Np1 -i ../fix-build.patch
+
+ # Use dbus-sharp-2
+ patch -Np1 -i ../03_dbus_sharp_2.diff
+
+ # Remove gnome-desktop2 dependency
+ patch -Np1 -i ../drop-gnome-destkop.patch
+
+ # <Super>space is already mapped in GNOME, use <Control>space instead by
default (similar to kupfer)
+ sed -i 's/<Super>space/<Control>space/' data/gnome-do.schemas.in
+ sed -i 's/<Super>space/<Control>space/' Do/src/CorePreferences.cs
Do/src/Do.Core/Controller.cs
+
+ # Disable broken network service
+ sed -i '/Do.Platform.Linux.NetworkService/d'
Do.Platform.Linux/Resources/Do.Platform.Linux.addin.xml
+
+ autoreconf -fi
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --disable-schemas-install \
+ --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ # Don't install autostart file system-wide
+ rm -r "$pkgdir"/etc
+}
Deleted: drop-gnome-destkop.patch
===================================================================
--- drop-gnome-destkop.patch 2018-01-13 12:03:08 UTC (rev 281806)
+++ drop-gnome-destkop.patch 2018-01-13 12:03:16 UTC (rev 281807)
@@ -1,149 +0,0 @@
-diff -Naur
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
---- gnome-do-0.95.3.orig/Do.Platform.Linux/Do.Platform.Linux.dll.config.in
2012-03-12 07:30:34.000000000 +0100
-+++ gnome-do-0.95.3/Do.Platform.Linux/Do.Platform.Linux.dll.config.in
2017-06-19 22:09:45.486322733 +0200
-@@ -1,4 +1,3 @@
- <configuration>
- <dllmap dll="libdo" target="@expanded_libdir@/@PACKAGE@/libdo.so"/>
-- <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2.so.17"/>
- </configuration>
-diff -Naur gnome-do-0.95.3.orig/Do.Platform.Linux/Makefile.am
gnome-do-0.95.3/Do.Platform.Linux/Makefile.am
---- gnome-do-0.95.3.orig/Do.Platform.Linux/Makefile.am 2013-12-26
14:14:28.558156000 +0100
-+++ gnome-do-0.95.3/Do.Platform.Linux/Makefile.am 2017-06-19
22:12:44.533411238 +0200
-@@ -28,8 +28,6 @@
- src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs \
- src/Do.Universe/ApplicationItem.cs \
- src/Do.Universe/CategoryItem.cs \
-- src/Do.Universe/Desktop.cs \
-- src/Do.Universe/DesktopThumbnailSize.cs \
- src/Do.Universe/NullApplicationItem.cs \
- src/Do.Universe/FileItem.cs \
- src/Do.Universe/ApplicationItemSource.cs \
-diff -Naur 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
---- gnome-do-0.95.3.orig/Do.Platform.Linux/src/Do.Universe/Desktop.cs
2012-03-12 07:30:34.000000000 +0100
-+++ gnome-do-0.95.3/Do.Platform.Linux/src/Do.Universe/Desktop.cs
1970-01-01 01:00:00.000000000 +0100
-@@ -1,76 +0,0 @@
--// This file was generated by the Gtk# code generator.
--// Any changes made will be lost if regenerated.
--
--namespace Gnome {
--
-- using System;
-- using System.Runtime.InteropServices;
--
--#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")]
-- static extern IntPtr
gnome_desktop_thumbnail_path_for_uri(IntPtr uri, int size);
--
-- public static string ThumbnailPathForUri(string uri,
Gnome.DesktopThumbnailSize size) {
-- IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup
(uri);
-- IntPtr raw_ret =
gnome_desktop_thumbnail_path_for_uri(native_uri, (int) size);
-- string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
-- 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
-- }
--}
-diff -Naur
gnome-do-0.95.3.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs
gnome-do-0.95.3/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs
----
gnome-do-0.95.3.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs
2012-03-12 07:30:34.000000000 +0100
-+++ gnome-do-0.95.3/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs
1970-01-01 01:00:00.000000000 +0100
-@@ -1,16 +0,0 @@
--// This file was generated by the Gtk# code generator.
--// Any changes made will be lost if regenerated.
--
--namespace Gnome {
--
-- using System;
-- using System.Runtime.InteropServices;
--
--#region Autogenerated code
-- public enum DesktopThumbnailSize {
--
-- Normal,
-- Large,
-- }
--#endregion
--}
-diff -Naur gnome-do-0.95.3.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs
gnome-do-0.95.3/Do.Platform.Linux/src/Do.Universe/FileItem.cs
---- gnome-do-0.95.3.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs
2013-05-06 00:55:12.000000000 +0200
-+++ gnome-do-0.95.3/Do.Platform.Linux/src/Do.Universe/FileItem.cs
2017-06-19 22:05:58.604392190 +0200
-@@ -144,17 +144,6 @@
- icon = MaybeGetSpecialFolderIconForPath (Path);
- if (icon != null) return icon;
-
-- string large_thumb =
Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Large);
-- string normal_thumb =
Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Normal);
--
-- // Generating the thumbnail ourself is too slow
for large files.
-- // Suggestion: generate thumbnails
asynchronously. Banshee's
-- // notion of job queues may be useful.
-- if (IO.File.Exists (large_thumb)) {
-- icon = large_thumb;
-- } else if (IO.File.Exists (normal_thumb)) {
-- icon = normal_thumb;
-- } else {
- try {
- if (MimeType ==
"x-directory/normal" || MimeType == "inode/directory") {
- icon = "folder";
-@@ -167,7 +156,6 @@
- } catch (NullReferenceException) {
- icon = "gtk-file";
- }
-- }
- return icon;
- }
- }
Copied: gnome-do/repos/community-x86_64/drop-gnome-destkop.patch (from rev
281806, gnome-do/trunk/drop-gnome-destkop.patch)
===================================================================
--- drop-gnome-destkop.patch (rev 0)
+++ drop-gnome-destkop.patch 2018-01-13 12:03:16 UTC (rev 281807)
@@ -0,0 +1,149 @@
+diff -Naur
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
+--- gnome-do-0.95.3.orig/Do.Platform.Linux/Do.Platform.Linux.dll.config.in
2012-03-12 07:30:34.000000000 +0100
++++ gnome-do-0.95.3/Do.Platform.Linux/Do.Platform.Linux.dll.config.in
2017-06-19 22:09:45.486322733 +0200
+@@ -1,4 +1,3 @@
+ <configuration>
+ <dllmap dll="libdo" target="@expanded_libdir@/@PACKAGE@/libdo.so"/>
+- <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2.so.17"/>
+ </configuration>
+diff -Naur gnome-do-0.95.3.orig/Do.Platform.Linux/Makefile.am
gnome-do-0.95.3/Do.Platform.Linux/Makefile.am
+--- gnome-do-0.95.3.orig/Do.Platform.Linux/Makefile.am 2013-12-26
14:14:28.558156000 +0100
++++ gnome-do-0.95.3/Do.Platform.Linux/Makefile.am 2017-06-19
22:12:44.533411238 +0200
+@@ -28,8 +28,6 @@
+ src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs \
+ src/Do.Universe/ApplicationItem.cs \
+ src/Do.Universe/CategoryItem.cs \
+- src/Do.Universe/Desktop.cs \
+- src/Do.Universe/DesktopThumbnailSize.cs \
+ src/Do.Universe/NullApplicationItem.cs \
+ src/Do.Universe/FileItem.cs \
+ src/Do.Universe/ApplicationItemSource.cs \
+diff -Naur 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
+--- gnome-do-0.95.3.orig/Do.Platform.Linux/src/Do.Universe/Desktop.cs
2012-03-12 07:30:34.000000000 +0100
++++ gnome-do-0.95.3/Do.Platform.Linux/src/Do.Universe/Desktop.cs
1970-01-01 01:00:00.000000000 +0100
+@@ -1,76 +0,0 @@
+-// This file was generated by the Gtk# code generator.
+-// Any changes made will be lost if regenerated.
+-
+-namespace Gnome {
+-
+- using System;
+- using System.Runtime.InteropServices;
+-
+-#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")]
+- static extern IntPtr
gnome_desktop_thumbnail_path_for_uri(IntPtr uri, int size);
+-
+- public static string ThumbnailPathForUri(string uri,
Gnome.DesktopThumbnailSize size) {
+- IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup
(uri);
+- IntPtr raw_ret =
gnome_desktop_thumbnail_path_for_uri(native_uri, (int) size);
+- string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
+- 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
+- }
+-}
+diff -Naur
gnome-do-0.95.3.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs
gnome-do-0.95.3/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs
+---
gnome-do-0.95.3.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs
2012-03-12 07:30:34.000000000 +0100
++++ gnome-do-0.95.3/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs
1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+-// This file was generated by the Gtk# code generator.
+-// Any changes made will be lost if regenerated.
+-
+-namespace Gnome {
+-
+- using System;
+- using System.Runtime.InteropServices;
+-
+-#region Autogenerated code
+- public enum DesktopThumbnailSize {
+-
+- Normal,
+- Large,
+- }
+-#endregion
+-}
+diff -Naur gnome-do-0.95.3.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs
gnome-do-0.95.3/Do.Platform.Linux/src/Do.Universe/FileItem.cs
+--- gnome-do-0.95.3.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs
2013-05-06 00:55:12.000000000 +0200
++++ gnome-do-0.95.3/Do.Platform.Linux/src/Do.Universe/FileItem.cs
2017-06-19 22:05:58.604392190 +0200
+@@ -144,17 +144,6 @@
+ icon = MaybeGetSpecialFolderIconForPath (Path);
+ if (icon != null) return icon;
+
+- string large_thumb =
Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Large);
+- string normal_thumb =
Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Normal);
+-
+- // Generating the thumbnail ourself is too slow
for large files.
+- // Suggestion: generate thumbnails
asynchronously. Banshee's
+- // notion of job queues may be useful.
+- if (IO.File.Exists (large_thumb)) {
+- icon = large_thumb;
+- } else if (IO.File.Exists (normal_thumb)) {
+- icon = normal_thumb;
+- } else {
+ try {
+ if (MimeType ==
"x-directory/normal" || MimeType == "inode/directory") {
+ icon = "folder";
+@@ -167,7 +156,6 @@
+ } catch (NullReferenceException) {
+ icon = "gtk-file";
+ }
+- }
+ return icon;
+ }
+ }
Deleted: fix-build.patch
===================================================================
--- fix-build.patch 2018-01-13 12:03:08 UTC (rev 281806)
+++ fix-build.patch 2018-01-13 12:03:16 UTC (rev 281807)
@@ -1,12 +0,0 @@
-diff -Naur gnome-do-0.95.1.orig/Do/src/Do.UI/PluginNodeView.cs
gnome-do-0.95.1/Do/src/Do.UI/PluginNodeView.cs
---- gnome-do-0.95.1.orig/Do/src/Do.UI/PluginNodeView.cs 2014-10-06
02:04:38.165823000 +0200
-+++ gnome-do-0.95.1/Do/src/Do.UI/PluginNodeView.cs 2014-10-06
02:04:59.252989251 +0200
-@@ -94,7 +94,7 @@
-
- cell = new CellRendererPixbuf ();
- cell.SetFixedSize (IconSize + IconPadding, IconSize +
IconPadding);
-- AppendColumn ("Icon", cell, IconDataFunc as
TreeCellDataFunc);
-+ AppendColumn ("Icon", cell, IconDataFunc);
-
- cell = new Gtk.CellRendererText ();
- (cell as CellRendererText).WrapWidth = WrapWidth;
Copied: gnome-do/repos/community-x86_64/fix-build.patch (from rev 281806,
gnome-do/trunk/fix-build.patch)
===================================================================
--- fix-build.patch (rev 0)
+++ fix-build.patch 2018-01-13 12:03:16 UTC (rev 281807)
@@ -0,0 +1,12 @@
+diff -Naur gnome-do-0.95.1.orig/Do/src/Do.UI/PluginNodeView.cs
gnome-do-0.95.1/Do/src/Do.UI/PluginNodeView.cs
+--- gnome-do-0.95.1.orig/Do/src/Do.UI/PluginNodeView.cs 2014-10-06
02:04:38.165823000 +0200
++++ gnome-do-0.95.1/Do/src/Do.UI/PluginNodeView.cs 2014-10-06
02:04:59.252989251 +0200
+@@ -94,7 +94,7 @@
+
+ cell = new CellRendererPixbuf ();
+ cell.SetFixedSize (IconSize + IconPadding, IconSize +
IconPadding);
+- AppendColumn ("Icon", cell, IconDataFunc as
TreeCellDataFunc);
++ AppendColumn ("Icon", cell, IconDataFunc);
+
+ cell = new Gtk.CellRendererText ();
+ (cell as CellRendererText).WrapWidth = WrapWidth;
