Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] gnome-{games,documents}: remove package
@ 2022-03-09 17:04 paper42
  2022-04-07 21:17 ` [PR PATCH] [Updated] " paper42
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: paper42 @ 2022-03-09 17:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1317 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gnome-documents-games-remove
https://github.com/void-linux/void-packages/pull/36065

gnome-{games,documents}: remove package
* archived project, uses tracker2, doesn't build with meson 0.61<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@Gottox
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36065.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-documents-games-remove-36065.patch --]
[-- Type: text/x-diff, Size: 3804 bytes --]

From b3b84f69b37fb8bf1ed3b4e2fa844f5a3658d983 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:11 +0100
Subject: [PATCH 1/2] gnome-games: remove package

* archived project, uses tracker2, doesn't build with meson 0.61
---
 srcpkgs/gnome-games/template      | 15 ---------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 srcpkgs/gnome-games/template

diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template
deleted file mode 100644
index 61df4a3bc7f1..000000000000
--- a/srcpkgs/gnome-games/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gnome-games'
-pkgname=gnome-games
-version=40.0
-revision=1
-build_style=meson
-hostmakedepends="gettext glib-devel pkg-config vala-devel"
-makedepends="libarchive-devel grilo-devel gtk+3-devel libglib-devel
- libmanette-devel librsvg-devel libsoup-devel libxml2-devel retro-gtk-devel
- sqlite-devel tracker-devel libhandy1-devel"
-short_desc="Browse and play your games"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Games"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=32cd413f89292a74b0a84a5a30d0f4878ce42caea36374b1fb4dce3b4f6adf0f
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a7a19630a01a..4d44d03c7ed5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -80,6 +80,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2
  gnome-twitch<=0.4.2_1

From 45f18db6807eb4f3b0c0941d05c2f4d26a0d8b55 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:35 +0100
Subject: [PATCH 2/2] gnome-documents: remove package

* archived project, uses tracker2, doesn't build with meson 0.61
---
 srcpkgs/gnome-documents/template  | 23 -----------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 srcpkgs/gnome-documents/template

diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template
deleted file mode 100644
index 7e45b825e712..000000000000
--- a/srcpkgs/gnome-documents/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-documents'
-pkgname=gnome-documents
-version=3.34.0
-revision=2
-build_helper="gir"
-build_style=meson
-hostmakedepends="docbook-xsl gettext itstool pkg-config glib-devel libxslt gdk-pixbuf
- librsvg"
-makedepends="clutter-gtk-devel evince-devel gjs-devel gnome-desktop-devel
- libgdata-devel libgepub-devel librsvg-devel libzapojit-devel tracker-devel
- vala-devel webkit2gtk-devel"
-depends="desktop-file-utils hicolor-icon-theme libgepub tracker tracker-miners
- gjs gnome-online-miners evince"
-short_desc="Documents Manager for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Documents"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d8a90e84aef3a78fcaa91dc12a24a473a5778a47eb4c2354d0e35d558f29f0e2
-lib32disabled=yes
-
-build_options="gir"
-build_options_default="gir"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4d44d03c7ed5..55e07f8ad20b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -80,6 +80,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-documents<=3.34.0_2
  gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] gnome-{games,documents}: remove package
  2022-03-09 17:04 [PR PATCH] gnome-{games,documents}: remove package paper42
@ 2022-04-07 21:17 ` paper42
  2022-04-07 21:24 ` paper42
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-04-07 21:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gnome-documents-games-remove
https://github.com/void-linux/void-packages/pull/36065

gnome-{games,documents}: remove package
* archived project, uses tracker2, doesn't build with meson 0.61<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@Gottox
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36065.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-documents-games-remove-36065.patch --]
[-- Type: text/x-diff, Size: 6660 bytes --]

From 77e8557eb5a8bc2e18b9e3d82c0a67c07189f673 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 22:57:19 +0200
Subject: [PATCH 1/3] gnome: remove gnome-documents from gnome-apps

---
 srcpkgs/gnome/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 0984bf8205a6..0b2910094713 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
 version=41.0
-revision=1
+revision=2
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -58,7 +58,6 @@ _apps_depends="
  gnome-clocks>=40.0
  gnome-dictionary>=40.0
  gnome-disk-utility>=${version}
- gnome-documents>=3.34.0
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
  gnome-music>=${version}

From 7a53f60ca3b8d3257fb962e183b187210ff04d30 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:11 +0100
Subject: [PATCH 2/3] gnome-games: remove package

* archived project, uses tracker2
---
 srcpkgs/gnome-games/patches/meson-0.61.patch | 20 --------------------
 srcpkgs/gnome-games/template                 | 15 ---------------
 srcpkgs/removed-packages/template            |  1 +
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-games/template

diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch
deleted file mode 100644
index 0a3b006b227b..000000000000
--- a/srcpkgs/gnome-games/patches/meson-0.61.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -44,7 +44,7 @@ mime_types = [
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
- desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
--desktop_file = i18n.merge_file ('desktop-file',
-+desktop_file = i18n.merge_file (
-   type: 'desktop',
-   input: configure_file(
-     input: files('org.gnome.Games.desktop.in.in'),
-@@ -70,7 +70,7 @@ endif
- 
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
-   input: configure_file(
-     input: files('org.gnome.Games.appdata.xml.in.in'),
-     output: 'org.gnome.Games.appdata.xml.in',
diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template
deleted file mode 100644
index 61df4a3bc7f1..000000000000
--- a/srcpkgs/gnome-games/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gnome-games'
-pkgname=gnome-games
-version=40.0
-revision=1
-build_style=meson
-hostmakedepends="gettext glib-devel pkg-config vala-devel"
-makedepends="libarchive-devel grilo-devel gtk+3-devel libglib-devel
- libmanette-devel librsvg-devel libsoup-devel libxml2-devel retro-gtk-devel
- sqlite-devel tracker-devel libhandy1-devel"
-short_desc="Browse and play your games"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Games"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=32cd413f89292a74b0a84a5a30d0f4878ce42caea36374b1fb4dce3b4f6adf0f
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 57df15daae2b..6511980ca218 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2
  gnome-twitch<=0.4.2_1

From 76709df99c94b83b18069662d9b56cd26d6f2995 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:35 +0100
Subject: [PATCH 3/3] gnome-documents: remove package

* archived project, uses tracker2
---
 .../gnome-documents/patches/meson-0.61.patch  | 18 ---------------
 srcpkgs/gnome-documents/template              | 23 -------------------
 srcpkgs/removed-packages/template             |  1 +
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-documents/template

diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch
deleted file mode 100644
index 131d34509406..000000000000
--- a/srcpkgs/gnome-documents/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -56,7 +56,6 @@ foreach app: documents_apps
-   appdata = app + '.appdata.xml'
- 
-   appdata_file = i18n.merge_file(
--    appdata,
-     input: appdata + '.in',
-     output: appdata,
-     po_dir: po_dir,
-@@ -76,7 +75,6 @@ foreach app: documents_apps
-   desktop = app + '.desktop'
- 
-   desktop_file = i18n.merge_file(
--    desktop,
-     type: 'desktop',
-     input: desktop + '.in',
-     output: desktop,
diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template
deleted file mode 100644
index 7e45b825e712..000000000000
--- a/srcpkgs/gnome-documents/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-documents'
-pkgname=gnome-documents
-version=3.34.0
-revision=2
-build_helper="gir"
-build_style=meson
-hostmakedepends="docbook-xsl gettext itstool pkg-config glib-devel libxslt gdk-pixbuf
- librsvg"
-makedepends="clutter-gtk-devel evince-devel gjs-devel gnome-desktop-devel
- libgdata-devel libgepub-devel librsvg-devel libzapojit-devel tracker-devel
- vala-devel webkit2gtk-devel"
-depends="desktop-file-utils hicolor-icon-theme libgepub tracker tracker-miners
- gjs gnome-online-miners evince"
-short_desc="Documents Manager for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Documents"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d8a90e84aef3a78fcaa91dc12a24a473a5778a47eb4c2354d0e35d558f29f0e2
-lib32disabled=yes
-
-build_options="gir"
-build_options_default="gir"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6511980ca218..f1dcebc2b8cc 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-documents<=3.34.0_2
  gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] gnome-{games,documents}: remove package
  2022-03-09 17:04 [PR PATCH] gnome-{games,documents}: remove package paper42
  2022-04-07 21:17 ` [PR PATCH] [Updated] " paper42
@ 2022-04-07 21:24 ` paper42
  2022-04-07 22:05 ` paper42
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-04-07 21:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gnome-documents-games-remove
https://github.com/void-linux/void-packages/pull/36065

gnome-{games,documents}: remove package
* archived project, uses tracker2, doesn't build with meson 0.61<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@Gottox
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36065.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-documents-games-remove-36065.patch --]
[-- Type: text/x-diff, Size: 6660 bytes --]

From 0c2d28166a4c63b69634c2978b79c6e885479118 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 22:57:19 +0200
Subject: [PATCH 1/3] gnome: remove gnome-documents from gnome-apps

---
 srcpkgs/gnome/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 0984bf8205a6..0b2910094713 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
 version=41.0
-revision=1
+revision=2
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -58,7 +58,6 @@ _apps_depends="
  gnome-clocks>=40.0
  gnome-dictionary>=40.0
  gnome-disk-utility>=${version}
- gnome-documents>=3.34.0
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
  gnome-music>=${version}

From 83bab21a26d32b87db9bb02a939e02749f2f82b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:11 +0100
Subject: [PATCH 2/3] gnome-games: remove package

* archived project, uses tracker2
---
 srcpkgs/gnome-games/patches/meson-0.61.patch | 20 --------------------
 srcpkgs/gnome-games/template                 | 15 ---------------
 srcpkgs/removed-packages/template            |  1 +
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-games/template

diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch
deleted file mode 100644
index 0a3b006b227b..000000000000
--- a/srcpkgs/gnome-games/patches/meson-0.61.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -44,7 +44,7 @@ mime_types = [
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
- desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
--desktop_file = i18n.merge_file ('desktop-file',
-+desktop_file = i18n.merge_file (
-   type: 'desktop',
-   input: configure_file(
-     input: files('org.gnome.Games.desktop.in.in'),
-@@ -70,7 +70,7 @@ endif
- 
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
-   input: configure_file(
-     input: files('org.gnome.Games.appdata.xml.in.in'),
-     output: 'org.gnome.Games.appdata.xml.in',
diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template
deleted file mode 100644
index 61df4a3bc7f1..000000000000
--- a/srcpkgs/gnome-games/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gnome-games'
-pkgname=gnome-games
-version=40.0
-revision=1
-build_style=meson
-hostmakedepends="gettext glib-devel pkg-config vala-devel"
-makedepends="libarchive-devel grilo-devel gtk+3-devel libglib-devel
- libmanette-devel librsvg-devel libsoup-devel libxml2-devel retro-gtk-devel
- sqlite-devel tracker-devel libhandy1-devel"
-short_desc="Browse and play your games"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Games"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=32cd413f89292a74b0a84a5a30d0f4878ce42caea36374b1fb4dce3b4f6adf0f
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 57df15daae2b..6511980ca218 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2
  gnome-twitch<=0.4.2_1

From 98ddf32b61e7bc9d8e456cc5b3b9bef1c4545cf0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:35 +0100
Subject: [PATCH 3/3] gnome-documents: remove package

* archived project, uses tracker2
---
 .../gnome-documents/patches/meson-0.61.patch  | 18 ---------------
 srcpkgs/gnome-documents/template              | 23 -------------------
 srcpkgs/removed-packages/template             |  1 +
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-documents/template

diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch
deleted file mode 100644
index 131d34509406..000000000000
--- a/srcpkgs/gnome-documents/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -56,7 +56,6 @@ foreach app: documents_apps
-   appdata = app + '.appdata.xml'
- 
-   appdata_file = i18n.merge_file(
--    appdata,
-     input: appdata + '.in',
-     output: appdata,
-     po_dir: po_dir,
-@@ -76,7 +75,6 @@ foreach app: documents_apps
-   desktop = app + '.desktop'
- 
-   desktop_file = i18n.merge_file(
--    desktop,
-     type: 'desktop',
-     input: desktop + '.in',
-     output: desktop,
diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template
deleted file mode 100644
index 7e45b825e712..000000000000
--- a/srcpkgs/gnome-documents/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-documents'
-pkgname=gnome-documents
-version=3.34.0
-revision=2
-build_helper="gir"
-build_style=meson
-hostmakedepends="docbook-xsl gettext itstool pkg-config glib-devel libxslt gdk-pixbuf
- librsvg"
-makedepends="clutter-gtk-devel evince-devel gjs-devel gnome-desktop-devel
- libgdata-devel libgepub-devel librsvg-devel libzapojit-devel tracker-devel
- vala-devel webkit2gtk-devel"
-depends="desktop-file-utils hicolor-icon-theme libgepub tracker tracker-miners
- gjs gnome-online-miners evince"
-short_desc="Documents Manager for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Documents"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d8a90e84aef3a78fcaa91dc12a24a473a5778a47eb4c2354d0e35d558f29f0e2
-lib32disabled=yes
-
-build_options="gir"
-build_options_default="gir"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6511980ca218..f1dcebc2b8cc 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-documents<=3.34.0_2
  gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] gnome-{games,documents}: remove package
  2022-03-09 17:04 [PR PATCH] gnome-{games,documents}: remove package paper42
  2022-04-07 21:17 ` [PR PATCH] [Updated] " paper42
  2022-04-07 21:24 ` paper42
@ 2022-04-07 22:05 ` paper42
  2022-04-09 11:24 ` [PR PATCH] [Updated] tracker3: rename to tracker, drop tracker2 paper42
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-04-07 22:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gnome-documents-games-remove
https://github.com/void-linux/void-packages/pull/36065

gnome-{games,documents}: remove package
* archived project, uses tracker2, doesn't build with meson 0.61<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@Gottox
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36065.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-documents-games-remove-36065.patch --]
[-- Type: text/x-diff, Size: 86680 bytes --]

From 0c2d28166a4c63b69634c2978b79c6e885479118 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 22:57:19 +0200
Subject: [PATCH 1/6] gnome: remove gnome-documents from gnome-apps

---
 srcpkgs/gnome/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 0984bf8205a6..0b2910094713 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
 version=41.0
-revision=1
+revision=2
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -58,7 +58,6 @@ _apps_depends="
  gnome-clocks>=40.0
  gnome-dictionary>=40.0
  gnome-disk-utility>=${version}
- gnome-documents>=3.34.0
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
  gnome-music>=${version}

From 83bab21a26d32b87db9bb02a939e02749f2f82b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:11 +0100
Subject: [PATCH 2/6] gnome-games: remove package

* archived project, uses tracker2
---
 srcpkgs/gnome-games/patches/meson-0.61.patch | 20 --------------------
 srcpkgs/gnome-games/template                 | 15 ---------------
 srcpkgs/removed-packages/template            |  1 +
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-games/template

diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch
deleted file mode 100644
index 0a3b006b227b..000000000000
--- a/srcpkgs/gnome-games/patches/meson-0.61.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -44,7 +44,7 @@ mime_types = [
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
- desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
--desktop_file = i18n.merge_file ('desktop-file',
-+desktop_file = i18n.merge_file (
-   type: 'desktop',
-   input: configure_file(
-     input: files('org.gnome.Games.desktop.in.in'),
-@@ -70,7 +70,7 @@ endif
- 
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
-   input: configure_file(
-     input: files('org.gnome.Games.appdata.xml.in.in'),
-     output: 'org.gnome.Games.appdata.xml.in',
diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template
deleted file mode 100644
index 61df4a3bc7f1..000000000000
--- a/srcpkgs/gnome-games/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gnome-games'
-pkgname=gnome-games
-version=40.0
-revision=1
-build_style=meson
-hostmakedepends="gettext glib-devel pkg-config vala-devel"
-makedepends="libarchive-devel grilo-devel gtk+3-devel libglib-devel
- libmanette-devel librsvg-devel libsoup-devel libxml2-devel retro-gtk-devel
- sqlite-devel tracker-devel libhandy1-devel"
-short_desc="Browse and play your games"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Games"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=32cd413f89292a74b0a84a5a30d0f4878ce42caea36374b1fb4dce3b4f6adf0f
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 57df15daae2b..6511980ca218 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2
  gnome-twitch<=0.4.2_1

From 98ddf32b61e7bc9d8e456cc5b3b9bef1c4545cf0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:35 +0100
Subject: [PATCH 3/6] gnome-documents: remove package

* archived project, uses tracker2
---
 .../gnome-documents/patches/meson-0.61.patch  | 18 ---------------
 srcpkgs/gnome-documents/template              | 23 -------------------
 srcpkgs/removed-packages/template             |  1 +
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-documents/template

diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch
deleted file mode 100644
index 131d34509406..000000000000
--- a/srcpkgs/gnome-documents/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -56,7 +56,6 @@ foreach app: documents_apps
-   appdata = app + '.appdata.xml'
- 
-   appdata_file = i18n.merge_file(
--    appdata,
-     input: appdata + '.in',
-     output: appdata,
-     po_dir: po_dir,
-@@ -76,7 +75,6 @@ foreach app: documents_apps
-   desktop = app + '.desktop'
- 
-   desktop_file = i18n.merge_file(
--    desktop,
-     type: 'desktop',
-     input: desktop + '.in',
-     output: desktop,
diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template
deleted file mode 100644
index 7e45b825e712..000000000000
--- a/srcpkgs/gnome-documents/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-documents'
-pkgname=gnome-documents
-version=3.34.0
-revision=2
-build_helper="gir"
-build_style=meson
-hostmakedepends="docbook-xsl gettext itstool pkg-config glib-devel libxslt gdk-pixbuf
- librsvg"
-makedepends="clutter-gtk-devel evince-devel gjs-devel gnome-desktop-devel
- libgdata-devel libgepub-devel librsvg-devel libzapojit-devel tracker-devel
- vala-devel webkit2gtk-devel"
-depends="desktop-file-utils hicolor-icon-theme libgepub tracker tracker-miners
- gjs gnome-online-miners evince"
-short_desc="Documents Manager for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Documents"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d8a90e84aef3a78fcaa91dc12a24a473a5778a47eb4c2354d0e35d558f29f0e2
-lib32disabled=yes
-
-build_options="gir"
-build_options_default="gir"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6511980ca218..f1dcebc2b8cc 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-documents<=3.34.0_2
  gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2

From 74b5b3a30e68bc8060e217d81c2656a0407fe3fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:29:56 +0200
Subject: [PATCH 4/6] gnome-online-miners: import a patch for tracker3

---
 .../patches/tracker3.patch                    | 1554 +++++++++++++++++
 srcpkgs/gnome-online-miners/template          |   11 +-
 2 files changed, 1562 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/gnome-online-miners/patches/tracker3.patch

diff --git a/srcpkgs/gnome-online-miners/patches/tracker3.patch b/srcpkgs/gnome-online-miners/patches/tracker3.patch
new file mode 100644
index 000000000000..c948f65c7953
--- /dev/null
+++ b/srcpkgs/gnome-online-miners/patches/tracker3.patch
@@ -0,0 +1,1554 @@
+From 53869ebc2783c9d08bb32d59c543ab692770c121 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:11:24 +0200
+Subject: [PATCH 1/5] Use GInitable interface for GomMiner class
+
+This allows for better error reporting.
+---
+ src/gom-application.c |  7 +++++-
+ src/gom-miner.c       | 58 +++++++++++++++++++++++++++++--------------
+ 2 files changed, 45 insertions(+), 20 deletions(-)
+
+diff --git a/src/gom-application.c b/src/gom-application.c
+index fadd388..bfa99ec 100644
+--- a/src/gom-application.c
++++ b/src/gom-application.c
+@@ -229,10 +229,15 @@ gom_application_constructed (GObject *object)
+ {
+   GomApplication *self = GOM_APPLICATION (object);
+   const gchar *display_name;
++  GError *error = NULL;
+ 
+   G_OBJECT_CLASS (gom_application_parent_class)->constructed (object);
+ 
+-  self->miner = g_object_new (self->miner_type, NULL);
++  self->miner = g_initable_new (self->miner_type, NULL, &error, NULL);
++
++  if (self->miner == NULL)
++    g_error ("%s", error->message);
++
+   display_name = gom_miner_get_display_name (self->miner);
+   gom_dbus_set_display_name (self->skeleton, display_name);
+ }
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 7147b33..1dd9bb8 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -28,7 +28,11 @@
+ 
+ #include "gom-miner.h"
+ 
+-G_DEFINE_TYPE (GomMiner, gom_miner, G_TYPE_OBJECT)
++static void gom_miner_initable_interface_init (GInitableIface *iface);
++
++G_DEFINE_TYPE_WITH_CODE (GomMiner, gom_miner, G_TYPE_OBJECT,
++                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gom_miner_initable_interface_init))
++
+ 
+ struct _GomMinerPrivate {
+   GoaClient *client;
+@@ -132,20 +136,21 @@ gom_miner_dispose (GObject *object)
+ }
+ 
+ static void
+-gom_miner_init_goa (GomMiner *self)
++gom_miner_init_goa (GomMiner  *self,
++                    GError   **error)
+ {
+   GoaAccount *account;
+   GoaObject *object;
+   const gchar *provider_type;
+   GList *accounts, *l;
+   GomMinerClass *miner_class = GOM_MINER_GET_CLASS (self);
++  GError *inner_error = NULL;
+ 
+-  self->priv->client = goa_client_new_sync (NULL, &self->priv->client_error);
++  self->priv->client = goa_client_new_sync (NULL, &inner_error);
+ 
+-  if (self->priv->client_error != NULL)
++  if (inner_error)
+     {
+-      g_critical ("Unable to create GoaClient: %s - indexing for %s will not work",
+-                  self->priv->client_error->message, miner_class->goa_provider_type);
++      g_propagate_error (error, inner_error);
+       return;
+     }
+ 
+@@ -170,16 +175,34 @@ gom_miner_init_goa (GomMiner *self)
+   g_list_free_full (accounts, g_object_unref);
+ }
+ 
+-static void
+-gom_miner_constructed (GObject *obj)
++static gboolean
++gom_miner_initable_init (GInitable     *initable,
++                         GCancellable  *cancellable,
++                         GError       **error)
+ {
+-  GomMiner *self = GOM_MINER (obj);
++  GError *inner_error = NULL;
++  GomMiner *self;
+ 
+-  G_OBJECT_CLASS (gom_miner_parent_class)->constructed (obj);
++  self = GOM_MINER (initable);
+ 
+-  gom_miner_init_goa (self);
++  self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error);
++  if (inner_error)
++    {
++      g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: ");
++      return FALSE;
++    }
++
++  gom_miner_init_goa (self, &inner_error);
++  if (inner_error)
++    {
++      g_propagate_prefixed_error (error, inner_error, "Unable to connect to GNOME Online Accounts: ");
++      return FALSE;
++    }
++
++  return TRUE;
+ }
+ 
++
+ static void
+ gom_miner_init (GomMiner *self)
+ {
+@@ -187,14 +210,12 @@ gom_miner_init (GomMiner *self)
+ 
+   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GOM_TYPE_MINER, GomMinerPrivate);
+   self->priv->display_name = g_strdup ("");
++}
+ 
+-  self->priv->connection = tracker_sparql_connection_get (NULL, &self->priv->connection_error);
+-  if (self->priv->connection_error != NULL)
+-    {
+-      g_critical ("Unable to create TrackerSparqlConnection: %s - indexing for %s will not work",
+-                  self->priv->connection_error->message,
+-                  klass->goa_provider_type);
+-    }
++static void
++gom_miner_initable_interface_init (GInitableIface *iface)
++{
++  iface->init = gom_miner_initable_init;
+ }
+ 
+ static void
+@@ -202,7 +223,6 @@ gom_miner_class_init (GomMinerClass *klass)
+ {
+   GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ 
+-  oclass->constructed = gom_miner_constructed;
+   oclass->dispose = gom_miner_dispose;
+ 
+   cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL);
+-- 
+GitLab
+
+
+From a2b53970e1c1486a61a1522010e345732ed6ca54 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:19:58 +0200
+Subject: [PATCH 2/5] Initial port to Tracker 3
+
+Each miner now stores its data in a private Tracker database, under
+the $XDG_CACHE_HOME/gnome-online-miners/$busname directory.
+
+Each miner now supports the org.freedesktop.Tracker3.Endpoint D-Bus
+interface which apps can use to query data directly from the miners.
+---
+ configure.ac          |   4 +-
+ src/gom-application.c |   4 +-
+ src/gom-miner.c       | 120 +++++++++++++++++++++++++++++++++++++++++-
+ src/gom-miner.h       |   1 +
+ src/gom-tracker.c     |   2 +-
+ 5 files changed, 125 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e91e4af..8ee6315 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,7 @@ AC_HEADER_STDC
+ 
+ GDATA_MIN_VERSION=0.15.2
+ GFBGRAPH_MIN_VERSION=0.2.2
+-GLIB_MIN_VERSION=2.35.1
++GLIB_MIN_VERSION=2.56.0
+ GOA_MIN_VERSION=3.13.3
+ GRILO_MIN_VERSION=0.3.0
+ ZAPOJIT_MIN_VERSION=0.0.2
+@@ -36,7 +36,7 @@ PKG_CHECK_MODULES(GIO, [gio-2.0 gio-unix-2.0])
+ PKG_CHECK_MODULES(GOA, [goa-1.0 >= $GOA_MIN_VERSION])
+ AC_DEFINE([GOA_API_IS_SUBJECT_TO_CHANGE], [], [We are aware that GOA's API can change])
+ 
+-PKG_CHECK_MODULES(TRACKER, [tracker-miner-2.0 tracker-sparql-2.0])
++PKG_CHECK_MODULES(TRACKER, [tracker-sparql-3.0])
+ 
+ # Facebook
+ AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook], [Enable Facebook miner])], [], [enable_facebook=yes])
+diff --git a/src/gom-application.c b/src/gom-application.c
+index bfa99ec..86546ed 100644
+--- a/src/gom-application.c
++++ b/src/gom-application.c
+@@ -233,7 +233,9 @@ gom_application_constructed (GObject *object)
+ 
+   G_OBJECT_CLASS (gom_application_parent_class)->constructed (object);
+ 
+-  self->miner = g_initable_new (self->miner_type, NULL, &error, NULL);
++  self->miner = g_initable_new (self->miner_type, NULL, &error,
++                                "bus-name", g_application_get_application_id (G_APPLICATION (self)),
++                                NULL);
+ 
+   if (self->miner == NULL)
+     g_error ("%s", error->message);
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 1dd9bb8..f349d01 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -38,7 +38,9 @@ struct _GomMinerPrivate {
+   GoaClient *client;
+   GError *client_error;
+ 
++  gchar *bus_name;
+   TrackerSparqlConnection *connection;
++  TrackerEndpointDBus *endpoint;
+   GError *connection_error;
+ 
+   gchar *display_name;
+@@ -62,6 +64,14 @@ typedef struct {
+   gpointer service;
+ } InsertSharedContentData;
+ 
++typedef enum
++{
++  PROP_BUS_NAME = 1,
++  N_PROPERTIES
++} GomMinerProperty;
++
++static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
++
+ static GThreadPool *cleanup_pool;
+ 
+ static void cleanup_job (gpointer data, gpointer user_data);
+@@ -135,6 +145,58 @@ gom_miner_dispose (GObject *object)
+   G_OBJECT_CLASS (gom_miner_parent_class)->dispose (object);
+ }
+ 
++static void
++gom_miner_init_database (GomMiner      *self,
++                         GCancellable  *cancellable,
++                         GError       **error)
++{
++  TrackerSparqlConnectionFlags flags;
++  g_autoptr (GFile) store_path = NULL;
++  g_autoptr (GDBusConnection) bus = NULL;
++  GError *inner_error = NULL;
++
++  flags = TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STEMMER |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_UNACCENT |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STOP_WORDS |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_IGNORE_NUMBERS;
++
++  store_path = g_file_new_build_filename (g_get_user_cache_dir (),
++                                          "gnome-online-miners",
++                                          self->priv->bus_name,
++                                          NULL);
++
++  self->priv->connection = tracker_sparql_connection_new (flags,
++                                                          store_path,
++                                                          tracker_sparql_get_ontology_nepomuk (),
++                                                          cancellable,
++                                                          &inner_error);
++
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++
++  bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &inner_error);
++
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++
++  self->priv->endpoint = tracker_endpoint_dbus_new (self->priv->connection,
++                                                    bus,
++                                                    NULL, /* object path */
++                                                    cancellable,
++                                                    &inner_error);
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++}
++
+ static void
+ gom_miner_init_goa (GomMiner  *self,
+                     GError   **error)
+@@ -185,10 +247,10 @@ gom_miner_initable_init (GInitable     *initable,
+ 
+   self = GOM_MINER (initable);
+ 
+-  self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error);
++  gom_miner_init_database (self, cancellable, &inner_error);
+   if (inner_error)
+     {
+-      g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: ");
++      g_propagate_prefixed_error (error, inner_error, "Unable to set up Tracker database: ");
+       return FALSE;
+     }
+ 
+@@ -212,6 +274,47 @@ gom_miner_init (GomMiner *self)
+   self->priv->display_name = g_strdup ("");
+ }
+ 
++static void
++gom_miner_set_property (GObject      *object,
++                        guint         property_id,
++                        const GValue *value,
++                        GParamSpec   *pspec)
++{
++  GomMiner *self = GOM_MINER (object);
++
++  switch ((GomMinerProperty) property_id)
++    {
++      case PROP_BUS_NAME:
++        g_free (self->priv->bus_name);
++        self->priv->bus_name = g_value_dup_string (value);
++        break;
++
++      default:
++        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++        break;
++    }
++}
++
++static void
++gom_miner_get_property (GObject    *object,
++                        guint       property_id,
++                        GValue     *value,
++                        GParamSpec *pspec)
++{
++  GomMiner *self = GOM_MINER (object);
++
++  switch ((GomMinerProperty) property_id)
++    {
++       case PROP_BUS_NAME:
++         g_value_set_string (value, self->priv->bus_name);
++         break;
++
++       default:
++         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++         break;
++    }
++}
++
+ static void
+ gom_miner_initable_interface_init (GInitableIface *iface)
+ {
+@@ -224,6 +327,19 @@ gom_miner_class_init (GomMinerClass *klass)
+   GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ 
+   oclass->dispose = gom_miner_dispose;
++  oclass->set_property = gom_miner_set_property;
++  oclass->get_property = gom_miner_get_property;
++
++  obj_properties[PROP_BUS_NAME] = g_param_spec_string ("bus-name",
++                                                       "Bus Name",
++                                                       "D-Bus name of the miner",
++                                                       NULL  /* default value */,
++                                                       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
++                                                       G_PARAM_STATIC_STRINGS);
++
++  g_object_class_install_properties (oclass,
++                                     N_PROPERTIES,
++                                     obj_properties);
+ 
+   cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL);
+ 
+diff --git a/src/gom-miner.h b/src/gom-miner.h
+index 8f83139..5dcfc8d 100644
+--- a/src/gom-miner.h
++++ b/src/gom-miner.h
+@@ -61,6 +61,7 @@ typedef struct _GomMinerPrivate GomMinerPrivate;
+ typedef struct {
+   GomMiner *miner;
+   TrackerSparqlConnection *connection;
++  gchar *bus_name;
+ 
+   GoaAccount *account;
+   GHashTable *services;
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 68818c4..5666c16 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -408,7 +408,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+   gchar *retval = NULL;
+   gchar *select = NULL;
+ 
+-  g_return_val_if_fail (TRACKER_SPARQL_IS_CONNECTION (connection), NULL);
++  g_return_val_if_fail (TRACKER_IS_SPARQL_CONNECTION (connection), NULL);
+   g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
+   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+   g_return_val_if_fail (make != NULL || model != NULL, NULL);
+-- 
+GitLab
+
+
+From 3e77eff8a677c1ecd9aa129094ed857da802d787 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:37:28 +0200
+Subject: [PATCH 3/5] Add DataObject class to our resources
+
+We need this to set nie:dataSource property. I don't understand
+how this worked in the past.
+---
+ src/gom-tracker.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 5666c16..63a4c29 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -208,7 +208,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   insert = g_string_new (NULL);
+   g_string_append_printf
+     (insert,
+-     "INSERT OR REPLACE %s { <%s> a nie:InformationElement ; %s %s }",
++     "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
+      graph_str, resource, property_name, quoted);
+   g_free (quoted);
+ 
+-- 
+GitLab
+
+
+From e742a60cf9dea1391d1ff409ce5696d21f423bed Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 02:13:11 +0200
+Subject: [PATCH 4/5] Organize data into content-based graphs
+
+Previously GOM used a graph per account and per resource but this
+cannot be done in Tracker 3.
+
+In Tracker 3, each graph is stored as a separate SQLite database
+and currently a maximum of ten graphs can be included in a single
+query due to SQLite's limitations.
+
+The new layout is modelled after how tracker-miner-fs uses graphs:
+we use a graph per content type (Contacts, Documents, Pictures),
+plus an extra graph to store accounts and folders/collections.
+---
+ src/gom-facebook-miner.c     | 12 ++---
+ src/gom-flickr-miner.c       | 24 +++++-----
+ src/gom-gdata-miner.c        | 31 ++++++------
+ src/gom-media-server-miner.c | 10 ++--
+ src/gom-miner.c              | 40 ++++++++++++----
+ src/gom-miner.h              |  1 -
+ src/gom-owncloud-miner.c     | 22 +++++----
+ src/gom-tracker.c            | 93 +++++++++++++++++-------------------
+ src/gom-tracker.h            | 14 +++++-
+ src/gom-zpj-miner.c          | 22 ++++-----
+ 10 files changed, 150 insertions(+), 119 deletions(-)
+
+diff --git a/src/gom-facebook-miner.c b/src/gom-facebook-miner.c
+index ff42ca5..fc89096 100644
+--- a/src/gom-facebook-miner.c
++++ b/src/gom-facebook-miner.c
+@@ -70,7 +70,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+@@ -239,7 +239,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", album_link);
+ 
+   if (*error != NULL)
+@@ -248,7 +248,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", album_description);
+ 
+   if (*error != NULL)
+@@ -257,7 +257,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", album_name);
+ 
+   if (*error != NULL)
+@@ -274,7 +274,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -284,7 +284,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", album_created_time);
+ 
+   if (*error != NULL)
+diff --git a/src/gom-flickr-miner.c b/src/gom-flickr-miner.c
+index 9ac338e..dc7349e 100644
+--- a/src/gom-flickr-miner.c
++++ b/src/gom-flickr-miner.c
+@@ -143,14 +143,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -166,7 +166,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_identifier,
++         TRACKER_PICTURES_GRAPH, parent_identifier,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_identifier);
+ 
+@@ -176,7 +176,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:isPartOf", parent_resource_urn);
+       g_free (parent_resource_urn);
+ 
+@@ -187,7 +187,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", grl_media_get_title (entry->media));
+ 
+   if (*error != NULL)
+@@ -202,7 +202,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   created_time = modification_date = grl_media_get_creation_date (entry->media);
+   new_mtime = g_date_time_to_unix (modification_date);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -221,7 +221,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:contentCreated", date);
+       g_free (date);
+     }
+@@ -233,7 +233,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", url);
+ 
+   if (*error != NULL)
+@@ -242,7 +242,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", grl_media_get_description (entry->media));
+ 
+   if (*error != NULL)
+@@ -254,7 +254,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:mimeType", mime);
+       g_free (mime);
+ 
+@@ -265,7 +265,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   contact_resource = gom_tracker_utils_ensure_contact_resource
+     (connection,
+      cancellable, error,
+-     datasource_urn, grl_media_get_author (entry->media));
++     TRACKER_PICTURES_GRAPH, grl_media_get_author (entry->media));
+ 
+   if (*error != NULL)
+     goto out;
+@@ -273,7 +273,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+diff --git a/src/gom-gdata-miner.c b/src/gom-gdata-miner.c
+index 7872431..d0deb80 100644
+--- a/src/gom-gdata-miner.c
++++ b/src/gom-gdata-miner.c
+@@ -120,7 +120,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_DOCUMENTS_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+@@ -187,7 +187,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_resource_id,
++         GOM_GRAPH, parent_resource_id,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_resource_id);
+ 
+@@ -219,7 +219,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_toggle_favorite
+     (connection,
+      cancellable, error,
+-     resource, starred);
++     TRACKER_PICTURES_GRAPH, resource, starred);
+ 
+   if (*error != NULL)
+     goto out;
+@@ -400,14 +400,14 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", "nmm:Photo", NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+   if (*error != NULL)
+     goto out;
+@@ -566,6 +566,7 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection,
+       equipment_resource = gom_tracker_utils_ensure_equipment_resource (connection,
+                                                                         cancellable,
+                                                                         error,
++                                                                        TRACKER_PICTURES_GRAPH,
+                                                                         make,
+                                                                         model);
+ 
+@@ -665,7 +666,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", "nfo:DataContainer",
+      NULL);
+ 
+@@ -674,7 +675,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+ 
+   gom_tracker_update_datasource
+     (connection, datasource_urn,
+-     resource_exists, identifier, resource,
++     resource_exists, TRACKER_PICTURES_GRAPH, resource,
+      cancellable, error);
+ 
+   if (*error != NULL)
+@@ -685,7 +686,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+    */
+   new_mtime = gdata_entry_get_updated (GDATA_ENTRY (album));
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -703,7 +704,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", alternate_uri);
+ 
+   if (*error != NULL)
+@@ -713,7 +714,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", summary);
+ 
+   if (*error != NULL)
+@@ -723,7 +724,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", title);
+ 
+   if (*error != NULL)
+@@ -743,7 +744,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -755,7 +756,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", date);
+   g_free (date);
+ 
+@@ -865,7 +866,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection,
+   if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection,
+                                                                cancellable,
+                                                                &local_error,
+-                                                               datasource_urn,
++                                                               TRACKER_PICTURES_GRAPH,
+                                                                source_urn,
+                                                                "nie:relatedTo",
+                                                                photo_resource_urn))
+@@ -878,7 +879,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection,
+   if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection,
+                                                                cancellable,
+                                                                &local_error,
+-                                                               datasource_urn,
++                                                               TRACKER_PICTURES_GRAPH,
+                                                                photo_resource_urn,
+                                                                "nie:links",
+                                                                source_urn))
+diff --git a/src/gom-media-server-miner.c b/src/gom-media-server-miner.c
+index 490869e..32e08c6 100644
+--- a/src/gom-media-server-miner.c
++++ b/src/gom-media-server-miner.c
+@@ -65,14 +65,14 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+   if (*error != NULL)
+     goto out;
+@@ -81,7 +81,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", photo->url);
+ 
+   if (*error != NULL)
+@@ -90,7 +90,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:mimeType", photo->mimetype);
+ 
+   if (*error != NULL)
+@@ -99,7 +99,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", photo->name);
+ 
+   if (*error != NULL)
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index f349d01..32892fa 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -376,7 +376,7 @@ gom_miner_ensure_datasource (GomMiner *self,
+                           "  <%s> a nie:DataSource ; nao:identifier \"%s\" . "
+                           "  <%s> a nie:InformationElement ; nie:rootElementOf <%s> ; nie:version \"%d\""
+                           "}",
+-                          datasource_urn,
++                          GOM_GRAPH,
+                           datasource_urn, klass->miner_identifier,
+                           root_element_urn, datasource_urn, klass->version);
+ 
+@@ -401,8 +401,8 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job,
+ 
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn nao:identifier(?urn) WHERE { ?urn nie:dataSource <%s> }",
+-                          job->datasource_urn);
++                          "SELECT ?urn ?id WHERE { GRAPH <%s> { ?urn nie:dataSource <%s> ; nao:identifier ?id . } }",
++                          GOM_GRAPH, job->datasource_urn);
+ 
+   cursor = tracker_sparql_connection_query (job->connection,
+                                             select->str,
+@@ -415,9 +415,21 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job,
+ 
+   while (tracker_sparql_cursor_next (cursor, cancellable, error))
+     {
+-      g_hash_table_insert (job->previous_resources,
+-                           g_strdup (tracker_sparql_cursor_get_string (cursor, 1, NULL)),
+-                           g_strdup (tracker_sparql_cursor_get_string (cursor, 0, NULL)));
++      const gchar *urn, *identifier;
++
++      urn = tracker_sparql_cursor_get_string (cursor, 0, NULL);
++      identifier = tracker_sparql_cursor_get_string (cursor, 1, NULL);
++
++      if (identifier != NULL)
++        {
++          g_hash_table_insert (job->previous_resources,
++                               g_strdup (identifier),
++                               g_strdup (urn));
++        }
++      else
++        {
++          g_warning ("Missing identifier for urn %s", urn);
++        }
+     }
+ 
+   g_object_unref (cursor);
+@@ -489,16 +501,19 @@ gom_account_miner_job (GTask *task,
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Querying existing accounts stored in database");
+   gom_account_miner_job_query_existing (job, &error);
+ 
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Querying remote server");
+   gom_account_miner_job_query (job, &error);
+ 
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Removing stale accounts");
+   gom_account_miner_job_cleanup_previous (job, &error);
+ 
+   if (error != NULL)
+@@ -752,10 +767,15 @@ cleanup_job (gpointer data,
+ 
+   /* find all our datasources in the tracker DB */
+   select = g_string_new (NULL);
+-  g_string_append_printf (select, "SELECT ?datasource nie:version(?root) WHERE { "
+-                          "?datasource a nie:DataSource . "
+-                          "?datasource nao:identifier \"%s\" . "
+-                          "OPTIONAL { ?root nie:rootElementOf ?datasource } }",
++  g_string_append_printf (select,
++                          "SELECT ?datasource nie:version(?root) WHERE { "
++                          "  GRAPH <%s> { "
++                          "    ?datasource a nie:DataSource . "
++                          "    ?datasource nao:identifier \"%s\" . "
++                          "    OPTIONAL { ?root nie:rootElementOf ?datasource } "
++                          "  }"
++                          "}",
++                          GOM_GRAPH,
+                           klass->miner_identifier);
+ 
+   cursor = tracker_sparql_connection_query (self->priv->connection,
+diff --git a/src/gom-miner.h b/src/gom-miner.h
+index 5dcfc8d..8f83139 100644
+--- a/src/gom-miner.h
++++ b/src/gom-miner.h
+@@ -61,7 +61,6 @@ typedef struct _GomMinerPrivate GomMinerPrivate;
+ typedef struct {
+   GomMiner *miner;
+   TrackerSparqlConnection *connection;
+-  gchar *bus_name;
+ 
+   GoaAccount *account;
+   GHashTable *services;
+diff --git a/src/gom-owncloud-miner.c b/src/gom-owncloud-miner.c
+index 34d303b..623f2e1 100644
+--- a/src/gom-owncloud-miner.c
++++ b/src/gom-owncloud-miner.c
+@@ -100,14 +100,14 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_DOCUMENTS_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_DOCUMENTS_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -117,7 +117,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   modification_time = g_date_time_new_from_timeval_local (&tv);
+   new_mtime = g_date_time_to_unix (modification_time);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_DOCUMENTS_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -133,7 +133,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_DOCUMENTS_GRAPH, resource,
+      "nie:url", uri);
+ 
+   if (*error != NULL)
+@@ -156,7 +156,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+             (connection, cancellable, error,
+              NULL,
+-             datasource_urn, parent_identifier,
++             GOM_GRAPH, parent_identifier,
+              "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+           g_checksum_reset (checksum);
+           g_free (parent_identifier);
+@@ -168,7 +168,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_DOCUMENTS_GRAPH, resource,
+              "nie:isPartOf", parent_resource_urn);
+           g_free (parent_resource_urn);
+ 
+@@ -182,7 +182,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_DOCUMENTS_GRAPH, resource,
+              "nie:mimeType", mime);
+ 
+           if (*error != NULL)
+@@ -194,7 +194,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_DOCUMENTS_GRAPH, resource,
+      "nfo:fileName", display_name);
+ 
+   if (*error != NULL)
+@@ -416,6 +416,11 @@ query_owncloud (GomAccountMinerJob *job,
+   mount = g_volume_get_mount (volume);
+   if (mount == NULL)
+     {
++      g_autofree gchar *volume_name;
++
++      volume_name = g_volume_get_name (volume);
++      g_debug ("Mounting Online Account volume %s", volume_name);
++
+       data.error = error;
+ 
+       context = g_main_context_new ();
+@@ -436,6 +441,7 @@ query_owncloud (GomAccountMinerJob *job,
+     }
+ 
+   root = g_mount_get_root (mount);
++  g_debug ("Got volume from gnome-online-accounts: root is %s", g_file_peek_path (root));
+   account_miner_job_traverse_dir (job, connection, previous_resources, datasource_urn, root, TRUE, cancellable, error);
+ 
+   g_object_unref (root);
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 63a4c29..0d1766c 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -26,16 +26,11 @@
+ #include "gom-tracker.h"
+ #include "gom-utils.h"
+ 
+-static gchar *
+-_tracker_utils_format_into_graph (const gchar *graph)
+-{
+-  return (graph != NULL) ? g_strdup_printf ("INTO <%s> ", graph) : g_strdup ("");
+-}
+-
+ static gboolean
+ gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *connection,
+                                                     GCancellable *cancellable,
+                                                     GError **error,
++                                                    const gchar *graph,
+                                                     const gchar *resource,
+                                                     const gchar *attribute,
+                                                     gchar **value)
+@@ -45,8 +40,8 @@ gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *con
+   const gchar *string_value = NULL;
+   gboolean res;
+ 
+-  g_string_append_printf (select, "SELECT ?val { <%s> %s ?val }",
+-                          resource, attribute);
++  g_string_append_printf (select, "SELECT ?val { GRAPH <%s> { <%s> %s ?val } }",
++                          graph, resource, attribute);
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+                                             cancellable, error);
+@@ -86,7 +81,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+                                                const gchar *class,
+                                                ...)
+ {
+-  GString *select, *insert, *inner;
++  GString *select, *inner;
++  gchar *insert;
+   va_list args;
+   const gchar *arg;
+   TrackerSparqlCursor *cursor;
+@@ -98,6 +94,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   gchar *key = NULL, *val = NULL;
+   gboolean exists = FALSE;
+ 
++  g_return_val_if_fail (graph != NULL, NULL);
++
+   /* build the inner query with all the classes */
+   va_start (args, class);
+   inner = g_string_new (NULL);
+@@ -112,7 +110,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   /* query if such a resource is already in the DB */
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn WHERE { ?urn %s }", inner->str);
++                          "SELECT ?urn WHERE { GRAPH <%s> { ?urn %s } }", graph, inner->str);
+ 
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+@@ -138,19 +136,12 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+     }
+ 
+   /* not found, create the resource */
+-  insert = g_string_new (NULL);
+-  graph_str = _tracker_utils_format_into_graph (graph);
+-
+-  g_string_append_printf (insert, "INSERT %s { _:res %s }",
+-                          graph_str, inner->str);
+-  g_free (graph_str);
+-  g_string_free (inner, TRUE);
+-
++  insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }",
++                            graph, inner->str);
+   insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert->str,
++    tracker_sparql_connection_update_blank (connection, insert,
+                                             G_PRIORITY_DEFAULT, NULL, error);
+-
+-  g_string_free (insert, TRUE);
++  g_free (insert);
+ 
+   if (*error != NULL)
+     goto out;
+@@ -194,10 +185,10 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+                                                         const gchar *property_value)
+ {
+   GString *insert;
+-  gchar *graph_str, *quoted;
++  gchar *quoted;
+   gboolean retval = TRUE;
+ 
+-  graph_str = _tracker_utils_format_into_graph (graph);
++  g_return_val_if_fail (graph != NULL, FALSE);
+ 
+   /* the "null" value must not be quoted */
+   if (property_value == NULL)
+@@ -208,8 +199,8 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   insert = g_string_new (NULL);
+   g_string_append_printf
+     (insert,
+-     "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
+-     graph_str, resource, property_name, quoted);
++     "INSERT OR REPLACE INTO <%s> { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
++     graph, resource, property_name, quoted);
+   g_free (quoted);
+ 
+   g_debug ("Insert or replace triple: query %s", insert->str);
+@@ -223,8 +214,6 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   if (*error != NULL)
+     retval = FALSE;
+ 
+-  g_free (graph_str);
+-
+   return retval;
+ }
+ 
+@@ -271,6 +260,7 @@ gboolean
+ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection,
+                                                GCancellable *cancellable,
+                                                GError **error,
++                                               const gchar *graph,
+                                                const gchar *resource,
+                                                gboolean favorite)
+ {
+@@ -279,15 +269,15 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti
+   gboolean retval = TRUE;
+ 
+   if (favorite)
+-    op_str = "INSERT OR REPLACE";
++    op_str = "INSERT OR REPLACE INTO";
+   else
+-    op_str = "DELETE";
++    op_str = "DELETE FROM";
+ 
+   update = g_string_new (NULL);
+   g_string_append_printf
+     (update,
+-     "%s { <%s> nao:hasTag nao:predefined-tag-favorite }",
+-     op_str, resource);
++     "%s <%s> { <%s> nao:hasTag nao:predefined-tag-favorite }",
++     op_str, graph, resource);
+ 
+   g_debug ("Toggle favorite: query %s", update->str);
+ 
+@@ -321,9 +311,13 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+   mail_uri = g_strconcat ("mailto:", email, NULL);
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn WHERE { ?urn a nco:Contact . "
+-                          "?urn nco:hasEmailAddress ?mail . "
+-                          "FILTER (fn:contains(?mail, \"%s\" )) }", mail_uri);
++                          "SELECT ?urn WHERE { "
++                          "  GRAPH <%s> { "
++                          "    ?urn a nco:Contact . "
++                          "    ?urn nco:hasEmailAddress ?mail . "
++                          "    FILTER (fn:contains(?mail, \"%s\" )) "
++                          "  }"
++                          "}", TRACKER_CONTACTS_GRAPH, mail_uri);
+ 
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+@@ -351,8 +345,9 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+   insert = g_string_new (NULL);
+ 
+   g_string_append_printf (insert,
+-                          "INSERT { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . "
++                          "INSERT INTO <%s> { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . "
+                           "_:res a nco:Contact ; nco:hasEmailAddress <%s> ; nco:fullname \"%s\" . }",
++                          TRACKER_CONTACTS_GRAPH,
+                           mail_uri, email,
+                           mail_uri, fullname);
+ 
+@@ -397,6 +392,7 @@ gchar *
+ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection,
+                                              GCancellable *cancellable,
+                                              GError **error,
++                                             const gchar *graph,
+                                              const gchar *make,
+                                              const gchar *model)
+ {
+@@ -416,7 +412,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+   equip_uri = tracker_sparql_escape_uri_printf ("urn:equipment:%s:%s:",
+                                                 make != NULL ? make : "",
+                                                 model != NULL ? model : "");
+-  select = g_strdup_printf ("SELECT <%s> WHERE { }", equip_uri);
++  select = g_strdup_printf ("ASK { GRAPH <%s> { <%s> a nfo:Equipment } }", graph, equip_uri);
+ 
+   local_error = NULL;
+   cursor = tracker_sparql_connection_query (connection, select, cancellable, &local_error);
+@@ -436,20 +432,19 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+ 
+   if (res)
+     {
+-      const gchar *cursor_uri;
+-
+-      cursor_uri = tracker_sparql_cursor_get_string (cursor, 0, NULL);
+-      if (g_strcmp0 (cursor_uri, equip_uri) == 0)
++      if (tracker_sparql_cursor_get_boolean (cursor, 0))
+         {
+-          /* return the found resource */
+-          retval = g_strdup (cursor_uri);
++          /* The resource exists */
++          retval = equip_uri;
++          equip_uri = NULL;
+           g_debug ("Found resource in the store: %s", retval);
+           goto out;
+         }
+     }
+ 
+   /* not found, create the resource */
+-  insert = g_strdup_printf ("INSERT { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }",
++  insert = g_strdup_printf ("INSERT INTO <%s> { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }",
++                            graph,
+                             equip_uri,
+                             make,
+                             model);
+@@ -480,7 +475,7 @@ void
+ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+                                const gchar              *datasource_urn,
+                                gboolean                  resource_exists,
+-                               const gchar              *identifier,
++                               const gchar              *graph,
+                                const gchar              *resource,
+                                GCancellable             *cancellable,
+                                GError                  **error)
+@@ -498,7 +493,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+ 
+       res = gom_tracker_sparql_connection_get_string_attribute
+         (connection, cancellable, error,
+-         resource, "nie:dataSource", &old_value);
++         graph, resource, "nie:dataSource", &old_value);
+       g_clear_error (error);
+ 
+       if (res)
+@@ -514,7 +509,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+   if (set_datasource)
+     gom_tracker_sparql_connection_set_triple
+       (connection, cancellable, error,
+-       identifier, resource,
++       graph, resource,
+        "nie:dataSource", datasource_urn);
+ }
+ 
+@@ -522,7 +517,7 @@ gboolean
+ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+                           gint64                    new_mtime,
+                           gboolean                  resource_exists,
+-                          const gchar              *identifier,
++                          const gchar              *graph,
+                           const gchar              *resource,
+                           GCancellable             *cancellable,
+                           GError                  **error)
+@@ -536,7 +531,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+     {
+       res = gom_tracker_sparql_connection_get_string_attribute
+         (connection, cancellable, error,
+-         resource, "nie:contentLastModified", &old_value);
++         graph, resource, "nie:contentLastModified", &old_value);
+       g_clear_error (error);
+ 
+       if (res)
+@@ -552,7 +547,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+   date = gom_iso8601_from_timestamp (new_mtime);
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection, cancellable, error,
+-     identifier, resource,
++     graph, resource,
+      "nie:contentLastModified", date);
+   g_free (date);
+ 
+diff --git a/src/gom-tracker.h b/src/gom-tracker.h
+index 94a39e8..a5ae6fd 100644
+--- a/src/gom-tracker.h
++++ b/src/gom-tracker.h
+@@ -29,6 +29,14 @@
+ 
+ G_BEGIN_DECLS
+ 
++/* The graph where we store account meta information */
++#define GOM_GRAPH "tracker.api.gnome.org/ontology/v3/gnome-online-miners"
++
++/* Graphs where we store content information */
++#define TRACKER_CONTACTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Contacts"
++#define TRACKER_DOCUMENTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Documents"
++#define TRACKER_PICTURES_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Pictures"
++
+ gchar *gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connection,
+                                                       GCancellable *cancellable,
+                                                       GError **error,
+@@ -57,6 +65,7 @@ gboolean gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *conn
+ gboolean gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection,
+                                                         GCancellable *cancellable,
+                                                         GError **error,
++                                                        const gchar *graph,
+                                                         const gchar *resource,
+                                                         gboolean favorite);
+ 
+@@ -69,20 +78,21 @@ gchar* gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *conne
+ gchar *gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection,
+                                                     GCancellable *cancellable,
+                                                     GError **error,
++                                                    const gchar *graph,
+                                                     const gchar *make,
+                                                     const gchar *model);
+ 
+ void gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+                                     const gchar              *datasource_urn,
+                                     gboolean                  resource_exists,
+-                                    const gchar              *identifier,
++                                    const gchar              *graph,
+                                     const gchar              *resource,
+                                     GCancellable             *cancellable,
+                                     GError                  **error);
+ gboolean gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+                                    gint64                    new_mtime,
+                                    gboolean                  resource_exists,
+-                                   const gchar              *identifier,
++                                   const gchar              *graph,
+                                    const gchar              *resource,
+                                    GCancellable             *cancellable,
+                                    GError                  **error);
+diff --git a/src/gom-zpj-miner.c b/src/gom-zpj-miner.c
+index 6dff947..1372de5 100644
+--- a/src/gom-zpj-miner.c
++++ b/src/gom-zpj-miner.c
+@@ -70,14 +70,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -86,7 +86,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   updated_time = zpj_skydrive_entry_get_updated_time (entry);
+   new_mtime = g_date_time_to_unix (updated_time);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -102,7 +102,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", identifier);
+ 
+   if (*error != NULL)
+@@ -119,7 +119,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_identifier,
++         TRACKER_PICTURES_GRAPH, parent_identifier,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_identifier);
+ 
+@@ -129,7 +129,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:isPartOf", parent_resource_urn);
+       g_free (parent_resource_urn);
+ 
+@@ -142,7 +142,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_PICTURES_GRAPH, resource,
+              "nie:mimeType", mime);
+           g_free (mime);
+ 
+@@ -154,7 +154,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", zpj_skydrive_entry_get_description (entry));
+ 
+   if (*error != NULL)
+@@ -163,7 +163,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nfo:fileName", name);
+ 
+   if (*error != NULL)
+@@ -180,7 +180,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -192,7 +192,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", date);
+   g_free (date);
+ 
+-- 
+GitLab
+
+
+From 34259944dd9e6e167663c97080142f6e8b7f00f2 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Mon, 27 Jul 2020 23:48:49 +0200
+Subject: [PATCH 5/5] Update for API changes in Tracker 2.99
+
+---
+ src/gom-miner.c   |  3 ---
+ src/gom-tracker.c | 22 ++++++----------------
+ 2 files changed, 6 insertions(+), 19 deletions(-)
+
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 32892fa..d9ccf67 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -382,7 +382,6 @@ gom_miner_ensure_datasource (GomMiner *self,
+ 
+   tracker_sparql_connection_update (self->priv->connection,
+                                     datasource_insert->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     error);
+ 
+@@ -469,7 +468,6 @@ gom_account_miner_job_cleanup_previous (GomAccountMinerJob *job,
+ 
+   tracker_sparql_connection_update (job->connection,
+                                     delete->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     error);
+ 
+@@ -709,7 +707,6 @@ cleanup_job_do_cleanup (CleanupJob *job, GCancellable *cancellable)
+ 
+   tracker_sparql_connection_update (self->priv->connection,
+                                     update->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     &error);
+   g_string_free (update, TRUE);
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 0d1766c..5f49f73 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -138,9 +138,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   /* not found, create the resource */
+   insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }",
+                             graph, inner->str);
+-  insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert,
+-                                            G_PRIORITY_DEFAULT, NULL, error);
++  insert_res = tracker_sparql_connection_update_blank (connection, insert, NULL, error);
+   g_free (insert);
+ 
+   if (*error != NULL)
+@@ -205,9 +203,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+ 
+   g_debug ("Insert or replace triple: query %s", insert->str);
+ 
+-  tracker_sparql_connection_update (connection, insert->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, insert->str, cancellable, error);
+ 
+   g_string_free (insert, TRUE);
+ 
+@@ -235,9 +231,7 @@ gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *connection,
+      "DELETE { <%s> %s ?val } WHERE { <%s> %s ?val }", resource,
+      property_name, resource, property_name);
+ 
+-  tracker_sparql_connection_update (connection, delete->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, delete->str, cancellable, error);
+ 
+   g_string_free (delete, TRUE);
+   if (*error != NULL)
+@@ -281,9 +275,7 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti
+ 
+   g_debug ("Toggle favorite: query %s", update->str);
+ 
+-  tracker_sparql_connection_update (connection, update->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, update->str, cancellable, error);
+ 
+   g_string_free (update, TRUE);
+ 
+@@ -351,9 +343,7 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+                           mail_uri, email,
+                           mail_uri, fullname);
+ 
+-  insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert->str,
+-                                            G_PRIORITY_DEFAULT, cancellable, error);
++  insert_res = tracker_sparql_connection_update_blank (connection, insert->str, cancellable, error);
+ 
+   g_string_free (insert, TRUE);
+ 
+@@ -450,7 +440,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+                             model);
+ 
+   local_error = NULL;
+-  tracker_sparql_connection_update (connection, insert, G_PRIORITY_DEFAULT, cancellable, &local_error);
++  tracker_sparql_connection_update (connection, insert, cancellable, &local_error);
+   if (local_error != NULL)
+     {
+       g_propagate_error (error, local_error);
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template
index 644ac3558c9f..a9b2f37d69a5 100644
--- a/srcpkgs/gnome-online-miners/template
+++ b/srcpkgs/gnome-online-miners/template
@@ -1,12 +1,13 @@
 # Template file for 'gnome-online-miners'
 pkgname=gnome-online-miners
 version=3.34.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel autoconf
+ automake libtool autoconf-archive"
 makedepends="libzapojit-devel libgdata-devel grilo-devel
- tracker-devel gfbgraph-devel gnome-online-accounts-devel"
+ tracker3-devel gfbgraph-devel gnome-online-accounts-devel"
 depends="libzapojit>=0.0.3_3"
 short_desc="GNOME service that crawls through your online content"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8
 lib32disabled=yes
+
+pre_configure() {
+	autoreconf -fi
+}

From 47b3b9289fc59ac5b471341e04d88c87c46f33d2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:48:50 +0200
Subject: [PATCH 5/6] tracker: merge with tracker3

* fix tests
---
 common/shlibs                                 |  7 +--
 srcpkgs/libtracker3                           |  2 +-
 .../tracker/patches/failing-test-musl.patch   | 24 --------
 srcpkgs/tracker/template                      | 53 +++++++++++------
 srcpkgs/tracker/update                        |  2 -
 srcpkgs/tracker3                              |  1 +
 srcpkgs/tracker3-devel                        |  2 +-
 srcpkgs/tracker3/template                     | 57 -------------------
 srcpkgs/tracker3/update                       |  1 -
 9 files changed, 41 insertions(+), 108 deletions(-)
 delete mode 100644 srcpkgs/tracker/patches/failing-test-musl.patch
 delete mode 100644 srcpkgs/tracker/update
 create mode 120000 srcpkgs/tracker3
 delete mode 100644 srcpkgs/tracker3/template
 delete mode 100644 srcpkgs/tracker3/update

diff --git a/common/shlibs b/common/shlibs
index 848b488bb2d0..70b3810b45bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -887,8 +887,6 @@ libepc-ui-1.0.so.3 libepc-0.4.1_1
 libgupnp-dlna-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-gst-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1
-libtracker-common.so libtracker-2.2.0_1
-libtracker-data.so libtracker-2.2.0_1
 libfm.so.4 libfm-1.2.3_3
 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2
 libfm-extra.so.4 libfm-extra-1.2.3_3
@@ -3114,10 +3112,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-control-2.0.so.0 libtracker-2.0.0_1
-libtracker-sparql-2.0.so.0 libtracker-2.0.0_1
-libtracker-miner-2.0.so.0 libtracker-2.0.1_1
-libtracker-sparql-3.0.so.0 libtracker3-3.0.0_1
+libtracker-sparql-3.0.so.0 libtracker-3.0.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/libtracker3 b/srcpkgs/libtracker3
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/failing-test-musl.patch b/srcpkgs/tracker/patches/failing-test-musl.patch
deleted file mode 100644
index 4407fe86e9e9..000000000000
--- a/srcpkgs/tracker/patches/failing-test-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5ee7d58f19542d1dac872badd72669ee288bd316 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:11:50 +0200
-Subject: [PATCH] drop test that fails on musl
-
----
- tests/libtracker-common/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git tests/libtracker-common/meson.build tests/libtracker-common/meson.build
-index 55b7ada..69688e0 100644
---- a/tests/libtracker-common/meson.build
-+++ b/tests/libtracker-common/meson.build
-@@ -2,7 +2,6 @@ libtracker_common_tests = [
-     'date-time',
-     'dbus',
-     'file-utils',
--    'sched',
-     'type-utils',
-     'utils',
- ]
--- 
-2.28.0
-
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index ce41975c713d..9be8022adf6d 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,23 +1,27 @@
 # Template file for 'tracker'
 pkgname=tracker
-version=2.3.6
-revision=3
+version=3.2.1
+revision=1
+wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
- -Djournal=true -Dman=true -Dnetwork_manager=enabled -Dstemmer=disabled
- -Dsystemd_user_services=no"
-hostmakedepends="gettext pkg-config glib-devel vala"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
+hostmakedepends="gettext pkg-config glib-devel vala asciidoc
+ python3-gobject"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
-checkdepends="tar"
+ libsoup-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>"
-license="GPL-2.0-or-later"
-homepage="https://live.gnome.org/Tracker"
+maintainer="q66 <daniel@octaforge.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2
+checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+
+do_check() {
+	dbus-run-session ninja -C build test
+}
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"
@@ -31,7 +35,8 @@ post_patch() {
 }
 
 tracker-devel_package() {
-	depends="libglib-devel libtracker>=${version}_${revision}"
+	depends="libtracker>=${version}_${revision} libglib-devel json-glib-devel
+	 libsoup-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -43,11 +48,27 @@ tracker-devel_package() {
 }
 
 libtracker_package() {
-	shlib_provides="libtracker-common.so libtracker-data.so"
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove "usr/lib/tracker-2.0/*.so*"
 		vmove usr/lib/girepository-1.0
 	}
 }
+
+tracker3_package() {
+	depends="tracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+tracker3-devel_package() {
+	depends="tracker-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+libtracker3_package() {
+	depends="libtracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker/update b/srcpkgs/tracker/update
deleted file mode 100644
index 6213b21d4152..000000000000
--- a/srcpkgs/tracker/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pattern="\Q$pkgname\E-\K[0-9]+\.[0-9]*\.[0-9.]*[0-9](?=)"
-ignore="3.* 2.9[0-9].*"
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
new file mode 120000
index 000000000000..b471d39eca12
--- /dev/null
+++ b/srcpkgs/tracker3
@@ -0,0 +1 @@
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
deleted file mode 100644
index 3ae12716faa5..000000000000
--- a/srcpkgs/tracker3/template
+++ /dev/null
@@ -1,57 +0,0 @@
-# Template file for 'tracker3'
-pkgname=tracker3
-version=3.2.1
-revision=1
-wrksrc=tracker-${version}
-build_style=meson
-build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
- -Dsystemd_user_services=false"
-hostmakedepends="gettext pkg-config glib-devel vala asciidoc
- python3-gobject"
-makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel bash-completion"
-checkdepends="tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://live.gnome.org/Tracker"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" dbus"
-fi
-
-# needs a dbus setup
-do_check() {
-	:
-}
-
-post_patch() {
-	if [ "$CROSS_BUILD" ]; then
-		# Tell the build system that we have internal fts5 in sqlite3
-		vsed -i "/\[properties\]/a sqlite3_has_fts5 = 'true'" xbps_meson.cross
-	fi
-}
-
-tracker3-devel_package() {
-	depends="libtracker3>=${version}_${revision} libglib-devel json-glib-devel
-	 libsoup-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
-
-libtracker3_package() {
-	short_desc+=" - shared libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/girepository-1.0
-	}
-}
diff --git a/srcpkgs/tracker3/update b/srcpkgs/tracker3/update
deleted file mode 100644
index 15e6dbf06d2d..000000000000
--- a/srcpkgs/tracker3/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker

From 74b19d19d687430abdaf16bb384f3fc70b23d6f7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:52:50 +0200
Subject: [PATCH 6/6] tracker-miners: merge with tracker3-miners

---
 .../patches/build.patch                       |  0
 srcpkgs/tracker-miners/template               | 34 ++++++++++++-------
 srcpkgs/tracker-miners/update                 |  1 -
 srcpkgs/tracker3-miners                       |  1 +
 srcpkgs/tracker3-miners/template              | 34 -------------------
 srcpkgs/tracker3-miners/update                |  1 -
 6 files changed, 22 insertions(+), 49 deletions(-)
 rename srcpkgs/{tracker3-miners => tracker-miners}/patches/build.patch (100%)
 delete mode 100644 srcpkgs/tracker-miners/update
 create mode 120000 srcpkgs/tracker3-miners
 delete mode 100644 srcpkgs/tracker3-miners/template
 delete mode 100644 srcpkgs/tracker3-miners/update

diff --git a/srcpkgs/tracker3-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
similarity index 100%
rename from srcpkgs/tracker3-miners/patches/build.patch
rename to srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 1d31d2f3882a..b2d1de2f76ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,27 +1,35 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
-version=2.3.5
-revision=3
+version=3.2.1
+revision=1
 build_style=meson
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+# missing libgrss for miner_rss
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
  -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
- -Dbattery_detection=upower -Dcharset_detection=icu
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=no -Dminer_rss=false"
-hostmakedepends="pkg-config glib-devel intltool"
-makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+ -Dsystemd_user_services=false -Dnetwork_manager=enabled"
+hostmakedepends="pkg-config glib-devel intltool asciidoc"
+makedepends="tracker-devel ffmpeg-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
- libvorbis-devel poppler-glib-devel totem-pl-parser-devel
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
+ poppler-glib-devel totem-pl-parser-devel
+ upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
+ NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
+checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
 make_check=no # relies on unsupported ops in chroot
+
+tracker3-miners_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker-miners/update b/srcpkgs/tracker-miners/update
deleted file mode 100644
index 6dcf64a5163a..000000000000
--- a/srcpkgs/tracker-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="3.*"
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
new file mode 120000
index 000000000000..8e0a62a93f22
--- /dev/null
+++ b/srcpkgs/tracker3-miners
@@ -0,0 +1 @@
+tracker-miners
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
deleted file mode 100644
index adc11e7970c1..000000000000
--- a/srcpkgs/tracker3-miners/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'tracker3-miners'
-pkgname=tracker3-miners
-version=3.2.1
-revision=1
-wrksrc=tracker-miners-${version}
-build_style=meson
-# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true
- -Dfunctional_tests=false -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
- -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
- -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=false -Dnetwork_manager=enabled"
-hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-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
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
- NetworkManager-devel libharfbuzz"
-short_desc="Data miners for tracker3"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later"
-homepage="https://developer.gnome.org/libtracker-miner/stable"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
diff --git a/srcpkgs/tracker3-miners/update b/srcpkgs/tracker3-miners/update
deleted file mode 100644
index 160976ffc453..000000000000
--- a/srcpkgs/tracker3-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker-miners

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] tracker3: rename to tracker, drop tracker2
  2022-03-09 17:04 [PR PATCH] gnome-{games,documents}: remove package paper42
                   ` (2 preceding siblings ...)
  2022-04-07 22:05 ` paper42
@ 2022-04-09 11:24 ` paper42
  2022-04-09 12:00 ` paper42
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-04-09 11:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gnome-documents-games-remove
https://github.com/void-linux/void-packages/pull/36065

tracker3: rename to tracker, drop tracker2
* archived project, uses tracker2

#### Testing the changes
- I tested the changes in this PR: **NO**

@Gottox
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36065.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-documents-games-remove-36065.patch --]
[-- Type: text/x-diff, Size: 14694 bytes --]

From aba3abcc3d5b7aed1f84c2c1e7ad3cf801311b4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:48:50 +0200
Subject: [PATCH 1/2] tracker: merge with tracker3

* fix tests
---
 common/shlibs                                 |  7 +--
 srcpkgs/libtracker3                           |  2 +-
 .../tracker/patches/failing-test-musl.patch   | 24 --------
 srcpkgs/tracker/template                      | 53 +++++++++++------
 srcpkgs/tracker/update                        |  2 -
 srcpkgs/tracker3                              |  1 +
 srcpkgs/tracker3-devel                        |  2 +-
 srcpkgs/tracker3/template                     | 57 -------------------
 srcpkgs/tracker3/update                       |  1 -
 9 files changed, 41 insertions(+), 108 deletions(-)
 delete mode 100644 srcpkgs/tracker/patches/failing-test-musl.patch
 delete mode 100644 srcpkgs/tracker/update
 create mode 120000 srcpkgs/tracker3
 delete mode 100644 srcpkgs/tracker3/template
 delete mode 100644 srcpkgs/tracker3/update

diff --git a/common/shlibs b/common/shlibs
index 673c62085f5b..83b53a69bb93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -887,8 +887,6 @@ libepc-ui-1.0.so.3 libepc-0.4.1_1
 libgupnp-dlna-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-gst-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1
-libtracker-common.so libtracker-2.2.0_1
-libtracker-data.so libtracker-2.2.0_1
 libfm.so.4 libfm-1.2.3_3
 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2
 libfm-extra.so.4 libfm-extra-1.2.3_3
@@ -3114,10 +3112,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-control-2.0.so.0 libtracker-2.0.0_1
-libtracker-sparql-2.0.so.0 libtracker-2.0.0_1
-libtracker-miner-2.0.so.0 libtracker-2.0.1_1
-libtracker-sparql-3.0.so.0 libtracker3-3.0.0_1
+libtracker-sparql-3.0.so.0 libtracker-3.0.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/libtracker3 b/srcpkgs/libtracker3
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/failing-test-musl.patch b/srcpkgs/tracker/patches/failing-test-musl.patch
deleted file mode 100644
index 4407fe86e9e9..000000000000
--- a/srcpkgs/tracker/patches/failing-test-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5ee7d58f19542d1dac872badd72669ee288bd316 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:11:50 +0200
-Subject: [PATCH] drop test that fails on musl
-
----
- tests/libtracker-common/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git tests/libtracker-common/meson.build tests/libtracker-common/meson.build
-index 55b7ada..69688e0 100644
---- a/tests/libtracker-common/meson.build
-+++ b/tests/libtracker-common/meson.build
-@@ -2,7 +2,6 @@ libtracker_common_tests = [
-     'date-time',
-     'dbus',
-     'file-utils',
--    'sched',
-     'type-utils',
-     'utils',
- ]
--- 
-2.28.0
-
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index ce41975c713d..9be8022adf6d 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,23 +1,27 @@
 # Template file for 'tracker'
 pkgname=tracker
-version=2.3.6
-revision=3
+version=3.2.1
+revision=1
+wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
- -Djournal=true -Dman=true -Dnetwork_manager=enabled -Dstemmer=disabled
- -Dsystemd_user_services=no"
-hostmakedepends="gettext pkg-config glib-devel vala"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
+hostmakedepends="gettext pkg-config glib-devel vala asciidoc
+ python3-gobject"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
-checkdepends="tar"
+ libsoup-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>"
-license="GPL-2.0-or-later"
-homepage="https://live.gnome.org/Tracker"
+maintainer="q66 <daniel@octaforge.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2
+checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+
+do_check() {
+	dbus-run-session ninja -C build test
+}
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"
@@ -31,7 +35,8 @@ post_patch() {
 }
 
 tracker-devel_package() {
-	depends="libglib-devel libtracker>=${version}_${revision}"
+	depends="libtracker>=${version}_${revision} libglib-devel json-glib-devel
+	 libsoup-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -43,11 +48,27 @@ tracker-devel_package() {
 }
 
 libtracker_package() {
-	shlib_provides="libtracker-common.so libtracker-data.so"
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove "usr/lib/tracker-2.0/*.so*"
 		vmove usr/lib/girepository-1.0
 	}
 }
+
+tracker3_package() {
+	depends="tracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+tracker3-devel_package() {
+	depends="tracker-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+libtracker3_package() {
+	depends="libtracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker/update b/srcpkgs/tracker/update
deleted file mode 100644
index 6213b21d4152..000000000000
--- a/srcpkgs/tracker/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pattern="\Q$pkgname\E-\K[0-9]+\.[0-9]*\.[0-9.]*[0-9](?=)"
-ignore="3.* 2.9[0-9].*"
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
new file mode 120000
index 000000000000..b471d39eca12
--- /dev/null
+++ b/srcpkgs/tracker3
@@ -0,0 +1 @@
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
deleted file mode 100644
index 3ae12716faa5..000000000000
--- a/srcpkgs/tracker3/template
+++ /dev/null
@@ -1,57 +0,0 @@
-# Template file for 'tracker3'
-pkgname=tracker3
-version=3.2.1
-revision=1
-wrksrc=tracker-${version}
-build_style=meson
-build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
- -Dsystemd_user_services=false"
-hostmakedepends="gettext pkg-config glib-devel vala asciidoc
- python3-gobject"
-makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel bash-completion"
-checkdepends="tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://live.gnome.org/Tracker"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" dbus"
-fi
-
-# needs a dbus setup
-do_check() {
-	:
-}
-
-post_patch() {
-	if [ "$CROSS_BUILD" ]; then
-		# Tell the build system that we have internal fts5 in sqlite3
-		vsed -i "/\[properties\]/a sqlite3_has_fts5 = 'true'" xbps_meson.cross
-	fi
-}
-
-tracker3-devel_package() {
-	depends="libtracker3>=${version}_${revision} libglib-devel json-glib-devel
-	 libsoup-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
-
-libtracker3_package() {
-	short_desc+=" - shared libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/girepository-1.0
-	}
-}
diff --git a/srcpkgs/tracker3/update b/srcpkgs/tracker3/update
deleted file mode 100644
index 15e6dbf06d2d..000000000000
--- a/srcpkgs/tracker3/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker

From 58527c0b2b937cc745a42816877bece90f49d0cd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:52:50 +0200
Subject: [PATCH 2/2] tracker-miners: merge with tracker3-miners

---
 .../patches/build.patch                       |  0
 srcpkgs/tracker-miners/template               | 34 ++++++++++++-------
 srcpkgs/tracker-miners/update                 |  1 -
 srcpkgs/tracker3-miners                       |  1 +
 srcpkgs/tracker3-miners/template              | 34 -------------------
 srcpkgs/tracker3-miners/update                |  1 -
 6 files changed, 22 insertions(+), 49 deletions(-)
 rename srcpkgs/{tracker3-miners => tracker-miners}/patches/build.patch (100%)
 delete mode 100644 srcpkgs/tracker-miners/update
 create mode 120000 srcpkgs/tracker3-miners
 delete mode 100644 srcpkgs/tracker3-miners/template
 delete mode 100644 srcpkgs/tracker3-miners/update

diff --git a/srcpkgs/tracker3-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
similarity index 100%
rename from srcpkgs/tracker3-miners/patches/build.patch
rename to srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 1d31d2f3882a..b2d1de2f76ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,27 +1,35 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
-version=2.3.5
-revision=3
+version=3.2.1
+revision=1
 build_style=meson
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+# missing libgrss for miner_rss
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
  -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
- -Dbattery_detection=upower -Dcharset_detection=icu
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=no -Dminer_rss=false"
-hostmakedepends="pkg-config glib-devel intltool"
-makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+ -Dsystemd_user_services=false -Dnetwork_manager=enabled"
+hostmakedepends="pkg-config glib-devel intltool asciidoc"
+makedepends="tracker-devel ffmpeg-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
- libvorbis-devel poppler-glib-devel totem-pl-parser-devel
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
+ poppler-glib-devel totem-pl-parser-devel
+ upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
+ NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
+checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
 make_check=no # relies on unsupported ops in chroot
+
+tracker3-miners_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker-miners/update b/srcpkgs/tracker-miners/update
deleted file mode 100644
index 6dcf64a5163a..000000000000
--- a/srcpkgs/tracker-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="3.*"
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
new file mode 120000
index 000000000000..8e0a62a93f22
--- /dev/null
+++ b/srcpkgs/tracker3-miners
@@ -0,0 +1 @@
+tracker-miners
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
deleted file mode 100644
index adc11e7970c1..000000000000
--- a/srcpkgs/tracker3-miners/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'tracker3-miners'
-pkgname=tracker3-miners
-version=3.2.1
-revision=1
-wrksrc=tracker-miners-${version}
-build_style=meson
-# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true
- -Dfunctional_tests=false -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
- -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
- -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=false -Dnetwork_manager=enabled"
-hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-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
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
- NetworkManager-devel libharfbuzz"
-short_desc="Data miners for tracker3"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later"
-homepage="https://developer.gnome.org/libtracker-miner/stable"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
diff --git a/srcpkgs/tracker3-miners/update b/srcpkgs/tracker3-miners/update
deleted file mode 100644
index 160976ffc453..000000000000
--- a/srcpkgs/tracker3-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker-miners

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] tracker3: rename to tracker, drop tracker2
  2022-03-09 17:04 [PR PATCH] gnome-{games,documents}: remove package paper42
                   ` (3 preceding siblings ...)
  2022-04-09 11:24 ` [PR PATCH] [Updated] tracker3: rename to tracker, drop tracker2 paper42
@ 2022-04-09 12:00 ` paper42
  2022-05-09 21:36 ` paper42
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-04-09 12:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gnome-documents-games-remove
https://github.com/void-linux/void-packages/pull/36065

tracker3: rename to tracker, drop tracker2
* archived project, uses tracker2

#### Testing the changes
- I tested the changes in this PR: **NO**

@Gottox
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36065.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-documents-games-remove-36065.patch --]
[-- Type: text/x-diff, Size: 14731 bytes --]

From 3074b312c66458cd8b812e35110c5b56dba75313 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:48:50 +0200
Subject: [PATCH 1/2] tracker: merge with tracker3

* fix tests
* update to 3.3.0
---
 common/shlibs                                 |  7 +--
 srcpkgs/libtracker3                           |  2 +-
 .../tracker/patches/failing-test-musl.patch   | 24 --------
 srcpkgs/tracker/template                      | 53 +++++++++++------
 srcpkgs/tracker/update                        |  2 -
 srcpkgs/tracker3                              |  1 +
 srcpkgs/tracker3-devel                        |  2 +-
 srcpkgs/tracker3/template                     | 57 -------------------
 srcpkgs/tracker3/update                       |  1 -
 9 files changed, 41 insertions(+), 108 deletions(-)
 delete mode 100644 srcpkgs/tracker/patches/failing-test-musl.patch
 delete mode 100644 srcpkgs/tracker/update
 create mode 120000 srcpkgs/tracker3
 delete mode 100644 srcpkgs/tracker3/template
 delete mode 100644 srcpkgs/tracker3/update

diff --git a/common/shlibs b/common/shlibs
index 673c62085f5b..83b53a69bb93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -887,8 +887,6 @@ libepc-ui-1.0.so.3 libepc-0.4.1_1
 libgupnp-dlna-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-gst-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1
-libtracker-common.so libtracker-2.2.0_1
-libtracker-data.so libtracker-2.2.0_1
 libfm.so.4 libfm-1.2.3_3
 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2
 libfm-extra.so.4 libfm-extra-1.2.3_3
@@ -3114,10 +3112,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-control-2.0.so.0 libtracker-2.0.0_1
-libtracker-sparql-2.0.so.0 libtracker-2.0.0_1
-libtracker-miner-2.0.so.0 libtracker-2.0.1_1
-libtracker-sparql-3.0.so.0 libtracker3-3.0.0_1
+libtracker-sparql-3.0.so.0 libtracker-3.0.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/libtracker3 b/srcpkgs/libtracker3
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/failing-test-musl.patch b/srcpkgs/tracker/patches/failing-test-musl.patch
deleted file mode 100644
index 4407fe86e9e9..000000000000
--- a/srcpkgs/tracker/patches/failing-test-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5ee7d58f19542d1dac872badd72669ee288bd316 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:11:50 +0200
-Subject: [PATCH] drop test that fails on musl
-
----
- tests/libtracker-common/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git tests/libtracker-common/meson.build tests/libtracker-common/meson.build
-index 55b7ada..69688e0 100644
---- a/tests/libtracker-common/meson.build
-+++ b/tests/libtracker-common/meson.build
-@@ -2,7 +2,6 @@ libtracker_common_tests = [
-     'date-time',
-     'dbus',
-     'file-utils',
--    'sched',
-     'type-utils',
-     'utils',
- ]
--- 
-2.28.0
-
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index ce41975c713d..241ff153034c 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,23 +1,27 @@
 # Template file for 'tracker'
 pkgname=tracker
-version=2.3.6
-revision=3
+version=3.3.0
+revision=1
+wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
- -Djournal=true -Dman=true -Dnetwork_manager=enabled -Dstemmer=disabled
- -Dsystemd_user_services=no"
-hostmakedepends="gettext pkg-config glib-devel vala"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
+hostmakedepends="gettext pkg-config glib-devel vala asciidoc
+ python3-gobject"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
-checkdepends="tar"
+ libsoup-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>"
-license="GPL-2.0-or-later"
-homepage="https://live.gnome.org/Tracker"
+maintainer="q66 <daniel@octaforge.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2
+checksum=0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda
+
+do_check() {
+	dbus-run-session ninja -C build test
+}
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"
@@ -31,7 +35,8 @@ post_patch() {
 }
 
 tracker-devel_package() {
-	depends="libglib-devel libtracker>=${version}_${revision}"
+	depends="libtracker>=${version}_${revision} libglib-devel json-glib-devel
+	 libsoup-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -43,11 +48,27 @@ tracker-devel_package() {
 }
 
 libtracker_package() {
-	shlib_provides="libtracker-common.so libtracker-data.so"
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove "usr/lib/tracker-2.0/*.so*"
 		vmove usr/lib/girepository-1.0
 	}
 }
+
+tracker3_package() {
+	depends="tracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+tracker3-devel_package() {
+	depends="tracker-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+libtracker3_package() {
+	depends="libtracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker/update b/srcpkgs/tracker/update
deleted file mode 100644
index 6213b21d4152..000000000000
--- a/srcpkgs/tracker/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pattern="\Q$pkgname\E-\K[0-9]+\.[0-9]*\.[0-9.]*[0-9](?=)"
-ignore="3.* 2.9[0-9].*"
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
new file mode 120000
index 000000000000..b471d39eca12
--- /dev/null
+++ b/srcpkgs/tracker3
@@ -0,0 +1 @@
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
deleted file mode 100644
index 3ae12716faa5..000000000000
--- a/srcpkgs/tracker3/template
+++ /dev/null
@@ -1,57 +0,0 @@
-# Template file for 'tracker3'
-pkgname=tracker3
-version=3.2.1
-revision=1
-wrksrc=tracker-${version}
-build_style=meson
-build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
- -Dsystemd_user_services=false"
-hostmakedepends="gettext pkg-config glib-devel vala asciidoc
- python3-gobject"
-makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel bash-completion"
-checkdepends="tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://live.gnome.org/Tracker"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" dbus"
-fi
-
-# needs a dbus setup
-do_check() {
-	:
-}
-
-post_patch() {
-	if [ "$CROSS_BUILD" ]; then
-		# Tell the build system that we have internal fts5 in sqlite3
-		vsed -i "/\[properties\]/a sqlite3_has_fts5 = 'true'" xbps_meson.cross
-	fi
-}
-
-tracker3-devel_package() {
-	depends="libtracker3>=${version}_${revision} libglib-devel json-glib-devel
-	 libsoup-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
-
-libtracker3_package() {
-	short_desc+=" - shared libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/girepository-1.0
-	}
-}
diff --git a/srcpkgs/tracker3/update b/srcpkgs/tracker3/update
deleted file mode 100644
index 15e6dbf06d2d..000000000000
--- a/srcpkgs/tracker3/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker

From e6c3019a6a96192f0b90613a0929c51093bbcce7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:52:50 +0200
Subject: [PATCH 2/2] tracker-miners: merge with tracker3-miners

* update to 3.3.0.
---
 .../patches/build.patch                       |  0
 srcpkgs/tracker-miners/template               | 34 ++++++++++++-------
 srcpkgs/tracker-miners/update                 |  1 -
 srcpkgs/tracker3-miners                       |  1 +
 srcpkgs/tracker3-miners/template              | 34 -------------------
 srcpkgs/tracker3-miners/update                |  1 -
 6 files changed, 22 insertions(+), 49 deletions(-)
 rename srcpkgs/{tracker3-miners => tracker-miners}/patches/build.patch (100%)
 delete mode 100644 srcpkgs/tracker-miners/update
 create mode 120000 srcpkgs/tracker3-miners
 delete mode 100644 srcpkgs/tracker3-miners/template
 delete mode 100644 srcpkgs/tracker3-miners/update

diff --git a/srcpkgs/tracker3-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
similarity index 100%
rename from srcpkgs/tracker3-miners/patches/build.patch
rename to srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 1d31d2f3882a..85845617e856 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,27 +1,35 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
-version=2.3.5
-revision=3
+version=3.3.0
+revision=1
 build_style=meson
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+# missing libgrss for miner_rss
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
  -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
- -Dbattery_detection=upower -Dcharset_detection=icu
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=no -Dminer_rss=false"
-hostmakedepends="pkg-config glib-devel intltool"
-makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+ -Dsystemd_user_services=false -Dnetwork_manager=enabled"
+hostmakedepends="pkg-config glib-devel intltool asciidoc"
+makedepends="tracker-devel ffmpeg-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
- libvorbis-devel poppler-glib-devel totem-pl-parser-devel
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
+ poppler-glib-devel totem-pl-parser-devel
+ upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
+ NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
+checksum=8b387debb774061c06adfb267a0e0e0f3d21799371bf01d056495ab9b8dd9417
 make_check=no # relies on unsupported ops in chroot
+
+tracker3-miners_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker-miners/update b/srcpkgs/tracker-miners/update
deleted file mode 100644
index 6dcf64a5163a..000000000000
--- a/srcpkgs/tracker-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="3.*"
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
new file mode 120000
index 000000000000..8e0a62a93f22
--- /dev/null
+++ b/srcpkgs/tracker3-miners
@@ -0,0 +1 @@
+tracker-miners
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
deleted file mode 100644
index adc11e7970c1..000000000000
--- a/srcpkgs/tracker3-miners/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'tracker3-miners'
-pkgname=tracker3-miners
-version=3.2.1
-revision=1
-wrksrc=tracker-miners-${version}
-build_style=meson
-# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true
- -Dfunctional_tests=false -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
- -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
- -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=false -Dnetwork_manager=enabled"
-hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-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
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
- NetworkManager-devel libharfbuzz"
-short_desc="Data miners for tracker3"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later"
-homepage="https://developer.gnome.org/libtracker-miner/stable"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
diff --git a/srcpkgs/tracker3-miners/update b/srcpkgs/tracker3-miners/update
deleted file mode 100644
index 160976ffc453..000000000000
--- a/srcpkgs/tracker3-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker-miners

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] tracker3: rename to tracker, drop tracker2
  2022-03-09 17:04 [PR PATCH] gnome-{games,documents}: remove package paper42
                   ` (4 preceding siblings ...)
  2022-04-09 12:00 ` paper42
@ 2022-05-09 21:36 ` paper42
  2022-06-11  9:41 ` paper42
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-05-09 21:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gnome-documents-games-remove
https://github.com/void-linux/void-packages/pull/36065

tracker3: rename to tracker, drop tracker2
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36065.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-documents-games-remove-36065.patch --]
[-- Type: text/x-diff, Size: 14670 bytes --]

From f5e3f3c2c3c5290ba60fd2591c34b28149267f50 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:48:50 +0200
Subject: [PATCH 1/2] tracker: merge with tracker3

* fix tests
---
 common/shlibs                                 |  7 +--
 srcpkgs/libtracker3                           |  2 +-
 .../tracker/patches/failing-test-musl.patch   | 24 --------
 srcpkgs/tracker/template                      | 50 ++++++++++------
 srcpkgs/tracker/update                        |  2 -
 srcpkgs/tracker3                              |  1 +
 srcpkgs/tracker3-devel                        |  2 +-
 srcpkgs/tracker3/template                     | 57 -------------------
 srcpkgs/tracker3/update                       |  1 -
 9 files changed, 38 insertions(+), 108 deletions(-)
 delete mode 100644 srcpkgs/tracker/patches/failing-test-musl.patch
 delete mode 100644 srcpkgs/tracker/update
 create mode 120000 srcpkgs/tracker3
 delete mode 100644 srcpkgs/tracker3/template
 delete mode 100644 srcpkgs/tracker3/update

diff --git a/common/shlibs b/common/shlibs
index 784375c7c9aa..c485c245066a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -889,8 +889,6 @@ libepc-ui-1.0.so.3 libepc-0.4.1_1
 libgupnp-dlna-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-gst-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1
-libtracker-common.so libtracker-2.2.0_1
-libtracker-data.so libtracker-2.2.0_1
 libfm.so.4 libfm-1.2.3_3
 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2
 libfm-extra.so.4 libfm-extra-1.2.3_3
@@ -3119,10 +3117,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-control-2.0.so.0 libtracker-2.0.0_1
-libtracker-sparql-2.0.so.0 libtracker-2.0.0_1
-libtracker-miner-2.0.so.0 libtracker-2.0.1_1
-libtracker-sparql-3.0.so.0 libtracker3-3.0.0_1
+libtracker-sparql-3.0.so.0 libtracker-3.0.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/libtracker3 b/srcpkgs/libtracker3
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/failing-test-musl.patch b/srcpkgs/tracker/patches/failing-test-musl.patch
deleted file mode 100644
index 4407fe86e9e9..000000000000
--- a/srcpkgs/tracker/patches/failing-test-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5ee7d58f19542d1dac872badd72669ee288bd316 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:11:50 +0200
-Subject: [PATCH] drop test that fails on musl
-
----
- tests/libtracker-common/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git tests/libtracker-common/meson.build tests/libtracker-common/meson.build
-index 55b7ada..69688e0 100644
---- a/tests/libtracker-common/meson.build
-+++ b/tests/libtracker-common/meson.build
-@@ -2,7 +2,6 @@ libtracker_common_tests = [
-     'date-time',
-     'dbus',
-     'file-utils',
--    'sched',
-     'type-utils',
-     'utils',
- ]
--- 
-2.28.0
-
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index ce41975c713d..3145aab4b06b 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,23 +1,24 @@
 # Template file for 'tracker'
 pkgname=tracker
-version=2.3.6
-revision=3
+version=3.2.1
+revision=1
+wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
- -Djournal=true -Dman=true -Dnetwork_manager=enabled -Dstemmer=disabled
- -Dsystemd_user_services=no"
-hostmakedepends="gettext pkg-config glib-devel vala"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
+hostmakedepends="gettext pkg-config glib-devel vala asciidoc
+ python3-gobject"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
-checkdepends="tar"
+ libsoup-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>"
-license="GPL-2.0-or-later"
-homepage="https://live.gnome.org/Tracker"
+maintainer="q66 <daniel@octaforge.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2
+checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+make_check_pre="dbus-run-session"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"
@@ -31,7 +32,8 @@ post_patch() {
 }
 
 tracker-devel_package() {
-	depends="libglib-devel libtracker>=${version}_${revision}"
+	depends="libtracker>=${version}_${revision} libglib-devel json-glib-devel
+	 libsoup-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -43,11 +45,27 @@ tracker-devel_package() {
 }
 
 libtracker_package() {
-	shlib_provides="libtracker-common.so libtracker-data.so"
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove "usr/lib/tracker-2.0/*.so*"
 		vmove usr/lib/girepository-1.0
 	}
 }
+
+tracker3_package() {
+	depends="tracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+tracker3-devel_package() {
+	depends="tracker-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+libtracker3_package() {
+	depends="libtracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker/update b/srcpkgs/tracker/update
deleted file mode 100644
index 6213b21d4152..000000000000
--- a/srcpkgs/tracker/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pattern="\Q$pkgname\E-\K[0-9]+\.[0-9]*\.[0-9.]*[0-9](?=)"
-ignore="3.* 2.9[0-9].*"
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
new file mode 120000
index 000000000000..b471d39eca12
--- /dev/null
+++ b/srcpkgs/tracker3
@@ -0,0 +1 @@
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
deleted file mode 100644
index 3ae12716faa5..000000000000
--- a/srcpkgs/tracker3/template
+++ /dev/null
@@ -1,57 +0,0 @@
-# Template file for 'tracker3'
-pkgname=tracker3
-version=3.2.1
-revision=1
-wrksrc=tracker-${version}
-build_style=meson
-build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
- -Dsystemd_user_services=false"
-hostmakedepends="gettext pkg-config glib-devel vala asciidoc
- python3-gobject"
-makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel bash-completion"
-checkdepends="tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://live.gnome.org/Tracker"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" dbus"
-fi
-
-# needs a dbus setup
-do_check() {
-	:
-}
-
-post_patch() {
-	if [ "$CROSS_BUILD" ]; then
-		# Tell the build system that we have internal fts5 in sqlite3
-		vsed -i "/\[properties\]/a sqlite3_has_fts5 = 'true'" xbps_meson.cross
-	fi
-}
-
-tracker3-devel_package() {
-	depends="libtracker3>=${version}_${revision} libglib-devel json-glib-devel
-	 libsoup-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
-
-libtracker3_package() {
-	short_desc+=" - shared libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/girepository-1.0
-	}
-}
diff --git a/srcpkgs/tracker3/update b/srcpkgs/tracker3/update
deleted file mode 100644
index 15e6dbf06d2d..000000000000
--- a/srcpkgs/tracker3/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker

From 7d9675e05139c66087371703618e5859a093d57e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:52:50 +0200
Subject: [PATCH 2/2] tracker-miners: merge with tracker3-miners

---
 .../patches/build.patch                       |  0
 srcpkgs/tracker-miners/template               | 34 ++++++++++++-------
 srcpkgs/tracker-miners/update                 |  1 -
 srcpkgs/tracker3-miners                       |  1 +
 srcpkgs/tracker3-miners/template              | 34 -------------------
 srcpkgs/tracker3-miners/update                |  1 -
 6 files changed, 22 insertions(+), 49 deletions(-)
 rename srcpkgs/{tracker3-miners => tracker-miners}/patches/build.patch (100%)
 delete mode 100644 srcpkgs/tracker-miners/update
 create mode 120000 srcpkgs/tracker3-miners
 delete mode 100644 srcpkgs/tracker3-miners/template
 delete mode 100644 srcpkgs/tracker3-miners/update

diff --git a/srcpkgs/tracker3-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
similarity index 100%
rename from srcpkgs/tracker3-miners/patches/build.patch
rename to srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 1d31d2f3882a..b2d1de2f76ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,27 +1,35 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
-version=2.3.5
-revision=3
+version=3.2.1
+revision=1
 build_style=meson
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+# missing libgrss for miner_rss
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
  -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
- -Dbattery_detection=upower -Dcharset_detection=icu
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=no -Dminer_rss=false"
-hostmakedepends="pkg-config glib-devel intltool"
-makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+ -Dsystemd_user_services=false -Dnetwork_manager=enabled"
+hostmakedepends="pkg-config glib-devel intltool asciidoc"
+makedepends="tracker-devel ffmpeg-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
- libvorbis-devel poppler-glib-devel totem-pl-parser-devel
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
+ poppler-glib-devel totem-pl-parser-devel
+ upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
+ NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
+checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
 make_check=no # relies on unsupported ops in chroot
+
+tracker3-miners_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker-miners/update b/srcpkgs/tracker-miners/update
deleted file mode 100644
index 6dcf64a5163a..000000000000
--- a/srcpkgs/tracker-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="3.*"
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
new file mode 120000
index 000000000000..8e0a62a93f22
--- /dev/null
+++ b/srcpkgs/tracker3-miners
@@ -0,0 +1 @@
+tracker-miners
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
deleted file mode 100644
index adc11e7970c1..000000000000
--- a/srcpkgs/tracker3-miners/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'tracker3-miners'
-pkgname=tracker3-miners
-version=3.2.1
-revision=1
-wrksrc=tracker-miners-${version}
-build_style=meson
-# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true
- -Dfunctional_tests=false -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
- -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
- -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=false -Dnetwork_manager=enabled"
-hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-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
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
- NetworkManager-devel libharfbuzz"
-short_desc="Data miners for tracker3"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later"
-homepage="https://developer.gnome.org/libtracker-miner/stable"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
diff --git a/srcpkgs/tracker3-miners/update b/srcpkgs/tracker3-miners/update
deleted file mode 100644
index 160976ffc453..000000000000
--- a/srcpkgs/tracker3-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker-miners

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] tracker3: rename to tracker, drop tracker2
  2022-03-09 17:04 [PR PATCH] gnome-{games,documents}: remove package paper42
                   ` (5 preceding siblings ...)
  2022-05-09 21:36 ` paper42
@ 2022-06-11  9:41 ` paper42
  2022-06-11  9:50 ` paper42
  2022-06-11 10:26 ` [PR PATCH] [Merged]: " paper42
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-06-11  9:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gnome-documents-games-remove
https://github.com/void-linux/void-packages/pull/36065

tracker3: rename to tracker, drop tracker2
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36065.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-documents-games-remove-36065.patch --]
[-- Type: text/x-diff, Size: 14670 bytes --]

From e96266374148f5bf95c771bc4b73ce44c60eb575 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:48:50 +0200
Subject: [PATCH 1/2] tracker: merge with tracker3

* fix tests
---
 common/shlibs                                 |  7 +--
 srcpkgs/libtracker3                           |  2 +-
 .../tracker/patches/failing-test-musl.patch   | 24 --------
 srcpkgs/tracker/template                      | 50 ++++++++++------
 srcpkgs/tracker/update                        |  2 -
 srcpkgs/tracker3                              |  1 +
 srcpkgs/tracker3-devel                        |  2 +-
 srcpkgs/tracker3/template                     | 57 -------------------
 srcpkgs/tracker3/update                       |  1 -
 9 files changed, 38 insertions(+), 108 deletions(-)
 delete mode 100644 srcpkgs/tracker/patches/failing-test-musl.patch
 delete mode 100644 srcpkgs/tracker/update
 create mode 120000 srcpkgs/tracker3
 delete mode 100644 srcpkgs/tracker3/template
 delete mode 100644 srcpkgs/tracker3/update

diff --git a/common/shlibs b/common/shlibs
index 18fd33aa1f58..636361d0ac47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -887,8 +887,6 @@ libepc-ui-1.0.so.3 libepc-0.4.1_1
 libgupnp-dlna-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-gst-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1
-libtracker-common.so libtracker-2.2.0_1
-libtracker-data.so libtracker-2.2.0_1
 libfm.so.4 libfm-1.2.3_3
 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2
 libfm-extra.so.4 libfm-extra-1.2.3_3
@@ -3111,10 +3109,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-control-2.0.so.0 libtracker-2.0.0_1
-libtracker-sparql-2.0.so.0 libtracker-2.0.0_1
-libtracker-miner-2.0.so.0 libtracker-2.0.1_1
-libtracker-sparql-3.0.so.0 libtracker3-3.0.0_1
+libtracker-sparql-3.0.so.0 libtracker-3.0.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/libtracker3 b/srcpkgs/libtracker3
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/failing-test-musl.patch b/srcpkgs/tracker/patches/failing-test-musl.patch
deleted file mode 100644
index 4407fe86e9e9..000000000000
--- a/srcpkgs/tracker/patches/failing-test-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5ee7d58f19542d1dac872badd72669ee288bd316 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:11:50 +0200
-Subject: [PATCH] drop test that fails on musl
-
----
- tests/libtracker-common/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git tests/libtracker-common/meson.build tests/libtracker-common/meson.build
-index 55b7ada..69688e0 100644
---- a/tests/libtracker-common/meson.build
-+++ b/tests/libtracker-common/meson.build
-@@ -2,7 +2,6 @@ libtracker_common_tests = [
-     'date-time',
-     'dbus',
-     'file-utils',
--    'sched',
-     'type-utils',
-     'utils',
- ]
--- 
-2.28.0
-
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index ce41975c713d..3145aab4b06b 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,23 +1,24 @@
 # Template file for 'tracker'
 pkgname=tracker
-version=2.3.6
-revision=3
+version=3.2.1
+revision=1
+wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
- -Djournal=true -Dman=true -Dnetwork_manager=enabled -Dstemmer=disabled
- -Dsystemd_user_services=no"
-hostmakedepends="gettext pkg-config glib-devel vala"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
+hostmakedepends="gettext pkg-config glib-devel vala asciidoc
+ python3-gobject"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
-checkdepends="tar"
+ libsoup-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>"
-license="GPL-2.0-or-later"
-homepage="https://live.gnome.org/Tracker"
+maintainer="q66 <daniel@octaforge.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2
+checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+make_check_pre="dbus-run-session"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"
@@ -31,7 +32,8 @@ post_patch() {
 }
 
 tracker-devel_package() {
-	depends="libglib-devel libtracker>=${version}_${revision}"
+	depends="libtracker>=${version}_${revision} libglib-devel json-glib-devel
+	 libsoup-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -43,11 +45,27 @@ tracker-devel_package() {
 }
 
 libtracker_package() {
-	shlib_provides="libtracker-common.so libtracker-data.so"
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove "usr/lib/tracker-2.0/*.so*"
 		vmove usr/lib/girepository-1.0
 	}
 }
+
+tracker3_package() {
+	depends="tracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+tracker3-devel_package() {
+	depends="tracker-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+libtracker3_package() {
+	depends="libtracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker/update b/srcpkgs/tracker/update
deleted file mode 100644
index 6213b21d4152..000000000000
--- a/srcpkgs/tracker/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pattern="\Q$pkgname\E-\K[0-9]+\.[0-9]*\.[0-9.]*[0-9](?=)"
-ignore="3.* 2.9[0-9].*"
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
new file mode 120000
index 000000000000..b471d39eca12
--- /dev/null
+++ b/srcpkgs/tracker3
@@ -0,0 +1 @@
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
deleted file mode 100644
index 3ae12716faa5..000000000000
--- a/srcpkgs/tracker3/template
+++ /dev/null
@@ -1,57 +0,0 @@
-# Template file for 'tracker3'
-pkgname=tracker3
-version=3.2.1
-revision=1
-wrksrc=tracker-${version}
-build_style=meson
-build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
- -Dsystemd_user_services=false"
-hostmakedepends="gettext pkg-config glib-devel vala asciidoc
- python3-gobject"
-makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel bash-completion"
-checkdepends="tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://live.gnome.org/Tracker"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" dbus"
-fi
-
-# needs a dbus setup
-do_check() {
-	:
-}
-
-post_patch() {
-	if [ "$CROSS_BUILD" ]; then
-		# Tell the build system that we have internal fts5 in sqlite3
-		vsed -i "/\[properties\]/a sqlite3_has_fts5 = 'true'" xbps_meson.cross
-	fi
-}
-
-tracker3-devel_package() {
-	depends="libtracker3>=${version}_${revision} libglib-devel json-glib-devel
-	 libsoup-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
-
-libtracker3_package() {
-	short_desc+=" - shared libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/girepository-1.0
-	}
-}
diff --git a/srcpkgs/tracker3/update b/srcpkgs/tracker3/update
deleted file mode 100644
index 15e6dbf06d2d..000000000000
--- a/srcpkgs/tracker3/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker

From 2715b4f3b21e93f60ec177258e03d9a32d718679 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:52:50 +0200
Subject: [PATCH 2/2] tracker-miners: merge with tracker3-miners

---
 .../patches/build.patch                       |  0
 srcpkgs/tracker-miners/template               | 34 ++++++++++++-------
 srcpkgs/tracker-miners/update                 |  1 -
 srcpkgs/tracker3-miners                       |  1 +
 srcpkgs/tracker3-miners/template              | 34 -------------------
 srcpkgs/tracker3-miners/update                |  1 -
 6 files changed, 22 insertions(+), 49 deletions(-)
 rename srcpkgs/{tracker3-miners => tracker-miners}/patches/build.patch (100%)
 delete mode 100644 srcpkgs/tracker-miners/update
 create mode 120000 srcpkgs/tracker3-miners
 delete mode 100644 srcpkgs/tracker3-miners/template
 delete mode 100644 srcpkgs/tracker3-miners/update

diff --git a/srcpkgs/tracker3-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
similarity index 100%
rename from srcpkgs/tracker3-miners/patches/build.patch
rename to srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 1d31d2f3882a..b2d1de2f76ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,27 +1,35 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
-version=2.3.5
-revision=3
+version=3.2.1
+revision=1
 build_style=meson
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+# missing libgrss for miner_rss
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
  -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
- -Dbattery_detection=upower -Dcharset_detection=icu
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=no -Dminer_rss=false"
-hostmakedepends="pkg-config glib-devel intltool"
-makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+ -Dsystemd_user_services=false -Dnetwork_manager=enabled"
+hostmakedepends="pkg-config glib-devel intltool asciidoc"
+makedepends="tracker-devel ffmpeg-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
- libvorbis-devel poppler-glib-devel totem-pl-parser-devel
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
+ poppler-glib-devel totem-pl-parser-devel
+ upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
+ NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
+checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
 make_check=no # relies on unsupported ops in chroot
+
+tracker3-miners_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker-miners/update b/srcpkgs/tracker-miners/update
deleted file mode 100644
index 6dcf64a5163a..000000000000
--- a/srcpkgs/tracker-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="3.*"
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
new file mode 120000
index 000000000000..8e0a62a93f22
--- /dev/null
+++ b/srcpkgs/tracker3-miners
@@ -0,0 +1 @@
+tracker-miners
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
deleted file mode 100644
index adc11e7970c1..000000000000
--- a/srcpkgs/tracker3-miners/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'tracker3-miners'
-pkgname=tracker3-miners
-version=3.2.1
-revision=1
-wrksrc=tracker-miners-${version}
-build_style=meson
-# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true
- -Dfunctional_tests=false -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
- -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
- -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=false -Dnetwork_manager=enabled"
-hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-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
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
- NetworkManager-devel libharfbuzz"
-short_desc="Data miners for tracker3"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later"
-homepage="https://developer.gnome.org/libtracker-miner/stable"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
diff --git a/srcpkgs/tracker3-miners/update b/srcpkgs/tracker3-miners/update
deleted file mode 100644
index 160976ffc453..000000000000
--- a/srcpkgs/tracker3-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker-miners

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] tracker3: rename to tracker, drop tracker2
  2022-03-09 17:04 [PR PATCH] gnome-{games,documents}: remove package paper42
                   ` (6 preceding siblings ...)
  2022-06-11  9:41 ` paper42
@ 2022-06-11  9:50 ` paper42
  2022-06-11 10:26 ` [PR PATCH] [Merged]: " paper42
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-06-11  9:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gnome-documents-games-remove
https://github.com/void-linux/void-packages/pull/36065

tracker3: rename to tracker, drop tracker2
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36065.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-documents-games-remove-36065.patch --]
[-- Type: text/x-diff, Size: 14643 bytes --]

From 7ac99b187a2bbe59866da44e2013899bb7e88a78 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:48:50 +0200
Subject: [PATCH 1/2] tracker: merge with tracker3

* fix tests
---
 common/shlibs                                 |  7 +--
 srcpkgs/libtracker3                           |  2 +-
 .../tracker/patches/failing-test-musl.patch   | 24 --------
 srcpkgs/tracker/template                      | 49 ++++++++++------
 srcpkgs/tracker/update                        |  2 -
 srcpkgs/tracker3                              |  1 +
 srcpkgs/tracker3-devel                        |  2 +-
 srcpkgs/tracker3/template                     | 57 -------------------
 srcpkgs/tracker3/update                       |  1 -
 9 files changed, 37 insertions(+), 108 deletions(-)
 delete mode 100644 srcpkgs/tracker/patches/failing-test-musl.patch
 delete mode 100644 srcpkgs/tracker/update
 create mode 120000 srcpkgs/tracker3
 delete mode 100644 srcpkgs/tracker3/template
 delete mode 100644 srcpkgs/tracker3/update

diff --git a/common/shlibs b/common/shlibs
index 18fd33aa1f58..636361d0ac47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -887,8 +887,6 @@ libepc-ui-1.0.so.3 libepc-0.4.1_1
 libgupnp-dlna-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-gst-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1
-libtracker-common.so libtracker-2.2.0_1
-libtracker-data.so libtracker-2.2.0_1
 libfm.so.4 libfm-1.2.3_3
 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2
 libfm-extra.so.4 libfm-extra-1.2.3_3
@@ -3111,10 +3109,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-control-2.0.so.0 libtracker-2.0.0_1
-libtracker-sparql-2.0.so.0 libtracker-2.0.0_1
-libtracker-miner-2.0.so.0 libtracker-2.0.1_1
-libtracker-sparql-3.0.so.0 libtracker3-3.0.0_1
+libtracker-sparql-3.0.so.0 libtracker-3.0.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/libtracker3 b/srcpkgs/libtracker3
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/failing-test-musl.patch b/srcpkgs/tracker/patches/failing-test-musl.patch
deleted file mode 100644
index 4407fe86e9e9..000000000000
--- a/srcpkgs/tracker/patches/failing-test-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5ee7d58f19542d1dac872badd72669ee288bd316 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:11:50 +0200
-Subject: [PATCH] drop test that fails on musl
-
----
- tests/libtracker-common/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git tests/libtracker-common/meson.build tests/libtracker-common/meson.build
-index 55b7ada..69688e0 100644
---- a/tests/libtracker-common/meson.build
-+++ b/tests/libtracker-common/meson.build
-@@ -2,7 +2,6 @@ libtracker_common_tests = [
-     'date-time',
-     'dbus',
-     'file-utils',
--    'sched',
-     'type-utils',
-     'utils',
- ]
--- 
-2.28.0
-
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index ce41975c713d..c8b297e73803 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,23 +1,23 @@
 # Template file for 'tracker'
 pkgname=tracker
-version=2.3.6
-revision=3
+version=3.2.1
+revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
- -Djournal=true -Dman=true -Dnetwork_manager=enabled -Dstemmer=disabled
- -Dsystemd_user_services=no"
-hostmakedepends="gettext pkg-config glib-devel vala"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
+hostmakedepends="gettext pkg-config glib-devel vala asciidoc
+ python3-gobject"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
-checkdepends="tar"
+ libsoup-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>"
-license="GPL-2.0-or-later"
-homepage="https://live.gnome.org/Tracker"
+maintainer="q66 <daniel@octaforge.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/Tracker"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2
+checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
+make_check_pre="dbus-run-session"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"
@@ -31,7 +31,8 @@ post_patch() {
 }
 
 tracker-devel_package() {
-	depends="libglib-devel libtracker>=${version}_${revision}"
+	depends="libtracker>=${version}_${revision} libglib-devel json-glib-devel
+	 libsoup-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -43,11 +44,27 @@ tracker-devel_package() {
 }
 
 libtracker_package() {
-	shlib_provides="libtracker-common.so libtracker-data.so"
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove "usr/lib/tracker-2.0/*.so*"
 		vmove usr/lib/girepository-1.0
 	}
 }
+
+tracker3_package() {
+	depends="tracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+tracker3-devel_package() {
+	depends="tracker-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+libtracker3_package() {
+	depends="libtracker>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker/update b/srcpkgs/tracker/update
deleted file mode 100644
index 6213b21d4152..000000000000
--- a/srcpkgs/tracker/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pattern="\Q$pkgname\E-\K[0-9]+\.[0-9]*\.[0-9.]*[0-9](?=)"
-ignore="3.* 2.9[0-9].*"
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
new file mode 120000
index 000000000000..b471d39eca12
--- /dev/null
+++ b/srcpkgs/tracker3
@@ -0,0 +1 @@
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index 59dd6911b3b3..b471d39eca12 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker3
\ No newline at end of file
+tracker
\ No newline at end of file
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
deleted file mode 100644
index 3ae12716faa5..000000000000
--- a/srcpkgs/tracker3/template
+++ /dev/null
@@ -1,57 +0,0 @@
-# Template file for 'tracker3'
-pkgname=tracker3
-version=3.2.1
-revision=1
-wrksrc=tracker-${version}
-build_style=meson
-build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
- -Dsystemd_user_services=false"
-hostmakedepends="gettext pkg-config glib-devel vala asciidoc
- python3-gobject"
-makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel bash-completion"
-checkdepends="tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://live.gnome.org/Tracker"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" dbus"
-fi
-
-# needs a dbus setup
-do_check() {
-	:
-}
-
-post_patch() {
-	if [ "$CROSS_BUILD" ]; then
-		# Tell the build system that we have internal fts5 in sqlite3
-		vsed -i "/\[properties\]/a sqlite3_has_fts5 = 'true'" xbps_meson.cross
-	fi
-}
-
-tracker3-devel_package() {
-	depends="libtracker3>=${version}_${revision} libglib-devel json-glib-devel
-	 libsoup-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
-
-libtracker3_package() {
-	short_desc+=" - shared libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/girepository-1.0
-	}
-}
diff --git a/srcpkgs/tracker3/update b/srcpkgs/tracker3/update
deleted file mode 100644
index 15e6dbf06d2d..000000000000
--- a/srcpkgs/tracker3/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker

From 80f1e83be0d3d841b706ea928e3ffb25bfc5a2f6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:52:50 +0200
Subject: [PATCH 2/2] tracker-miners: merge with tracker3-miners

---
 .../patches/build.patch                       |  0
 srcpkgs/tracker-miners/template               | 34 ++++++++++++-------
 srcpkgs/tracker-miners/update                 |  1 -
 srcpkgs/tracker3-miners                       |  1 +
 srcpkgs/tracker3-miners/template              | 34 -------------------
 srcpkgs/tracker3-miners/update                |  1 -
 6 files changed, 22 insertions(+), 49 deletions(-)
 rename srcpkgs/{tracker3-miners => tracker-miners}/patches/build.patch (100%)
 delete mode 100644 srcpkgs/tracker-miners/update
 create mode 120000 srcpkgs/tracker3-miners
 delete mode 100644 srcpkgs/tracker3-miners/template
 delete mode 100644 srcpkgs/tracker3-miners/update

diff --git a/srcpkgs/tracker3-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
similarity index 100%
rename from srcpkgs/tracker3-miners/patches/build.patch
rename to srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 1d31d2f3882a..b2d1de2f76ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,27 +1,35 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
-version=2.3.5
-revision=3
+version=3.2.1
+revision=1
 build_style=meson
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+# missing libgrss for miner_rss
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
  -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
- -Dbattery_detection=upower -Dcharset_detection=icu
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=no -Dminer_rss=false"
-hostmakedepends="pkg-config glib-devel intltool"
-makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+ -Dsystemd_user_services=false -Dnetwork_manager=enabled"
+hostmakedepends="pkg-config glib-devel intltool asciidoc"
+makedepends="tracker-devel ffmpeg-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
- libvorbis-devel poppler-glib-devel totem-pl-parser-devel
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
+ poppler-glib-devel totem-pl-parser-devel
+ upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
+ NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
+checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
 make_check=no # relies on unsupported ops in chroot
+
+tracker3-miners_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/tracker-miners/update b/srcpkgs/tracker-miners/update
deleted file mode 100644
index 6dcf64a5163a..000000000000
--- a/srcpkgs/tracker-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="3.*"
diff --git a/srcpkgs/tracker3-miners b/srcpkgs/tracker3-miners
new file mode 120000
index 000000000000..8e0a62a93f22
--- /dev/null
+++ b/srcpkgs/tracker3-miners
@@ -0,0 +1 @@
+tracker-miners
\ No newline at end of file
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
deleted file mode 100644
index adc11e7970c1..000000000000
--- a/srcpkgs/tracker3-miners/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'tracker3-miners'
-pkgname=tracker3-miners
-version=3.2.1
-revision=1
-wrksrc=tracker-miners-${version}
-build_style=meson
-# missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Dextract=true
- -Dfunctional_tests=false -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
- -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
- -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
- -Dsystemd_user_services=false -Dnetwork_manager=enabled"
-hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-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
- upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
- NetworkManager-devel libharfbuzz"
-short_desc="Data miners for tracker3"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-2.0-or-later"
-homepage="https://developer.gnome.org/libtracker-miner/stable"
-distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
diff --git a/srcpkgs/tracker3-miners/update b/srcpkgs/tracker3-miners/update
deleted file mode 100644
index 160976ffc453..000000000000
--- a/srcpkgs/tracker3-miners/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=tracker-miners

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Merged]: tracker3: rename to tracker, drop tracker2
  2022-03-09 17:04 [PR PATCH] gnome-{games,documents}: remove package paper42
                   ` (7 preceding siblings ...)
  2022-06-11  9:50 ` paper42
@ 2022-06-11 10:26 ` paper42
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-06-11 10:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 996 bytes --]

There's a merged pull request on the void-packages repository

tracker3: rename to tracker, drop tracker2
https://github.com/void-linux/void-packages/pull/36065

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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] 10+ messages in thread

end of thread, other threads:[~2022-06-11 10:26 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-09 17:04 [PR PATCH] gnome-{games,documents}: remove package paper42
2022-04-07 21:17 ` [PR PATCH] [Updated] " paper42
2022-04-07 21:24 ` paper42
2022-04-07 22:05 ` paper42
2022-04-09 11:24 ` [PR PATCH] [Updated] tracker3: rename to tracker, drop tracker2 paper42
2022-04-09 12:00 ` paper42
2022-05-09 21:36 ` paper42
2022-06-11  9:41 ` paper42
2022-06-11  9:50 ` paper42
2022-06-11 10:26 ` [PR PATCH] [Merged]: " paper42

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).