[arch-commits] Commit in tomboy/trunk (PKGBUILD use_dbussharp_2.patch)

[Jan de Groot]

    Date: Monday, February 23, 2015 @ 16:45:45
  Author: jgc
Revision: 231822

upgpkg: tomboy 1.14.1-2

Added:
  tomboy/trunk/use_dbussharp_2.patch
Modified:
  tomboy/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   16 ++++++++++++----
 use_dbussharp_2.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-23 09:46:32 UTC (rev 231821)
+++ PKGBUILD	2015-02-23 15:45:45 UTC (rev 231822)
@@ -3,23 +3,31 @@
 
 pkgname=tomboy
 pkgver=1.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop note-taking application for Linux and Unix"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/tomboy/"
-depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
+depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
 makedepends=('intltool' 'pkgconfig'  'gnome-doc-utils')
 options=('!emptydirs' '!makeflags')
 install=tomboy.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f9e81fd9c9a9180e8ddcb4b9237ead0c842aa5b5ac21af87e97939e5015af018')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        use_dbussharp_2.patch)
+sha256sums=('f9e81fd9c9a9180e8ddcb4b9237ead0c842aa5b5ac21af87e97939e5015af018'
+            'ef6804f9f461f4c61d0d4ab514936f423f4a58b7d4606d576a8c62162f9acf9e')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../use_dbussharp_2.patch
+}
+
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
   mkdir -p "$MONO_SHARED_DIR"
 
   cd "$pkgname-$pkgver"
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --disable-update-mimedb

Added: use_dbussharp_2.patch
===================================================================
--- use_dbussharp_2.patch	                        (rev 0)
+++ use_dbussharp_2.patch	2015-02-23 15:45:45 UTC (rev 231822)
@@ -0,0 +1,27 @@
+Index: tomboy/configure.in
+===================================================================
+--- tomboy.orig/configure.in	2014-01-09 10:41:48.213622716 +0000
++++ tomboy/configure.in	2014-01-09 10:41:48.209622716 +0000
+@@ -175,7 +175,7 @@
+ #
+ # Check for dbus-sharp
+ #
+-PKG_CHECK_MODULES(DBUS, dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3)
++PKG_CHECK_MODULES(DBUS, dbus-sharp-2.0 >= 0.4 dbus-sharp-glib-2.0 >= 0.3)
+ AC_SUBST(DBUS_LIBS)
+ 
+ #
+Index: tomboy/Tomboy/RemoteControlProxy.cs
+===================================================================
+--- tomboy.orig/Tomboy/RemoteControlProxy.cs	2013-10-27 23:42:50.649722383 +0000
++++ tomboy/Tomboy/RemoteControlProxy.cs	2014-01-09 10:42:13.273621654 +0000
+@@ -55,8 +55,7 @@
+ 				return null;
+ 
+ 			RemoteControl remote_control = new RemoteControl (manager);
+-			Bus.Session.Register (Namespace,
+-			                      new ObjectPath (Path),
++			Bus.Session.Register (new ObjectPath (Path),
+ 			                      remote_control);
+ 			return remote_control;
+ #else