summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@redhat.com>2018-05-28 16:45:01 +0200
committerCarlos Soriano <csoriano1618@gmail.com>2018-05-28 19:50:08 +0000
commit0994474acc60a47decebdd456161a389f013be75 (patch)
tree56b3ad621880e01e4aa0d8a8008ece3278cd5657
parent6daacbec2e95f53621f7ed119e75228dd7848539 (diff)
downloadnautilus-0994474acc60a47decebdd456161a389f013be75.tar.gz
Flatpak: Update exiv2 upstream url and build system
-rw-r--r--build-aux/flatpak/org.gnome.Nautilus-master.yml9
-rw-r--r--build-aux/flatpak/org.gnome.Nautilus.json6
-rw-r--r--build-aux/flatpak/org.gnome.Nautilus.yml9
3 files changed, 18 insertions, 6 deletions
diff --git a/build-aux/flatpak/org.gnome.Nautilus-master.yml b/build-aux/flatpak/org.gnome.Nautilus-master.yml
index 5ce399d4d..40f2a5339 100644
--- a/build-aux/flatpak/org.gnome.Nautilus-master.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus-master.yml
@@ -26,10 +26,15 @@ finish-args:
modules:
- name: exiv2
+ buildsystem: cmake
+ build-options:
+ config-opts:
+ - -DCMAKE_INSTALL_PREFIX=/app
+ - -DCMAKE_INSTALL_LIBDIR=/app/lib
sources:
- type: archive
- url: http://exiv2.org/builds/exiv2-0.26-trunk.tar.gz
- sha256: c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb
+ url: https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz
+ sha256: 51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01
- type: shell
commands:
- cp -f /usr/share/automake-1.15/config.sub ./config/
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index 82c6745e1..ce3509cf5 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -33,11 +33,13 @@
},
{
"name": "exiv2",
+ "config-opts": [ "-DCMAKE_INSTALL_PREFIX=/app", "-DCMAKE_INSTALL_LIBDIR=/app/lib" ],
+ "buildsystem": "cmake",
"sources": [
{
"type": "archive",
- "url": "http://exiv2.org/builds/exiv2-0.26-trunk.tar.gz",
- "sha256": "c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb"
+ "url": "https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz",
+ "sha256": "51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01"
},
{
"type": "shell",
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index 593587852..e7b735363 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -35,10 +35,15 @@ modules:
sha256: 2d917692d2cc194e12295f00469fbdf3c045e85d0295e5e59ced69115920ffa0
- name: exiv2
+ buildsystem: cmake
+ build-options:
+ config-opts:
+ - -DCMAKE_INSTALL_PREFIX=/app
+ - -DCMAKE_INSTALL_LIBDIR=/app/lib
sources:
- type: archive
- url: http://exiv2.org/builds/exiv2-0.26-trunk.tar.gz
- sha256: c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb
+ url: https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz
+ sha256: 51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01
- type: shell
commands:
- cp -f /usr/share/automake-1.15/config.sub ./config/