Revert

Merge branch 'master' into f20
Conflicts: zeitgeist.spec
2014-08-21 16:43:55 +08:00 · 2014-08-21 16:10:46 +08:00 · 2014-08-18 17:20:48 +08:00 · 2014-08-12 12:03:30 +08:00
2 changed files with 31 additions and 8 deletions
--- a/0001-WhereClause-Fix-array-length-to-work-with-string.joi.patch
+++ b/0001-WhereClause-Fix-array-length-to-work-with-string.joi.patch
@ -0,0 +1,29 @@
+From 201bd67de450320520a12e2b0c465c8eb6818bd2 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Mon, 17 Mar 2014 20:57:49 +0100
+Subject: [PATCH] WhereClause: Fix array-length to work with string.joinv of
+ vala-0.24
+
+---
+ libzeitgeist/where-clause.vala | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libzeitgeist/where-clause.vala b/libzeitgeist/where-clause.vala
+index a830599..d981914 100644
+--- a/libzeitgeist/where-clause.vala
+++ b/libzeitgeist/where-clause.vala
+@@ -211,7 +211,11 @@ namespace Zeitgeist
+          */
+         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;
+-- 
+2.0.0
+
--- a/zeitgeist.spec
+++ b/zeitgeist.spec
@ -98,7 +98,7 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure

 %build
 %configure --enable-fts --enable-datahub --disable-silent-rules
-%make_build
+make %{?_smp_mflags}

 %install
 %make_install
@ -148,7 +148,7 @@ make check || true
 %{python2_sitelib}/zeitgeist/

 %changelog
-* Tue Aug 12 2014 Christopher Meng <rpm@cicku.me> - 0.9.16-0.2.20140808.git.ce9affa
+* Thu Aug 21 2014 Christopher Meng <rpm@cicku.me> - 0.9.16-0.2.20140808.git.ce9affa
 - Introduce python-zeitgeist subpkg
 - Mark xdg autostart file as noreplace for better UX, Fix BZ#863222

@ -156,12 +156,6 @@ make check || true
 - Update to 0.9.16 snapshot
 - Fix BZ#1126461

-* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 0.9.14-4
- Rebuilt for gobject-introspection 1.41.4
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
Author	SHA1	Message	Date
Christopher Meng	0c53d67cf5	Revert	2014-08-21 16:43:55 +08:00
Christopher Meng	9a7592d885	Merge branch 'master' into f20 Conflicts: zeitgeist.spec	2014-08-21 16:10:46 +08:00
Christopher Meng	91bf8e987f	Add a patch from upstream to fix crashes with vala 0.24	2014-08-18 17:20:48 +08:00
Christopher Meng	6db99f26bc	- Mark xdg autostart file as noreplace for better UX, Fix BZ#863222	2014-08-12 12:03:30 +08:00