[arch-commits] Commit in gnome-do/trunk (4 files)

[Balló György]

    Date: Thursday, October 9, 2014 @ 02:54:01
  Author: bgyorgy
Revision: 120416

upgpkg: gnome-do 0.95.1-2

Fix crasher with glib2 2.42 (FS#42240)

Added:
  gnome-do/trunk/05_do_gtk_threading_correctly.diff
  gnome-do/trunk/fix-build.patch
Modified:
  gnome-do/trunk/PKGBUILD
  gnome-do/trunk/gnome-do.install

------------------------------------+
 05_do_gtk_threading_correctly.diff |   12 ++++++++++++
 PKGBUILD                           |   26 ++++++++++++++++++++------
 fix-build.patch                    |   12 ++++++++++++
 gnome-do.install                   |    4 ++--
 4 files changed, 46 insertions(+), 8 deletions(-)

Added: 05_do_gtk_threading_correctly.diff
===================================================================
--- 05_do_gtk_threading_correctly.diff	                        (rev 0)
+++ 05_do_gtk_threading_correctly.diff	2014-10-09 00:54:01 UTC (rev 120416)
@@ -0,0 +1,12 @@
+--- a/Do/src/Do.cs
++++ b/Do/src/Do.cs
+@@ -73,7 +73,9 @@
+ 			if (!Preferences.QuietStart)
+ 				Controller.Summon ();
+ 
++		        Gdk.Threads.Enter ();
+ 			Gtk.Application.Run ();
++			Gdk.Threads.Leave ();
+ 			
+ 			RelevanceProvider.Serialize (RelevanceProvider.DefaultProvider);
+ 		}

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-08 22:14:02 UTC (rev 120415)
+++ PKGBUILD	2014-10-09 00:54:01 UTC (rev 120416)
@@ -5,19 +5,33 @@
 
 pkgname=gnome-do
 pkgver=0.95.1
-pkgrel=1
+pkgrel=2
 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://cooperteam.net/"
 license=('GPL3')
-depends=('gconf-sharp' 'gnome-desktop2' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp' 'gkeyfile-sharp' 'hicolor-icon-theme' 'xdg-utils')
+depends=('gconf-sharp' 'gnome-desktop2' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp' 'gkeyfile-sharp')
 makedepends=('intltool' 'gio-sharp')
 install=$pkgname.install
-source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('1f61376718d75d3defcdf81958754296')
+source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        fix-build.patch
+        05_do_gtk_threading_correctly.diff)
+md5sums=('1f61376718d75d3defcdf81958754296'
+         '4ac79a8270bc6c1539f56b8f56043894'
+         'f2f0293eb43648d0e04e45030f32b853')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix build
+  patch -Np1 -i ../fix-build.patch
+
+  # Fix crasher
+  patch -Np1 -i ../05_do_gtk_threading_correctly.diff
+}
+
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
               --disable-schemas-install \
               --with-gconf-schema-file-dir=/usr/share/gconf/schemas
@@ -25,6 +39,6 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }

Added: fix-build.patch
===================================================================
--- fix-build.patch	                        (rev 0)
+++ fix-build.patch	2014-10-09 00:54:01 UTC (rev 120416)
@@ -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;

Modified: gnome-do.install
===================================================================
--- gnome-do.install	2014-10-08 22:14:02 UTC (rev 120415)
+++ gnome-do.install	2014-10-09 00:54:01 UTC (rev 120416)
@@ -2,7 +2,7 @@
 
 post_install() {
   gconfpkg --install $pkgname
-  xdg-icon-resource forceupdate
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
@@ -18,5 +18,5 @@
 }
 
 post_remove() {
-  xdg-icon-resource forceupdate
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }