eva 15/03/03 23:48:32
Added: zeitgeist-0.9.15-python-detection.patch
zeitgeist-0.9.15-fix-array-length-string-join.patch
Log:
Version bump, fix bug #518174. Move vala_src_prepare call after potential
eautoreconf, fix configure to properly detect/use python, make unittest run
within a dbus session, do not install docs in multiple paths.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
C6085806)
Revision Changes Path
1.1
gnome-extra/zeitgeist/files/zeitgeist-0.9.15-python-detection.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-python-detection.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-python-detection.patch?rev=1.1&content-type=text/plain
Index: zeitgeist-0.9.15-python-detection.patch
===================================================================
>From dd46d6f8db69ee8d291d63251d841e73070cd526 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <[email protected]>
Date: Sun, 4 Jan 2015 00:09:14 +0100
Subject: [PATCH] Make python module detection match detected python
Some distribution might provided multiple python and configure can know
about which exactly though AM_PATH_PYTHON.
---
configure.ac | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index acf7daa..6136ad6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,13 +269,14 @@ if test "x$HAVE_RAPPER" = "xno"; then
fi
# check for python-rdflib
+AM_PATH_PYTHON([2.7])
+
AC_MSG_CHECKING([for python-rdflib])
-echo "import rdflib" | python - 2>/dev/null
-if test $? -ne 0 ; then
- AC_MSG_FAILURE([failed. Please install the python-rdflib package.])
-else
+AS_IF([$PYTHON -c "import rdflib" 2>/dev/null], [
AC_MSG_RESULT([yes])
-fi
+], [
+ AC_MSG_FAILURE([failed. Please install the python-rdflib package.])
+])
#################################################
# Summary
--
2.3.0
1.1
gnome-extra/zeitgeist/files/zeitgeist-0.9.15-fix-array-length-string-join.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-fix-array-length-string-join.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-fix-array-length-string-join.patch?rev=1.1&content-type=text/plain
Index: zeitgeist-0.9.15-fix-array-length-string-join.patch
===================================================================
>From 201bd67de450320520a12e2b0c465c8eb6818bd2 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <[email protected]>
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.3.0
