Merge pull request openscad#5618 from openscad/update-snap

Update snap to core24. Bump cgal to 6.0.1, lib3mf to v2.3.1.
gsohler · Jan 24, 2025 · 9df3dc9 · 9df3dc9
2 parents c8a8c30 + 7dee848
commit 9df3dc9
Showing 1 changed file with 30 additions and 56 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: openscad-nightly
 title: OpenSCAD-Nightly
-base: core20
+base: core24
 version: "git"
 summary: OpenSCAD - Design. Code. Create.
 description: >
@@ -26,15 +26,11 @@ confinement: strict
 icon: resources/icons/openscad-nightly-256.png
 license: GPL-3.0
 grade: stable
-architectures:
-  - build-on: amd64
-    run-on: amd64
-  - build-on: arm64
-    run-on: arm64
-  - build-on: s390x
-    run-on: s390x
-  - build-on: ppc64el
-    run-on: ppc64el
+platforms:
+  amd64:
+  arm64:
+  s390x:
+  ppc64el:
 
 apps:
   openscad-nightly:
@@ -46,70 +42,51 @@ apps:
       DISABLE_WAYLAND: 1
 
 parts:
-  opencsg:
-    disable-parallel: true
-    source: https://www.opencsg.org/OpenCSG-1.5.1.tar.gz
-    plugin: make
-    override-build: |
-      ( cd src && qmake INSTALLDIR=/usr && sed -i 's,-isystem /usr/include,,' Makefile )
-      make -C src
-      make -C src INSTALL_ROOT="${SNAPCRAFT_PART_INSTALL}" install
-    build-packages:
-    - libglew-dev
-    - freeglut3-dev
-    stage-packages:
-    - libglew2.1
-
   cgal:
-    source: https://github.com/CGAL/cgal/releases/download/v5.5.2/CGAL-5.5.2-library.tar.xz
+    source: https://github.com/CGAL/cgal/releases/download/v6.0.1/CGAL-6.0.1-library.tar.xz
     plugin: cmake
-    cmake-parameters: [ "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INSTALL_PREFIX=/usr" ]
+    cmake-parameters: [
+      "-DCMAKE_BUILD_TYPE=Release",
+      "-DCMAKE_INSTALL_PREFIX=/usr",
+    ]
     after: [ patches ]
     build-packages:
     - cmake
     - libboost-dev
     - libboost-thread-dev
 
-  lib3mf:
-    source: https://github.com/3MFConsortium/lib3mf/archive/v1.8.1.tar.gz
+  lib3mf2:
+    source: https://github.com/3MFConsortium/lib3mf/archive/refs/tags/v2.3.1.tar.gz
     plugin: cmake
     cmake-parameters: [
-        "-DCMAKE_INSTALL_PREFIX=/usr",
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DLIB3MF_TESTS=OFF"
+      "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
+      "-DCMAKE_INSTALL_PREFIX:PATH=/usr",
+      "-DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib",
+      "-DLIB3MF_TESTS=OFF",
+      "-DUSE_INCLUDED_ZLIB=OFF",
+      "-DUSE_INCLUDED_LIBZIP=OFF",
     ]
-    build-packages:
-    - uuid-dev
 
   openscad-nightly:
     source: .
     build-snaps: [cmake]
     plugin: cmake
-    cmake-parameters: [
-        "-DCMAKE_PREFIX_PATH=${SNAPCRAFT_STAGE}/usr",
-        "-DCMAKE_INSTALL_PREFIX=/usr",
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DSUFFIX=nightly",
-        "-DEXPERIMENTAL=ON",
-        "-DSNAPSHOT=ON"
-    ]
     override-build: |
-        git -C "${SNAPCRAFT_PART_SRC}" submodule update --init --recursive
         CC=clang CXX=clang++ cmake ${SNAPCRAFT_PART_SRC} \
             -G 'Unix Makefiles' \
             -DCMAKE_PREFIX_PATH="${SNAPCRAFT_STAGE}/usr" \
             -DCMAKE_INSTALL_PREFIX=/usr \
             -DCMAKE_BUILD_TYPE=Release \
             -DSUFFIX=nightly \
             -DEXPERIMENTAL=ON \
-            -DSNAPSHOT=ON
+            -DSNAPSHOT=ON \
+            -DUSE_BUILTIN_OPENCSG=ON
         cmake --build .
         cmake --install . --prefix "${SNAPCRAFT_PART_INSTALL}/usr"
-    after: [ desktop-qt5, opencsg, cgal, lib3mf ]
+    after: [ desktop-qt5, cgal, lib3mf2 ]
     build-packages:
     - git
     - clang
-    - qt5-default
     - qtbase5-dev
     - qtmultimedia5-dev
     - libqt5svg5-dev
@@ -124,7 +101,7 @@ parts:
     - libgmp-dev
     - libmpfr-dev
     - libcairo2-dev
-    - python
+    - python3
     - libboost-dev
     - libboost-regex-dev
     - libboost-system-dev
@@ -145,12 +122,12 @@ parts:
     stage-packages:
     - qtwayland5
     - libasyncns0
-    - libboost-regex1.71.0
-    - libboost-system1.71.0
-    - libboost-program-options1.71.0
+    - libboost-regex1.83.0
+    - libboost-system1.83.0
+    - libboost-program-options1.83.0
     - libdouble-conversion3
-    - libflac8
-    - libglew2.1
+    - libflac12t64
+    - libglew2.2
     - libglu1-mesa
     - libglvnd0
     - libopengl0
@@ -168,8 +145,8 @@ parts:
     - libsndfile1
     - libvorbis0a
     - libvorbisenc2
-    - libzip5
-    - libtbb2
+    - libzip4t64
+    - libtbb12
     - libatomic1
 
   # https://github.com/ubuntu/snapcraft-desktop-helpers/blob/master/snapcraft.yaml
@@ -184,16 +161,13 @@ parts:
       - dpkg-dev
     stage-packages:
       - libxkbcommon0
-      - ttf-ubuntu-font-family
       - dmz-cursor-theme
       - light-themes
       - adwaita-icon-theme
-      - gnome-themes-standard
       - shared-mime-info
       - libqt5gui5
       - libgdk-pixbuf2.0-0
       - libqt5svg5 # for loading icon themes which are svg
-      - try: [appmenu-qt5] # not available on core18
       - locales-all
       - xdg-user-dirs
       - fcitx-frontend-qt5