diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 8eeae2fdb9..abd77ba02a 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -115,7 +115,7 @@ jobs: flatpak: name: "Flatpak" container: - image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-47 + image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48 options: --privileged volumes: - /usr/local/lib/android:/usr/local/lib/android diff --git a/build_flatpak.sh b/build_flatpak.sh index 3cdf49b5a4..bdfac22555 100755 --- a/build_flatpak.sh +++ b/build_flatpak.sh @@ -186,22 +186,22 @@ echo -e "${GREEN}All required dependencies found${NC}" # Install runtime and SDK if requested if [[ "$INSTALL_RUNTIME" == true ]]; then 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.Sdk//47 + flatpak install --user -y flathub org.gnome.Platform//48 + flatpak install --user -y flathub org.gnome.Sdk//48 fi # Check if required runtime is available -if ! flatpak info --user org.gnome.Platform//47 &> /dev/null; then - echo -e "${RED}Error: GNOME Platform 47 runtime is not installed.${NC}" +if ! flatpak info --user org.gnome.Platform//48 &> /dev/null; then + 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 "flatpak install --user flathub org.gnome.Platform//47" + echo "flatpak install --user flathub org.gnome.Platform//48" exit 1 fi -if ! flatpak info --user org.gnome.Sdk//47 &> /dev/null; then - echo -e "${RED}Error: GNOME SDK 47 is not installed.${NC}" +if ! flatpak info --user org.gnome.Sdk//48 &> /dev/null; then + echo -e "${RED}Error: GNOME SDK 48 is not installed.${NC}" 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 fi diff --git a/scripts/flatpak/io.github.softfever.OrcaSlicer.yml b/scripts/flatpak/io.github.softfever.OrcaSlicer.yml index 5bb8d7fe63..9fa5b7d8b8 100755 --- a/scripts/flatpak/io.github.softfever.OrcaSlicer.yml +++ b/scripts/flatpak/io.github.softfever.OrcaSlicer.yml @@ -1,10 +1,10 @@ app-id: io.github.softfever.OrcaSlicer runtime: org.gnome.Platform -runtime-version: "47" +runtime-version: "48" sdk: org.gnome.Sdk command: entrypoint separate-locales: true -rename-icon: OrcaSlicer +rename-icon: OrcaSlicer finish-args: - --share=ipc - --socket=x11 @@ -56,7 +56,7 @@ modules: url: https://github.com/KDE/extra-cmake-modules tag: v5.249.0 cleanup: - - / + - / - name: libspnav sources: @@ -88,10 +88,10 @@ modules: - /app/include - "*.a" - "*.la" - + sources: # OrcaSlicer Source Archive - - type: dir + - type: dir path: ../../deps dest: deps @@ -100,7 +100,7 @@ modules: dest: deps/wxWidgets dest-filename: 0001-flatpak.patch - - name: OrcaSlicer + - name: OrcaSlicer buildsystem: simple build-commands: - | diff --git a/scripts/flatpak/setup_env_ubuntu24.04.sh b/scripts/flatpak/setup_env_ubuntu24.04.sh index f88654275f..b49dac27a1 100755 --- a/scripts/flatpak/setup_env_ubuntu24.04.sh +++ b/scripts/flatpak/setup_env_ubuntu24.04.sh @@ -3,7 +3,7 @@ sudo apt update 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 install flathub org.gnome.Platform//46 org.gnome.Sdk//46 +flatpak install flathub org.gnome.Platform//48 org.gnome.Sdk//48 ##