diff options
| author | Ondrej Holy <oholy@redhat.com> | 2021-09-17 12:29:01 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2021-09-17 12:56:00 +0200 |
| commit | f5b9018f2c45945d2f24c9b50cf3b79d59e1bad8 (patch) | |
| tree | 5d0e60437338db88ccb3b0c6d0b48d99a91b1f1c | |
| parent | 6be470866bf119c2b7b0f3be0819c2faa36af44e (diff) | |
| download | nautilus-wip/oholy/pin-gexiv2.tar.gz | |
flatpak: Pin gexiv2 and exiv2 dependencies to fix buildwip/oholy/pin-gexiv2
The flatpak build currently fails because of gexiv2 build failure, which is
a problem for our contributors and among others breaks our CI pipeline. The
potential fix is available already for a couple of days on
https://gitlab.gnome.org/GNOME/gexiv2/-/merge_requests/63 but not yet merged.
Let's temporarily pin the gexiv2 and exiv2 dependencies to the stable branches
to fix those issues.
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.json | 5 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.yml | 3 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.NautilusMaster.yml | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index 4fd009949..e4ab02ef2 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -36,7 +36,7 @@ { "type": "git", "url": "https://github.com/Exiv2/exiv2.git", - "branch": "main" + "branch": "0.27-maintenance" } ] }, @@ -54,7 +54,8 @@ "sources": [ { "type": "git", - "url": "https://gitlab.gnome.org/GNOME/gexiv2.git" + "url": "https://gitlab.gnome.org/GNOME/gexiv2.git", + "branch": "gexiv2-0.12" } ] }, diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml index f378ed963..748ced249 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.yml +++ b/build-aux/flatpak/org.gnome.Nautilus.yml @@ -32,7 +32,7 @@ modules: sources: - type: git url: https://github.com/Exiv2/exiv2.git - branch: main + branch: 0.27-maintenance - name: gexiv2 buildsystem: meson builddir: true @@ -45,6 +45,7 @@ modules: sources: - type: git url: https://gitlab.gnome.org/GNOME/gexiv2.git + tag: gexiv2-0.12 - name: tracker-miners buildsystem: meson cleanup: diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml index 8fff7aefc..7f5bc7c35 100644 --- a/build-aux/flatpak/org.gnome.NautilusMaster.yml +++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml @@ -32,7 +32,7 @@ modules: sources: - type: git url: https://github.com/Exiv2/exiv2.git - branch: main + branch: 0.27-maintenance - name: gexiv2 buildsystem: meson builddir: true @@ -45,6 +45,7 @@ modules: sources: - type: git url: https://gitlab.gnome.org/GNOME/gexiv2.git + branch: gexiv2-0.12 - name: tracker-miners buildsystem: meson cleanup: |