Update to core22 initial commit, update to jammy dep version, update …

…snapcraft variables, use core22, update build snap.
FreeCAD · Aug 10, 2023 · be8ec33 · be8ec33
1 parent eec272b
commit be8ec33
Showing 1 changed file with 24 additions and 8 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -31,8 +31,10 @@ license: LGPL-2.0-or-later
 assumes: [snapd2.55.3] # for cups interface & private shared memory
 
 layout:
+  /usr/share/X11:
+    symlink: $SNAP/kf5/usr/share/X11
   /usr/share/libdrm/amdgpu.ids:
-    symlink: $SNAP/kf5/usr/share/libdrm/amdgpu.ids
+    bind-file: $SNAP/kf5/usr/share/libdrm/amdgpu.ids
   /usr/share/openmpi:
     symlink: $SNAP/usr/share/openmpi
   /etc/openmpi:
@@ -69,9 +71,15 @@ plugs:
   # Necessary to enable semaphores for numba, OpenMP etc.
   shared-memory:
     private: true
+  # QT5 libs
+  kf5-5-108-qt-5-15-10-core22:
+    content: kf5-5-108-qt-5-15-10-core22-all
+    interface: content
+    default-provider: kf5-5-108-qt-5-15-10-core22
+    target: $SNAP/kf5
 
 environment:
-  LD_LIBRARY_PATH: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/blas:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/lapack # numpy
+  LD_LIBRARY_PATH: "$SNAP/usr/lib/:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/:$SNAP/kf5/usr/lib/$CRAFT_ARCH_TRIPLET/:$SNAP/kf5/usr/lib:/$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/blas:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/lapack:$LD_LIBRARY_PATH"
   LD_PRELOAD: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/libstubchown.so
   FREECAD_USER_HOME: $SNAP_USER_COMMON
   GIT_EXEC_PATH: $SNAP/usr/lib/git-core
@@ -103,6 +111,8 @@ apps:
       - unity7
       - cups
       - shared-memory
+    command-chain:
+      - snap/command-chain/desktop-launch
   cmd:
     command: usr/bin/FreeCADCmd
     extensions: [kde-neon]
@@ -114,8 +124,6 @@ apps:
 package-repositories:
   - type: apt
     ppa: elmer-csc-ubuntu/elmer-csc-ppa
-  - type: apt
-    ppa: openscad/releases
   - type: apt
     components:
       - main
@@ -128,13 +136,17 @@ package-repositories:
 parts:
   stub-chown:
     plugin: meson
-    source: snap/local/stub-chown
+    source: $CRAFT_PROJECT_DIR/local/stub-chown
+    source-type: local
+    build-packages:
+    - meson
     meson-parameters:
       - --prefix=/usr
 
   snap-setup-mod:
     plugin: dump
-    source: snap/local/snap-setup-mod
+    source: $CRAFT_PROJECT_DIR/local/snap-setup-mod
+    source-type: local
     organize:
       "*": usr/Mod/SnapSetup/
 
@@ -154,9 +166,9 @@ parts:
       - -DFREECAD_USE_QT_FILEDIALOG=ON
       - -DBUILD_FLAT_MESH=ON
     build-snaps:
-      - freecad-deps-core22
+      - freecad-deps-core22/candidate
     stage-snaps:
-      - freecad-deps-core22
+      - freecad-deps-core22/candidate
     build-packages:
       - g++
       - git
@@ -181,6 +193,7 @@ parts:
       - libshiboken2-dev
       - pybind11-dev
       - libfreeimage-dev
+      - openscad
     stage-packages:
       - libaec0
       - libboost-filesystem1.74.0
@@ -239,6 +252,7 @@ parts:
       - openscad  # OpenSCAD
       - povray # Raytracing
       - povray-includes # Raytracing
+      - openscad
     override-build: |
       kde_sdk_dir="/snap/kf5-5-108-qt-5-15-10-core22-sdk/current"
       mkdir -p /etc/xdg/qtchooser
@@ -261,6 +275,8 @@ parts:
 
   python-packages:
     plugin: python
+    source: .
+    source-type: local
     build-packages:
       - libsuitesparse-dev
     stage-packages: