aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Weiss <luca@z3ntu.xyz>2021-04-08 23:33:08 +0200
committerRasmus Thomsen <oss@cogitri.dev>2021-04-09 11:15:43 +0000
commit0a32766bc303a35edd918fad686656e54d8c8db2 (patch)
tree39e071c5b41305fbf2785614d55d608c66a03962
parent60948431973dc77b619eb48c63e84de690774dfa (diff)
testing/zeitgeist: upgrade to 1.0.3
-rw-r--r--testing/zeitgeist/0001-Use-GenericArray-API-only.patch25
-rw-r--r--testing/zeitgeist/APKBUILD15
-rw-r--r--testing/zeitgeist/gettext_0.20.patch13
3 files changed, 33 insertions, 20 deletions
diff --git a/testing/zeitgeist/0001-Use-GenericArray-API-only.patch b/testing/zeitgeist/0001-Use-GenericArray-API-only.patch
new file mode 100644
index 00000000000..29245dc385f
--- /dev/null
+++ b/testing/zeitgeist/0001-Use-GenericArray-API-only.patch
@@ -0,0 +1,25 @@
+From 64ac3a6f94cd299e5e14945dc31b48f009dec152 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+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/testing/zeitgeist/APKBUILD b/testing/zeitgeist/APKBUILD
index d5a9065ad97..6cb8ea211eb 100644
--- a/testing/zeitgeist/APKBUILD
+++ b/testing/zeitgeist/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=zeitgeist
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.3
+pkgrel=0
pkgdesc="Activity logging framework"
arch="all"
url="https://zeitgeist.freedesktop.org/"
@@ -10,8 +10,9 @@ depends_dev="sqlite-dev gobject-introspection-dev xapian-core-dev telepathy-glib
gtk+3.0-dev json-glib-dev"
makedepends="$depends_dev autoconf automake gettext-dev libtool py3-rdflib vala git
raptor2"
+checkdepends="dbus-test-runner"
source="https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/archive/v$pkgver/zeitgeist-v$pkgver.tar.gz
- gettext_0.20.patch"
+ 0001-Use-GenericArray-API-only.patch"
subpackages="
$pkgname-dev
$pkgname-doc
@@ -20,7 +21,7 @@ subpackages="
$pkgname-bash-completion
"
builddir="$srcdir/$pkgname-v$pkgver"
-options="!check" # Needs D-Bus server, see https://gitlab.freedesktop.org/zeitgeist/zeitgeist/issues/4
+options="!check" # tests fail to build
prepare() {
default_prepare
@@ -44,7 +45,7 @@ build() {
}
check() {
- make check
+ dbus-test-runner -t make -p check
}
package() {
@@ -62,5 +63,5 @@ py3() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib
}
-sha512sums="077c2b751b5cb96efc5da6e47336456e1dec4238b1d252218c6da137049dd0c61d518b6079e632fbbfe5edeced0c89e922c826aed1f0811fd6a29ad89abd53ae zeitgeist-v1.0.2.tar.gz
-db47a77efe7ba5cc3f71a9a2d438359c8c9a8dcd2e016726f7776d373177c863e848e4ed4525df66237c79fbf94e3cad3e2844ac685a90e663680cb71e44ff5d gettext_0.20.patch"
+sha512sums="a4dd58ee75e8f8cb68e9a6d91617b7d216412c1025c6ae893cf709b7b81ade648c3a17f1d6d6f0dd34e8b9271b4839ac41f2e04332cc81e1d21d7a7f2881f08b zeitgeist-v1.0.3.tar.gz
+027d5b016a85230f855650a347dfadf7e292a84487a7417d5965c2bba376281774f064c66035105439821b294c3e71e2033ac109b3324df7431550caf00bc246 0001-Use-GenericArray-API-only.patch"
diff --git a/testing/zeitgeist/gettext_0.20.patch b/testing/zeitgeist/gettext_0.20.patch
deleted file mode 100644
index 8e42fa5760c..00000000000
--- a/testing/zeitgeist/gettext_0.20.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 14d8efa..3ea1cc7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,7 +31,7 @@ AM_SILENT_RULES([yes])
- GETTEXT_PACKAGE=AC_PACKAGE_NAME
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])
--AM_GNU_GETTEXT_VERSION([0.19])
-+AM_GNU_GETTEXT_VERSION([0.20])
- AM_GNU_GETTEXT([external])
-
- AC_SUBST(CFLAGS)