From 3829b27eb1c99e837407e0e36b019a6d23d762c3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sep 09 2019 16:38:54 +0000 Subject: update to version 1.0.2, drop python2 module --- diff --git a/.gitignore b/.gitignore index 25f27b7..264a2c0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.9.16.tar.xz /zeitgeist-1.0.tar.xz /zeitgeist-1.0.1.tar.xz +/zeitgeist-1.0.2.tar.xz diff --git a/00-disable-python.patch b/00-disable-python.patch new file mode 100644 index 0000000..beaf2c0 --- /dev/null +++ b/00-disable-python.patch @@ -0,0 +1,353 @@ +diff --git a/Makefile.am b/Makefile.am +index 9664cde..b145e62 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,6 @@ SUBDIRS = \ + src \ + extensions \ + data \ +- python \ + test \ + examples \ + po \ +diff --git a/Makefile.in b/Makefile.in +index 395df47..f68dac0 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -195,7 +195,7 @@ am__define_uniq_tagged_files = \ + ETAGS = etags + CTAGS = ctags + CSCOPE = cscope +-DIST_SUBDIRS = libzeitgeist src extensions data python test examples \ ++DIST_SUBDIRS = libzeitgeist src extensions data test examples \ + po doc datahub + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/build-aux/compile \ +@@ -343,11 +343,6 @@ PKG_CONFIG = @PKG_CONFIG@ + PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ + PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POSUB = @POSUB@ +-PYTHON = @PYTHON@ +-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_PLATFORM = @PYTHON_PLATFORM@ +-PYTHON_PREFIX = @PYTHON_PREFIX@ +-PYTHON_VERSION = @PYTHON_VERSION@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +@@ -411,12 +406,10 @@ mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + pkgpyexecdir = @pkgpyexecdir@ +-pkgpythondir = @pkgpythondir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ + pyexecdir = @pyexecdir@ +-pythondir = @pythondir@ + runstatedir = @runstatedir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +@@ -428,7 +421,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + NULL = + ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS} +-SUBDIRS = libzeitgeist src extensions data python test examples po doc \ ++SUBDIRS = libzeitgeist src extensions data test examples po doc \ + $(NULL) $(am__append_1) + zeitgeistdocdir = $(pkgdatadir)/doc + zeitgeistdoc_DATA = \ +diff --git a/configure b/configure +index dd39c48..86708cd 100755 +--- a/configure ++++ b/configure +@@ -812,15 +812,6 @@ CPPFLAGS + LDFLAGS + CFLAGS + CC +-pkgpyexecdir +-pyexecdir +-pkgpythondir +-pythondir +-PYTHON_PLATFORM +-PYTHON_EXEC_PREFIX +-PYTHON_PREFIX +-PYTHON_VERSION +-PYTHON + MAINT + MAINTAINER_MODE_FALSE + MAINTAINER_MODE_TRUE +@@ -921,7 +912,6 @@ enable_introspection + ac_precious_vars='build_alias + host_alias + target_alias +-PYTHON + CC + CFLAGS + LDFLAGS +@@ -1619,7 +1609,6 @@ Optional Packages: + Build the FTS extension with dee-icu + + Some influential environment variables: +- PYTHON the Python interpreter + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a +@@ -3224,215 +3213,6 @@ fi + MAINT=$MAINTAINER_MODE_TRUE + + +- +- +- +- +- +- +- +- # Find any Python interpreter. +- if test -z "$PYTHON"; then +- for ac_prog in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_PYTHON+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case $PYTHON in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-PYTHON=$ac_cv_path_PYTHON +-if test -n "$PYTHON"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +-$as_echo "$PYTHON" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$PYTHON" && break +-done +-test -n "$PYTHON" || PYTHON=":" +- +- fi +- am_display_PYTHON=python +- +- +- if test "$PYTHON" = :; then +- as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 +- else +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +-$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +-if ${am_cv_python_version+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +-$as_echo "$am_cv_python_version" >&6; } +- PYTHON_VERSION=$am_cv_python_version +- +- +- +- PYTHON_PREFIX='${prefix}' +- +- PYTHON_EXEC_PREFIX='${exec_prefix}' +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +-if ${am_cv_python_platform+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +-$as_echo "$am_cv_python_platform" >&6; } +- PYTHON_PLATFORM=$am_cv_python_platform +- +- +- # Just factor out some code duplication. +- am_python_setup_sysconfig="\ +-import sys +-# Prefer sysconfig over distutils.sysconfig, for better compatibility +-# with python 3.x. See automake bug#10227. +-try: +- import sysconfig +-except ImportError: +- can_use_sysconfig = 0 +-else: +- can_use_sysconfig = 1 +-# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +-# +-try: +- from platform import python_implementation +- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': +- can_use_sysconfig = 0 +-except ImportError: +- pass" +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +-if ${am_cv_python_pythondir+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "x$prefix" = xNONE +- then +- am_py_prefix=$ac_default_prefix +- else +- am_py_prefix=$prefix +- fi +- am_cv_python_pythondir=`$PYTHON -c " +-$am_python_setup_sysconfig +-if can_use_sysconfig: +- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +-else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +-sys.stdout.write(sitedir)"` +- case $am_cv_python_pythondir in +- $am_py_prefix*) +- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` +- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` +- ;; +- *) +- case $am_py_prefix in +- /usr|/System*) ;; +- *) +- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages +- ;; +- esac +- ;; +- esac +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +-$as_echo "$am_cv_python_pythondir" >&6; } +- pythondir=$am_cv_python_pythondir +- +- +- +- pkgpythondir=\${pythondir}/$PACKAGE +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +-if ${am_cv_python_pyexecdir+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "x$exec_prefix" = xNONE +- then +- am_py_exec_prefix=$am_py_prefix +- else +- am_py_exec_prefix=$exec_prefix +- fi +- am_cv_python_pyexecdir=`$PYTHON -c " +-$am_python_setup_sysconfig +-if can_use_sysconfig: +- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +-else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +-sys.stdout.write(sitedir)"` +- case $am_cv_python_pyexecdir in +- $am_py_exec_prefix*) +- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` +- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` +- ;; +- *) +- case $am_py_exec_prefix in +- /usr|/System*) ;; +- *) +- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages +- ;; +- esac +- ;; +- esac +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +-$as_echo "$am_cv_python_pyexecdir" >&6; } +- pyexecdir=$am_cv_python_pyexecdir +- +- +- +- pkgpyexecdir=\${pyexecdir}/$PACKAGE +- +- +- +- fi +- +- +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -18776,7 +18556,7 @@ $as_echo "yes" >&6; } + fi + + +-ac_config_files="$ac_config_files Makefile src/Makefile libzeitgeist/Makefile libzeitgeist/zeitgeist-2.0.pc datahub/Makefile extensions/Makefile extensions/fts++/Makefile extensions/fts++/test/Makefile data/Makefile data/ontology/Makefile python/Makefile test/Makefile test/dbus/Makefile test/direct/Makefile test/c/Makefile test/data/Makefile examples/Makefile examples/c/Makefile examples/vala/Makefile doc/Makefile doc/libzeitgeist/Makefile po/Makefile.in" ++ac_config_files="$ac_config_files Makefile src/Makefile libzeitgeist/Makefile libzeitgeist/zeitgeist-2.0.pc datahub/Makefile extensions/Makefile extensions/fts++/Makefile extensions/fts++/test/Makefile data/Makefile data/ontology/Makefile test/Makefile test/dbus/Makefile test/direct/Makefile test/c/Makefile test/data/Makefile examples/Makefile examples/c/Makefile examples/vala/Makefile doc/Makefile doc/libzeitgeist/Makefile po/Makefile.in" + + + ################################################# +@@ -19531,24 +19311,6 @@ fi + + + +-fi +- +-################################################# +-# Ontology parsing dependencies +-################################################# +- +-# check for python-rdflib +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python-rdflib" >&5 +-$as_echo_n "checking for python-rdflib... " >&6; } +-echo "import rdflib" | $PYTHON - 2>/dev/null +-if test $? -ne 0 ; then +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "failed. Please install the python-rdflib package. +-See \`config.log' for more details" "$LINENO" 5; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } + fi + + ################################################# +@@ -20727,7 +20489,6 @@ do + "extensions/fts++/test/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/fts++/test/Makefile" ;; + "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; + "data/ontology/Makefile") CONFIG_FILES="$CONFIG_FILES data/ontology/Makefile" ;; +- "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; + "test/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES test/dbus/Makefile" ;; + "test/direct/Makefile") CONFIG_FILES="$CONFIG_FILES test/direct/Makefile" ;; diff --git a/sources b/sources index 3672bfc..10eb7d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeitgeist-1.0.1.tar.xz) = e800de89ac574af49b9449fe5cb623994ff2515ff36ba94d81f0b1eebcb93b1aeecfbde14c0dd1ea24aef36b5b69be33c2cdf2ef69fc17a69bf98b40dae80cef +SHA512 (zeitgeist-1.0.2.tar.xz) = 5feb96cd52bbc2fc0fb69759dc10d39358385e853c03324eb2e58b0ac44383362be6554bc7df4561f5636ab9ce7b6883b76385c98ddcb43e48e89fa809e85855 diff --git a/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch b/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch deleted file mode 100644 index 979e76b..0000000 --- a/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cc4603a2b5d9e6f36d196432042f6f0048dd5d89 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Thu, 5 Apr 2018 13:12:51 +0200 -Subject: [PATCH] ontology: Avoid ownership mismatches of container elements to - fix memleak - ---- - libzeitgeist/ontology.vala.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libzeitgeist/ontology.vala.in b/libzeitgeist/ontology.vala.in -index 63171701..768fd005 100644 ---- a/libzeitgeist/ontology.vala.in -+++ b/libzeitgeist/ontology.vala.in -@@ -56,7 +56,7 @@ namespace Zeitgeist - { - initialize_symbols (); - -- var results = new List (); -+ var results = new List (); - var symbol = all_symbols.lookup (symbol_uri); - if (symbol == null) return results; - -@@ -64,7 +64,7 @@ namespace Zeitgeist - { - results.append (uri); - // Recursively get the other parents -- foreach (string parent_uri in get_all_parents (uri)) -+ foreach (unowned string parent_uri in get_all_parents (uri)) - if (results.index (parent_uri) == -1) - results.append (parent_uri); - } -@@ -76,7 +76,7 @@ namespace Zeitgeist - { - initialize_symbols (); - -- var results = new List (); -+ var results = new List (); - var symbol = all_symbols.lookup (symbol_uri); - if (symbol == null) return results; - -@@ -89,7 +89,7 @@ namespace Zeitgeist - public static List get_children (string symbol_uri) - { - initialize_symbols (); -- var results = new List (); -+ var results = new List (); - var symbol = all_symbols.lookup (symbol_uri); - if (symbol == null) return results; - -@@ -103,7 +103,7 @@ namespace Zeitgeist - { - initialize_symbols (); - -- var results = new List(); -+ var results = new List(); - var symbol = all_symbols.lookup (symbol_uri); - if (symbol == null) return results; - --- -2.18.1 - diff --git a/zeitgeist-1.0.1-fix-vapi.patch b/zeitgeist-1.0.1-fix-vapi.patch deleted file mode 100644 index 9c1507f..0000000 --- a/zeitgeist-1.0.1-fix-vapi.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 131a84f1a65a4ce8bffd94f52746425f7e96b7ae Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Tue, 5 Jun 2018 23:23:26 +0200 -Subject: [PATCH] Asynchronous out-parameters are only allowed at the end of - argument lists - -This will not result in an ABI/API change on the c-level. ---- - extensions/fts++/zeitgeist-fts.vala | 8 ++++---- - extensions/fts.vala | 4 ++-- - libzeitgeist/index.vala | 6 +++--- - libzeitgeist/remote.vala | 7 ++++--- - 4 files changed, 13 insertions(+), 12 deletions(-) - -diff --git a/extensions/fts++/zeitgeist-fts.vala b/extensions/fts++/zeitgeist-fts.vala -index e408ff34..0f8ecbc6 100644 ---- a/extensions/fts++/zeitgeist-fts.vala -+++ b/extensions/fts++/zeitgeist-fts.vala -@@ -118,8 +118,8 @@ namespace Zeitgeist - public async void search (string query_string, Variant time_range, - Variant filter_templates, - uint offset, uint count, uint result_type, -- out Variant events, out uint matches, -- Cancellable? cancellable=null) -+ Cancellable? cancellable, -+ out Variant events, out uint matches) - throws Error - { - var tr = new TimeRange.from_variant (time_range); -@@ -140,9 +140,9 @@ namespace Zeitgeist - Variant filter_templates, - uint storage_state, uint offset, - uint count, uint result_type, -+ Cancellable? cancellable, - out Variant events, out double[] relevancies, -- out uint matches, -- Cancellable? cancellable=null) -+ out uint matches) - throws Error - { - var tr = new TimeRange.from_variant (time_range); -diff --git a/extensions/fts.vala b/extensions/fts.vala -index 0b8d81b7..359cd030 100644 ---- a/extensions/fts.vala -+++ b/extensions/fts.vala -@@ -183,7 +183,7 @@ namespace Zeitgeist - - var timer = new Timer (); - yield siin.search (query_string, time_range, filter_templates, -- offset, count, result_type, -+ offset, count, result_type, null, - out events, out matches); - debug ("Got %u[/%u] results from indexer (in %f seconds)", - (uint) events.n_children (), matches, timer.elapsed ()); -@@ -201,7 +201,7 @@ namespace Zeitgeist - var timer = new Timer (); - yield siin.search_with_relevancies ( - query_string, time_range, filter_templates, -- storage_state, offset, count, result_type, -+ storage_state, offset, count, result_type, null, - out events, out relevancies, out matches); - - debug ("Got %u[/%u] results from indexer (in %f seconds)", -diff --git a/libzeitgeist/index.vala b/libzeitgeist/index.vala -index e19621a5..458247ad 100644 ---- a/libzeitgeist/index.vala -+++ b/libzeitgeist/index.vala -@@ -137,7 +137,7 @@ public class Index : QueuedProxyWrapper - - yield proxy.search (query, time_range.to_variant (), - Events.to_variant (event_templates_cp), offset, num_events, -- result_type, out result, out matches, cancellable); -+ result_type, cancellable, out result, out matches); - - return new SimpleResultSet.with_num_matches ( - Events.from_variant (result), matches); -@@ -195,8 +195,8 @@ public class Index : QueuedProxyWrapper - - yield proxy.search_with_relevancies (query, time_range.to_variant (), - Events.to_variant (event_templates_cp), storage_state, offset, -- num_events, result_type, out relevancies_variant, out result, -- out matches, cancellable); -+ num_events, result_type, cancellable, out relevancies_variant, -+ out result, out matches); - - relevancies = new double[relevancies_variant.n_children ()]; - VariantIter iter = relevancies_variant.iterator (); -diff --git a/libzeitgeist/remote.vala b/libzeitgeist/remote.vala -index 0035e154..677aef5f 100644 ---- a/libzeitgeist/remote.vala -+++ b/libzeitgeist/remote.vala -@@ -141,16 +141,17 @@ namespace Zeitgeist - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, -- out uint matches, Cancellable? cancellable=null) throws Error; -+ out uint matches) throws Error; - public abstract async void search_with_relevancies ( - string query_string, - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint storage_state, uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, -- out double[] relevancies, out uint matches, -- Cancellable? cancellable=null) throws Error; -+ out double[] relevancies, out uint matches) throws Error; - } - - /* FIXME: Remove this! Only here because of a bug ---- a/src/ext-fts.vala -+++ b/src/ext-fts.vala -@@ -183,7 +183,7 @@ namespace Zeitgeist - - var timer = new Timer (); - yield siin.search (query_string, time_range, filter_templates, -- offset, count, result_type, -+ offset, count, result_type, null, - out events, out matches); - debug ("Got %u[/%u] results from indexer (in %f seconds)", - (uint) events.n_children (), matches, timer.elapsed ()); -@@ -201,7 +201,7 @@ namespace Zeitgeist - var timer = new Timer (); - yield siin.search_with_relevancies ( - query_string, time_range, filter_templates, -- storage_state, offset, count, result_type, -+ storage_state, offset, count, result_type, null, - out events, out relevancies, out matches); - - debug ("Got %u[/%u] results from indexer (in %f seconds)", --- -2.18.1 - diff --git a/zeitgeist-1.0.1-fts-vala-fix.patch b/zeitgeist-1.0.1-fts-vala-fix.patch deleted file mode 100644 index aacd691..0000000 --- a/zeitgeist-1.0.1-fts-vala-fix.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 4cd7031da14d4a2a291f7a176b3e6c08c49ddcef Mon Sep 17 00:00:00 2001 -From: David King -Date: Wed, 30 Jan 2019 07:55:44 +0000 -Subject: [PATCH] fts: Adapt fully for commit 131a84f1 - ---- - extensions/fts.vala | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/extensions/fts.vala b/extensions/fts.vala -index 359cd030..72404e5f 100644 ---- a/extensions/fts.vala -+++ b/extensions/fts.vala -@@ -29,6 +29,7 @@ namespace Zeitgeist - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, - out uint matches) throws Error; - public abstract async void search_with_relevancies ( -@@ -36,6 +37,7 @@ namespace Zeitgeist - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint storage_state, uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, - out double[] relevancies, - out uint matches) throws Error; -@@ -177,13 +179,14 @@ namespace Zeitgeist - - public async void search (string query_string, Variant time_range, - Variant filter_templates, uint offset, uint count, uint result_type, -- out Variant events, out uint matches) throws Error -+ Cancellable? cancellable, out Variant events, -+ out uint matches) throws Error - { - if (siin == null) yield wait_for_proxy (); - - var timer = new Timer (); - yield siin.search (query_string, time_range, filter_templates, -- offset, count, result_type, null, -+ offset, count, result_type, cancellable, - out events, out matches); - debug ("Got %u[/%u] results from indexer (in %f seconds)", - (uint) events.n_children (), matches, timer.elapsed ()); -@@ -193,15 +196,15 @@ namespace Zeitgeist - string query_string, Variant time_range, - Variant filter_templates, uint storage_state, - uint offset, uint count, uint result_type, -- out Variant events, out double[] relevancies, out uint matches) -- throws Error -+ Cancellable? cancellable, out Variant events, -+ out double[] relevancies, out uint matches) throws Error - { - if (siin == null) yield wait_for_proxy (); - - var timer = new Timer (); - yield siin.search_with_relevancies ( - query_string, time_range, filter_templates, -- storage_state, offset, count, result_type, null, -+ storage_state, offset, count, result_type, cancellable, - out events, out relevancies, out matches); - - debug ("Got %u[/%u] results from indexer (in %f seconds)", ---- a/src/ext-fts.vala -+++ b/src/ext-fts.vala -@@ -29,6 +29,7 @@ namespace Zeitgeist - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, - out uint matches) throws Error; - public abstract async void search_with_relevancies ( -@@ -36,6 +37,7 @@ namespace Zeitgeist - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint storage_state, uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, - out double[] relevancies, - out uint matches) throws Error; -@@ -177,13 +179,14 @@ namespace Zeitgeist - - public async void search (string query_string, Variant time_range, - Variant filter_templates, uint offset, uint count, uint result_type, -- out Variant events, out uint matches) throws Error -+ Cancellable? cancellable, out Variant events, -+ out uint matches) throws Error - { - if (siin == null) yield wait_for_proxy (); - - var timer = new Timer (); - yield siin.search (query_string, time_range, filter_templates, -- offset, count, result_type, null, -+ offset, count, result_type, cancellable, - out events, out matches); - debug ("Got %u[/%u] results from indexer (in %f seconds)", - (uint) events.n_children (), matches, timer.elapsed ()); -@@ -193,15 +196,15 @@ namespace Zeitgeist - string query_string, Variant time_range, - Variant filter_templates, uint storage_state, - uint offset, uint count, uint result_type, -- out Variant events, out double[] relevancies, out uint matches) -- throws Error -+ Cancellable? cancellable, out Variant events, -+ out double[] relevancies, out uint matches) throws Error - { - if (siin == null) yield wait_for_proxy (); - - var timer = new Timer (); - yield siin.search_with_relevancies ( - query_string, time_range, filter_templates, -- storage_state, offset, count, result_type, null, -+ storage_state, offset, count, result_type, cancellable, - out events, out relevancies, out matches); - - debug ("Got %u[/%u] results from indexer (in %f seconds)", --- -2.20.1 - diff --git a/zeitgeist.spec b/zeitgeist.spec index ce0150b..1705c7c 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist -Version: 1.0.1 -Release: 3%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -10,15 +10,19 @@ Summary: Framework providing Desktop activity awareness # 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}/1.0/%{version}/+download/%{name}-%{version}.tar.xz -Patch0: zeitgeist-1.0.1-fix-ontology-vala-syntax.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1668410 -Patch1: zeitgeist-1.0.1-fix-vapi.patch -# https://gitlab.freedesktop.org/zeitgeist/zeitgeist/merge_requests/1 -Patch2: zeitgeist-1.0.1-fts-vala-fix.patch +Source0: %{url}/1.0/%{version}/+download/%{name}-%{version}.tar.xz + +# patch build system to disable building custom python2 bindings +Patch0: 00-disable-python.patch BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: systemd +BuildRequires: vala +BuildRequires: xapian-core-devel + BuildRequires: pkgconfig(dee-icu-1.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -26,18 +30,12 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(telepathy-glib) -BuildRequires: gettext -BuildRequires: python2-devel -BuildRequires: python2-rdflib -BuildRequires: raptor2 + %{?systemd_requires} -BuildRequires: systemd -BuildRequires: vala -BuildRequires: xapian-core-devel Requires: dbus -Requires: python2-%{name} = %{version}-%{release} Obsoletes: zeitgeist-datahub < 0.9.5-4 +Obsoletes: python2-%{name} < 1.0.2-1 %description Zeitgeist is a service which logs the users's activities and events (files @@ -63,22 +61,12 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} This package contains libraries and header files for developing applications that use %{name}. -%package -n python2-%{name} -Summary: Python 2 bindings for %{name} -BuildArch: noarch -Requires: python2-dbus -Requires: python2-pyxdg -Requires: %{name} = %{version}-%{release} -%{?python_provide:%python_provide python2-%{name}} - -%description -n python2-%{name} -This package contains Python 2 API for -developing applications that use %{name}. %prep %autosetup -p1 -sed -i -e 's|/usr/bin/env python|/usr/bin/python2|' data/ontology2code +# make sure to nuke python stuff +rm -r python ## nuke unwanted rpaths, see also ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath @@ -142,10 +130,12 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-2.0.vapi %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi -%files -n python2-%{name} -%{python2_sitelib}/zeitgeist/ - %changelog +* Mon Sep 09 2019 Fabio Valentini - 1.0.2-1 +- Update to version 1.0.2. +- Drop unused python bindings. +- Drop unnecessary patches. + * Sat Jul 27 2019 Fedora Release Engineering - 1.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild