From 6e20cb1ac5a7b7a4a2bcdd772cebae8e28251771 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 6 Feb 2024 15:44:14 +0000 Subject: [PATCH] build: move patches to snap/local directory --- .../local/patches}/libwmf/freetype-pkg-config.patch | 0 {patches => snap/local/patches}/libwmf/no-trio.patch | 0 {patches => snap/local/patches}/rawtherapee.patch | 0 snap/snapcraft.yaml | 8 ++++---- 4 files changed, 4 insertions(+), 4 deletions(-) rename {patches => snap/local/patches}/libwmf/freetype-pkg-config.patch (100%) rename {patches => snap/local/patches}/libwmf/no-trio.patch (100%) rename {patches => snap/local/patches}/rawtherapee.patch (100%) diff --git a/patches/libwmf/freetype-pkg-config.patch b/snap/local/patches/libwmf/freetype-pkg-config.patch similarity index 100% rename from patches/libwmf/freetype-pkg-config.patch rename to snap/local/patches/libwmf/freetype-pkg-config.patch diff --git a/patches/libwmf/no-trio.patch b/snap/local/patches/libwmf/no-trio.patch similarity index 100% rename from patches/libwmf/no-trio.patch rename to snap/local/patches/libwmf/no-trio.patch diff --git a/patches/rawtherapee.patch b/snap/local/patches/rawtherapee.patch similarity index 100% rename from patches/rawtherapee.patch rename to snap/local/patches/rawtherapee.patch diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 078cc15..40d66d5 100755 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -14,7 +14,7 @@ compression: lzo architectures: - build-on: amd64 - - build-on: arm64 + # - build-on: arm64 layout: /etc/gimp: @@ -415,7 +415,7 @@ parts: plugin: cmake override-pull: | craftctl default - patch -Np1 -i $CRAFT_PROJECT_DIR/patches/rawtherapee.patch + patch -Np1 -i $CRAFT_PROJECT_DIR/snap/local/patches/rawtherapee.patch cmake-parameters: - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX=/usr @@ -438,8 +438,8 @@ parts: source: https://github.com/caolanm/libwmf/archive/refs/tags/v0.2.12.tar.gz override-pull: | craftctl default - patch -Np1 -i $CRAFT_PROJECT_DIR/patches/libwmf/no-trio.patch - patch -Np1 -i $CRAFT_PROJECT_DIR/patches/libwmf/freetype-pkg-config.patch + patch -Np1 -i $CRAFT_PROJECT_DIR/snap/local/patches/libwmf/no-trio.patch + patch -Np1 -i $CRAFT_PROJECT_DIR/snap/local/patches/libwmf/freetype-pkg-config.patch autoreconf --force --install --include=patches autotools-configure-parameters: - --prefix=/usr