diff options
| author | Ondrej Holy <oholy@redhat.com> | 2021-08-10 10:08:01 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2021-08-10 11:20:25 +0000 |
| commit | 82f4d0cd94e1b2cd9cbe47580304989f78ccebab (patch) | |
| tree | a976295036fd1793fd4fa521e135b3e541deabfe | |
| parent | 156a68cf520a8d2e818a21c5ec6622cdeab5d3d9 (diff) | |
| download | nautilus-82f4d0cd94e1b2cd9cbe47580304989f78ccebab.tar.gz | |
Switch to meson for gnome-autoar
Relates: https://gitlab.gnome.org/GNOME/gnome-autoar/-/merge_requests/11
| -rw-r--r-- | .gitlab/Dockerfile | 6 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.json | 2 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.yml | 2 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.NautilusMaster.yml | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile index 601829db7..8c05e2635 100644 --- a/.gitlab/Dockerfile +++ b/.gitlab/Dockerfile @@ -9,9 +9,9 @@ RUN dnf install --nogpg -y gnome-common \ && dnf clean all \ && git clone --depth 1 https://gitlab.gnome.org/GNOME/gnome-autoar.git \ && cd gnome-autoar \ - && ./autogen.sh --prefix /usr \ - && make \ - && make install \ + && meson . _build --prefix=/usr \ + && ninja -C _build \ + && ninja -C _build install \ && cd .. \ && rm -rf gnome-autoar diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index c4b5687e0..9d7f22269 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -100,6 +100,8 @@ }, { "name": "gnome-autoar", + "buildsystem": "meson", + "builddir": true, "sources": [ { "type": "git", diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml index d3497fe68..dd4c83a0e 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.yml +++ b/build-aux/flatpak/org.gnome.Nautilus.yml @@ -73,6 +73,8 @@ modules: - type: git url: https://gitlab.gnome.org/GNOME/gnome-desktop.git - name: gnome-autoar + buildsystem: meson + builddir: true sources: - type: git url: https://gitlab.gnome.org/GNOME/gnome-autoar.git diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml index 72da8d7d4..23a17214e 100644 --- a/build-aux/flatpak/org.gnome.NautilusMaster.yml +++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml @@ -73,6 +73,8 @@ modules: - type: git url: https://gitlab.gnome.org/GNOME/gnome-desktop.git - name: gnome-autoar + buildsystem: meson + builddir: true sources: - type: git url: https://gitlab.gnome.org/GNOME/gnome-autoar.git |