Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update FreeCAD snap to core24 #123

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+9 −9
Open

Update FreeCAD snap to core24 #123

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a47f1a
Update kde-neon extension
furgo16 Oct 7, 2024
ba60fc1
Merge branch 'FreeCAD:master' into update-kde-neon-deps
furgo16 Oct 16, 2024
483aac4
Merge branch 'FreeCAD:master' into update-kde-neon-deps
furgo16 Jan 30, 2025
8e343c3
Update to core 24
furgo16 Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: freecad
base: core22
base: core24
adopt-info: freecad
donation: https://wiki.freecad.org/Donate
issues: https://github.com/FreeCAD/FreeCAD-snap/issues
Expand Down Expand Up @@ -74,10 +74,10 @@ plugs:
shared-memory:
private: true
# QT5 libs
kf5-5-108-qt-5-15-10-core22:
content: kf5-5-108-qt-5-15-10-core22-all
kf5-core24:
content: kf5-core24-all
interface: content
default-provider: kf5-5-108-qt-5-15-10-core22
default-provider: kf5-core24
target: $SNAP/kf5

environment:
Expand Down Expand Up @@ -165,9 +165,9 @@ parts:
- -DFREECAD_USE_QT_FILEDIALOG=ON
- -DBUILD_FLAT_MESH=ON
build-snaps:
- freecad-deps-core22/candidate
- freecad-deps-core24/candidate
stage-snaps:
- freecad-deps-core22/candidate
- freecad-deps-core24/candidate
build-packages:
- g++
- git
Expand Down Expand Up @@ -250,7 +250,7 @@ parts:
- elmerfem-csc # FEM
- openscad # OpenSCAD
override-build: |
kde_sdk_dir="/snap/kf5-5-108-qt-5-15-10-core22-sdk/current"
kde_sdk_dir="/snap/kf5-core24-sdk/current"
mkdir -p /etc/xdg/qtchooser
cp "$kde_sdk_dir/etc/xdg/qtchooser/default.conf" "/etc/xdg/qtchooser/default.conf"
SHIBOKEN_BIN_PATH="/workspace/usr/bin/shiboken2"
Expand Down Expand Up @@ -311,10 +311,10 @@ parts:
cleanup:
after: [stub-chown, freecad, python-packages, snap-setup-mod, graphviz]
plugin: nil
build-snaps: [kf5-5-108-qt-5-15-10-core22-sdk]
build-snaps: [kf5-core24-sdk]
override-prime: |
set -eux
for snap in "kf5-5-108-qt-5-15-10-core22-sdk"; do # List all content-snaps you're using here
for snap in "kf5-core24-sdk"; do # List all content-snaps you're using here
cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" "$CRAFT_PRIME/usr/{}" \;
done
for cruft in bug lintian man; do
Expand Down