diff options
| author | Ondrej Holy <oholy@redhat.com> | 2021-06-04 14:39:06 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2021-07-09 15:46:59 +0200 |
| commit | 8c5fa3eb080203432d7bf07af27aa27604e44ed1 (patch) | |
| tree | ee4de66c93f5994309d971a9560c8037985495b0 /build-aux | |
| parent | 24df6cf4a90bc854ef61a6f93c76f48a0079e556 (diff) | |
| download | nautilus-8c5fa3eb080203432d7bf07af27aa27604e44ed1.tar.gz | |
extensions/image-properties: Replace deprecated symbols
The build log contains warnings about deprecated gexiv2 functions. Let's
port to the new API, unpin exiv3 and gexiv2 dependencies in flatpak manifests
and bump the build dependency accordingly to get rid of the warnings.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.json | 12 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.yml | 10 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.NautilusMaster.yml | 7 |
3 files changed, 15 insertions, 14 deletions
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index 52e6333a7..c4b5687e0 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -34,9 +34,9 @@ "buildsystem": "cmake-ninja", "sources": [ { - "type": "archive", - "url": "https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz", - "sha256": "51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01" + "type": "git", + "url": "https://github.com/Exiv2/exiv2.git", + "branch": "main" } ] }, @@ -46,13 +46,13 @@ "builddir": true, "config-opts": [ "--libdir=/app/lib", - "-Ddisable-introspection=True" + "-Dintrospection=false", + "-Dpython3_girdir=no" ], "sources": [ { "type": "git", - "url": "https://gitlab.gnome.org/GNOME/gexiv2.git", - "tag": "gexiv2-0.10.10" + "url": "https://gitlab.gnome.org/GNOME/gexiv2.git" } ] }, diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml index 4a15c4c53..d3497fe68 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.yml +++ b/build-aux/flatpak/org.gnome.Nautilus.yml @@ -30,19 +30,19 @@ modules: - "-DCMAKE_INSTALL_LIBDIR=/app/lib" buildsystem: cmake-ninja sources: - - type: archive - url: https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz - sha256: 51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01 + - type: git + url: https://github.com/Exiv2/exiv2.git + branch: main - name: gexiv2 buildsystem: meson builddir: true config-opts: - "--libdir=/app/lib" - - "-Ddisable-introspection=True" + - "-Dintrospection=false" + - "-Dpython3_girdir=no" sources: - type: git url: https://gitlab.gnome.org/GNOME/gexiv2.git - tag: gexiv2-0.10.10 - 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 bc1771627..72da8d7d4 100644 --- a/build-aux/flatpak/org.gnome.NautilusMaster.yml +++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml @@ -30,15 +30,16 @@ modules: - "-DCMAKE_INSTALL_LIBDIR=/app/lib" buildsystem: cmake-ninja sources: - - type: archive - url: https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz - sha256: 51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01 + - type: git + url: https://github.com/Exiv2/exiv2.git + branch: main - name: gexiv2 buildsystem: meson builddir: true config-opts: - "--libdir=/app/lib" - "-Dintrospection=false" + - "-Dpython3_girdir=no" sources: - type: git url: https://gitlab.gnome.org/GNOME/gexiv2.git |