* [PR PATCH] tinysparql: update to 3.8.0, rename from tracker
@ 2024-09-30 1:20 oreo639
2024-09-30 1:26 ` [PR PATCH] [Updated] " oreo639
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: oreo639 @ 2024-09-30 1:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1572 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 28778 bytes --]
From 15ed4fa57384bbe56b026f54692f505ff5ac7b51 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
srcpkgs/{tracker => tinysparql}/template | 41 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
10 files changed, 38 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
rename srcpkgs/{tracker => tinysparql}/template (70%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 70%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..0cdd3e9a617b49 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,13 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -43,8 +43,9 @@ post_patch() {
fi
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +56,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +64,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From e6216471b95f94658df8b30970688ac41c3b5f67 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From 21686492f6b4276362ffea1ce2a8e0fa94e74ab5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From e3aa3c699720fad7fcd1c9a3b6605e74b911d0b2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From 6efc6e2d9811674959aecb2584c30003614ef0e1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 27bc856d94aee540b783d1f5c881f6e3cd801039 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..9ab9147095f8e0 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
From 6e461fe8e8e109b09c112c3bde739e2c30f1640b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From 38da5ce3c08913ffd8841c7719ea73f2be264279 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..0771b2df83cdec 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
From 0f28d69452a7d46e99facec3805cc1cf013c9dd4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 133 ++++++++++++++++++++
srcpkgs/nautilus/template | 10 +-
2 files changed, 138 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..693b79a4c3cd8e
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,133 @@
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+index 4fa7371d15..d770619b38 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Files
+-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
++Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Files
+ NameSuffix=Miner.Files
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index b946225e33..4c1da5ec5b 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
+@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
+ &error);
+ if (!success)
+ {
+- g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
++ g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ return;
+ }
+
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..f355487fa665f3 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
From 759f0629f83b5fd9e8efe2fb954bdd7ecb183f0d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From 417c1fc880eb29b9a84adce020607f92b9dfdf22 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..a25ceb7a20c341 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
@ 2024-09-30 1:26 ` oreo639
2024-09-30 1:36 ` oreo639
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-09-30 1:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 29087 bytes --]
From 7dc1d3b12bcbf56adb8dfb2fa43ee3c927f95375 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtinysparql | 1 +
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
srcpkgs/{tracker => tinysparql}/template | 41 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
11 files changed, 39 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/libtinysparql
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
rename srcpkgs/{tracker => tinysparql}/template (70%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 70%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..0cdd3e9a617b49 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,13 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -43,8 +43,9 @@ post_patch() {
fi
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +56,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +64,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From 07aac725e41addb9d661ef834f62c1f6e4cf80e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From 0aacfc31c8d703fabf60df25938a0b3cae8637af Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From 83786985bc3ba1a09d4f43da7d6932205a8a6b8f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From d61efc78786e30ae5945437f345a052716f2ef93 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 09fb358b8169ecd041246e065ee05e6ae391767f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..9ab9147095f8e0 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
From 45d8b31af66620182c79895803419a321f932004 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From 643c803929aa6e88cc49ea9f07e86aefc55f52ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..0771b2df83cdec 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
From 0fc35516c99f64911ff5a18b4db070e1210967fc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 133 ++++++++++++++++++++
srcpkgs/nautilus/template | 10 +-
2 files changed, 138 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..693b79a4c3cd8e
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,133 @@
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+index 4fa7371d15..d770619b38 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Files
+-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
++Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Files
+ NameSuffix=Miner.Files
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index b946225e33..4c1da5ec5b 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
+@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
+ &error);
+ if (!success)
+ {
+- g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
++ g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ return;
+ }
+
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..f355487fa665f3 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
From 91a6354ee93939642cbf9ffa1916f879f3bd3545 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From cab45ca4b3390806d99fe2b3ffe7140ebdb5fb6d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..a25ceb7a20c341 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
2024-09-30 1:26 ` [PR PATCH] [Updated] " oreo639
@ 2024-09-30 1:36 ` oreo639
2024-09-30 1:42 ` oreo639
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-09-30 1:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 29375 bytes --]
From 6ff30a4c777e2fc50091007bae4dfe00d9278cf7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtinysparql | 1 +
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
srcpkgs/{tracker => tinysparql}/template | 42 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
11 files changed, 40 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/libtinysparql
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
rename srcpkgs/{tracker => tinysparql}/template (68%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 68%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..6e5a4c911895f5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,13 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -41,10 +41,12 @@ post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
vsed -e "s/error('Libc implementation has broken 4-digit years implementation.')/year_modifier = '%2C%y'/" -i meson.build
fi
+ vsed -e 's/timeout: 30/timeout: 100/g' -i tests/functional-tests/meson.build
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +57,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +65,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From 1e49f53602f371a583bf4c128be777e1aa8796b4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From 9435ef5ad7f5a673f412e76977c1bd2a4d93ad03 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From 8421897d8f54faa61b61e16ec10fcbd5c660cc04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From 29027c2c077b5ebe7fe78acbc6f9c8a906ad893d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 560d78b74f0e37e4f6bc50aace8d2ac80979452d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..9ab9147095f8e0 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
From e632d9e541d23a77fe55ffd531897f60a18873d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From f0cf57dce30241becdc0f1e87606b03dd04541c0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..0771b2df83cdec 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
From 6024e8735cc46365dc3a5cc49960c51e69ef40af Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 133 ++++++++++++++++++++
srcpkgs/nautilus/template | 10 +-
2 files changed, 138 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..693b79a4c3cd8e
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,133 @@
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+index 4fa7371d15..d770619b38 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Files
+-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
++Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Files
+ NameSuffix=Miner.Files
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index b946225e33..4c1da5ec5b 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
+@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
+ &error);
+ if (!success)
+ {
+- g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
++ g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ return;
+ }
+
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..f355487fa665f3 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
From 3147f57cd76a973a7cacbc96144d1cb4d9d0b02d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From 29f6516ee202735ca16bb82784f19f79a3835ae3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..a25ceb7a20c341 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
2024-09-30 1:26 ` [PR PATCH] [Updated] " oreo639
2024-09-30 1:36 ` oreo639
@ 2024-09-30 1:42 ` oreo639
2024-09-30 2:09 ` oreo639
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-09-30 1:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 29404 bytes --]
From 86f33f8de5e576ca5e8072f00da446708603b210 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtinysparql | 1 +
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
srcpkgs/{tracker => tinysparql}/template | 43 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
11 files changed, 41 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/libtinysparql
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
rename srcpkgs/{tracker => tinysparql}/template (67%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 67%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..a377e14fb8d96e 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,14 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
+make_check_args="--verbose"
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -41,10 +42,12 @@ post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
vsed -e "s/error('Libc implementation has broken 4-digit years implementation.')/year_modifier = '%2C%y'/" -i meson.build
fi
+ vsed -e 's/timeout: 30/timeout: 100/g' -i tests/functional-tests/meson.build
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +58,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +66,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From 390072cb6a01e0346ccbca5fe2c68d7b8af6b5d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From 75a6bdb45d4a360f0d52c639fecdb49ac3e98427 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9bb140adc063b63c542be28e6911a92e7543123e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From 023dd563e985678f2dfd546b5737f0e33dcd01fc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 4324338ede42e7a23badf1da7959908abb517e05 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..9ab9147095f8e0 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
From dc92dcf85e5fa4e125313d87ed99d1c2ecbb807b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From 9963ada931c34def1a7f671d9525ed0ad313f53e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..0771b2df83cdec 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
From 6e5107cb764e04e35dc9f2e58e98d53e95511609 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 133 ++++++++++++++++++++
srcpkgs/nautilus/template | 10 +-
2 files changed, 138 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..693b79a4c3cd8e
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,133 @@
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+index 4fa7371d15..d770619b38 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Files
+-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
++Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Files
+ NameSuffix=Miner.Files
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index b946225e33..4c1da5ec5b 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
+@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
+ &error);
+ if (!success)
+ {
+- g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
++ g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ return;
+ }
+
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..f355487fa665f3 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
From b2d2e2488d878ef268e6b6af65d38e875da7c9ef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From 49e1f6ba0a2508a052e494b04caafe6549a282d4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..a25ceb7a20c341 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
` (2 preceding siblings ...)
2024-09-30 1:42 ` oreo639
@ 2024-09-30 2:09 ` oreo639
2024-09-30 2:18 ` oreo639
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-09-30 2:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 31336 bytes --]
From 9956791f7f2e95c1e66b9957a73b73f16aacfd1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtinysparql | 1 +
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
.../tinysparql/patches/gh-ci-timeout.patch | 31 +++++++++++++
srcpkgs/{tracker => tinysparql}/template | 43 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
12 files changed, 72 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/libtinysparql
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
create mode 100644 srcpkgs/tinysparql/patches/gh-ci-timeout.patch
rename srcpkgs/{tracker => tinysparql}/template (67%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tinysparql/patches/gh-ci-timeout.patch b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
new file mode 100644
index 00000000000000..61bfef89c8c926
--- /dev/null
+++ b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
@@ -0,0 +1,31 @@
+--- b/tests/functional-tests/fixtures.py
++++ a/tests/functional-tests/fixtures.py
+@@ -264,8 +264,6 @@
+ raise
+
+ def tearDown(self):
+- for name in self.connections:
+- self.connections[name].conn.close()
+ for service in self.message_queues:
+ self.stop_service(service)
+ self.sandbox.stop()
+--- b/tests/functional-tests/sandbox.py
++++ a/tests/functional-tests/sandbox.py
+@@ -37,7 +37,6 @@
+ log = logging.getLogger(__name__)
+
+ TRACKER_DBUS_PREFIX = 'org.freedesktop.Tracker3'
+-TRACKER_PORTAL_NAME = 'org.freedesktop.portal.Tracker'
+
+ _process_list = []
+
+@@ -109,7 +108,7 @@
+
+ log.info("Looking for active Tracker processes on the session bus")
+ for busname in self.session_bus.list_names_sync():
++ if busname.startswith(TRACKER_DBUS_PREFIX):
+- if busname.startswith(TRACKER_DBUS_PREFIX) or busname == TRACKER_PORTAL_NAME:
+ pid = self.session_bus.get_connection_unix_process_id_sync(busname)
+ if pid is not None:
+ tracker_processes.append(pid)
+
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 67%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..a377e14fb8d96e 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,14 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
+make_check_args="--verbose"
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -41,10 +42,12 @@ post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
vsed -e "s/error('Libc implementation has broken 4-digit years implementation.')/year_modifier = '%2C%y'/" -i meson.build
fi
+ vsed -e 's/timeout: 30/timeout: 100/g' -i tests/functional-tests/meson.build
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +58,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +66,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From ca7baebebb1c0202852b01cd2b55d8878924df32 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From 23def0032f94ba15c3c52cdef4d18ee263174aac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From 699b655edfe2d5205136ebd5604871efdcf74045 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From 8df6bfd3dd2e7fa7ea7d236a1646acd65c2816ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From bdfb1826d363d75c657b2a36c80b2fb518e35e19 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..9ab9147095f8e0 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
From f84893d961be14a4ee891c1e935668e1d48dd891 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From 2b4b82baba65efc3a4a3aae7912e517f19df9d8d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..0771b2df83cdec 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
From 723f513f930a0f978b9eecc72675e5c2607eddd0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 133 ++++++++++++++++++++
srcpkgs/nautilus/template | 10 +-
2 files changed, 138 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..693b79a4c3cd8e
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,133 @@
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+index 4fa7371d15..d770619b38 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Files
+-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
++Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Files
+ NameSuffix=Miner.Files
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index b946225e33..4c1da5ec5b 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
+@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
+ &error);
+ if (!success)
+ {
+- g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
++ g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ return;
+ }
+
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..f355487fa665f3 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
From 877e90d104d6aa1cda1ec87ae7207709f541c9f3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From 96abc35203170fad1ce518beabbc02bb123a60be Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..92cd6488b4ab38 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Rygel"
changelog="https://gitlab.gnome.org/GNOME/rygel/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=47d25704b61088375e26aaba56be47c17189472e6f80c752abe86f02ef4e3304
+checksum=5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72
conf_files="/etc/rygel.conf"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
` (3 preceding siblings ...)
2024-09-30 2:09 ` oreo639
@ 2024-09-30 2:18 ` oreo639
2024-09-30 2:22 ` oreo639
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-09-30 2:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 30654 bytes --]
From 5572d4811cbe6e7579e925b9587f3ddaaabfc246 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtinysparql | 1 +
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
.../tinysparql/patches/gh-ci-timeout.patch | 20 +++++++++
srcpkgs/{tracker => tinysparql}/template | 41 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
12 files changed, 59 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/libtinysparql
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
create mode 100644 srcpkgs/tinysparql/patches/gh-ci-timeout.patch
rename srcpkgs/{tracker => tinysparql}/template (70%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tinysparql/patches/gh-ci-timeout.patch b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
new file mode 100644
index 00000000000000..16eba5022fee50
--- /dev/null
+++ b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
@@ -0,0 +1,20 @@
+--- b/tests/functional-tests/sandbox.py
++++ a/tests/functional-tests/sandbox.py
+@@ -37,7 +37,6 @@
+ log = logging.getLogger(__name__)
+
+ TRACKER_DBUS_PREFIX = 'org.freedesktop.Tracker3'
+-TRACKER_PORTAL_NAME = 'org.freedesktop.portal.Tracker'
+
+ _process_list = []
+
+@@ -109,7 +108,7 @@
+
+ log.info("Looking for active Tracker processes on the session bus")
+ for busname in self.session_bus.list_names_sync():
++ if busname.startswith(TRACKER_DBUS_PREFIX):
+- if busname.startswith(TRACKER_DBUS_PREFIX) or busname == TRACKER_PORTAL_NAME:
+ pid = self.session_bus.get_connection_unix_process_id_sync(busname)
+ if pid is not None:
+ tracker_processes.append(pid)
+
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 70%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..0cdd3e9a617b49 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,13 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -43,8 +43,9 @@ post_patch() {
fi
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +56,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +64,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From 83ef2789d6c25a5a69e1ed305386cf75eff0cc95 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From e811f80a598e5b43b0f2deb0c318acb27d8a0460 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From af2cea647eec8b6b2530664bfbfb7e643e3c0f51 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From 51011923e6873f91ef2c098731b6a29424086a21 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From ba4802d3fc04ade615268b45a7ba210883db0d8a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..9ab9147095f8e0 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
From 835222f46003f1a84692d4cae3813b70bb83d5bd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From b4be62308c61901c358ce38391b1738466bbfd2b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..0771b2df83cdec 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
From 5e77f2ff0baa5c249f0431099d25dc6af0170bd1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 133 ++++++++++++++++++++
srcpkgs/nautilus/template | 10 +-
2 files changed, 138 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..693b79a4c3cd8e
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,133 @@
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+index 4fa7371d15..d770619b38 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Files
+-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
++Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Files
+ NameSuffix=Miner.Files
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index b946225e33..4c1da5ec5b 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
+@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
+ &error);
+ if (!success)
+ {
+- g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
++ g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ return;
+ }
+
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..f355487fa665f3 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
From c8fe692651a41f180afc8a5f090b93d2b6c88861 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From 352f70fe484a6ba1bb56ed73ea527881a3ed54b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..92cd6488b4ab38 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Rygel"
changelog="https://gitlab.gnome.org/GNOME/rygel/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=47d25704b61088375e26aaba56be47c17189472e6f80c752abe86f02ef4e3304
+checksum=5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72
conf_files="/etc/rygel.conf"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
` (4 preceding siblings ...)
2024-09-30 2:18 ` oreo639
@ 2024-09-30 2:22 ` oreo639
2024-09-30 2:28 ` oreo639
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-09-30 2:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 30245 bytes --]
From 5785583545d9e167e9b20be6ecedef9e7688c981 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtinysparql | 1 +
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
.../tinysparql/patches/gh-ci-timeout.patch | 11 +++++
srcpkgs/{tracker => tinysparql}/template | 41 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
12 files changed, 50 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/libtinysparql
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
create mode 100644 srcpkgs/tinysparql/patches/gh-ci-timeout.patch
rename srcpkgs/{tracker => tinysparql}/template (70%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tinysparql/patches/gh-ci-timeout.patch b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
new file mode 100644
index 00000000000000..eb3b0bc49bdb84
--- /dev/null
+++ b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
@@ -0,0 +1,11 @@
+--- b/tests/functional-tests/fixtures.py
++++ a/tests/functional-tests/fixtures.py
+@@ -264,8 +264,6 @@
+ raise
+
+ def tearDown(self):
+- for name in self.connections:
+- self.connections[name].conn.close()
+ for service in self.message_queues:
+ self.stop_service(service)
+ self.sandbox.stop()
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 70%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..0cdd3e9a617b49 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,13 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -43,8 +43,9 @@ post_patch() {
fi
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +56,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +64,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From 9cca2a6a3eb05486e0b48ca6a0303498db938453 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From 573d5bfa7ed9d325e7c6a12d1a06246dafd69370 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From b15ede3b2d06541b36e18347e2ae60a0fe670c74 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From 4328aeb3a5a1447b40baa088e5fca55da2eaa98d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 5edf7a68dd6fa1bfb3714b0eec62ec357f6c4d24 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..9ab9147095f8e0 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
From 537f91487730a08d52dd2534656119faf18c79d6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From c169cf7be8af31a6815482afdea9338a080d81d2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..0771b2df83cdec 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
From 7f092ef98e5c4a72f1d1f84210d18cf9888dc9a2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 133 ++++++++++++++++++++
srcpkgs/nautilus/template | 10 +-
2 files changed, 138 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..693b79a4c3cd8e
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,133 @@
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+index 4fa7371d15..d770619b38 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Files
+-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
++Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Files
+ NameSuffix=Miner.Files
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index b946225e33..4c1da5ec5b 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
+@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
+ &error);
+ if (!success)
+ {
+- g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
++ g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ return;
+ }
+
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..f355487fa665f3 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
From 1493ec3e437d093083553602ac92c1643faa0e82 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From ec8b3b7748c218113e56dd2b6dcea26bf151f118 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..92cd6488b4ab38 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Rygel"
changelog="https://gitlab.gnome.org/GNOME/rygel/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=47d25704b61088375e26aaba56be47c17189472e6f80c752abe86f02ef4e3304
+checksum=5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72
conf_files="/etc/rygel.conf"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
` (5 preceding siblings ...)
2024-09-30 2:22 ` oreo639
@ 2024-09-30 2:28 ` oreo639
2024-09-30 3:47 ` oreo639
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-09-30 2:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 31084 bytes --]
From 5f0841f8dbf63ebb976212c18beb73dbcbb284d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtinysparql | 1 +
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
.../tinysparql/patches/gh-ci-timeout.patch | 22 ++++++++++
srcpkgs/{tracker => tinysparql}/template | 43 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
12 files changed, 63 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/libtinysparql
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
create mode 100644 srcpkgs/tinysparql/patches/gh-ci-timeout.patch
rename srcpkgs/{tracker => tinysparql}/template (67%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tinysparql/patches/gh-ci-timeout.patch b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
new file mode 100644
index 00000000000000..6f004e300b954b
--- /dev/null
+++ b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
@@ -0,0 +1,22 @@
+Partially revert 5bbf312ddb9fb4a9e834aaceba80a6fdbaefec11 to avoid infinate loop in github actions
+
+--- b/tests/functional-tests/sandbox.py
++++ a/tests/functional-tests/sandbox.py
+@@ -37,7 +37,6 @@
+ log = logging.getLogger(__name__)
+
+ TRACKER_DBUS_PREFIX = 'org.freedesktop.Tracker3'
+-TRACKER_PORTAL_NAME = 'org.freedesktop.portal.Tracker'
+
+ _process_list = []
+
+@@ -109,7 +108,7 @@
+
+ log.info("Looking for active Tracker processes on the session bus")
+ for busname in self.session_bus.list_names_sync():
++ if busname.startswith(TRACKER_DBUS_PREFIX):
+- if busname.startswith(TRACKER_DBUS_PREFIX) or busname == TRACKER_PORTAL_NAME:
+ pid = self.session_bus.get_connection_unix_process_id_sync(busname)
+ if pid is not None:
+ tracker_processes.append(pid)
+
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 67%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..06751532f8d3ce 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,13 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -41,10 +41,13 @@ post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
vsed -e "s/error('Libc implementation has broken 4-digit years implementation.')/year_modifier = '%2C%y'/" -i meson.build
fi
+ # Increase timeout for github actions
+ vsed -e 's/timeout: 30/timeout: 60/g' -i tests/functional-tests/meson.build
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +58,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +66,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From 90f52e3f561a6dcc588ab8200a6b3133f1504e29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From f159e87c3f8a1b81ed0e8bcbee968a86a725dc26 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From da7af69da22b0ee9eeb6802c5491cf3af14e8a98 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From 7d18ae8f1a59a4be42e6d2c13037f2dbe48063de Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 08fd73f17d36e2d4041bfbdb2ff0d3c82d5691f0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..9ab9147095f8e0 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
From ab224dedec3b157dc62f8d833a36700d7102b66f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From ad90db57a83a96d9328cab2cf3e8e6aee2277b3d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..0771b2df83cdec 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
From 0159780b6032d87c475743f5d505d35dbde19507 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 133 ++++++++++++++++++++
srcpkgs/nautilus/template | 10 +-
2 files changed, 138 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..693b79a4c3cd8e
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,133 @@
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+index 4fa7371d15..d770619b38 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Files
+-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
++Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Files
+ NameSuffix=Miner.Files
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index b946225e33..4c1da5ec5b 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
+@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
+ &error);
+ if (!success)
+ {
+- g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
++ g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ return;
+ }
+
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..f355487fa665f3 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
From 56d7712b4f76ad72f2bcba3a0cd23f95168a8a60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From 73531158e430b4e9214ac316e3e44f0e2ce91191 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..92cd6488b4ab38 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Rygel"
changelog="https://gitlab.gnome.org/GNOME/rygel/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=47d25704b61088375e26aaba56be47c17189472e6f80c752abe86f02ef4e3304
+checksum=5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72
conf_files="/etc/rygel.conf"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
` (6 preceding siblings ...)
2024-09-30 2:28 ` oreo639
@ 2024-09-30 3:47 ` oreo639
2024-09-30 4:33 ` oreo639
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-09-30 3:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 32132 bytes --]
From 5f0841f8dbf63ebb976212c18beb73dbcbb284d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtinysparql | 1 +
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
.../tinysparql/patches/gh-ci-timeout.patch | 22 ++++++++++
srcpkgs/{tracker => tinysparql}/template | 43 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
12 files changed, 63 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/libtinysparql
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
create mode 100644 srcpkgs/tinysparql/patches/gh-ci-timeout.patch
rename srcpkgs/{tracker => tinysparql}/template (67%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tinysparql/patches/gh-ci-timeout.patch b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
new file mode 100644
index 00000000000000..6f004e300b954b
--- /dev/null
+++ b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
@@ -0,0 +1,22 @@
+Partially revert 5bbf312ddb9fb4a9e834aaceba80a6fdbaefec11 to avoid infinate loop in github actions
+
+--- b/tests/functional-tests/sandbox.py
++++ a/tests/functional-tests/sandbox.py
+@@ -37,7 +37,6 @@
+ log = logging.getLogger(__name__)
+
+ TRACKER_DBUS_PREFIX = 'org.freedesktop.Tracker3'
+-TRACKER_PORTAL_NAME = 'org.freedesktop.portal.Tracker'
+
+ _process_list = []
+
+@@ -109,7 +108,7 @@
+
+ log.info("Looking for active Tracker processes on the session bus")
+ for busname in self.session_bus.list_names_sync():
++ if busname.startswith(TRACKER_DBUS_PREFIX):
+- if busname.startswith(TRACKER_DBUS_PREFIX) or busname == TRACKER_PORTAL_NAME:
+ pid = self.session_bus.get_connection_unix_process_id_sync(busname)
+ if pid is not None:
+ tracker_processes.append(pid)
+
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 67%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..06751532f8d3ce 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,13 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -41,10 +41,13 @@ post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
vsed -e "s/error('Libc implementation has broken 4-digit years implementation.')/year_modifier = '%2C%y'/" -i meson.build
fi
+ # Increase timeout for github actions
+ vsed -e 's/timeout: 30/timeout: 60/g' -i tests/functional-tests/meson.build
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +58,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +66,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From 90f52e3f561a6dcc588ab8200a6b3133f1504e29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From f159e87c3f8a1b81ed0e8bcbee968a86a725dc26 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From da7af69da22b0ee9eeb6802c5491cf3af14e8a98 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From 7d18ae8f1a59a4be42e6d2c13037f2dbe48063de Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 08fd73f17d36e2d4041bfbdb2ff0d3c82d5691f0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..9ab9147095f8e0 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
From ab224dedec3b157dc62f8d833a36700d7102b66f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From 8df1df41e680140c0d395d89318df3b59d6288ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..4eaea2db4e3f44 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
@@ -19,11 +19,3 @@ homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/grilo-plugins/${version%.*}/grilo-plugins-${version}.tar.xz"
checksum=fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb
make_check=no # feel free to fix
-
-post_patch() {
- if [ "$CROSS_BUILD" ]; then
- # tests try to use tracker-sandbox from the wrong path:
- # "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
- vsed -e "/subdir('tests')/d" -i meson.build
- fi
-}
From 06811299535097c1c7650b608b1c7f8b0e83f5bd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 133 ++++++++++++++++++++
srcpkgs/nautilus/template | 18 +--
2 files changed, 139 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..693b79a4c3cd8e
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,133 @@
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+index 4fa7371d15..d770619b38 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Files
+-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
++Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Files
+ NameSuffix=Miner.Files
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index b946225e33..4c1da5ec5b 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
+@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
+ &error);
+ if (!success)
+ {
+- g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
++ g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ return;
+ }
+
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..edd50dc79ded6d 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
- gtk-update-icon-cache"
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
+ localsearch gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -26,12 +26,6 @@ checksum=6ee8c99019b9e3447f6918d68232a20deca89e5525c05805432b7d8840ca71fa
# 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
make_check=ci-skip
-if [ "$CROSS_BUILD" ]; then
- # tests try to use tracker-sandbox from the wrong path, because of some confusion with libdir:
- # "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
- configure_args+=" -Dtests=none"
-fi
-
build_options="gir"
build_options_default="gir"
From 2239c83311976bff5bf2d540b318ccc91adbb751 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From 721ddcd5e5adc56807d3ac435ace2c4bbb11cb5f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..92cd6488b4ab38 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Rygel"
changelog="https://gitlab.gnome.org/GNOME/rygel/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=47d25704b61088375e26aaba56be47c17189472e6f80c752abe86f02ef4e3304
+checksum=5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72
conf_files="/etc/rygel.conf"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
` (7 preceding siblings ...)
2024-09-30 3:47 ` oreo639
@ 2024-09-30 4:33 ` oreo639
2024-09-30 4:47 ` oreo639
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-09-30 4:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 32556 bytes --]
From 5f0841f8dbf63ebb976212c18beb73dbcbb284d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtinysparql | 1 +
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
.../tinysparql/patches/gh-ci-timeout.patch | 22 ++++++++++
srcpkgs/{tracker => tinysparql}/template | 43 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
12 files changed, 63 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/libtinysparql
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
create mode 100644 srcpkgs/tinysparql/patches/gh-ci-timeout.patch
rename srcpkgs/{tracker => tinysparql}/template (67%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tinysparql/patches/gh-ci-timeout.patch b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
new file mode 100644
index 00000000000000..6f004e300b954b
--- /dev/null
+++ b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
@@ -0,0 +1,22 @@
+Partially revert 5bbf312ddb9fb4a9e834aaceba80a6fdbaefec11 to avoid infinate loop in github actions
+
+--- b/tests/functional-tests/sandbox.py
++++ a/tests/functional-tests/sandbox.py
+@@ -37,7 +37,6 @@
+ log = logging.getLogger(__name__)
+
+ TRACKER_DBUS_PREFIX = 'org.freedesktop.Tracker3'
+-TRACKER_PORTAL_NAME = 'org.freedesktop.portal.Tracker'
+
+ _process_list = []
+
+@@ -109,7 +108,7 @@
+
+ log.info("Looking for active Tracker processes on the session bus")
+ for busname in self.session_bus.list_names_sync():
++ if busname.startswith(TRACKER_DBUS_PREFIX):
+- if busname.startswith(TRACKER_DBUS_PREFIX) or busname == TRACKER_PORTAL_NAME:
+ pid = self.session_bus.get_connection_unix_process_id_sync(busname)
+ if pid is not None:
+ tracker_processes.append(pid)
+
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 67%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..06751532f8d3ce 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,13 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -41,10 +41,13 @@ post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
vsed -e "s/error('Libc implementation has broken 4-digit years implementation.')/year_modifier = '%2C%y'/" -i meson.build
fi
+ # Increase timeout for github actions
+ vsed -e 's/timeout: 30/timeout: 60/g' -i tests/functional-tests/meson.build
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +58,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +66,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From 90f52e3f561a6dcc588ab8200a6b3133f1504e29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From f159e87c3f8a1b81ed0e8bcbee968a86a725dc26 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From da7af69da22b0ee9eeb6802c5491cf3af14e8a98 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From 7d18ae8f1a59a4be42e6d2c13037f2dbe48063de Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 53388665b792a1a782976f8f7b68c8b8ecbe9d73 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..6670f7fc52a4e2 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
@@ -19,6 +19,7 @@ homepage="https://wiki.gnome.org/Apps/Photos"
changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
checksum=e78e210397d3c62809c6cd5521da6eccb4a11ddea5bf2af8632a47f4da5c829e
+do_check=no # https://gitlab.gnome.org/GNOME/gnome-photos/-/issues/214
build_options="gir"
build_options_default="gir"
From 72b585018a5d3c7812a05bbad21649851ac00700 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From 001bc60cf61b157579e9db351ba7cccd4fa26160 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..4eaea2db4e3f44 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
@@ -19,11 +19,3 @@ homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/grilo-plugins/${version%.*}/grilo-plugins-${version}.tar.xz"
checksum=fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb
make_check=no # feel free to fix
-
-post_patch() {
- if [ "$CROSS_BUILD" ]; then
- # tests try to use tracker-sandbox from the wrong path:
- # "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
- vsed -e "/subdir('tests')/d" -i meson.build
- fi
-}
From 02b6319a81976f3cd419730832e62e62cc46a892 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 133 ++++++++++++++++++++
srcpkgs/nautilus/template | 18 +--
2 files changed, 139 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..693b79a4c3cd8e
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,133 @@
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+index 4fa7371d15..d770619b38 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Files
+-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
++Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Files
+ NameSuffix=Miner.Files
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index b946225e33..4c1da5ec5b 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
+@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
+ &error);
+ if (!success)
+ {
+- g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
++ g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ return;
+ }
+
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..edd50dc79ded6d 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
- gtk-update-icon-cache"
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
+ localsearch gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -26,12 +26,6 @@ checksum=6ee8c99019b9e3447f6918d68232a20deca89e5525c05805432b7d8840ca71fa
# 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
make_check=ci-skip
-if [ "$CROSS_BUILD" ]; then
- # tests try to use tracker-sandbox from the wrong path, because of some confusion with libdir:
- # "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
- configure_args+=" -Dtests=none"
-fi
-
build_options="gir"
build_options_default="gir"
From 539f943e72724ea4210c7781008ff921be241b05 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From 099ba2c97c35b4b89ddd8b094bbe25de73975dd8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..92cd6488b4ab38 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Rygel"
changelog="https://gitlab.gnome.org/GNOME/rygel/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=47d25704b61088375e26aaba56be47c17189472e6f80c752abe86f02ef4e3304
+checksum=5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72
conf_files="/etc/rygel.conf"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
` (8 preceding siblings ...)
2024-09-30 4:33 ` oreo639
@ 2024-09-30 4:47 ` oreo639
2024-10-01 0:25 ` oreo639
2024-10-03 20:27 ` [PR PATCH] [Merged]: " oreo639
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-09-30 4:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 32558 bytes --]
From 5f0841f8dbf63ebb976212c18beb73dbcbb284d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtinysparql | 1 +
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
.../tinysparql/patches/gh-ci-timeout.patch | 22 ++++++++++
srcpkgs/{tracker => tinysparql}/template | 43 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
12 files changed, 63 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/libtinysparql
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
create mode 100644 srcpkgs/tinysparql/patches/gh-ci-timeout.patch
rename srcpkgs/{tracker => tinysparql}/template (67%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tinysparql/patches/gh-ci-timeout.patch b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
new file mode 100644
index 00000000000000..6f004e300b954b
--- /dev/null
+++ b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
@@ -0,0 +1,22 @@
+Partially revert 5bbf312ddb9fb4a9e834aaceba80a6fdbaefec11 to avoid infinate loop in github actions
+
+--- b/tests/functional-tests/sandbox.py
++++ a/tests/functional-tests/sandbox.py
+@@ -37,7 +37,6 @@
+ log = logging.getLogger(__name__)
+
+ TRACKER_DBUS_PREFIX = 'org.freedesktop.Tracker3'
+-TRACKER_PORTAL_NAME = 'org.freedesktop.portal.Tracker'
+
+ _process_list = []
+
+@@ -109,7 +108,7 @@
+
+ log.info("Looking for active Tracker processes on the session bus")
+ for busname in self.session_bus.list_names_sync():
++ if busname.startswith(TRACKER_DBUS_PREFIX):
+- if busname.startswith(TRACKER_DBUS_PREFIX) or busname == TRACKER_PORTAL_NAME:
+ pid = self.session_bus.get_connection_unix_process_id_sync(busname)
+ if pid is not None:
+ tracker_processes.append(pid)
+
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 67%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..06751532f8d3ce 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,13 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -41,10 +41,13 @@ post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
vsed -e "s/error('Libc implementation has broken 4-digit years implementation.')/year_modifier = '%2C%y'/" -i meson.build
fi
+ # Increase timeout for github actions
+ vsed -e 's/timeout: 30/timeout: 60/g' -i tests/functional-tests/meson.build
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +58,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +66,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From 90f52e3f561a6dcc588ab8200a6b3133f1504e29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From f159e87c3f8a1b81ed0e8bcbee968a86a725dc26 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From da7af69da22b0ee9eeb6802c5491cf3af14e8a98 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From 7d18ae8f1a59a4be42e6d2c13037f2dbe48063de Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 2c907d92146155a08cd1edf6f99cdb677ec5a34d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..e39937ca5d18c0 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
@@ -19,6 +19,7 @@ homepage="https://wiki.gnome.org/Apps/Photos"
changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
checksum=e78e210397d3c62809c6cd5521da6eccb4a11ddea5bf2af8632a47f4da5c829e
+make_check=no # https://gitlab.gnome.org/GNOME/gnome-photos/-/issues/214
build_options="gir"
build_options_default="gir"
From fad47d1bb5109bd9a480b0d56905380d6c1a5a29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From e9a2355042a453a94cc0d3364390c663ecb7f312 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..4eaea2db4e3f44 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
@@ -19,11 +19,3 @@ homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/grilo-plugins/${version%.*}/grilo-plugins-${version}.tar.xz"
checksum=fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb
make_check=no # feel free to fix
-
-post_patch() {
- if [ "$CROSS_BUILD" ]; then
- # tests try to use tracker-sandbox from the wrong path:
- # "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
- vsed -e "/subdir('tests')/d" -i meson.build
- fi
-}
From ba8a6f9b01cdd838d2f1d1123391ce252d48b1bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 133 ++++++++++++++++++++
srcpkgs/nautilus/template | 18 +--
2 files changed, 139 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..693b79a4c3cd8e
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,133 @@
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+index 4fa7371d15..d770619b38 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Files
+-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
++Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Files
+ NameSuffix=Miner.Files
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index b946225e33..4c1da5ec5b 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++ gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gint stdout_fd;
+ GPid child_pid;
+ g_autoptr (GError) error = NULL;
+@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
+ &error);
+ if (!success)
+ {
+- g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
++ g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ return;
+ }
+
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..edd50dc79ded6d 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
- gtk-update-icon-cache"
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
+ localsearch gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -26,12 +26,6 @@ checksum=6ee8c99019b9e3447f6918d68232a20deca89e5525c05805432b7d8840ca71fa
# 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
make_check=ci-skip
-if [ "$CROSS_BUILD" ]; then
- # tests try to use tracker-sandbox from the wrong path, because of some confusion with libdir:
- # "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
- configure_args+=" -Dtests=none"
-fi
-
build_options="gir"
build_options_default="gir"
From 4cebe7d16cb859c75b2331448b1fcb30e77349e9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From 04c07e14cf194d7f5d0bd416ba5af7d90c7222dd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..92cd6488b4ab38 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Rygel"
changelog="https://gitlab.gnome.org/GNOME/rygel/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=47d25704b61088375e26aaba56be47c17189472e6f80c752abe86f02ef4e3304
+checksum=5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72
conf_files="/etc/rygel.conf"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
` (9 preceding siblings ...)
2024-09-30 4:47 ` oreo639
@ 2024-10-01 0:25 ` oreo639
2024-10-03 20:27 ` [PR PATCH] [Merged]: " oreo639
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-10-01 0:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/52416
tinysparql: update to 3.8.0, rename from tracker
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52416.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-52416.patch --]
[-- Type: text/x-diff, Size: 32497 bytes --]
From e4ead7503a2dda982986f3ebb818e1f648300c51 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:42:10 -0700
Subject: [PATCH 01/11] tinysparql: update to 3.8.0, rename from tracker
---
common/shlibs | 2 +-
srcpkgs/libtinysparql | 1 +
srcpkgs/libtracker | 2 +-
srcpkgs/libtracker3 | 2 +-
srcpkgs/tinysparql-devel | 1 +
.../patches/disable-cli-test.patch | 0
.../tinysparql/patches/gh-ci-timeout.patch | 22 ++++++++++
srcpkgs/{tracker => tinysparql}/template | 43 ++++++++++++++-----
srcpkgs/tracker | 1 +
srcpkgs/tracker-devel | 2 +-
srcpkgs/tracker3 | 2 +-
srcpkgs/tracker3-devel | 2 +-
12 files changed, 63 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/libtinysparql
create mode 120000 srcpkgs/tinysparql-devel
rename srcpkgs/{tracker => tinysparql}/patches/disable-cli-test.patch (100%)
create mode 100644 srcpkgs/tinysparql/patches/gh-ci-timeout.patch
rename srcpkgs/{tracker => tinysparql}/template (67%)
create mode 120000 srcpkgs/tracker
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..24dcb247bf26d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tinysparql/patches/gh-ci-timeout.patch b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
new file mode 100644
index 00000000000000..6f004e300b954b
--- /dev/null
+++ b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
@@ -0,0 +1,22 @@
+Partially revert 5bbf312ddb9fb4a9e834aaceba80a6fdbaefec11 to avoid infinate loop in github actions
+
+--- b/tests/functional-tests/sandbox.py
++++ a/tests/functional-tests/sandbox.py
+@@ -37,7 +37,6 @@
+ log = logging.getLogger(__name__)
+
+ TRACKER_DBUS_PREFIX = 'org.freedesktop.Tracker3'
+-TRACKER_PORTAL_NAME = 'org.freedesktop.portal.Tracker'
+
+ _process_list = []
+
+@@ -109,7 +108,7 @@
+
+ log.info("Looking for active Tracker processes on the session bus")
+ for busname in self.session_bus.list_names_sync():
++ if busname.startswith(TRACKER_DBUS_PREFIX):
+- if busname.startswith(TRACKER_DBUS_PREFIX) or busname == TRACKER_PORTAL_NAME:
+ pid = self.session_bus.get_connection_unix_process_id_sync(busname)
+ if pid is not None:
+ tracker_processes.append(pid)
+
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 67%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd855f8..06751532f8d3ce 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,13 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/tinysparql"
changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
@@ -41,10 +41,13 @@ post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
vsed -e "s/error('Libc implementation has broken 4-digit years implementation.')/year_modifier = '%2C%y'/" -i meson.build
fi
+ # Increase timeout for github actions
+ vsed -e 's/timeout: 30/timeout: 60/g' -i tests/functional-tests/meson.build
}
-tracker-devel_package() {
- depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+ depends="libtinysparql>=${version}_${revision} libglib-devel
+ json-glib-devel libxml2-devel sqlite-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -55,7 +58,7 @@ tracker-devel_package() {
}
}
-libtracker_package() {
+libtinysparql_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -63,6 +66,24 @@ libtracker_package() {
}
}
+tracker_package() {
+ depends="tinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+tracker-devel_package() {
+ depends="tinysparql-devel>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
+libtracker_package() {
+ depends="libtinysparql>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3_package() {
depends="tracker>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000000..551412b1f42ef4
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca12f0..551412b1f42ef4 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
From e1c89d6beecfc64df3a446cdd46c6b1d0071c6e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:29:26 -0700
Subject: [PATCH 02/11] localsearch: update to 3.8.0, rename from
tracker-miners
---
.../patches/fix-musl-build-tgkill.patch | 0
.../patches/fix-musl-missing-include.patch | 0
.../patches/sqlite-seccomp.patch | 0
.../{tracker-miners => localsearch}/template | 32 +++++++++++--------
srcpkgs/tracker-miners | 1 +
srcpkgs/tracker3-miners | 2 +-
6 files changed, 21 insertions(+), 14 deletions(-)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-build-tgkill.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/fix-musl-missing-include.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/patches/sqlite-seccomp.patch (100%)
rename srcpkgs/{tracker-miners => localsearch}/template (66%)
create mode 120000 srcpkgs/tracker-miners
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch b/srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-build-tgkill.patch
rename to srcpkgs/localsearch/patches/fix-musl-build-tgkill.patch
diff --git a/srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch b/srcpkgs/localsearch/patches/fix-musl-missing-include.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/fix-musl-missing-include.patch
rename to srcpkgs/localsearch/patches/fix-musl-missing-include.patch
diff --git a/srcpkgs/tracker-miners/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch
similarity index 100%
rename from srcpkgs/tracker-miners/patches/sqlite-seccomp.patch
rename to srcpkgs/localsearch/patches/sqlite-seccomp.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/localsearch/template
similarity index 66%
rename from srcpkgs/tracker-miners/template
rename to srcpkgs/localsearch/template
index bb4126b4936423..a194e0867ead9f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/localsearch/template
@@ -1,11 +1,11 @@
-# Template file for 'tracker-miners'
-pkgname=tracker-miners
-version=3.7.3
-revision=2
+# Template file for 'localsearch'
+pkgname=localsearch
+version=3.8.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enabled
+configure_args="-Dextract=true -Dcue=enabled -Dexif=enabled
-Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
-Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
-Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
@@ -14,21 +14,21 @@ configure_args="-Dtracker_core=system -Dextract=true -Dcue=enabled -Dexif=enable
-Dsystemd_user_services=false -Dnetwork_manager=enabled
$(vopt_feature landlock)"
hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker-devel ffmpeg6-devel dbus-devel exempi-devel
+makedepends="tinysparql-devel ffmpeg6-devel dbus-devel exempi-devel
libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- poppler-glib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel libgirepository-devel
upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
NetworkManager-devel libharfbuzz"
-checkdepends="python3-gobject tracker dbus gst-plugins-good1 gst-plugins-bad1"
-short_desc="Data miners for tracker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="python3-gobject localsearch tinysparql dbus gst-plugins-good1 gst-plugins-bad1"
+short_desc="File search framework of the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
-changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe
+changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz"
+checksum=e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9
make_check_pre="dbus-run-session"
make_check=ci-skip # TODO: d-bus tests timeout ci
@@ -51,6 +51,12 @@ post_check() {
HOME="$oldhome"
}
+tracker-miners_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
+
tracker3-miners_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker-miners b/srcpkgs/tracker-miners
new file mode 120000
index 00000000000000..6098c5a0146ecb
--- /dev/null
+++ b/srcpkgs/tracker-miners
@@ -0,0 +1 @@
+localsearch
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
index 8e0a62a93f224e..6098c5a0146ecb 120000
--- a/srcpkgs/tracker3-miners
+++ b/srcpkgs/tracker3-miners
@@ -1 +1 @@
-tracker-miners
\ No newline at end of file
+localsearch
\ No newline at end of file
From 267a19bb751d16a5a432f6677af7837d7ea73fb8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:39:06 -0700
Subject: [PATCH 03/11] gtk4: rebuild for tinysparql 3.8
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 0f10adc6470ef0..8cb79868d3bf38 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.16.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -24,7 +24,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
$(vopt_if cloudproviders 'libcloudproviders-devel')
$(vopt_if vulkan 'vulkan-loader-devel')
- $(vopt_if tracker 'tracker-devel')"
+ $(vopt_if tracker 'tinysparql-devel')"
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6ed84adcebb8565c547f8a3a18bed87864fba38e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:39 -0700
Subject: [PATCH 04/11] bijiben: rebuild for tinysparql 3.8
---
srcpkgs/bijiben/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 2829568c7f4b61..d042d3b0a9c700 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,11 +1,11 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=5
+revision=6
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker-devel
+makedepends="clutter-gtk-devel evolution-devel tinysparql-devel
libwebkit2gtk41-devel libhandy1-devel libcurl-devel"
depends="desktop-file-utils tracker"
short_desc="Intuitive note editor with strong GNOME desktop integration"
From fdd1a2a2f32f26a9daaf2d32f16679050770984a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:30:57 -0700
Subject: [PATCH 05/11] gnome-music: rebuild for tinysparql 3.8
---
srcpkgs/gnome-music/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 292ad482c4291a..e62e89ccc0cfd8 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-music'
pkgname=gnome-music
version=46.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config
gtk4-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ python3-gobject-devel python3-dbus tinysparql-devel gnome-online-accounts-devel
libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ tinysparql localsearch gst-plugins-good1 grilo-plugins libdazzle
libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 155b1d892a0ec26ec2ff1b0884920953e1c223c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:13 -0700
Subject: [PATCH 06/11] gnome-photos: rebuild for tinysparql 3.8
---
srcpkgs/gnome-photos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 0a9e3d86237deb..e39937ca5d18c0 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
version=44.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- tracker-devel libexif-devel librsvg-devel grilo-devel
+ tinysparql-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
libportal-gtk3-devel"
@@ -19,6 +19,7 @@ homepage="https://wiki.gnome.org/Apps/Photos"
changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
checksum=e78e210397d3c62809c6cd5521da6eccb4a11ddea5bf2af8632a47f4da5c829e
+make_check=no # https://gitlab.gnome.org/GNOME/gnome-photos/-/issues/214
build_options="gir"
build_options_default="gir"
From f4541759621573c7a9886fd336da9235c632a855 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:31:35 -0700
Subject: [PATCH 07/11] gnome-usage: update to 46.0
---
srcpkgs/gnome-usage/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index d57dd57a1c824b..2ffd31af8417eb 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-usage'
pkgname=gnome-usage
-version=3.38.1
+version=46.0
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
-makedepends="gtk+3-devel libglib-devel libgtop-devel vala-devel
- libdazzle-devel tracker3-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel libglib-devel libgtop-devel vala-devel
+ tinysparql-devel libgee-devel"
short_desc="Nice way to view information about use of system resources"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Usage"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393
+distfiles="${GNOME_SITE}/gnome-usage/${version%.*}/gnome-usage-${version}.tar.xz"
+checksum=186ada8e00188c89f8cab54f35998ed97a46eab6fdb21891028361bf386ac9b2
From a7b08b2166ec268cebc47fbe3484c9121ca56ca3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:21 -0700
Subject: [PATCH 08/11] grilo-plugins: rebuild for tinysparql 3.8
---
srcpkgs/grilo-plugins/template | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index e94ad30a82546d..4eaea2db4e3f44 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,14 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.16
-revision=2
+revision=3
build_style=meson
configure_args="-Dgoa=enabled"
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tinysparql"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
libquvi-devel sqlite-devel libgcrypt-devel
- tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ tinysparql-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel
avahi-glib-libs-devel"
checkdepends="python3-gobject gst-plugins-bad1 dbus"
@@ -19,11 +19,3 @@ homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/grilo-plugins/${version%.*}/grilo-plugins-${version}.tar.xz"
checksum=fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb
make_check=no # feel free to fix
-
-post_patch() {
- if [ "$CROSS_BUILD" ]; then
- # tests try to use tracker-sandbox from the wrong path:
- # "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
- vsed -e "/subdir('tests')/d" -i meson.build
- fi
-}
From 4e2a29d5ccd3ac4b9071ad99dab13c986b15ef3b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:32:45 -0700
Subject: [PATCH 09/11] nautilus: rebuild for tinysparql 3.8
---
srcpkgs/nautilus/patches/localsearch3.patch | 131 ++++++++++++++++++++
srcpkgs/nautilus/template | 18 +--
2 files changed, 137 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/nautilus/patches/localsearch3.patch
diff --git a/srcpkgs/nautilus/patches/localsearch3.patch b/srcpkgs/nautilus/patches/localsearch3.patch
new file mode 100644
index 00000000000000..62663de38676bc
--- /dev/null
+++ b/srcpkgs/nautilus/patches/localsearch3.patch
@@ -0,0 +1,131 @@
+Update tests for GNOME localsearch and remove call to feature removed in the tracker to tinysparql transition.
+
+Source 1: https://gitlab.gnome.org/GNOME/nautilus/-/commit/0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9.patch
+Source 2: https://gitlab.gnome.org/GNOME/nautilus/-/commit/493858117e0e40052160b8e6df05bb4025e41d6c.patch
+Source 3: https://gitlab.gnome.org/GNOME/nautilus/-/commit/493858117e0e40052160b8e6df05bb4025e41d6c.patch
+
+
+From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Mon, 10 Jun 2024 22:41:33 +0100
+Subject: [PATCH] general: React to tracker projects rename
+
+Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch.
+
+The old DBus and library APIs still work so there is no rush there.
+
+But the executables and git repositories need to be updated now.
+
+https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461
+---
+ README.md | 2 +-
+ build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
+ data/tracker/meson.build | 9 +++++----
+ .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
+ .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
+ src/nautilus-tag-manager.c | 4 ++--
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/data/tracker/meson.build b/data/tracker/meson.build
+index 5320af164c..2921ca925e 100644
+--- a/data/tracker/meson.build
++++ b/data/tracker/meson.build
+@@ -1,11 +1,12 @@
+-# Files needed for running Tracker inside the Flatpak sandbox, for systems
+-# which don't have a suitable version of Tracker in the host OS.
++# Files needed for running LocalSearch (historically known as Tracker) inside
++# the Flatpak sandbox, for systems which don't have a suitable version of
++# LocalSearch in the host OS.
+ #
+ # We must export the .service files from the sandbox so they work on the
+-# session bus. This means the Tracker domain name must correspond with the
++# session bus. This means the LocalSearch domain name must correspond with the
+ # application ID.
+
+-domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
++domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+ dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+ tracker_domain_config = configuration_data()
+diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+index eb7a87aa65..23ded45837 100644
+--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
++++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+@@ -1,7 +1,7 @@
+ [D-BUS Service]
+ Name=@application_id@.Tracker3.Miner.Extract
+-Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
++Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+
+-# Miner details needed for tracker-control
++# Miner details needed for localsearch-control
+ Path=/org/freedesktop/Tracker3/Miner/Extract
+ NameSuffix=Miner.Files
+--
+GitLab
+
+From 25f445f4d7f38f501090cca88566ffd319d69463 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 12 Jun 2024 11:24:24 +0100
+Subject: [PATCH] tests: Use localsearch3 test-sandbox
+
+Test sandbox program has been moved from the `TinySPARQL` (previously
+`tracker`) project to `localsearch` (previously `tracker-miners`).
+
+https://gitlab.gnome.org/GNOME/tinysparql/-/commit/067e855151cf47609bdeccadd9baa314016c4152
+https://gitlab.gnome.org/GNOME/localsearch/-/commit/abc100fa6b259b9281231e6c8daf27723d62a3ed
+---
+ test/automated/displayless/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
+index 9d50c5084e..13616a2608 100644
+--- a/test/automated/displayless/meson.build
++++ b/test/automated/displayless/meson.build
+@@ -1,6 +1,4 @@
+-trackertestutils = dependency('tracker-testutils-3.0')
+-
+-tracker_sandbox = find_program(trackertestutils.get_variable('command'))
++tracker_sandbox = find_program('localsearch')
+
+ tests = [
+ ['test-directory', [
+@@ -75,7 +73,7 @@ foreach t: tracker_tests
+ test(
+ t[0],
+ tracker_sandbox,
+- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
++ args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ env: [
+ test_env,
+ 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+--
+GitLab
+
+From 493858117e0e40052160b8e6df05bb4025e41d6c Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Sat, 28 Sep 2024 15:29:01 +0800
+Subject: [PATCH] nautilus-tag-manager: Drop tinysparql 2to3 migration
+
+This reverts commit 7cf268ab73f71c09ed85f917c5c5f2703d71e400.
+
+"tinysparql export --2to3" was gone in https://gitlab.gnome.org/GNOME/tinysparql/-/commit/e580569df5639bea171cf4211a31a2c5bdf809e9.
+---
+ src/nautilus-application.c | 1 -
+ src/nautilus-tag-manager.c | 176 -------------------------------------
+ src/nautilus-tag-manager.h | 2 -
+ 3 files changed, 179 deletions(-)
+
+diff --git a/src/nautilus-application.c b/src/nautilus-application.c
+index f13b4d7fe7..065eb053b4 100644
+--- a/src/nautilus-application.c
++++ b/src/nautilus-application.c
+@@ -1173,7 +1173,6 @@ nautilus_application_startup (GApplication *app)
+ if (g_strcmp0 (g_getenv ("RUNNING_TESTS"), "TRUE") != 0)
+ {
+ maybe_migrate_gtk_filechooser_preferences ();
+- nautilus_tag_manager_maybe_migrate_tracker2_data (priv->tag_manager);
+ }
+
+ g_signal_connect (self, "shutdown", G_CALLBACK (on_application_shutdown), NULL);
+
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 148160313449cb..edd50dc79ded6d 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,19 +1,19 @@
# Template file for 'nautilus'
pkgname=nautilus
version=46.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
- gtk-update-icon-cache"
+hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils
+ localsearch gtk-update-icon-cache"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libxml2-devel gst-plugins-base1-devel harfbuzz-devel
libadwaita-devel libportal-gtk4-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker-miners tracker"
-checkdepends="tracker tracker-miners python3-gobject dbus"
+ tinysparql localsearch"
+checkdepends="tinysparql localsearch python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -26,12 +26,6 @@ checksum=6ee8c99019b9e3447f6918d68232a20deca89e5525c05805432b7d8840ca71fa
# 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
make_check=ci-skip
-if [ "$CROSS_BUILD" ]; then
- # tests try to use tracker-sandbox from the wrong path, because of some confusion with libdir:
- # "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
- configure_args+=" -Dtests=none"
-fi
-
build_options="gir"
build_options_default="gir"
From 36aa1f09e7c46147ea59879ccf6e13c6c04a400a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:01 -0700
Subject: [PATCH 10/11] polari: rebuild for tinysparql 3.8
---
srcpkgs/polari/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index e782d075baacee..0c245fa9af37bf 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -1,12 +1,12 @@
# Template file for 'polari'
pkgname=polari
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config itstool gettext glib-devel gtk-update-icon-cache
desktop-file-utils"
-makedepends="gjs-devel telepathy-glib-devel tracker-devel"
+makedepends="gjs-devel telepathy-glib-devel tinysparql-devel"
depends="telepathy-glib libsecret gtk4 libadwaita telepathy-idle
telepathy-mission-control"
checkdepends="appstream-glib desktop-file-utils"
From 99bfff369c9534ec2e528356c5e3e6f013ee93c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 29 Sep 2024 17:33:16 -0700
Subject: [PATCH 11/11] rygel: rebuild for tinysparql 3.8
---
srcpkgs/rygel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 2d6737be668192..92cd6488b4ab38 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,13 +1,13 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.6
+version=0.44.0
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false"
hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup3-devel libgee-devel
- gupnp-av-devel gupnp-dlna-devel tracker-devel
+ gupnp-av-devel gupnp-dlna-devel tinysparql-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel python3-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME home media solution"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Rygel"
changelog="https://gitlab.gnome.org/GNOME/rygel/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=47d25704b61088375e26aaba56be47c17189472e6f80c752abe86f02ef4e3304
+checksum=5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72
conf_files="/etc/rygel.conf"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: tinysparql: update to 3.8.0, rename from tracker
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
` (10 preceding siblings ...)
2024-10-01 0:25 ` oreo639
@ 2024-10-03 20:27 ` oreo639
11 siblings, 0 replies; 13+ messages in thread
From: oreo639 @ 2024-10-03 20:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1421 bytes --]
There's a merged pull request on the void-packages repository
tinysparql: update to 3.8.0, rename from tracker
https://github.com/void-linux/void-packages/pull/52416
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
tracker was renamed to tinysparql and tracker-miners was renamed to localsearch, partially to avoid negative connotations of the name tracker and also to clarify the relationship between tracker and tracker-miners:
https://blogs.gnome.org/carlosg/2024/07/14/goodbye-tracker-hello-tinysparql-and-localsearch/
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-10-03 20:27 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-30 1:20 [PR PATCH] tinysparql: update to 3.8.0, rename from tracker oreo639
2024-09-30 1:26 ` [PR PATCH] [Updated] " oreo639
2024-09-30 1:36 ` oreo639
2024-09-30 1:42 ` oreo639
2024-09-30 2:09 ` oreo639
2024-09-30 2:18 ` oreo639
2024-09-30 2:22 ` oreo639
2024-09-30 2:28 ` oreo639
2024-09-30 3:47 ` oreo639
2024-09-30 4:33 ` oreo639
2024-09-30 4:47 ` oreo639
2024-10-01 0:25 ` oreo639
2024-10-03 20:27 ` [PR PATCH] [Merged]: " oreo639
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).