[gnome-build-meta/sam/tracker3: 3/3] WIP: Use Tracker 3 by default, Tracker 2.3 for GNOME Photos




commit bb99f81aa0e458d94951a620604b040286aab0b5
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Aug 10 12:48:07 2020 +0200

    WIP: Use Tracker 3 by default, Tracker 2.3 for GNOME Photos
    
    For GNOME 3.38, we expect to have all core apps ported to Tracker 3
    except for GNOME Photos. The Photos port to Tracker 3 lacks review
    and testing so for reliability's sake we should stick to 2.x.
    
    We must avoid Tracker 2 and 3 indexing the same locations as much
    as possible. To this end, we will ship Tracker 2.x with autostart
    disabled, and GNOME Photos will start Tracker miners on-demand.

 elements/core-deps.bst                     | 4 ++--
 elements/core-deps/gnome-online-miners.bst | 4 ++--
 elements/core-deps/tracker-miners-2.bst    | 2 +-
 elements/core/gnome-boxes.bst              | 8 +++++---
 elements/core/gnome-photos.bst             | 4 ++--
 elements/core/nautilus.bst                 | 6 +++---
 6 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 5a06b8f2..aaa8f15a 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -116,9 +116,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-miners-2.bst
+- core-deps/tracker-2.bst
 - core-deps/udisks2.bst
 - core-deps/uhttpmock.bst
 - core-deps/upower.bst
diff --git a/elements/core-deps/gnome-online-miners.bst b/elements/core-deps/gnome-online-miners.bst
index 49ae8e8c..6d21cd45 100644
--- a/elements/core-deps/gnome-online-miners.bst
+++ b/elements/core-deps/gnome-online-miners.bst
@@ -2,7 +2,7 @@ kind: autotools
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gnome-online-miners.git
-  track: master
+  track: sam/tracker3
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
@@ -10,8 +10,8 @@ depends:
 - core-deps/grilo.bst
 - core-deps/libgdata.bst
 - core-deps/libgfbgraph-0.2.bst
-- core-deps/tracker-2.bst
 - sdk/glib.bst
+- sdk/tracker.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   conf-local: >-
diff --git a/elements/core-deps/tracker-miners-2.bst b/elements/core-deps/tracker-miners-2.bst
index 04922e71..f3699b71 100644
--- a/elements/core-deps/tracker-miners-2.bst
+++ b/elements/core-deps/tracker-miners-2.bst
@@ -2,7 +2,7 @@ kind: meson
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/tracker-miners.git
-  track: tracker-miners-2.3
+  track: sam/tracker-miners-2.3-no-autostart
 build-depends:
 - core-deps/intltool.bst
 - freedesktop-sdk.bst:components/systemd.bst
diff --git a/elements/core/gnome-boxes.bst b/elements/core/gnome-boxes.bst
index f575fe62..22507bb5 100644
--- a/elements/core/gnome-boxes.bst
+++ b/elements/core/gnome-boxes.bst
@@ -3,7 +3,7 @@ kind: meson
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gnome-boxes.git
-  track: master
+  track: wip/carlosg/tracker3
   submodules:
     subprojects/gtk-frdp:
       checkout: true
@@ -27,8 +27,7 @@ depends:
 - core-deps/libvirt-glib.bst
 - core-deps/osinfo-db.bst
 - core-deps/spice-gtk.bst
-- core-deps/tracker-2.bst
-- core-deps/tracker-miners-2.bst
+- core-deps/tracker-miners.bst
 - core-deps/vte.bst
 - sdk/WebKitGTK.bst
 - sdk/adwaita-icon-theme.bst
@@ -37,5 +36,8 @@ depends:
 - sdk/gtksourceview.bst
 - sdk/json-glib.bst
 - sdk/libsecret.bst
+- sdk/tracker.bst
+- sdk/vala.bst
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:components/libgudev.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-photos.bst b/elements/core/gnome-photos.bst
index 59a61b28..413922a0 100644
--- a/elements/core/gnome-photos.bst
+++ b/elements/core/gnome-photos.bst
@@ -2,7 +2,7 @@ kind: meson
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gnome-photos.git
-  track: master
+  track: sam/tracker2-domain
   submodules:
     subprojects/libgd:
       checkout: true
@@ -22,8 +22,8 @@ depends:
 - core-deps/libdazzle.bst
 - core-deps/libgdata.bst
 - core-deps/libgfbgraph-0.2.bst
-- core-deps/tracker-miners-2.bst
 - core-deps/tracker-2.bst
+- core-deps/tracker-miners-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 4c09f644..40f63b7f 100644
--- a/elements/core/nautilus.bst
+++ b/elements/core/nautilus.bst
@@ -2,7 +2,7 @@ kind: meson
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/nautilus.git
-  track: master
+  track: sam/tracker-3
   submodules:
     subprojects/libgd:
       checkout: true
@@ -12,14 +12,14 @@ build-depends:
 depends:
 - core-deps/gexiv2.bst
 - core-deps/gnome-autoar.bst
-- core-deps/tracker-miners-2.bst
-- core-deps/tracker-2.bst
+- core-deps/tracker-miners.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
 - sdk/pango.bst
+- sdk/tracker.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]