Date: Tuesday, April 22, 2014 @ 15:55:26 Author: heftig Revision: 211656
Use git Modified: zeitgeist/trunk/PKGBUILD Deleted: zeitgeist/trunk/gio-dependency.patch zeitgeist/trunk/vala-0.24-fix.patch ----------------------+ PKGBUILD | 24 ++++++++++-------------- gio-dependency.patch | 20 -------------------- vala-0.24-fix.patch | 16 ---------------- 3 files changed, 10 insertions(+), 50 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-04-22 13:36:26 UTC (rev 211655) +++ PKGBUILD 2014-04-22 13:55:26 UTC (rev 211656) @@ -11,29 +11,25 @@ url="http://zeitgeist-project.com/"; license=(GPL2 LGPL2.1) depends=(json-glib telepathy-glib gtk3) -makedepends=(intltool gobject-introspection vala raptor python2-rdflib gnome-common) +makedepends=(intltool gobject-introspection vala raptor python2-rdflib gnome-common git) provides=(zeitgeist-datahub) conflicts=(zeitgeist-datahub) replaces=(zeitgeist-datahub) -source=(http://cgit.freedesktop.org/$pkgname/$pkgname/snapshot/$pkgname-$pkgver.tar.gz - gio-dependency.patch - vala-0.24-fix.patch) -sha256sums=('c293c13fda9248823c8f92d61aa3d07357fbc8687a8cadfecc6c0a7404a1e009' - '4f2403b0695a6bf7b7cc10833e0e3a07d14fa22afeccc4ec89af0e89bbb35291' - '1a408fe26724b1d9e52bde6ea213e1b529d9f345f865d2c350e339b845841206') +source=("$pkgname::git://anongit.freedesktop.org/$pkgname/$pkgname#commit=d2c966f") +sha256sums=('SKIP') prepare() { - cd $pkgname-$pkgver - mkdir m4 + cd $pkgname + sed -i 's/python -/$PYTHON -/' configure.ac sed -i '1s/python$/python2/' data/ontology2code - patch -Np1 -i ../gio-dependency.patch - patch -Np0 -i ../vala-0.24-fix.patch + + mkdir m4 NOCONFIGURE=1 ./autogen.sh } build() { - cd $pkgname-$pkgver + cd $pkgname export PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/$pkgname @@ -41,12 +37,12 @@ } check() { - cd $pkgname-$pkgver + cd $pkgname # Log test fails in chroot, as we have no X and no proper dbus make -k check || : } package() { - cd $pkgname-$pkgver + cd $pkgname make DESTDIR="$pkgdir" install } Deleted: gio-dependency.patch =================================================================== --- gio-dependency.patch 2014-04-22 13:36:26 UTC (rev 211655) +++ gio-dependency.patch 2014-04-22 13:55:26 UTC (rev 211656) @@ -1,20 +0,0 @@ -From ab624e66b0a1eccd4a605980be07726ac8ecb460 Mon Sep 17 00:00:00 2001 -From: Philip Withnall <phi...@tecnocode.co.uk> -Date: Sun, 16 Feb 2014 15:08:49 +0000 -Subject: [PATCH] libzeitgeist: Add a missing dependency on gio-2.0 - -This actually makes the zeitgeist vapi file usable. ---- - libzeitgeist/zeitgeist-2.0.deps | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libzeitgeist/zeitgeist-2.0.deps b/libzeitgeist/zeitgeist-2.0.deps -index ff8d39b..59eec5d 100644 ---- a/libzeitgeist/zeitgeist-2.0.deps -+++ b/libzeitgeist/zeitgeist-2.0.deps -@@ -1 +1,2 @@ - zeitgeist-datamodel-2.0 -+gio-2.0 --- -1.8.5.3 - Deleted: vala-0.24-fix.patch =================================================================== --- vala-0.24-fix.patch 2014-04-22 13:36:26 UTC (rev 211655) +++ vala-0.24-fix.patch 2014-04-22 13:55:26 UTC (rev 211656) @@ -1,16 +0,0 @@ -=== modified file 'libzeitgeist/where-clause.vala' ---- libzeitgeist/where-clause.vala 2013-02-16 22:35:31 +0000 -+++ libzeitgeist/where-clause.vala 2014-03-17 19:57:49 +0000 -@@ -211,7 +211,11 @@ - */ - private T[] generic_array_to_unowned_array<T> (GenericArray<T> gptrarr) - { -+#if VALA_0_24 -+ long[] pointers = new long[gptrarr.length]; -+#else - long[] pointers = new long[gptrarr.length + 1]; -+#endif - Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata, - (gptrarr.length) * sizeof (void *)); - return (T[]) pointers; -
