Date: Tuesday, March 21, 2023 @ 17:02:57 Author: heftig Revision: 471692
3.5.0-1 Modified: tracker3/trunk/PKGBUILD Deleted: tracker3/trunk/hotdoc.diff -------------+ PKGBUILD | 38 ++++++++++++++++---------------------- hotdoc.diff | 16 ---------------- 2 files changed, 16 insertions(+), 38 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-21 16:38:12 UTC (rev 471691) +++ PKGBUILD 2023-03-21 17:02:57 UTC (rev 471692) @@ -4,8 +4,8 @@ pkgbase=tracker3 pkgname=(tracker3 tracker3-docs) -pkgver=3.4.2 -pkgrel=2 +pkgver=3.5.0 +pkgrel=1 pkgdesc="Desktop-neutral user information store, search tool and indexer" url="https://wiki.gnome.org/Projects/Tracker"; arch=(x86_64) @@ -23,9 +23,9 @@ asciidoc bash-completion dbus + gi-docgen git gobject-introspection - hotdoc libsoup meson python-dbus @@ -32,12 +32,15 @@ python-gobject python-tappy systemd + vala ) -_commit=0de82e325639c567353ca68ccc421d12e5f1de86 # tags/3.4.2^0 -source=("git+https://gitlab.gnome.org/GNOME/tracker.git#commit=$_commit"; - hotdoc.diff) -sha256sums=('SKIP' - '804c682efe02e89349b4269f87bb50f97de5674f58b20bd7895569dbaafc6788') +_commit=00e9909ada1a79ac775a99f1c089854f0cf7c074 # tags/3.5.0^0 +source=( + "git+https://gitlab.gnome.org/GNOME/tracker.git#commit=$_commit"; + "git+https://gitlab.gnome.org/GNOME/gvdb.git"; +) +b2sums=('SKIP' + 'SKIP') pkgver() { cd tracker @@ -47,8 +50,9 @@ prepare() { cd tracker - # Fix docs build - git apply -3 ../hotdoc.diff + git submodule init + git submodule set-url subprojects/gvdb "$srcdir/gvdb" + git -c protocol.file.allow=always submodule update } build() { @@ -60,16 +64,6 @@ dbus-run-session meson test -C build --print-errorlogs -t 3 } -_pick() { - local p="$1" f d; shift - for f; do - d="$srcdir/$p/${f#$pkgdir/}" - mkdir -p "$(dirname "$d")" - mv "$f" "$d" - rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" - done -} - package_tracker3() { optdepends=('libsoup: Alternative remoting backend') provides=(libtracker-sparql-3.0.so) @@ -76,8 +70,8 @@ meson install -C build --destdir "$pkgdir" - cd "$pkgdir" - _pick docs usr/share/{devhelp,doc} + mkdir -p docs/usr/share + mv {"$pkgdir",docs}/usr/share/doc } package_tracker3-docs() { Deleted: hotdoc.diff =================================================================== --- hotdoc.diff 2023-03-21 16:38:12 UTC (rev 471691) +++ hotdoc.diff 2023-03-21 17:02:57 UTC (rev 471692) @@ -1,16 +0,0 @@ -diff --git i/docs/reference/libtracker-sparql/meson.build w/docs/reference/libtracker-sparql/meson.build -index b6dad9c9a..f027ce697 100644 ---- i/docs/reference/libtracker-sparql/meson.build -+++ w/docs/reference/libtracker-sparql/meson.build -@@ -69,7 +69,10 @@ hotdoc.generate_doc(docs_name, - index: 'index.md', - gi_index: 'gi-index.md', - gi_smart_index: true, -- gi_c_source_roots: [sparqlinc], -+ gi_c_source_roots: [ -+ join_paths(meson.project_build_root(), 'src/libtracker-sparql'), -+ join_paths(meson.project_source_root(), 'src/libtracker-sparql'), -+ ], - dependencies: [tracker_sparql_dep, base_ontology_docs, nepomuk_ontology_docs], - extra_assets: [join_paths(meson.current_source_dir(), 'images')], - html_theme: 'https://github.com/hotdoc/hotdoc_lumen_theme/releases/download/0.13.2/hotdoc_lumen_theme-0.13.2.tar.xz?sha256=5721189b7e985f27381ee20137f4a9003049a70a75ab1221a69fd04d27e752bc',
