From 999865acb3059c2f8bd18727726240b941a660bc Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Mon, 4 Dec 2023 14:26:04 +0000 Subject: [PATCH] zeitgeist: update to 1.0.4. --- .../0001-Use-GenericArray-API-only.patch | 25 ------------ .../zeitgeist/patches/skip-log-tests.patch | 38 +++++++++++++++++++ srcpkgs/zeitgeist/template | 11 ++++-- 3 files changed, 45 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/zeitgeist/patches/0001-Use-GenericArray-API-only.patch create mode 100644 srcpkgs/zeitgeist/patches/skip-log-tests.patch diff --git a/srcpkgs/zeitgeist/patches/0001-Use-GenericArray-API-only.patch b/srcpkgs/zeitgeist/patches/0001-Use-GenericArray-API-only.patch deleted file mode 100644 index 29245dc385f68..0000000000000 --- a/srcpkgs/zeitgeist/patches/0001-Use-GenericArray-API-only.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 64ac3a6f94cd299e5e14945dc31b48f009dec152 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Wed, 30 Dec 2020 16:50:32 +0100 -Subject: [PATCH] Use GenericArray API only - ---- - libzeitgeist/where-clause.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libzeitgeist/where-clause.vala b/libzeitgeist/where-clause.vala -index 204e9b1a..c3e6fa62 100644 ---- a/libzeitgeist/where-clause.vala -+++ b/libzeitgeist/where-clause.vala -@@ -216,7 +216,7 @@ namespace Zeitgeist - #else - long[] pointers = new long[gptrarr.length + 1]; - #endif -- Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata, -+ Memory.copy(pointers, (void*) gptrarr.data, - gptrarr.length * sizeof (void *)); - return (T[]) pointers; - } --- -2.31.1 - diff --git a/srcpkgs/zeitgeist/patches/skip-log-tests.patch b/srcpkgs/zeitgeist/patches/skip-log-tests.patch new file mode 100644 index 0000000000000..7c99613a7a61d --- /dev/null +++ b/srcpkgs/zeitgeist/patches/skip-log-tests.patch @@ -0,0 +1,38 @@ +https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/issues/25 + +--- a/test/c/Makefile.am 2016-09-17 08:57:19.000000000 +0100 ++++ b/test/c/Makefile.am 2023-12-04 14:20:58.941739810 +0000 +@@ -26,7 +26,6 @@ + test-timestamp \ + test-symbols \ + test-monitor \ +- test-log \ + test-event \ + test-datasource \ + test-mimetypes \ +@@ -38,7 +37,6 @@ + test_timestamp_SOURCES = test-timestamp.c + test_symbols_SOURCES = test-symbols.c + test_monitor_SOURCES = test-monitor.c +-test_log_SOURCES = test-log.c + test_event_SOURCES = test-event.c + test_datasource_SOURCES = test-datasource.c + test_mimetypes_SOURCES = test-mimetypes.c +--- a/test/direct/Makefile.am 2016-09-17 08:57:19.000000000 +0100 ++++ b/test/direct/Makefile.am 2023-12-04 14:15:59.567828861 +0000 +@@ -47,7 +47,6 @@ + datamodel-test \ + datasource-test \ + event-test \ +- log-test \ + marshalling-test \ + mimetype-test \ + monitor-test \ +@@ -62,7 +61,6 @@ + datamodel_test_SOURCES = datamodel-test.vala + datasource_test_SOURCES = datasource-test.vala + event_test_SOURCES = event-test.vala +-log_test_SOURCES = log-test.vala + marshalling_test_SOURCES = marshalling-test.vala + query_operators_test_SOURCES = query-operators-test.vala + symbol_test_SOURCES = symbol-test.vala diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template index cf445049eeacd..a57220d559676 100644 --- a/srcpkgs/zeitgeist/template +++ b/srcpkgs/zeitgeist/template @@ -1,7 +1,7 @@ # Template file for 'zeitgeist' pkgname=zeitgeist -version=1.0.3 -revision=4 +version=1.0.4 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--enable-fts --enable-datahub $(vopt_enable gir introspection)" @@ -10,12 +10,15 @@ hostmakedepends="automake libtool pkg-config gettext-devel makedepends="json-glib-devel gtk+3-devel telepathy-glib-devel python3-gobject-devel dbus-devel sqlite-devel xapian-core-devel raptor" depends="python3-dbus python3-gobject" +checkdepends="xvfb-run" short_desc="Logs the users’ activities and events" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://launchpad.net/zeitgeist/" +changelog="https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/raw/main/NEWS" distfiles="https://launchpad.net/zeitgeist/${version%.*}/${version}/+download/zeitgeist-${version}.tar.xz" -checksum=609f5eeccc74ebec8d1a15155ee2306c86f2f670a510052da52ba9b3216c4cd5 +checksum=da0e11160b2a36fe6260acf62b4190e29755fd5df130818157a04883c1eb7237 +make_check_pre="xvfb-run" # Package build options build_options="gir vala" @@ -33,7 +36,7 @@ post_install() { libzeitgeist2_package() { short_desc+=" - shared library" pkg_install() { - vmove usr/lib/*.so.* + vmove "usr/lib/*.so.*" if [ "$build_option_gir" ]; then vmove usr/lib/girepository-1.0 fi