flatpak: Update to 3.34 runtime

Also, bundle intltool, because the 3.34 Sdk doesn't include it but
tracker-miners still depends on it.

Intltool lines taken from https://github.com/flathub/shared-modules.git
This commit is contained in:
António Fernandes 2019-09-18 17:48:58 +00:00 committed by António Fernandes
parent 474270cc89
commit 81dd339634
4 changed files with 34 additions and 7 deletions

View file

@ -50,7 +50,7 @@ stages:
expire_in: 2 days
flatpak devel:
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.32
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.34
stage: test
variables:
MANIFEST_PATH: "build-aux/flatpak/org.gnome.Nautilus.yml"

View file

@ -1,7 +1,7 @@
{
"app-id": "org.gnome.NautilusDevel",
"runtime": "org.gnome.Platform",
"runtime-version": "3.32",
"runtime-version": "3.34",
"sdk": "org.gnome.Sdk",
"command": "nautilus",
"tags": [
@ -83,7 +83,18 @@
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/tracker.git",
"tag": "2.2.1"
"tag": "2.3.0"
}
]
},
{
"name": "intltool",
"cleanup": [ "*" ],
"sources": [
{
"type": "archive",
"url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz",
"sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
}
]
},
@ -116,7 +127,7 @@
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/tracker-miners.git",
"tag": "2.2.1"
"tag": "2.3.0"
}
]
},

View file

@ -1,7 +1,7 @@
---
app-id: org.gnome.NautilusDevel
runtime: org.gnome.Platform
runtime-version: "3.32"
runtime-version: "3.34"
sdk: org.gnome.Sdk
command: nautilus
tags:
@ -65,7 +65,15 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/tracker.git
tag: 2.2.1
tag: 2.3.0
# Bundle intltool until tracker-miners drops that dependency https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/29
- name: intltool
cleanup:
- "*"
sources:
- type: archive
url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
sha256: 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd
- name: tracker-miners
buildsystem: meson
cleanup:
@ -91,7 +99,7 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/tracker-miners.git
tag: 2.2.1
tag: 2.3.0
- name: gnome-desktop
buildsystem: meson
config-opts:

View file

@ -64,6 +64,14 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/tracker.git
# Bundle intltool until tracker-miners drops that dependency https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/29
- name: intltool
cleanup:
- "*"
sources:
- type: archive
url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
sha256: 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd
- name: tracker-miners
buildsystem: meson
cleanup: