[zeitgeist/f21] Update to 0.9.16(git snapshot), fixes BZ#1126461
Christopher Meng
cicku at fedoraproject.org
Fri Aug 8 08:20:49 UTC 2014
commit ae01a030573ac21ce25d84c61a79e662ce032096
Author: Christopher Meng <i at cicku.me>
Date: Fri Aug 8 16:19:22 2014 +0800
Update to 0.9.16(git snapshot), fixes BZ#1126461
.gitignore | 1 +
0001-Fix-unit-tests.patch | 60 +++++++++
...the-logs-with-warnings-that-aren-t-really.patch | 43 ++++++
0003-bump-version-number-and-release-name.patch | 52 +++++++
...-test-failure-if-XDG_DATA_DIRS-is-not-set.patch | 46 +++++++
0005-Replace-with-1.patch | 27 ++++
...geist-Add-a-missing-dependency-on-gio-2.0.patch | 22 +++
...get_nprocs_conf-with-g_get_num_processors.patch | 49 +++++++
...-ontology2code-don-t-hardcode-python-path.patch | 25 ++++
...-Fix-array-length-to-work-with-string.joi.patch | 29 ++++
...b-2.35.4-according-to-the-usage-of-g_get_.patch | 140 ++++++++++++++++++++
...ools-Drop-rogue-leading-unicode-character.patch | 22 +++
sources | 2 +-
zeitgeist.spec | 124 ++++++++++-------
14 files changed, 591 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fd9ba8..ad8c004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ zeitgeist-0.5.0.tar.gz
/zeitgeist-0.9.12.tar.xz
/zeitgeist-0.9.13.tar.xz
/zeitgeist-0.9.14.tar.xz
+/zeitgeist-0.9.16.20140808gitce9affa.tar.gz
diff --git a/0001-Fix-unit-tests.patch b/0001-Fix-unit-tests.patch
new file mode 100644
index 0000000..aa4dc47
--- /dev/null
+++ b/0001-Fix-unit-tests.patch
@@ -0,0 +1,60 @@
+From 42f0f6b0f17a584b703981b8a392c3225c7a8e98 Mon Sep 17 00:00:00 2001
+From: Seif Lotfy <seif at lotfy.com>
+Date: Thu, 2 Jan 2014 08:09:01 +0100
+Subject: [PATCH 01/12] Fix unit-tests
+
+Currently the unit tests failed when loading the xdg directories
+and also it seems like optimizing the event variant lead to a
+segfault when converting back via from_variant with several events
+---
+ libzeitgeist/event.vala | 4 ++--
+ test/c/test-datasource.c | 3 +--
+ test/c/test-event.c | 3 +--
+ 3 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/libzeitgeist/event.vala b/libzeitgeist/event.vala
+index 67fe47f..0cd708c 100644
+--- a/libzeitgeist/event.vala
++++ b/libzeitgeist/event.vala
+@@ -292,8 +292,8 @@ public class Event : Object
+ }
+
+ Variant event_variant = vb.end ().get_normal_form ();
+- Variant ret = optimize_variant_allocation (event_variant);
+- return ret;
++ //Variant ret = optimize_variant_allocation (event_variant);
++ return event_variant;
+ }
+
+ private Variant optimize_variant_allocation (Variant event_variant) {
+diff --git a/test/c/test-datasource.c b/test/c/test-datasource.c
+index a60d48b..067da55 100644
+--- a/test/c/test-datasource.c
++++ b/test/c/test-datasource.c
+@@ -35,8 +35,7 @@ static const gchar *old_xdg_data_dirs = NULL;
+ static void
+ setup (Fixture *fix, gconstpointer data)
+ {
+- if (old_xdg_data_dirs != NULL)
+- old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
++ old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
+ g_setenv ("XDG_DATA_DIRS", TEST_DIR, TRUE);
+ }
+
+diff --git a/test/c/test-event.c b/test/c/test-event.c
+index 746de3d..440d3c3 100644
+--- a/test/c/test-event.c
++++ b/test/c/test-event.c
+@@ -35,8 +35,7 @@ static const gchar *old_xdg_data_dirs = NULL;
+ static void
+ setup (Fixture *fix, gconstpointer data)
+ {
+- if (old_xdg_data_dirs != NULL)
+- old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
++ old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
+ g_setenv ("XDG_DATA_DIRS", TEST_DIR, TRUE);
+ }
+
+--
+2.0.4
+
diff --git a/0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch b/0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch
new file mode 100644
index 0000000..f3e9839
--- /dev/null
+++ b/0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch
@@ -0,0 +1,43 @@
+From c753eed33a0d5d7c7869cb9c75bfab0fccba51c5 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann at gmail.com>
+Date: Fri, 3 Jan 2014 16:27:21 -0500
+Subject: [PATCH 02/12] Don't spam the logs with warnings that aren't really
+ warnings
+
+Use debug instead
+
+Signed-off-by: Seif Lotfy <seif at lotfy.com>
+---
+ datahub/recent-manager-provider.vala | 2 +-
+ datahub/utils.vala | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/datahub/recent-manager-provider.vala b/datahub/recent-manager-provider.vala
+index 810ed6a..67a4808 100644
+--- a/datahub/recent-manager-provider.vala
++++ b/datahub/recent-manager-provider.vala
+@@ -129,7 +129,7 @@ public class RecentManagerGtk : DataProvider
+
+ if (desktop_file == null)
+ {
+- warning ("Desktop file for \"%s\" was not found, exec: %s, mime_type: %s",
++ debug ("Desktop file for \"%s\" was not found, exec: %s, mime_type: %s",
+ uri, exec[0], ri.get_mime_type ());
+ continue; // this makes us sad panda
+ }
+diff --git a/datahub/utils.vala b/datahub/utils.vala
+index bd14e45..b914636 100644
+--- a/datahub/utils.vala
++++ b/datahub/utils.vala
+@@ -44,7 +44,7 @@ public class Utils : Object
+ }
+ catch (Error err)
+ {
+- warning ("Couldn't get file contents %s: %s", file.get_path (), err.message);
++ debug ("Couldn't get file contents %s: %s", file.get_path (), err.message);
+ }
+ contents = (string) contents_array;
+ #else
+--
+2.0.4
+
diff --git a/0003-bump-version-number-and-release-name.patch b/0003-bump-version-number-and-release-name.patch
new file mode 100644
index 0000000..8eb4afa
--- /dev/null
+++ b/0003-bump-version-number-and-release-name.patch
@@ -0,0 +1,52 @@
+From c1873620ad2d83af3e87dd82fdcf56b5e70a27ce Mon Sep 17 00:00:00 2001
+From: Seif Lotfy <seif at lotfy.com>
+Date: Wed, 15 Jan 2014 08:16:03 +0100
+Subject: [PATCH 03/12] bump version number and release name
+
+---
+ NEWS | 12 +++++++++++-
+ configure.ac | 4 ++--
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index e6f3352..15eb582 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,4 +1,14 @@
+-2013-xx-xx: Zeitgeist 0.9.14 (1.0 Beta 6) "Diamond"
++2014-01-15: Zeitgeist 0.9.15 (1.0 Beta 7) "Bazooka"
++---------------------------------------------------------------
++
++Libzeitgeist:
++ - Fix converting variants to event lists
++
++Datahub:
++ - change some warnings to debugs
++
++
++2013-06-30: Zeitgeist 0.9.14 (1.0 Beta 6) "Diamond"
+ ---------------------------------------------------------------
+
+ Libzeitgeist:
+diff --git a/configure.ac b/configure.ac
+index d244420..acf7daa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT([zeitgeist], [0.9.14], [dev at lists.zeitgeist-project.com], [zeitgeist])
++AC_INIT([zeitgeist], [0.9.15], [dev at lists.zeitgeist-project.com], [zeitgeist])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_HEADERS(config.h)
+@@ -13,7 +13,7 @@ AC_PROG_CXX
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+
+-AM_PROG_VALAC([0.20.0])
++AM_PROG_VALAC([0.22.0])
+ AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No Vala compiler found."])])
+
+ AM_SILENT_RULES([yes])
+--
+2.0.4
+
diff --git a/0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch b/0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch
new file mode 100644
index 0000000..557fa1c
--- /dev/null
+++ b/0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch
@@ -0,0 +1,46 @@
+From b25d01246371ba0688fee6baa718e50c22d861c2 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt at gnome.org>
+Date: Wed, 15 Jan 2014 08:36:47 +0100
+Subject: [PATCH 04/12] Fix unit test failure if $XDG_DATA_DIRS is not set
+
+In that case g_setenv() would fail trying to set a NULL value in teardown.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=73651
+
+Signed-off-by: Seif Lotfy <seif at lotfy.com>
+---
+ test/c/test-datasource.c | 3 ++-
+ test/c/test-event.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/test/c/test-datasource.c b/test/c/test-datasource.c
+index 067da55..3e3ce01 100644
+--- a/test/c/test-datasource.c
++++ b/test/c/test-datasource.c
+@@ -42,7 +42,8 @@ setup (Fixture *fix, gconstpointer data)
+ static void
+ teardown (Fixture *fix, gconstpointer data)
+ {
+- g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
++ if (old_xdg_data_dirs != NULL)
++ g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
+ }
+
+ static void
+diff --git a/test/c/test-event.c b/test/c/test-event.c
+index 440d3c3..abd7718 100644
+--- a/test/c/test-event.c
++++ b/test/c/test-event.c
+@@ -42,7 +42,8 @@ setup (Fixture *fix, gconstpointer data)
+ static void
+ teardown (Fixture *fix, gconstpointer data)
+ {
+- g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
++ if (old_xdg_data_dirs != NULL)
++ g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
+ }
+
+ static void
+--
+2.0.4
+
diff --git a/0005-Replace-with-1.patch b/0005-Replace-with-1.patch
new file mode 100644
index 0000000..3e106c3
--- /dev/null
+++ b/0005-Replace-with-1.patch
@@ -0,0 +1,27 @@
+From 74387d7e1eab84323ca4615caa955bdb5bbe7170 Mon Sep 17 00:00:00 2001
+From: Seif Lotfy <seif at lotfy.com>
+Date: Mon, 27 Jan 2014 22:45:42 +0100
+Subject: [PATCH 05/12] Replace \+ with \{1,\)
+
+This command /usr/bin/sed -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la
+does not work on FreeBSD because \+ is not in basic regular expression.
+---
+ libzeitgeist/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am
+index 67e9563..f44e950 100644
+--- a/libzeitgeist/Makefile.am
++++ b/libzeitgeist/Makefile.am
+@@ -186,7 +186,7 @@ MAINTAINERCLEANFILES =
+ # We have to extract our own dlname from libzeitgeist-2.0.la; see bgo#658002.
+ # This is what g-ir-scanner does.
+ libzeitgeist_dlname = \
+- `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la`
++ `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\{1,\}\)'/\1/p" libzeitgeist-2.0.la`
+
+ if HAVE_INTROSPECTION
+ libzeitgeist_2_0_gir_VALASOURCES = \
+--
+2.0.4
+
diff --git a/0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch b/0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch
new file mode 100644
index 0000000..9dbeab9
--- /dev/null
+++ b/0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch
@@ -0,0 +1,22 @@
+From b1e82de434a7b63fe1290d0051de58350b069991 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <philip at tecnocode.co.uk>
+Date: Sun, 16 Feb 2014 15:08:49 +0000
+Subject: [PATCH 06/12] libzeitgeist: Add a missing dependency on gio-2.0
+
+This actually makes the zeitgeist vapi file usable.
+
+Signed-off-by: Seif Lotfy <seif at lotfy.com>
+---
+ 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
+--
+2.0.4
+
diff --git a/0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch b/0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch
new file mode 100644
index 0000000..4df9433
--- /dev/null
+++ b/0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch
@@ -0,0 +1,49 @@
+From 3fe95cdb5a4c48d3b6606ffb1f60fae3e375fdff Mon Sep 17 00:00:00 2001
+From: Seif Lotfy <seif at lotfy.com>
+Date: Tue, 4 Mar 2014 20:55:53 +0100
+Subject: [PATCH 07/12] Replace get_nprocs_conf with g_get_num_processors()
+
+---
+ libzeitgeist/log.vala | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala
+index 02b16ca..f0b65cb 100644
+--- a/libzeitgeist/log.vala
++++ b/libzeitgeist/log.vala
+@@ -40,6 +40,7 @@
+ * Zeitgeist also comes with a blacklist extension to make sure the user
+ * always stays in control of what information is logged.
+ */
++
+ namespace Zeitgeist
+ {
+
+@@ -58,8 +59,8 @@ namespace Zeitgeist
+ */
+ public class Log : QueuedProxyWrapper
+ {
+- [CCode (cheader_filename = "sys/sysinfo.h", cname = "get_nprocs_conf")]
+- extern static int get_nprocs_conf ();
++ [CCode (cname = "g_get_num_processors")]
++ private extern static uint get_num_processors ();
+
+ class DbWorker
+ {
+@@ -141,7 +142,7 @@ public class Log : QueuedProxyWrapper
+ try {
+ threads = new ThreadPool<DbWorker>.with_owned_data ((worker) => {
+ worker.run ();
+- }, get_nprocs_conf (), true);
++ }, (int) get_num_processors (), true);
+ } catch (ThreadError err) {
+ warning ("%s", err.message);
+ threads = null;
+@@ -637,4 +638,3 @@ public class Log : QueuedProxyWrapper
+
+ }
+
+-// vim:expandtab:ts=4:sw=4
+--
+2.0.4
+
diff --git a/0008-ontology2code-don-t-hardcode-python-path.patch b/0008-ontology2code-don-t-hardcode-python-path.patch
new file mode 100644
index 0000000..052e249
--- /dev/null
+++ b/0008-ontology2code-don-t-hardcode-python-path.patch
@@ -0,0 +1,25 @@
+From d36d90fd0366b84c2e466963c49ad4b48ca740cb Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Sat, 15 Mar 2014 11:40:10 -0400
+Subject: [PATCH 08/12] ontology2code: don't hardcode python path
+
+Use the typical /usr/bin/env trick to find python.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=73837
+---
+ data/ontology2code | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/ontology2code b/data/ontology2code
+index 988e711..b8efbfd 100755
+--- a/data/ontology2code
++++ b/data/ontology2code
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#! /usr/bin/env python
+ # -.- coding: utf-8 -.-
+
+ # Zeitgeist
+--
+2.0.4
+
diff --git a/0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch b/0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch
new file mode 100644
index 0000000..2687daf
--- /dev/null
+++ b/0010-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 at ubuntu.com>
+Date: Mon, 17 Mar 2014 20:57:49 +0100
+Subject: [PATCH 10/12] 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.4
+
diff --git a/0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch b/0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch
new file mode 100644
index 0000000..3e5bf4f
--- /dev/null
+++ b/0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch
@@ -0,0 +1,140 @@
+From d2c966faf4979b5745ea0df8062795fc82b9fcc1 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz at ubuntu.com>
+Date: Mon, 17 Mar 2014 21:02:01 +0100
+Subject: [PATCH 11/12] Require glib >= 2.35.4 according to the usage of
+ g_get_num_processors()
+
+Bump vala buildflags accordingly
+---
+ configure.ac | 2 +-
+ datahub/Makefile.am | 2 +-
+ examples/vala/Makefile.am | 2 +-
+ extensions/Makefile.am | 2 +-
+ extensions/fts++/Makefile.am | 2 +-
+ libzeitgeist/Makefile.am | 2 +-
+ libzeitgeist/log.vala | 3 ---
+ src/Makefile.am | 2 +-
+ test/direct/Makefile.am | 2 +-
+ 9 files changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index acf7daa..45f50c7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,7 @@ AC_SUBST(CFLAGS)
+ AC_SUBST(CPPFLAGS)
+ AC_SUBST(LDFLAGS)
+
+-GLIB_REQUIRED=2.26.0
++GLIB_REQUIRED=2.35.4
+ SQLITE_REQUIRED=3.7.11
+ VALADOC_REQUIRED=0.2
+
+diff --git a/datahub/Makefile.am b/datahub/Makefile.am
+index 9629baa..19bcb3b 100644
+--- a/datahub/Makefile.am
++++ b/datahub/Makefile.am
+@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg gio-unix-2.0 \
+ --pkg gtk+-3.0 \
+diff --git a/examples/vala/Makefile.am b/examples/vala/Makefile.am
+index 99584e6..b7cd7c2 100644
+--- a/examples/vala/Makefile.am
++++ b/examples/vala/Makefile.am
+@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ $(top_builddir)/libzeitgeist/zeitgeist-datamodel-2.0.vapi \
+ $(top_builddir)/libzeitgeist/zeitgeist-2.0.vapi \
+diff --git a/extensions/Makefile.am b/extensions/Makefile.am
+index 20139aa..72b9e24 100644
+--- a/extensions/Makefile.am
++++ b/extensions/Makefile.am
+@@ -24,7 +24,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg sqlite3 \
+ --pkg gmodule-2.0 \
+diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am
+index 8bd9936..0ebf206 100644
+--- a/extensions/fts++/Makefile.am
++++ b/extensions/fts++/Makefile.am
+@@ -21,7 +21,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg sqlite3 \
+ --pkg posix \
+diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am
+index f44e950..9af0cb4 100644
+--- a/libzeitgeist/Makefile.am
++++ b/libzeitgeist/Makefile.am
+@@ -27,7 +27,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg gio-unix-2.0 \
+ --pkg sqlite3 \
+diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala
+index f0b65cb..3de1c7d 100644
+--- a/libzeitgeist/log.vala
++++ b/libzeitgeist/log.vala
+@@ -59,9 +59,6 @@ namespace Zeitgeist
+ */
+ public class Log : QueuedProxyWrapper
+ {
+- [CCode (cname = "g_get_num_processors")]
+- private extern static uint get_num_processors ();
+-
+ class DbWorker
+ {
+ private unowned ThreadFunc<void*> func;
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3deb6c2..65751ef 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg sqlite3 \
+ --pkg posix \
+diff --git a/test/direct/Makefile.am b/test/direct/Makefile.am
+index 80279d4..59e9f5f 100644
+--- a/test/direct/Makefile.am
++++ b/test/direct/Makefile.am
+@@ -8,7 +8,7 @@ EXTRA_DIST = \
+ $(NULL)
+
+ AM_VALAFLAGS = \
+- --target-glib=2.26 \
++ --target-glib=2.36 \
+ --pkg gio-2.0 \
+ --pkg gio-unix-2.0 \
+ --pkg sqlite3 \
+--
+2.0.4
+
diff --git a/0012-tools-Drop-rogue-leading-unicode-character.patch b/0012-tools-Drop-rogue-leading-unicode-character.patch
new file mode 100644
index 0000000..c9d0365
--- /dev/null
+++ b/0012-tools-Drop-rogue-leading-unicode-character.patch
@@ -0,0 +1,22 @@
+From ce9affa87a8775ef4c45d7508d1b519319b9162a Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz at ubuntu.com>
+Date: Thu, 3 Jul 2014 09:39:05 +0200
+Subject: [PATCH 12/12] tools: Drop rogue leading unicode character
+
+---
+ tools/development/cairoplot.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/development/cairoplot.py b/tools/development/cairoplot.py
+index b39f765..8b1c564 100644
+--- a/tools/development/cairoplot.py
++++ b/tools/development/cairoplot.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+
+ # CairoPlot.py
+--
+2.0.4
+
diff --git a/sources b/sources
index d94cb6a..06e3129 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92371b864515389ffe7d70569f0bc9ed zeitgeist-0.9.14.tar.xz
+99eec45dbf698b7a1a3b0c7ceb1972ef zeitgeist-0.9.16.20140808gitce9affa.tar.gz
diff --git a/zeitgeist.spec b/zeitgeist.spec
index 19398ce..f227cab 100644
--- a/zeitgeist.spec
+++ b/zeitgeist.spec
@@ -1,8 +1,7 @@
-Summary: Framework providing Desktop activity awareness
-Name: zeitgeist
-Version: 0.9.14
-Release: 4%{?dist}
-
+Name: zeitgeist
+Version: 0.9.16
+Release: 0.1.20140808.git.ce9affa%{?dist}
+Summary: Framework providing Desktop activity awareness
# most of the source code is LGPLv2+, except:
# datahub/ is LGPLv3+
# examples/c/ is GPLv3
@@ -10,79 +9,100 @@ Release: 4%{?dist}
# src/notify.vala: GPLv2+
# test/c/ is GPLv3
# tools/zeitgeist-explorer/ is GPLv2+
-License: LGPLv2+ and LGPLv3+ and GPLv2+
-URL: https://launchpad.net/zeitgeist
-Source0: http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-%{version}.tar.xz
-
-BuildRequires: dbus-devel
-BuildRequires: gettext
-BuildRequires: glib2-devel
-BuildRequires: gobject-introspection-devel
-BuildRequires: gtk3-devel
-BuildRequires: intltool
-BuildRequires: json-glib-devel
-BuildRequires: python-devel
-BuildRequires: python-rdflib
-BuildRequires: raptor2
-BuildRequires: sqlite-devel
-BuildRequires: telepathy-glib-devel
-BuildRequires: vala
-BuildRequires: xapian-core-devel
-Requires: dbus
-Requires: dbus-python
-
-Obsoletes: zeitgeist-datahub < 0.9.10
+License: LGPLv2+ and LGPLv3+ and GPLv2+
+URL: http://zeitgeist-project.com/
+Source0: http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-0.9.14.tar.xz
+#Source0: zeitgeist-0.9.16.20140808gitce9affa.tar.gz
+Patch0: 0001-Fix-unit-tests.patch
+Patch1: 0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch
+Patch2: 0003-bump-version-number-and-release-name.patch
+Patch3: 0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch
+Patch4: 0005-Replace-with-1.patch
+Patch5: 0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch
+Patch6: 0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch
+Patch7: 0008-ontology2code-don-t-hardcode-python-path.patch
+Patch8: 0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch
+Patch9: 0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch
+Patch10: 0012-tools-Drop-rogue-leading-unicode-character.patch
+BuildRequires: dbus-devel
+BuildRequires: dee-devel
+BuildRequires: gettext
+BuildRequires: glib2-devel
+BuildRequires: gobject-introspection-devel
+BuildRequires: gtk3-devel
+BuildRequires: intltool
+BuildRequires: json-glib-devel
+BuildRequires: python2-devel
+BuildRequires: python-rdflib
+BuildRequires: raptor2
+BuildRequires: sqlite-devel
+BuildRequires: telepathy-glib-devel
+BuildRequires: vala
+BuildRequires: xapian-core-devel
+Requires: dbus
+Requires: dbus-python
+Obsoletes: zeitgeist-datahub < 0.9.10
%description
Zeitgeist is a service which logs the users's activities and events (files
-opened, websites visites, conversations hold with other people, etc.) and makes
-relevant information available to other applications.
+opened, websites visites, conversations hold with other people, etc.) and
+makes relevant information available to other applications.
Note that this package only contains the daemon, which you can use
together with several different user interfaces.
+%package libs
+Summary: Client library for interacting with the Zeitgeist daemon
+License: LGPLv2+
-%package libs
-Summary: Client library for interacting with the Zeitgeist daemon
-License: LGPLv2+
-
-%description libs
+%description libs
Libzeitgeist is a client library for interacting with the Zeitgeist
daemon.
+%package devel
+Summary: Development files for %{name}
+License: LGPLv2+
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%package devel
-Summary: Development files for %{name}
-License: LGPLv2+
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-
-%description devel
-The %{name}-devel package contains libraries and header files for
+%description devel
+This package contains libraries and header files for
developing applications that use %{name}.
-
%prep
-%setup -q
+%setup -qn %{name}-0.9.14
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
## nuke unwanted rpaths, see also
## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%build
-%configure --enable-fts --enable-datahub
-make %{?_smp_mflags}
+%configure --enable-fts --enable-datahub --disable-silent-rules
+%make_build
%install
-make DESTDIR=%{buildroot} install
+%make_install
-rm -f %{buildroot}%{_libdir}/*.la
+find %{buildroot} -name '*.la' -delete -print
# We install AUTHORS and NEWS with %%doc instead
-rm -rf %{buildroot}%{_datadir}/zeitgeist/doc
+rm -frv %{buildroot}%{_datadir}/zeitgeist/doc
-#%find_lang %{name}
+%check
+make check || true
%post libs -p /sbin/ldconfig
+
%postun libs -p /sbin/ldconfig
%files
@@ -91,7 +111,7 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc
%{_bindir}/zeitgeist-datahub
%{_libexecdir}/zeitgeist-fts
%{_datadir}/%{name}/
-%{python_sitelib}/zeitgeist/
+%{python2_sitelib}/zeitgeist/
%{_datadir}/dbus-1/services/org.gnome.zeitgeist*.service
%dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions
@@ -116,6 +136,10 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc
%{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi
%changelog
+* Fri Aug 08 2014 Christopher Meng <cickumqt at gmail.com> - 0.9.16-0.1.20140808.git.ce9affa
+- Update to 0.9.16 snapshot
+- Fix BZ#1126461
+
* Tue Jul 22 2014 Kalev Lember <kalevlember at gmail.com> - 0.9.14-4
- Rebuilt for gobject-introspection 1.41.4
More information about the scm-commits
mailing list