[arch-commits] Commit in zeitgeist/trunk (PKGBUILD vala-0.24-fix.patch)

[Jan de Groot]

    Date: Tuesday, April 22, 2014 @ 12:39:19
  Author: jgc
Revision: 211641

upgpkg: zeitgeist 0.9.14-3

Add fix for vala 0.24 (FS#40003)

Added:
  zeitgeist/trunk/vala-0.24-fix.patch
Modified:
  zeitgeist/trunk/PKGBUILD

---------------------+
 PKGBUILD            |    9 ++++++---
 vala-0.24-fix.patch |   16 ++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-22 10:12:44 UTC (rev 211640)
+++ PKGBUILD	2014-04-22 10:39:19 UTC (rev 211641)
@@ -5,7 +5,7 @@
 
 pkgname=zeitgeist
 pkgver=0.9.14
-pkgrel=2
+pkgrel=3
 pkgdesc="Service logging user activities and events"
 arch=(i686 x86_64)
 url="http://zeitgeist-project.com/"
@@ -16,14 +16,17 @@
 conflicts=(zeitgeist-datahub)
 replaces=(zeitgeist-datahub)
 source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz"
-         gio-dependency.patch)
+         gio-dependency.patch
+         vala-0.24-fix.patch)
 sha256sums=('769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061'
-            '4f2403b0695a6bf7b7cc10833e0e3a07d14fa22afeccc4ec89af0e89bbb35291')
+            '4f2403b0695a6bf7b7cc10833e0e3a07d14fa22afeccc4ec89af0e89bbb35291'
+            '1a408fe26724b1d9e52bde6ea213e1b529d9f345f865d2c350e339b845841206')
 
 prepare() {
   cd $pkgname-$pkgver
   sed -i 's/python -/$PYTHON -/' configure configure.ac
   patch -Np1 -i ../gio-dependency.patch
+  patch -Np0 -i ../vala-0.24-fix.patch
 }
 
 build() {

Added: vala-0.24-fix.patch
===================================================================
--- vala-0.24-fix.patch	                        (rev 0)
+++ vala-0.24-fix.patch	2014-04-22 10:39:19 UTC (rev 211641)
@@ -0,0 +1,16 @@
+=== 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;
+