Rebase on main

flatpak/io.github.softfever.OrcaSlicer.yml

@@ -31,12 +31,6 @@ modules:
       - -Ddoc=disabled
       - -Dexamples=disabled
       - -Dtests=disabled
-    build-options:
-      arch:
-        aarch64:
-          config-opts:
-            - -Dnls=disabled
-            - -Dstatic=disabled
     sources:
       - type: archive
         url: https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.8.tar.xz
@@ -266,13 +260,18 @@ modules:
         url: https://github.com/glfw/glfw/archive/refs/tags/3.3.7.zip
         dest: external-packages/GLFW
         sha256: e02d956935e5b9fb4abf90e2c2e07c9a0526d7eacae8ee5353484c69a2a76cd0
+      # libnoise
+      - type: file
+        url: https://github.com/SoftFever/Orca-deps-libnoise/archive/refs/tags/1.0.zip
+        dest: external-packages/libnoise
+        sha256: 96ffd6cc47898dd8147aab53d7d1b1911b507d9dbaecd5613ca2649468afd8b6
 
   - name: OrcaSlicer 
     buildsystem: simple
     build-commands:
       - |
-        mkdir -p build && cd build
-        CXXFLAGS=-std=gnu++20 cmake ../ \
+        mkdir -p build
+        CXXFLAGS=-std=gnu++20 cmake . -B build \
           -DSLIC3R_PCH=OFF \
           -DSLIC3R_FHS=ON \
           -DSLIC3R_GTK=3 \
@@ -284,7 +283,9 @@ modules:
           -DBBL_RELEASE_TO_PUBLIC=1 \
           -DCMAKE_PREFIX_PATH=/app \
           -DCMAKE_INSTALL_PREFIX=/app
-        CXXFLAGS=-std=gnu++20 cmake --build . --target install -j$FLATPAK_BUILDER_N_JOBS
+        CXXFLAGS=-std=gnu++20 cmake --build build --target OrcaSlicer -j$FLATPAK_BUILDER_N_JOBS
+        ./run_gettext.sh
+        CXXFLAGS=-std=gnu++20 cmake --build build --target install -j$FLATPAK_BUILDER_N_JOBS
 
     cleanup:
       - /include