diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml new file mode 100644 index 00000000..a8a721d9 --- /dev/null +++ b/.github/workflows/lock.yml @@ -0,0 +1,30 @@ +name: Lock closed issues and PRs + +on: + issues: + types: [closed] + pull_request: + types: [closed] + +permissions: + issues: write + pull-requests: write +jobs: + lock: + runs-on: ubuntu-latest + steps: + - name: Lock issue + if: github.event_name == 'issues' + run: | + gh issue lock ${{ github.event.issue.number }} --reason resolved || true + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_REPO: ${{ github.repository }} + + - name: Lock pull request + if: github.event_name == 'pull_request' + run: | + gh pr lock ${{ github.event.pull_request.number }} --reason resolved || true + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_REPO: ${{ github.repository }} diff --git a/com.valvesoftware.Steam.metainfo.xml b/com.valvesoftware.Steam.metainfo.xml index 01427654..35c9d753 100644 --- a/com.valvesoftware.Steam.metainfo.xml +++ b/com.valvesoftware.Steam.metainfo.xml @@ -52,8 +52,11 @@ https://raw.githubusercontent.com/flathub/com.valvesoftware.Steam/master/images/com.valvesoftware.Steam-thumb.png + + + - + diff --git a/com.valvesoftware.Steam.yml b/com.valvesoftware.Steam.yml index 4bc012c5..db9f521a 100644 --- a/com.valvesoftware.Steam.yml +++ b/com.valvesoftware.Steam.yml @@ -24,18 +24,24 @@ finish-args: - --socket=pulseaudio - --share=network - --own-name=com.steampowered.* - - --talk-name=org.gnome.SettingsDaemon.MediaKeys # Wine uses UDisks2 to enumerate disk drives - --system-talk-name=org.freedesktop.UDisks2 - --talk-name=org.kde.StatusNotifierWatcher - --system-talk-name=org.freedesktop.UPower - --talk-name=org.freedesktop.ScreenSaver + - --talk-name=org.gnome.SessionManager - --talk-name=org.freedesktop.PowerManagement - --talk-name=org.freedesktop.Notifications - --filesystem=xdg-music:ro - --filesystem=xdg-pictures:ro - --filesystem=xdg-run/app/com.discordapp.Discord:create - --filesystem=xdg-run/pipewire-0:ro + - --filesystem=xdg-config/MangoHud:ro + - --filesystem=/run/udev:ro + - --filesystem=xdg-run/speech-dispatcher:ro + - --filesystem=/mnt + - --filesystem=/media + - --filesystem=/run/media - --device=all - --allow=multiarch - --allow=devel @@ -71,7 +77,7 @@ finish-args: - --env=PROTON_DEBUG_DIR=/var/tmp - --env=XDG_CONFIG_DIRS=/etc/xdg:/usr/lib/x86_64-linux-gnu/GL:/usr/lib/i386-linux-gnu/GL - --env=XDG_DATA_DIRS=/app/share:/usr/lib/extensions/vulkan/share:/usr/share:/usr/share/runtime/share:/run/host/user-share:/run/host/share:/usr/lib/pressure-vessel/overrides/share - - --env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0:/app/lib32/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:/usr/lib/x86_64-linux-gnu/codecs-extra/lib/gstreamer-1.0:/usr/lib/x86_64-linux-gnu/gstreamer-1.0:/usr/lib/i386-linux-gnu/gstreamer-1.0 + - --env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0:/app/lib32/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:/usr/lib/x86_64-linux-gnu/codecs-extra/lib/gstreamer-1.0:/usr/lib/i386-linux-gnu/codecs-extra/lib/gstreamer-1.0:/usr/lib/x86_64-linux-gnu/gstreamer-1.0:/usr/lib/i386-linux-gnu/gstreamer-1.0 - --require-version=1.12.0 add-extensions: @@ -176,6 +182,41 @@ modules: - python3-requirements.json + - name: dotconf + cleanup: + - "*" + sources: + - type: archive + url: https://github.com/williamh/dotconf/archive/refs/tags/v1.3.tar.gz + sha256: 7f1ecf40de1ad002a065a321582ed34f8c14242309c3547ad59710ae3c805653 + - type: script + commands: + - autoreconf -fiv + dest-filename: autogen.sh + + - name: libspeechd + config-opts: + - --disable-python + - --with-systemdsystemunitdir='' + - --disable-rpath + - --disable-static + - --with-kali=no + - --with-baratinoo=no + - --with-ibmtts=no + - --with-voxin=no + - --without-oss + sources: + - type: archive + url: https://github.com/brailcom/speechd/releases/download/0.12.0/speech-dispatcher-0.12.0.tar.gz + sha256: e1dd0bfa24b8338545e165451330adf51c4c0dca862b1b67e76fba5142dbbb74 + cleanup: + - /bin + - /etc + - /libexec + - /lib/speech-dispatcher + - /share/sounds/speech-dispatcher + - /share/speech-dispatcher + - name: steam_wrapper buildsystem: simple sources: @@ -202,8 +243,8 @@ modules: test -x /app/lib/steam/bin_steam.sh sources: - type: archive - url: https://repo.steampowered.com/steam/archive/stable/steam_1.0.0.84.tar.gz - sha256: 31fa762d58793f1aa8ea9df0122c3469c253fc8acb6daa7140fb7433fe077b44 + url: https://repo.steampowered.com/steam/archive/stable/steam_1.0.0.85.tar.gz + sha256: 7f2d374a2fb413ced5b8125151456219d918a255872b4bb77016cbccf38bb7f1 x-checker-data: type: html is-main-source: true diff --git a/modules-32bit.yml b/modules-32bit.yml index ec371747..dd1e70c2 100644 --- a/modules-32bit.yml +++ b/modules-32bit.yml @@ -12,26 +12,6 @@ buildsystem: simple build-commands: [] modules: - - name: eudev-32bit - build-options: - arch: - x86_64: *compat_i386_opts - cleanup: - - /bin - - /sbin - - /lib*/udev - sources: - - sources/eudev-archive.json - - - name: libusb-32bit - build-options: - arch: - x86_64: *compat_i386_opts - ldflags: -L/app/lib32 -Wl,-z,relro,-z,now -Wl,--as-needed - ldflags-override: true - sources: - - sources/libusb-archive.json - # -- discord -- - name: discord-rpc-32bit @@ -59,8 +39,8 @@ modules: sources: - type: git url: https://github.com/gperftools/gperftools.git - commit: d9a5d38e5cd1c5d50c77d6bcff707d040c43e4de - tag: gperftools-2.17.2 + commit: d837a42788ba591d5d791c3b686f2738e7a93562 + tag: gperftools-2.18.1 x-checker-data: type: json url: https://api.github.com/repos/gperftools/gperftools/releases/latest diff --git a/modules.yml b/modules.yml index b6125185..21b7ccde 100644 --- a/modules.yml +++ b/modules.yml @@ -10,8 +10,8 @@ modules: - -DZLIB_COMPAT=true sources: - type: archive - url: https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.5.tar.gz - sha256: 5b3b022489f3ced82384f06db1e13ba148cbce38c7941e424d6cb414416acd18 + url: https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.3.3.tar.gz + sha256: f9c65aa9c852eb8255b636fd9f07ce1c406f061ec19a2e7d508b318ca0c907d1 x-checker-data: type: anitya project-id: 115592 @@ -25,34 +25,20 @@ modules: sources: - type: git url: https://github.com/vcrhonek/hwdata - tag: v0.399 - commit: 7ba0e54565843faee300ca885699e4c42ed674b2 + tag: v0.405 + commit: be46d7186e918e62eb75de399e800145a781c8db x-checker-data: type: json url: https://api.github.com/repos/vcrhonek/hwdata/releases/latest tag-query: .tag_name - - name: eudev - cleanup: - - /bin - - /sbin - - /lib*/udev - post-install: - - udevadm hwdb --update --usr - sources: - - sources/eudev-archive.json - - - name: libusb - sources: - - sources/libusb-archive.json - - name: usbutils buildsystem: meson sources: - type: git url: https://github.com/gregkh/usbutils - commit: cda6883cade6ec67671d0c7de61e70eb992509a9 - tag: v018 + commit: d0c76b601b4b3ab9b2ab2647d604a8e3cce6d666 + tag: v019 x-checker-data: type: anitya project-id: 5061 @@ -68,8 +54,8 @@ modules: sources: - type: git url: https://github.com/lsof-org/lsof - commit: ed0fef9a134b64c9398075185534a76714c91179 - tag: 4.99.5 + commit: b173315c8f94bf61d52094857ea3fe7d0f5aaff9 + tag: 4.99.6 x-checker-data: type: json url: https://api.github.com/repos/lsof-org/lsof/releases/latest @@ -154,8 +140,8 @@ modules: buildsystem: meson sources: - type: archive - url: https://github.com/pygobject/pycairo/archive/refs/tags/v1.28.0.tar.gz - sha256: e7e1a487820467a174512633f3ec4c49d567041e40f2d0135d14679045b054e9 + url: https://github.com/pygobject/pycairo/archive/refs/tags/v1.29.0.tar.gz + sha256: 25c6a8a5a488afdd21208b5a71f95796891cceb2ee94f2ec1c51fdf0735eab0b x-checker-data: type: anitya project-id: 13166 diff --git a/sources/eudev-archive.json b/sources/eudev-archive.json deleted file mode 100644 index 191b276b..00000000 --- a/sources/eudev-archive.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "archive", - "url": "https://github.com/eudev-project/eudev/releases/download/v3.2.14/eudev-3.2.14.tar.gz", - "sha256": "8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc1927f006f", - "x-checker-data": { - "type": "json", - "url": "https://api.github.com/repos/eudev-project/eudev/releases/latest", - "version-query": ".tag_name | sub(\"^v\"; \"\")", - "url-query": ".assets[] | select(.name==\"eudev-\" + $version + \".tar.gz\") | .browser_download_url" - } -} diff --git a/sources/libusb-archive.json b/sources/libusb-archive.json deleted file mode 100644 index 51bcb14b..00000000 --- a/sources/libusb-archive.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "archive", - "url": "https://github.com/libusb/libusb/releases/download/v1.0.29/libusb-1.0.29.tar.bz2", - "sha256": "5977fc950f8d1395ccea9bd48c06b3f808fd3c2c961b44b0c2e6e29fc3a70a85", - "x-checker-data": { - "type": "anitya", - "project-id": 1749, - "stable-only": true, - "url-template": "https://github.com/libusb/libusb/releases/download/v$version/libusb-$version.tar.bz2" - } -} diff --git a/steam_wrapper/steam_wrapper.py b/steam_wrapper/steam_wrapper.py index f6049c46..aaf86a61 100644 --- a/steam_wrapper/steam_wrapper.py +++ b/steam_wrapper/steam_wrapper.py @@ -302,7 +302,8 @@ def _get_host_xdg_mounts(xdg_name: str, flatpak_info): filesystem_path = filesystem.rsplit(":", 1)[0] path_seq = os.path.normpath(filesystem_path).split(os.path.sep) if path_seq[0] == xdg_name: - dirs.add(os.path.join(*path_seq[1:])) + subpath = path_seq[1:] + dirs.add(os.path.join(*subpath) if subpath else "") return dirs @@ -424,6 +425,8 @@ def check_extensions(flatpak_info): # For each installed .GL. extension, check for its .GL32. counterpart GL_EXT_PREFIX = "org.freedesktop.Platform.GL" for ext_id in installed_ext_ids: + if ".Debug" in ext_id: + continue if ext_id.startswith(f"{GL_EXT_PREFIX}."): compat_ids.append(f"{GL_EXT_PREFIX}32" + ext_id[len(GL_EXT_PREFIX):])