* update zeitgeist to 1.0.4-3

zeitgeist/PKGBUILD

@@ -5,46 +5,96 @@
 
 pkgname=zeitgeist
 pkgver=1.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Service logging user activities and events"
-arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url="https://launchpad.net/zeitgeist/"
-license=(GPL2 LGPL2.1)
-depends=(json-glib telepathy-glib gtk3 xapian-core sqlite)
-makedepends=(gobject-introspection vala raptor python-rdflib git)
+arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
+license=(
+  "BSD-3-Clause OR CC-BY-3.0"
+  GPL-3.0-or-later
+  LGPL-2.1-or-later
+  LGPL-3.0-or-later
+)
+depends=(
+  gtk3
+  json-glib
+  sqlite
+  telepathy-glib
+  xapian-core
+)
+makedepends=(
+  git
+  gobject-introspection
+  python-rdflib
+  raptor
+  vala
+)
+checkdepends=(xorg-server-xvfb)
+optdepends=('python: Python bindings')
 provides=(zeitgeist-datahub)
 conflicts=(zeitgeist-datahub)
 replaces=(zeitgeist-datahub)
-_commit=8b89364c077b46734d193c5b8a80f83b0fc917dd
-source=("git+https://gitlab.freedesktop.org/zeitgeist/zeitgeist#commit=$_commit")
-sha256sums=('SKIP')
-validpgpkeys=('E4884AEEDE4CC02043C3D8045DECDBA89270E723') #Rico Tzschichholz <ricotz@ubuntu.com>
+_commit=8b89364c077b46734d193c5b8a80f83b0fc917dd  # tags/v1.0.4^0
+source=(
+  "git+https://gitlab.freedesktop.org/zeitgeist/zeitgeist.git#commit=$_commit"
+)
+b2sums=('SKIP')
+validpgpkeys=(
+  E4884AEEDE4CC02043C3D8045DECDBA89270E723  # Rico Tzschichholz <ricotz@ubuntu.com>
+)
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/^v//;s/-/+/g'
+  git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
+
+  # Fix some crashes
+  # https://gitlab.freedesktop.org/zeitgeist/zeitgeist/issues/19
+  # https://gitlab.freedesktop.org/zeitgeist/zeitgeist/issues/26
+  git cherry-pick -n 1be2a5fff77cdf61c843edc8356dfdef3fd2dbfc \
+                     33ab4cce74857f928382ba6cfada111a64dafe88
+
   autoreconf -fi
 }
 
 build() {
+  local configure_options=(
+    --prefix=/usr
+    --sysconfdir=/etc
+    --localstatedir=/var
+    --libexecdir=/usr/lib
+    --enable-fts
+  )
+
   cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --enable-fts
+  ./configure "${configure_options[@]}"
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
+_check() {
+  export ZEITGEIST_DATA_PATH="$PWD"
+
+  ./src/zeitgeist-daemon --no-datahub --log-level=debug &
+  _z=$!
+
+  trap "kill $_z; wait" EXIT
+
+  make -k check VERBOSE=1
+}
+
 check() {
   cd $pkgname
-  # Log test fails in chroot, as we have no X and no proper dbus
-  make -k check || :
+  dbus-run-session xvfb-run -s '-nolisten local' \
+    bash -c "$(declare -f _check); _check"
 }
 
 package() {
   cd $pkgname
   make DESTDIR="$pkgdir" install
 }
+
+# vim:set sw=2 sts=-1 et:

zeitgeist/keys/pgp/E4884AEEDE4CC02043C3D8045DECDBA89270E723.asc

@@ -0,0 +1,125 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=y2se
+-----END PGP PUBLIC KEY BLOCK-----