juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update GNOME runtime and SDK to version 48 (#11384)

Browse Source
This commit is contained in:
Nanashi
2025-11-17 06:46:44 -06:00
committed by GitHub
parent 77f7514d97
commit a24785ee39
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_all.yml vendored
View File

@@ -115,7 +115,7 @@ jobs:
flatpak: flatpak:
name: "Flatpak" name: "Flatpak"
container: container:
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-47 image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
options: --privileged options: --privileged
volumes: volumes:
- /usr/local/lib/android:/usr/local/lib/android - /usr/local/lib/android:/usr/local/lib/android

16
build_flatpak.sh
View File

@@ -186,22 +186,22 @@ echo -e "${GREEN}All required dependencies found${NC}"
# Install runtime and SDK if requested # Install runtime and SDK if requested
if [[ "$INSTALL_RUNTIME" == true ]]; then if [[ "$INSTALL_RUNTIME" == true ]]; then
echo -e "${YELLOW}Installing GNOME runtime and SDK...${NC}" echo -e "${YELLOW}Installing GNOME runtime and SDK...${NC}"
flatpak install --user -y flathub org.gnome.Platform//47 flatpak install --user -y flathub org.gnome.Platform//48
flatpak install --user -y flathub org.gnome.Sdk//47 flatpak install --user -y flathub org.gnome.Sdk//48
fi fi
# Check if required runtime is available # Check if required runtime is available
if ! flatpak info --user org.gnome.Platform//47 &> /dev/null; then if ! flatpak info --user org.gnome.Platform//48 &> /dev/null; then
echo -e "${RED}Error: GNOME Platform 47 runtime is not installed.${NC}" echo -e "${RED}Error: GNOME Platform 48 runtime is not installed.${NC}"
echo "Run with -i flag to install it automatically, or install manually:" echo "Run with -i flag to install it automatically, or install manually:"
echo "flatpak install --user flathub org.gnome.Platform//47" echo "flatpak install --user flathub org.gnome.Platform//48"
exit 1 exit 1
fi fi
if ! flatpak info --user org.gnome.Sdk//47 &> /dev/null; then if ! flatpak info --user org.gnome.Sdk//48 &> /dev/null; then
echo -e "${RED}Error: GNOME SDK 47 is not installed.${NC}" echo -e "${RED}Error: GNOME SDK 48 is not installed.${NC}"
echo "Run with -i flag to install it automatically, or install manually:" echo "Run with -i flag to install it automatically, or install manually:"
echo "flatpak install --user flathub org.gnome.Sdk//47" echo "flatpak install --user flathub org.gnome.Sdk//48"
exit 1 exit 1
fi fi

12
scripts/flatpak/io.github.softfever.OrcaSlicer.yml
View File

@@ -1,10 +1,10 @@
app-id: io.github.softfever.OrcaSlicer app-id: io.github.softfever.OrcaSlicer
runtime: org.gnome.Platform runtime: org.gnome.Platform
runtime-version: "47" runtime-version: "48"
sdk: org.gnome.Sdk sdk: org.gnome.Sdk
command: entrypoint command: entrypoint
separate-locales: true separate-locales: true
rename-icon: OrcaSlicer rename-icon: OrcaSlicer
finish-args: finish-args:
- --share=ipc - --share=ipc
- --socket=x11 - --socket=x11
@@ -56,7 +56,7 @@ modules:
url: https://github.com/KDE/extra-cmake-modules url: https://github.com/KDE/extra-cmake-modules
tag: v5.249.0 tag: v5.249.0
cleanup: cleanup:
- / - /
- name: libspnav - name: libspnav
sources: sources:
@@ -88,10 +88,10 @@ modules:
- /app/include - /app/include
- "*.a" - "*.a"
- "*.la" - "*.la"
sources: sources:
# OrcaSlicer Source Archive # OrcaSlicer Source Archive
- type: dir - type: dir
path: ../../deps path: ../../deps
dest: deps dest: deps
@@ -100,7 +100,7 @@ modules:
dest: deps/wxWidgets dest: deps/wxWidgets
dest-filename: 0001-flatpak.patch dest-filename: 0001-flatpak.patch
- name: OrcaSlicer - name: OrcaSlicer
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- | - |

2
scripts/flatpak/setup_env_ubuntu24.04.sh
View File

@@ -3,7 +3,7 @@
sudo apt update sudo apt update
sudo apt install build-essential flatpak flatpak-builder gnome-software-plugin-flatpak -y sudo apt install build-essential flatpak flatpak-builder gnome-software-plugin-flatpak -y
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install flathub org.gnome.Platform//46 org.gnome.Sdk//46 flatpak install flathub org.gnome.Platform//48 org.gnome.Sdk//48
## ##