Date: Thursday, May 11, 2017 @ 22:04:32
Author: jgc
Revision: 295848
upgpkg: tomboy 1.15.7-1
Modified:
tomboy/trunk/PKGBUILD
Deleted:
tomboy/trunk/use_dbussharp_2.patch
-----------------------+
PKGBUILD | 29 +++++++++++++++++++----------
use_dbussharp_2.patch | 27 ---------------------------
2 files changed, 19 insertions(+), 37 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-05-11 21:57:05 UTC (rev 295847)
+++ PKGBUILD 2017-05-11 22:04:32 UTC (rev 295848)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <j...@archlinux.org>
pkgname=tomboy
-pkgver=1.15.4
+pkgver=1.15.7
pkgrel=1
pkgdesc="Desktop note-taking application for Linux and Unix"
arch=('i686' 'x86_64')
@@ -9,16 +9,25 @@
license=('GPL')
url="http://www.gnome.org/projects/tomboy/";
depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp-glib'
'mono-addins' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
+makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils' git yelp-tools
autoconf-archive)
options=('!emptydirs' '!makeflags')
-source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- use_dbussharp_2.patch)
-sha256sums=('1429790dbe7475850e753e9ac10bb1ea9f184f2142826c389da75930c093968b'
- 'ef6804f9f461f4c61d0d4ab514936f423f4a58b7d4606d576a8c62162f9acf9e')
+_commit=6f031efb7e5a905704ef6ee877f5240a3b0a4a86 # tags/1.15.7^0
+source=("git+https://git.gnome.org/browse/tomboy#commit=$_commit";)
+sha256sums=('SKIP')
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+check() {
+ cd $pkgname
+ make check
+}
+
prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../use_dbussharp_2.patch
+ cd $pkgname
+ NOCONFIGURE=1 ./autogen.sh
}
build() {
@@ -25,7 +34,7 @@
export MONO_SHARED_DIR="$srcdir/.wabi"
mkdir -p "$MONO_SHARED_DIR"
- cd "$pkgname-$pkgver"
+ cd "$pkgname"
autoreconf -fi
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var \
@@ -35,7 +44,7 @@
}
package() {
- cd "$pkgname-$pkgver"
+ cd "$pkgname"
make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
install -m755 -d "$pkgdir/usr/share/gconf/schemas"
Deleted: use_dbussharp_2.patch
===================================================================
--- use_dbussharp_2.patch 2017-05-11 21:57:05 UTC (rev 295847)
+++ use_dbussharp_2.patch 2017-05-11 22:04:32 UTC (rev 295848)
@@ -1,27 +0,0 @@
-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
