From 62d57878b85ff6e54c925fc1de412aab71f9ffef Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Sun, 25 Jan 2026 00:44:28 -0500 Subject: [PATCH] build(flatpak): remove See https://github.com/PrismLauncher/flatpak Signed-off-by: Seth Flynn (cherry picked from commit 3833b1e292319aebdbdebfcec24b4c105f578c3f) --- .github/workflows/flatpak.yml | 109 ------------- flatpak/cmark.yml | 14 -- flatpak/flite.json | 20 --- flatpak/libdecor.json | 18 -- flatpak/org.prismlauncher.PrismLauncher.yml | 154 ------------------ ...rsor-position-until-the-cursor-is-lo.patch | 59 ------- flatpak/prime-run | 4 - flatpak/prismlauncher | 11 -- flatpak/shared-modules | 1 - flatpak/tomlplusplus.yml | 6 - 10 files changed, 396 deletions(-) delete mode 100644 .github/workflows/flatpak.yml delete mode 100644 flatpak/cmark.yml delete mode 100644 flatpak/flite.json delete mode 100644 flatpak/libdecor.json delete mode 100644 flatpak/org.prismlauncher.PrismLauncher.yml delete mode 100644 flatpak/patches/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch delete mode 100644 flatpak/prime-run delete mode 100644 flatpak/prismlauncher delete mode 160000 flatpak/shared-modules delete mode 100644 flatpak/tomlplusplus.yml diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml deleted file mode 100644 index 7f7a3c528..000000000 --- a/.github/workflows/flatpak.yml +++ /dev/null @@ -1,109 +0,0 @@ -name: Flatpak - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -on: - push: - branches: - - "develop" - - "release-*" - # We don't do anything with these artifacts on releases. They go to Flathub - tags-ignore: - - "*" - paths: - # File types - - "**.cpp" - - "**.h" - - "**.java" - - "**.ui" - - # Build files - - "flatpak/**" - - # Directories - - "buildconfig/**" - - "cmake/**" - - "launcher/**" - - "libraries/**" - - "program_info/**" - - "tests/**" - - # Files - - "CMakeLists.txt" - - "COPYING.md" - - # Workflows - - ".github/workflows/flatpak.yml" - pull_request: - paths: - # File types - - "**.cpp" - - "**.h" - - "**.java" - - "**.ui" - - # Build files - - "flatpak/**" - - # Directories - - "buildconfig/**" - - "cmake/**" - - "launcher/**" - - "libraries/**" - - "program_info/**" - - "tests/**" - - # Files - - "CMakeLists.txt" - - "COPYING.md" - - # Workflows - - ".github/workflows/flatpak.yml" - workflow_dispatch: - -permissions: - contents: read - -jobs: - build: - name: Build (${{ matrix.arch }}) - - strategy: - fail-fast: false - matrix: - include: - - os: ubuntu-22.04 - arch: x86_64 - - runs-on: ${{ matrix.os }} - - container: - image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.10 - options: --privileged - volumes: - - /opt/hostedtoolcache:/hostedtoolcache - - steps: - - name: Free up disk space - shell: bash - run: | - rm -rf /hostedtoolcache/* - - - name: Checkout repository - uses: actions/checkout@v6 - with: - submodules: true - - - name: Set short version - shell: bash - run: | - echo "VERSION=${GITHUB_SHA::7}" >> "$GITHUB_ENV" - - - name: Build Flatpak - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 - with: - bundle: PrismLauncher-${{ runner.os }}-${{ env.VERSION }}-Flatpak.flatpak - manifest-path: flatpak/org.prismlauncher.PrismLauncher.yml - arch: ${{ matrix.arch }} diff --git a/flatpak/cmark.yml b/flatpak/cmark.yml deleted file mode 100644 index d5078baab..000000000 --- a/flatpak/cmark.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: cmark -buildsystem: cmake-ninja -builddir: true -config-opts: - - -DCMAKE_TESTS=OFF -sources: - - type: archive - url: https://github.com/commonmark/cmark/archive/0.31.1.tar.gz - sha256: 3da93db5469c30588cfeb283d9d62edfc6ded9eb0edc10a4f5bbfb7d722ea802 - x-checker-data: - type: anitya - project-id: 9159 - stable-only: true - url-template: https://github.com/commonmark/cmark/archive/$version.tar.gz diff --git a/flatpak/flite.json b/flatpak/flite.json deleted file mode 100644 index 1bf280af1..000000000 --- a/flatpak/flite.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "flite", - "config-opts": [ - "--enable-shared", - "--with-audio=pulseaudio" - ], - "no-parallel-make": true, - "sources": [ - { - "type": "git", - "url": "https://github.com/festvox/flite.git", - "tag": "v2.2", - "commit": "e9e2e37c329dbe98bfeb27a1828ef9a71fa84f88", - "x-checker-data": { - "type": "git", - "tag-pattern": "^v([\\d.]+)$" - } - } - ] -} diff --git a/flatpak/libdecor.json b/flatpak/libdecor.json deleted file mode 100644 index 1652a2f04..000000000 --- a/flatpak/libdecor.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "libdecor", - "buildsystem": "meson", - "config-opts": [ - "-Ddemo=false" - ], - "sources": [ - { - "type": "git", - "url": "https://gitlab.freedesktop.org/libdecor/libdecor.git", - "commit": "c2bd8ad6fa42c0cb17553ce77ad8a87d1f543b1f" - } - ], - "cleanup": [ - "/include", - "/lib/pkgconfig" - ] -} diff --git a/flatpak/org.prismlauncher.PrismLauncher.yml b/flatpak/org.prismlauncher.PrismLauncher.yml deleted file mode 100644 index 3de68e228..000000000 --- a/flatpak/org.prismlauncher.PrismLauncher.yml +++ /dev/null @@ -1,154 +0,0 @@ -id: org.prismlauncher.PrismLauncher -runtime: org.kde.Platform -runtime-version: '6.10' -sdk: org.kde.Sdk -sdk-extensions: - - org.freedesktop.Sdk.Extension.openjdk17 - -command: prismlauncher -finish-args: - - --share=ipc - - --socket=x11 - - --socket=wayland - - --device=all - - --share=network - - --socket=pulseaudio - # for Discord RPC mods - - --filesystem=xdg-run/app/com.discordapp.Discord:create - # Mod drag&drop - - --filesystem=xdg-download:ro - # FTBApp import - - --filesystem=~/.ftba:ro - # Userspace visibility for manual hugepages configuration - # Required for -XX:+UseLargePages - - --filesystem=/sys/kernel/mm/hugepages:ro - # Userspace visibility for transparent hugepages configuration - # Required for -XX:+UseTransparentHugePages - - --filesystem=/sys/kernel/mm/transparent_hugepage:ro - -modules: - - cmark.yml - - tomlplusplus.yml - - # Might be needed by some Controller mods (see https://github.com/isXander/Controlify/issues/31) - - shared-modules/libusb/libusb.json - - # Needed for proper Wayland support - - libdecor.json - - # Text to Speech in the game - - flite.json - - - name: prismlauncher - buildsystem: cmake-ninja - builddir: true - config-opts: - - -DLauncher_BUILD_PLATFORM=flatpak - # This allows us to manage and update Java independently of this Flatpak - - -DLauncher_ENABLE_JAVA_DOWNLOADER=ON - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - build-options: - env: - JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17 - JAVA_COMPILER: /usr/lib/sdk/openjdk17/jvm/openjdk-17/bin/javac - run-tests: true - sources: - - type: dir - path: ../ - - - name: glfw - buildsystem: cmake-ninja - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DBUILD_SHARED_LIBS:BOOL=ON - - -DGLFW_BUILD_WAYLAND:BOOL=ON - - -DGLFW_BUILD_DOCS:BOOL=OFF - sources: - - type: git - url: https://github.com/glfw/glfw.git - commit: 7b6aead9fb88b3623e3b3725ebb42670cbe4c579 # 3.4 - - type: patch - path: patches/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch - cleanup: - - /include - - /lib/cmake - - /lib/pkgconfig - - - name: xrandr - buildsystem: autotools - sources: - - type: archive - url: https://xorg.freedesktop.org/archive/individual/app/xrandr-1.5.3.tar.xz - sha256: f8dd7566adb74147fab9964680b6bbadee87cf406a7fcff51718a5e6949b841c - x-checker-data: - type: anitya - project-id: 14957 - stable-only: true - url-template: https://xorg.freedesktop.org/archive/individual/app/xrandr-$version.tar.xz - cleanup: - - /share/man - - /bin/xkeystone - - - name: gamemode - buildsystem: meson - config-opts: - - -Dwith-sd-bus-provider=no-daemon - - -Dwith-examples=false - post-install: - # gamemoderun is installed for users who want to use wrapper commands - # post-install is running inside the build dir, we need it from the source though - - install -Dm755 ../data/gamemoderun -t /app/bin - sources: - - type: archive - dest-filename: gamemode.tar.gz - url: https://api.github.com/repos/FeralInteractive/gamemode/tarball/1.8.2 - sha256: 2886d4ce543c78bd2a364316d5e7fd59ef06b71de63f896b37c6d3dc97658f60 - x-checker-data: - type: json - url: https://api.github.com/repos/FeralInteractive/gamemode/releases/latest - version-query: .tag_name - url-query: .tarball_url - timestamp-query: .published_at - cleanup: - - /include - - /lib/pkgconfig - - /lib/libgamemodeauto.a - - - name: glxinfo - buildsystem: meson - config-opts: - - --bindir=/app/mesa-demos - - -Degl=disabled - - -Dglut=disabled - - -Dosmesa=disabled - - -Dvulkan=disabled - - -Dwayland=disabled - post-install: - - mv -v /app/mesa-demos/glxinfo /app/bin - sources: - - type: archive - url: https://archive.mesa3d.org/demos/mesa-demos-9.0.0.tar.xz - sha256: 3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b - x-checker-data: - type: anitya - project-id: 16781 - stable-only: true - url-template: https://archive.mesa3d.org/demos/mesa-demos-$version.tar.xz - cleanup: - - /include - - /mesa-demos - - /share - modules: - - shared-modules/glu/glu-9.json - - - name: enhance - buildsystem: simple - build-commands: - - install -Dm755 prime-run /app/bin/prime-run - - mv /app/bin/prismlauncher /app/bin/prismrun - - install -Dm755 prismlauncher /app/bin/prismlauncher - sources: - - type: file - path: prime-run - - type: file - path: prismlauncher diff --git a/flatpak/patches/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch b/flatpak/patches/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch deleted file mode 100644 index 70cec9981..000000000 --- a/flatpak/patches/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9997ae55a47de469ea26f8437c30b51483abda5f Mon Sep 17 00:00:00 2001 -From: Dan Klishch -Date: Sat, 30 Sep 2023 23:38:05 -0400 -Subject: Defer setting cursor position until the cursor is locked - ---- - src/wl_platform.h | 3 +++ - src/wl_window.c | 14 ++++++++++++-- - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/wl_platform.h b/src/wl_platform.h -index ca34f66e..cd1f227f 100644 ---- a/src/wl_platform.h -+++ b/src/wl_platform.h -@@ -403,6 +403,9 @@ typedef struct _GLFWwindowWayland - int scaleSize; - int compositorPreferredScale; - -+ double askedCursorPosX, askedCursorPosY; -+ GLFWbool didAskForSetCursorPos; -+ - struct zwp_relative_pointer_v1* relativePointer; - struct zwp_locked_pointer_v1* lockedPointer; - struct zwp_confined_pointer_v1* confinedPointer; -diff --git a/src/wl_window.c b/src/wl_window.c -index 1de26558..0df16747 100644 ---- a/src/wl_window.c -+++ b/src/wl_window.c -@@ -2586,8 +2586,9 @@ void _glfwGetCursorPosWayland(_GLFWwindow* window, double* xpos, double* ypos) - - void _glfwSetCursorPosWayland(_GLFWwindow* window, double x, double y) - { -- _glfwInputError(GLFW_FEATURE_UNAVAILABLE, -- "Wayland: The platform does not support setting the cursor position"); -+ window->wl.didAskForSetCursorPos = true; -+ window->wl.askedCursorPosX = x; -+ window->wl.askedCursorPosY = y; - } - - void _glfwSetCursorModeWayland(_GLFWwindow* window, int mode) -@@ -2819,6 +2820,15 @@ static const struct zwp_relative_pointer_v1_listener relativePointerListener = - static void lockedPointerHandleLocked(void* userData, - struct zwp_locked_pointer_v1* lockedPointer) - { -+ _GLFWwindow* window = userData; -+ -+ if (window->wl.didAskForSetCursorPos) -+ { -+ window->wl.didAskForSetCursorPos = false; -+ zwp_locked_pointer_v1_set_cursor_position_hint(window->wl.lockedPointer, -+ wl_fixed_from_double(window->wl.askedCursorPosX), -+ wl_fixed_from_double(window->wl.askedCursorPosY)); -+ } - } - - static void lockedPointerHandleUnlocked(void* userData, --- -2.42.0 - diff --git a/flatpak/prime-run b/flatpak/prime-run deleted file mode 100644 index 946c28dd5..000000000 --- a/flatpak/prime-run +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -export __NV_PRIME_RENDER_OFFLOAD=1 __VK_LAYER_NV_optimus=NVIDIA_only __GLX_VENDOR_LIBRARY_NAME=nvidia -exec "$@" diff --git a/flatpak/prismlauncher b/flatpak/prismlauncher deleted file mode 100644 index 039d890d2..000000000 --- a/flatpak/prismlauncher +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# discord RPC -for i in {0..9}; do - test -S "$XDG_RUNTIME_DIR"/discord-ipc-"$i" || ln -sf {app/com.discordapp.Discord,"$XDG_RUNTIME_DIR"}/discord-ipc-"$i"; -done - -export PATH="${PATH}${PATH:+:}/usr/lib/extensions/vulkan/gamescope/bin:/usr/lib/extensions/vulkan/MangoHud/bin" -export VK_LAYER_PATH="/usr/lib/extensions/vulkan/share/vulkan/implicit_layer.d/" - -exec /app/bin/prismrun "$@" diff --git a/flatpak/shared-modules b/flatpak/shared-modules deleted file mode 160000 index 73f08ed2c..000000000 --- a/flatpak/shared-modules +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 73f08ed2c3187f6648ca04ebef030930a6c9f0be diff --git a/flatpak/tomlplusplus.yml b/flatpak/tomlplusplus.yml deleted file mode 100644 index 0afaf6678..000000000 --- a/flatpak/tomlplusplus.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: tomlplusplus -buildsystem: cmake-ninja -sources: - - type: archive - url: https://github.com/marzer/tomlplusplus/archive/v3.4.0.tar.gz - sha256: 8517f65938a4faae9ccf8ebb36631a38c1cadfb5efa85d9a72e15b9e97d25155