GNOME.org
 

[gnome-build-meta/sam/tracker-3] Add tracker-3 and tracker-miners-3 elements

commit 69e98a61b44b50796620ec2c067c9c7ff9d0d745
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun May 3 09:55:52 2020 +0200

    Add tracker-3 and tracker-miners-3 elements
    
    We are targetting GNOME 3.38 to include Tracker 3.0, and we want
    Tracker 3.0 available in the master Flatpak runtimes now so apps
    can start porting and testing.
    
    Tracker Miners 3.0 will remain in core-deps rather than SDK as
    most Flatpak apps will want to use the host's miners, rather
    than running its own miners inside its sandbox.
    
    Tracker 2 and 3 are parallel installable, however we don't want
    to depend on on both versions in a stable GNOME release. Our plan
    is to port all apps in core to use Tracker 3 and to remove Tracker 2.0
    before the GNOME 3.37.90 release. (Tracking issue here:
    https://gitlab.gnome.org/GNOME/tracker/-/issues/194)

 elements/core-deps.bst                            |  3 +-
 elements/core-deps/gnome-online-miners.bst        |  2 +-
 elements/core-deps/grilo-plugins.bst              |  2 +-
 elements/core-deps/{tracker.bst => tracker-2.bst} |  0
 elements/core-deps/tracker-miners-2.bst           | 37 +++++++++++++++++++++++
 elements/core-deps/tracker-miners.bst             | 10 +++---
 elements/core/gnome-boxes.bst                     |  4 +--
 elements/core/gnome-music.bst                     |  4 +--
 elements/core/gnome-photos.bst                    |  4 +--
 elements/core/nautilus.bst                        |  4 +--
 elements/core/rygel.bst                           |  2 +-
 elements/sdk-platform.bst                         |  1 +
 elements/sdk/tracker.bst                          | 22 ++++++++++++++
 elements/world/bijiben.bst                        |  2 +-
 elements/world/gnome-documents.bst                |  4 +--
 elements/world/gnome-games.bst                    |  4 +--
 16 files changed, 83 insertions(+), 22 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 00c61b6b..96c797ae 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -129,8 +129,9 @@ depends:
 - core-deps/template-glib.bst
 - core-deps/tepl.bst
 - core-deps/totem-pl-parser.bst
+- core-deps/tracker-2.bst
+- core-deps/tracker-miners-2.bst
 - core-deps/tracker-miners.bst
-- core-deps/tracker.bst
 - core-deps/uchardet.bst
 - core-deps/udisks2.bst
 - core-deps/uhttpmock.bst
diff --git a/elements/core-deps/gnome-online-miners.bst b/elements/core-deps/gnome-online-miners.bst
index 7372ea5c..3ad7373e 100644
--- a/elements/core-deps/gnome-online-miners.bst
+++ b/elements/core-deps/gnome-online-miners.bst
@@ -10,7 +10,7 @@ depends:
 - core-deps/grilo.bst
 - core-deps/libgdata.bst
 - core-deps/libgfbgraph.bst
-- core-deps/tracker.bst
+- core-deps/tracker-2.bst
 - sdk/glib.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
diff --git a/elements/core-deps/grilo-plugins.bst b/elements/core-deps/grilo-plugins.bst
index 3a7878be..51a97f43 100644
--- a/elements/core-deps/grilo-plugins.bst
+++ b/elements/core-deps/grilo-plugins.bst
@@ -17,7 +17,7 @@ depends:
 - core-deps/libmediaart.bst
 - core-deps/librest.bst
 - core-deps/totem-pl-parser.bst
-- core-deps/tracker.bst
+- core-deps/tracker-2.bst
 - sdk/json-glib.bst
 - sdk/libsoup.bst
 - freedesktop-sdk.bst:components/itstool.bst
diff --git a/elements/core-deps/tracker.bst b/elements/core-deps/tracker-2.bst
similarity index 100%
rename from elements/core-deps/tracker.bst
rename to elements/core-deps/tracker-2.bst
diff --git a/elements/core-deps/tracker-miners-2.bst b/elements/core-deps/tracker-miners-2.bst
new file mode 100644
index 00000000..9825fce8
--- /dev/null
+++ b/elements/core-deps/tracker-miners-2.bst
@@ -0,0 +1,37 @@
+kind: meson
+sources:
+- kind: git_tag
+  url: gitlab_gnome_org:GNOME/tracker-miners.git
+  track: tracker-miners-2.3
+build-depends:
+- core-deps/intltool.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+depends:
+- core-deps/NetworkManager.bst
+- core-deps/gexiv2.bst
+- core-deps/libcue.bst
+- core-deps/libgsf.bst
+- core-deps/libgxps.bst
+- core-deps/libosinfo.bst
+- core-deps/poppler.bst
+- core-deps/totem-pl-parser.bst
+- core-deps/tracker-2.bst
+- sdk/dconf.bst
+- sdk/gdk-pixbuf.bst
+- sdk/glib.bst
+- sdk/gst-plugins-base.bst
+- sdk/libsecret.bst
+- sdk/openjpeg.bst
+- freedesktop-sdk.bst:components/gstreamer.bst
+- freedesktop-sdk.bst:components/libflac.bst
+- freedesktop-sdk.bst:components/libseccomp.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+variables:
+  meson-local: >-
+    -Dxmp=disabled
+    -Dexif=disabled
+    -Diptc=disabled
+    -Dminer_rss=false
+    -Dtiff=disabled
+    -Dtaglib=disabled
+    -Dgif=disabled
diff --git a/elements/core-deps/tracker-miners.bst b/elements/core-deps/tracker-miners.bst
index 177e5885..4cf34ac3 100644
--- a/elements/core-deps/tracker-miners.bst
+++ b/elements/core-deps/tracker-miners.bst
@@ -2,9 +2,10 @@ kind: meson
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/tracker-miners.git
-  track: tracker-miners-2.3
+  track: master
 build-depends:
-- core-deps/intltool.bst
+- freedesktop-sdk.bst:components/asciidoc.bst
+- freedesktop-sdk.bst:components/docbook-xsl.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/NetworkManager.bst
@@ -15,13 +16,14 @@ depends:
 - core-deps/libosinfo.bst
 - core-deps/poppler.bst
 - core-deps/totem-pl-parser.bst
-- core-deps/tracker.bst
+- core-deps/upower.bst
 - sdk/dconf.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gst-plugins-base.bst
 - sdk/libsecret.bst
 - sdk/openjpeg.bst
+- sdk/tracker.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:components/libflac.bst
 - freedesktop-sdk.bst:components/libseccomp.bst
@@ -29,9 +31,7 @@ depends:
 variables:
   meson-local: >-
     -Dxmp=disabled
-    -Dexif=disabled
     -Diptc=disabled
     -Dminer_rss=false
     -Dtiff=disabled
-    -Dtaglib=disabled
     -Dgif=disabled
diff --git a/elements/core/gnome-boxes.bst b/elements/core/gnome-boxes.bst
index b50eb6df..986a6396 100644
--- a/elements/core/gnome-boxes.bst
+++ b/elements/core/gnome-boxes.bst
@@ -19,8 +19,8 @@ depends:
 - core-deps/libosinfo.bst
 - core-deps/libvirt-glib.bst
 - core-deps/spice-gtk.bst
-- core-deps/tracker-miners.bst
-- core-deps/tracker.bst
+- core-deps/tracker-miners-2.bst
+- core-deps/tracker-2.bst
 - core-deps/vte.bst
 - sdk/WebKitGTK.bst
 - sdk/adwaita-icon-theme.bst
diff --git a/elements/core/gnome-music.bst b/elements/core/gnome-music.bst
index 24db3faa..be538a2e 100644
--- a/elements/core/gnome-music.bst
+++ b/elements/core/gnome-music.bst
@@ -20,8 +20,8 @@ depends:
 - core-deps/grilo.bst
 - core-deps/libdazzle.bst
 - core-deps/libmediaart.bst
-- core-deps/tracker-miners.bst
-- core-deps/tracker.bst
+- core-deps/tracker-miners-2.bst
+- core-deps/tracker-2.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
diff --git a/elements/core/gnome-photos.bst b/elements/core/gnome-photos.bst
index 90318831..692e78a6 100644
--- a/elements/core/gnome-photos.bst
+++ b/elements/core/gnome-photos.bst
@@ -22,8 +22,8 @@ depends:
 - core-deps/libdazzle.bst
 - core-deps/libgdata.bst
 - core-deps/libgfbgraph.bst
-- core-deps/tracker-miners.bst
-- core-deps/tracker.bst
+- core-deps/tracker-miners-2.bst
+- core-deps/tracker-2.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
diff --git a/elements/core/nautilus.bst b/elements/core/nautilus.bst
index 3f5cb997..4c09f644 100644
--- a/elements/core/nautilus.bst
+++ b/elements/core/nautilus.bst
@@ -12,8 +12,8 @@ build-depends:
 depends:
 - core-deps/gexiv2.bst
 - core-deps/gnome-autoar.bst
-- core-deps/tracker-miners.bst
-- core-deps/tracker.bst
+- core-deps/tracker-miners-2.bst
+- core-deps/tracker-2.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/glib.bst
diff --git a/elements/core/rygel.bst b/elements/core/rygel.bst
index fe9197f0..871b40ba 100644
--- a/elements/core/rygel.bst
+++ b/elements/core/rygel.bst
@@ -11,7 +11,7 @@ depends:
 - core-deps/gupnp-dlna.bst
 - core-deps/gupnp.bst
 - core-deps/libmediaart.bst
-- core-deps/tracker.bst
+- core-deps/tracker-2.bst
 - sdk/libgee.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index ca7ba1e4..44319aa8 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -49,6 +49,7 @@ depends:
 - sdk/pipewire.bst
 - sdk/pycairo.bst
 - sdk/pygobject.bst
+- sdk/tracker.bst
 - sdk/woff2.bst
 - sdk/wpebackend-fdo.bst
 - sdk/yelp-xsl.bst
diff --git a/elements/sdk/tracker.bst b/elements/sdk/tracker.bst
new file mode 100644
index 00000000..0edfeca1
--- /dev/null
+++ b/elements/sdk/tracker.bst
@@ -0,0 +1,22 @@
+kind: meson
+sources:
+- kind: git_tag
+  url: gitlab_gnome_org:GNOME/tracker.git
+  track: master
+build-depends:
+- sdk/gtk-doc.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/asciidoc.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+depends:
+- sdk/glib.bst
+- sdk/json-glib.bst
+- sdk/libsoup.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+- freedesktop-sdk.bst:components/dbus.bst
+variables:
+  meson-local: >-
+    -Ddocs=false
+    -Dunicode_support=icu
+    -Dstemmer=disabled
+    -Dbash_completion_dir=%{datadir}/bash-completion/completions
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index db5c9f1e..e44ef88f 100644
--- a/elements/world/bijiben.bst
+++ b/elements/world/bijiben.bst
@@ -14,7 +14,7 @@ build-depends:
 depends:
 - core-deps/evolution-data-server.bst
 - core-deps/libhandy.bst
-- core-deps/tracker.bst
+- core-deps/tracker-2.bst
 - sdk/WebKitGTK.bst
 - sdk/appstream-glib.bst
 - sdk/clutter-gtk.bst
diff --git a/elements/world/gnome-documents.bst b/elements/world/gnome-documents.bst
index 0984ba3b..6b327afe 100644
--- a/elements/world/gnome-documents.bst
+++ b/elements/world/gnome-documents.bst
@@ -15,8 +15,8 @@ depends:
 - core-deps/gnome-online-accounts.bst
 - core-deps/gnome-online-miners.bst
 - core-deps/libgdata.bst
-- core-deps/tracker-miners.bst
-- core-deps/tracker.bst
+- core-deps/tracker-miners-2.bst
+- core-deps/tracker-2.bst
 - core/evince.bst
 - core/gnome-desktop.bst
 - sdk/WebKitGTK.bst
diff --git a/elements/world/gnome-games.bst b/elements/world/gnome-games.bst
index a25c1534..84d878a3 100644
--- a/elements/world/gnome-games.bst
+++ b/elements/world/gnome-games.bst
@@ -11,8 +11,8 @@ depends:
 - core-deps/grilo-plugins.bst
 - core-deps/grilo.bst
 - core-deps/libhandy.bst
-- core-deps/tracker-miners.bst
-- core-deps/tracker.bst
+- core-deps/tracker-miners-2.bst
+- core-deps/tracker-2.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]