[arch-commits] Commit in gnome-do-plugins/trunk (PKGBUILD use_dbussharp_2.patch)

[Jan de Groot]

    Date: Thursday, February 26, 2015 @ 14:12:24
  Author: jgc
Revision: 128253

upgpkg: gnome-do-plugins 0.8.5-2

Added:
  gnome-do-plugins/trunk/use_dbussharp_2.patch
Modified:
  gnome-do-plugins/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   10 ++++++++--
 use_dbussharp_2.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-26 12:25:05 UTC (rev 128252)
+++ PKGBUILD	2015-02-26 13:12:24 UTC (rev 128253)
@@ -5,7 +5,7 @@
 
 pkgname=gnome-do-plugins
 pkgver=0.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for gnome-do"
 arch=('any')
 url="http://cooperteam.net/"
@@ -13,8 +13,10 @@
 depends=('gnome-do>=0.9' 'flickrnet' 'gdata-sharp' 'wnck-sharp')
 makedepends=('intltool' 'libgnome-sharp' 'libgnome-desktop-sharp')
 source=(http://launchpad.net/do-plugins/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        use_dbussharp_2.patch
         flickrnet-3.2.patch)
 md5sums=('022d184e884cabd3078716385f123c0a'
+         'bf39bfb9f33f258938bcdf182a3a53a5'
          '8222b36baf39657d8f4e4c214f124093')
 
 prepare() {
@@ -27,11 +29,15 @@
   sed -i '/AptURL/d
           /DiskMounter/d
           /Transmission/d' Makefile.{am,in}
+
+  # Port to dbus-sharp-2
+  patch -Np1 -i ../use_dbussharp_2.patch
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-release \
+  autoreconf -fi
+  ./configure --prefix=/usr --enable-release
   make
 }
 

Added: use_dbussharp_2.patch
===================================================================
--- use_dbussharp_2.patch	                        (rev 0)
+++ use_dbussharp_2.patch	2015-02-26 13:12:24 UTC (rev 128253)
@@ -0,0 +1,33 @@
+From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Date: Tue, 18 Nov 2014 10:07:49 +0800
+Subject: use_dbussharp_2
+
+===================================================================
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 166dfd4..db2b685 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,7 +44,7 @@ fi
+ AC_MSG_RESULT([$BANSHEE_COLLECTION_INDEXER])
+ 
+ AC_MSG_CHECKING([which DBus implementation Banshee.CollectionIndexer requires])
+-if $PKG_CONFIG --print-requires $BANSHEE_COLLECTION_INDEXER 2>&1 | grep dbus-sharp-1.0 > /dev/null ; then
++if $PKG_CONFIG --print-requires $BANSHEE_COLLECTION_INDEXER 2>&1 | grep dbus-sharp-2.0 > /dev/null ; then
+ 	BANSHEE_USE_DBUS_SHARP=yes
+ 	AC_MSG_RESULT([dbus-sharp])
+ else
+@@ -53,8 +53,8 @@ else
+ fi
+ 
+ dnl -- DBus# required for Banshee and Telepathy support
+-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_SNARP_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_SNARP_GLIB=no)
+ 
+ if test "x$HAVE_DBUS_SHARP" = "xyes" ; then
+ 	DBUS_BUILD_DEFINES=-define:USE_DBUS_SHARP