[gnome-photos/wip/rishi/tracker-switch-to-2.3] flatpak: Fix the tracker and tracker-miners builds



commit e083186ec391cc8bd1519d3af4d86179b9858bcd
Author: Syed Kaleem <kaleem105 gmail com>
Date:   Mon Mar 30 15:20:28 2020 +0200

    flatpak: Fix the tracker and tracker-miners builds
    
    Intltool was removed from version 3.34 of the GNOME SDK, but it's
    still used by tracker-miners. Therefore it has to be bundled with the
    build.
    
    Tracker's master branches are now being used to develop version 3.0,
    and it's not ready for use [1]. Hence the build has to be switched to
    use the respective 2.3 branches.
    
    [1] 
https://discourse.gnome.org/t/tracker-has-branched-for-3-0-use-the-2-3-branch-if-you-want-stability/1889
    
    https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/118
    https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/125

 flatpak/org.gnome.Photos.json | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/flatpak/org.gnome.Photos.json b/flatpak/org.gnome.Photos.json
index ec9f9c73..debee5f5 100644
--- a/flatpak/org.gnome.Photos.json
+++ b/flatpak/org.gnome.Photos.json
@@ -256,7 +256,19 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/tracker.git";
+                    "url": "https://gitlab.gnome.org/GNOME/tracker.git";,
+                    "branch": "tracker-2.3"
+                }
+            ]
+        },
+        {
+            "name": "intltool",
+            "cleanup": [ "*" ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz";,
+                    "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
                 }
             ]
         },
@@ -284,7 +296,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git";
+                    "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git";,
+                    "branch": "tracker-miners-2.3"
                 }
             ]
         },


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