[nautilus/wip/oholy/pin-gexiv2] flatpak: Pin gexiv2 and exiv2 dependencies to fix build
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/oholy/pin-gexiv2] flatpak: Pin gexiv2 and exiv2 dependencies to fix build
- Date: Fri, 17 Sep 2021 10:57:47 +0000 (UTC)
commit f5b9018f2c45945d2f24c9b50cf3b79d59e1bad8
Author: Ondrej Holy <oholy redhat com>
Date: Fri Sep 17 12:29:01 2021 +0200
flatpak: Pin gexiv2 and exiv2 dependencies to fix build
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.
build-aux/flatpak/org.gnome.Nautilus.json | 5 +++--
build-aux/flatpak/org.gnome.Nautilus.yml | 3 ++-
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:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]