[arch-commits] Commit in gnome-do/trunk (03_dbus_sharp_2.diff PKGBUILD)

[Jan de Groot]

    Date: Thursday, February 26, 2015 @ 13:24:57
  Author: jgc
Revision: 128251

upgpkg: gnome-do 0.95.3-2

Added:
  gnome-do/trunk/03_dbus_sharp_2.diff
Modified:
  gnome-do/trunk/PKGBUILD

----------------------+
 03_dbus_sharp_2.diff |   13 +++++++++++++
 PKGBUILD             |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

Added: 03_dbus_sharp_2.diff
===================================================================
--- 03_dbus_sharp_2.diff	                        (rev 0)
+++ 03_dbus_sharp_2.diff	2015-02-26 12:24:57 UTC (rev 128251)
@@ -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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-26 12:20:26 UTC (rev 128250)
+++ PKGBUILD	2015-02-26 12:24:57 UTC (rev 128251)
@@ -5,7 +5,7 @@
 
 pkgname=gnome-do
 pkgver=0.95.3
-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://do.cooperteam.net/"
@@ -14,8 +14,10 @@
 makedepends=('intltool' 'gio-sharp')
 install=$pkgname.install
 source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        03_dbus_sharp_2.diff
         fix-build.patch)
 md5sums=('698ff640c8b54565725e9f836384c894'
+         '4629501823d94099fbb9d613913839a6'
          '4ac79a8270bc6c1539f56b8f56043894')
 
 prepare() {
@@ -23,10 +25,14 @@
 
   # Fix build
   patch -Np1 -i ../fix-build.patch
+
+  # Use dbus-sharp-2
+  patch -Np1 -i ../03_dbus_sharp_2.diff
 }
 
 build() {
   cd $pkgname-$pkgver
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
               --disable-schemas-install \
               --with-gconf-schema-file-dir=/usr/share/gconf/schemas