Fix runners and components from not showing when prereleases are off
diff --git a/meson.build b/meson.build
index ce7980b9348..4bff6b07aac 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project(
'bottles',
- version: '51.9',
+ version: '51.10',
meson_version: '>= 0.59.0',
default_options: [
'warning_level=2',
From 79f024cd591b68ffe720ffaeda285409b31a8e71 Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Wed, 27 Sep 2023 09:45:51 +0200
Subject: [PATCH 03/20] Update manifest automation to reflect new Python
runtime version
---
.github/workflows/update-manifest.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/update-manifest.yml b/.github/workflows/update-manifest.yml
index f3aceaac90a..fe15ce4e3d9 100644
--- a/.github/workflows/update-manifest.yml
+++ b/.github/workflows/update-manifest.yml
@@ -35,7 +35,7 @@ jobs:
git config user.name "github-actions[bot]"
pur -r requirements.txt
pur -r requirements.dev.txt
- req2flatpak --requirements-file requirements.txt --yaml --target-platforms 310-x86_64 -o com.usebottles.bottles.pypi-deps.yaml
+ req2flatpak --requirements-file requirements.txt --yaml --target-platforms 311-x86_64 -o com.usebottles.bottles.pypi-deps.yaml
git diff ${{ github.ref_name }} --exit-code requirements.txt requirements.dev.txt com.usebottles.bottles.pypi-deps.yaml
updated=$?
if [ $updated -ne 0 ]; then
From e249be3b640251cf265bb7494a1a22a7703ad9c2 Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Wed, 27 Sep 2023 09:50:08 +0200
Subject: [PATCH 04/20] manifest: Mark more modules as important
---
com.usebottles.bottles.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml
index 9374c590a4e..e99f6bae01f 100644
--- a/com.usebottles.bottles.yml
+++ b/com.usebottles.bottles.yml
@@ -206,6 +206,7 @@ modules:
commit: 13df0b887a7eb7b0f9b14069561a41f62e813155
x-checker-data:
type: git
+ is-important: true
tag-pattern: ^([\d.]+)$
- name: blueprint-compiler
@@ -246,6 +247,7 @@ modules:
commit: 6fbeab0470df55aeab141a45763147440b2f0290
x-checker-data:
type: git
+ is-important: true
tag-pattern: ^([\d.]+)$
modules:
- name: vte
From 693ec34bdea77f49674a4ee2149bd0346a2bfadd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 07:52:32 +0000
Subject: [PATCH 05/20] :robot:: Update manifest (important) (#17)
* Update PyPI dependencies
* Update 5 modules
Update Vulkan-Headers.git to 1.3.261.1
Update Vulkan-Tools.git to 1.3.261.1
Update ImageMagick to 7.1.1-18
Update libportal to 0.7.1
Update vte to 0.74.0
---------
Co-authored-by: github-actions[bot]
---
com.usebottles.bottles.pypi-deps.yaml | 34 +++++++++++++--------------
com.usebottles.bottles.yml | 20 ++++++++--------
requirements.dev.txt | 2 +-
requirements.txt | 12 +++++-----
4 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/com.usebottles.bottles.pypi-deps.yaml b/com.usebottles.bottles.pypi-deps.yaml
index 073d0b8fc12..2a2c007c68f 100644
--- a/com.usebottles.bottles.pypi-deps.yaml
+++ b/com.usebottles.bottles.pypi-deps.yaml
@@ -1,4 +1,4 @@
-# Generated by req2flatpak.py --requirements-file requirements.txt --yaml --target-platforms 310-x86_64 -o com.usebottles.bottles.pypi-deps.yaml
+# Generated by req2flatpak.py --requirements-file requirements.txt --yaml --target-platforms 311-x86_64 -o com.usebottles.bottles.pypi-deps.yaml
name: python3-package-installation
buildsystem: simple
build-commands:
@@ -14,11 +14,11 @@ sources:
url: https://files.pythonhosted.org/packages/1a/b5/228c1cdcfe138f1a8e01ab1b54284c8b83735476cb22b6ba251656ed13ad/Markdown-3.4.4-py3-none-any.whl
sha256: a4c1b65c0957b4bd9e7d86ddc7b3c9868fb9670660f6f99f6d1bca8954d5a941
- type: file
- url: https://files.pythonhosted.org/packages/44/80/96d6317a15a13a4f80ffa61118dc144a70756135fbc6ace30f9b033f51f7/PyGObject-3.44.1.tar.gz
- sha256: 665fbe980c91e8b31ad78ed3f66879946948200864002d193f67eccc1d7d5d83
+ url: https://files.pythonhosted.org/packages/ac/4a/f24ddf1d20cc4b56affc7921e29928559a06c922eb60077448392792b914/PyGObject-3.46.0.tar.gz
+ sha256: 481437b05af0a66b7c366ea052710eb3aacbb979d22d30b797f7ec29347ab1e6
- type: file
- url: https://files.pythonhosted.org/packages/29/61/bf33c6c85c55bc45a29eee3195848ff2d518d84735eb0e2d8cb42e0d285e/PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
- sha256: ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515
+ url: https://files.pythonhosted.org/packages/7b/5e/efd033ab7199a0b2044dab3b9f7a4f6670e6a52c089de572e928d2873b06/PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+ sha256: d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673
only-arches:
- x86_64
- type: file
@@ -28,8 +28,8 @@ sources:
url: https://files.pythonhosted.org/packages/38/6f/f5fbc992a329ee4e0f288c1fe0e2ad9485ed064cac731ed2fe47dcc38cbf/chardet-5.2.0-py3-none-any.whl
sha256: e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970
- type: file
- url: https://files.pythonhosted.org/packages/a4/65/057bf29660aae6ade0816457f8db4e749e5c0bfa2366eb5f67db9912fa4c/charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
- sha256: 193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad
+ url: https://files.pythonhosted.org/packages/bc/85/ef25d4ba14c7653c3020a1c6e1a7413e6791ef36a0ac177efa605fc2c737/charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+ sha256: 246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6
only-arches:
- x86_64
- type: file
@@ -39,13 +39,13 @@ sources:
url: https://files.pythonhosted.org/packages/fc/34/3030de6f1370931b9dbb4dad48f6ab1015ab1d32447850b9fc94e60097be/idna-3.4-py3-none-any.whl
sha256: 90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
- type: file
- url: https://files.pythonhosted.org/packages/34/7a/9ec6142fdab1749eacbab23c8a502cccb57f1985d764a5cfacad1d55a2de/orjson-3.9.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
- sha256: f13d61c0c7414ddee1ef4d0f303e2222f8cced5a2e26d9774751aecd72324c9e
+ url: https://files.pythonhosted.org/packages/0b/e1/2c6e894de23c1bb5c76eff087c99fc3c7ce8f317a793f8c80767f4225733/orjson-3.9.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+ sha256: e5205ec0dfab1887dd383597012199f5175035e782cdb013c542187d280ca443
only-arches:
- x86_64
- type: file
- url: https://files.pythonhosted.org/packages/c8/98/e6c836ea547236fffab67503ff691d302f2366fbe3a1e37bfe611e352b3c/pathvalidate-3.1.0-py3-none-any.whl
- sha256: 912fd1d2e1a2a6a6f98da36a91f21ed86746473810ff625b9c34f3d06c0caa1d
+ url: https://files.pythonhosted.org/packages/0c/ab/673cce13ab635fd755d206b18c0a371ef6e28ddbe25fadba9ae6c59f22a5/pathvalidate-3.2.0-py3-none-any.whl
+ sha256: cc593caa6299b22b37f228148257997e2fa850eea2daf7e4cc9205cef6908dee
- type: file
url: https://files.pythonhosted.org/packages/43/94/52243ddff508780dd2d8110964320ab4851134a55ab102285b46e740f76a/patool-1.12-py2.py3-none-any.whl
sha256: 3f642549c9a78f5b8bef1af92df385b521d360520d1f34e4dba3fd1dee2a21bc
@@ -53,8 +53,8 @@ sources:
url: https://files.pythonhosted.org/packages/55/26/d0ad8b448476d0a1e8d3ea5622dc77b916db84c6aa3cb1e1c0965af948fc/pefile-2023.2.7-py3-none-any.whl
sha256: da185cd2af68c08a6cd4481f7325ed600a88f6a813bad9dea07ab3ef73d8d8d6
- type: file
- url: https://files.pythonhosted.org/packages/a2/dd/bc2c9ee9485308a29c18b1241329e677917af25c60b127857f0fb23d0c6e/pycairo-1.24.0.tar.gz
- sha256: 1444d52f1bb4cc79a4a0c0fe2ccec4bd78ff885ab01ebe1c0f637d8392bcafb6
+ url: https://files.pythonhosted.org/packages/db/f1/45f288a45215e12dea5a107a2e686e33902701d5485219437b5d64d1080a/pycairo-1.25.0.tar.gz
+ sha256: 37842b9bfa6339c45a5025f752e1d78d5840b1a0f82303bdd5610846ad8b5c4f
- type: file
url: https://files.pythonhosted.org/packages/a8/af/24d3acfa76b867dbd8f1166853c18eefc890fc5da03a48672b38ea77ddae/pycurl-7.45.2.tar.gz
sha256: 5730590be0271364a5bddd9e245c9cc0fb710c4cbacbdd95264a3122d23224ca
@@ -62,8 +62,8 @@ sources:
url: https://files.pythonhosted.org/packages/70/8e/0e2d847013cb52cd35b38c009bb167a1a26b2ce6cd6965bf26b47bc0bf44/requests-2.31.0-py3-none-any.whl
sha256: 58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f
- type: file
- url: https://files.pythonhosted.org/packages/9b/81/62fd61001fa4b9d0df6e31d47ff49cfa9de4af03adecf339c7bc30656b37/urllib3-2.0.4-py3-none-any.whl
- sha256: de7df1803967d2c2a98e4b11bb7d6bd9210474c46e8a0401514e3a42a75ebde4
+ url: https://files.pythonhosted.org/packages/37/dc/399e63f5d1d96bb643404ee830657f4dfcf8503f5ba8fa3c6d465d0c57fe/urllib3-2.0.5-py3-none-any.whl
+ sha256: ef16afa8ba34a1f989db38e1dbbe0c302e4289a47856990d0682e374563ce35e
- type: file
- url: https://files.pythonhosted.org/packages/28/f5/6955d7b3a5d71ce6bac104f9cf98c1b0513ad656cdaca8ea7d579196f771/wheel-0.41.1-py3-none-any.whl
- sha256: 473219bd4cbedc62cea0cb309089b593e47c15c4a2531015f94e4e3b9a0f6981
+ url: https://files.pythonhosted.org/packages/b8/8b/31273bf66016be6ad22bb7345c37ff350276cfd46e389a0c2ac5da9d9073/wheel-0.41.2-py3-none-any.whl
+ sha256: 75909db2664838d015e3d9139004ee16711748a52c8f336b52882266540215d8
diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml
index e99f6bae01f..eba4308e6c0 100644
--- a/com.usebottles.bottles.yml
+++ b/com.usebottles.bottles.yml
@@ -118,8 +118,8 @@ modules:
sources:
- type: git
url: https://github.com/KhronosGroup/Vulkan-Tools.git
- tag: sdk-1.3.250.1
- commit: 695887a994ef9cc00a7aa3f9c00b31a56ea79534
+ tag: sdk-1.3.261.1
+ commit: a7da7027ca9fd0901639f02619c226da9c6036f1
x-checker-data:
type: git
tag-pattern: ^sdk-([\d.]+)$
@@ -129,8 +129,8 @@ modules:
sources:
- type: git
url: https://github.com/KhronosGroup/Vulkan-Headers.git
- tag: sdk-1.3.250.1
- commit: 9e61870ecbd32514113b467e0a0c46f60ed222c7
+ tag: sdk-1.3.261.1
+ commit: 85c2334e92e215cce34e8e0ed8b2dce4700f4a50
x-checker-data:
type: git
tag-pattern: ^sdk-([\d.]+)$
@@ -188,8 +188,8 @@ modules:
sources:
- type: git
url: https://github.com/ImageMagick/ImageMagick
- tag: 7.1.1-15
- commit: a0a5f3da4cd07919dd2d1bbae121e590b5f105e2
+ tag: 7.1.1-18
+ commit: 44b2ac8c0326c895a1663071e129d01cc221bc79
x-checker-data:
type: git
tag-pattern: ^([\d.]+-[\d]+)$
@@ -202,8 +202,8 @@ modules:
sources:
- type: git
url: https://github.com/flatpak/libportal
- tag: '0.6'
- commit: 13df0b887a7eb7b0f9b14069561a41f62e813155
+ tag: 0.7.1
+ commit: e9ed3a50cdde321eaf42361212480a66eb94a57a
x-checker-data:
type: git
is-important: true
@@ -258,8 +258,8 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/vte
- tag: 0.73.93
- commit: f13f4d6cd83ba01315ac62755d70736705c40c99
+ tag: 0.74.0
+ commit: 7fb5b2395c9e9c786c2277bc98d7e2661485fb10
x-checker-data:
type: git
tag-pattern: ^([\d.]+)$
diff --git a/requirements.dev.txt b/requirements.dev.txt
index 1fe53caa01d..dfd9350e085 100644
--- a/requirements.dev.txt
+++ b/requirements.dev.txt
@@ -1,5 +1,5 @@
# Updated using pur -r requirements.txt
-pytest==7.4.0
+pytest==7.4.2
requirements-parser==0.5.0
mypy==1.5.1
types_Markdown
diff --git a/requirements.txt b/requirements.txt
index 9f8a64f6bae..efe6504cade 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
# Updated using pur -r requirements.txt
-wheel==0.41.1
+wheel==0.41.2
PyYAML==6.0.1
pycurl==7.45.2
chardet==5.2.0
@@ -7,13 +7,13 @@ requests[use_chardet_on_py3]==2.31.0
Markdown==3.4.4
icoextract==0.1.4
patool==1.12
-pathvalidate==3.1.0
+pathvalidate==3.2.0
FVS==0.3.4
-orjson==3.9.5
-pycairo==1.24.0
-PyGObject==3.44.1
+orjson==3.9.7
+pycairo==1.25.0
+PyGObject==3.46.0
charset-normalizer==3.2.0
idna==3.4
-urllib3==2.0.4
+urllib3==2.0.5
certifi==2023.7.22
pefile==2023.2.7
From 5a0920311c84fd6dc8cde1d9ade3ce0904fdba9b Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Wed, 27 Sep 2023 10:25:48 +0200
Subject: [PATCH 06/20] manifest: Workaround to build gamemode in the new Gnome
45 runtime
---
com.usebottles.bottles.yml | 4 ++++
gamemode.patch | 13 +++++++++++++
2 files changed, 17 insertions(+)
create mode 100644 gamemode.patch
diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml
index eba4308e6c0..da3b6310aab 100644
--- a/com.usebottles.bottles.yml
+++ b/com.usebottles.bottles.yml
@@ -150,6 +150,10 @@ modules:
type: git
is-important: true
tag-pattern: ^([\d.]+)$
+ # https://github.com/FeralInteractive/gamemode/commit/4934191b1928ef695c3e8af21e75781f8591745f
+ # Build workaround, please remove once gamemode > 1.7 is released!
+ - type: patch
+ path: gamemode.patch
- name: gamemode-32bit
build-options:
diff --git a/gamemode.patch b/gamemode.patch
new file mode 100644
index 00000000000..82042c1fe63
--- /dev/null
+++ b/gamemode.patch
@@ -0,0 +1,13 @@
+diff --git a/common/common-pidfds.c b/common/common-pidfds.c
+index 00929f70..61442e34 100644
+--- a/common/common-pidfds.c
++++ b/common/common-pidfds.c
+@@ -58,6 +58,8 @@ static int pidfd_open(pid_t pid, unsigned int flags)
+ {
+ return (int)syscall(__NR_pidfd_open, pid, flags);
+ }
++#else
++#include
+ #endif
+
+ /* pidfd functions */
From 3270741b4d208870f501e04072dd8bc0a50d02df Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Wed, 27 Sep 2023 10:46:49 +0200
Subject: [PATCH 07/20] manifest: Use updated backend build option for
libflatpak
---
com.usebottles.bottles.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml
index da3b6310aab..ca45b917956 100644
--- a/com.usebottles.bottles.yml
+++ b/com.usebottles.bottles.yml
@@ -202,7 +202,7 @@ modules:
buildsystem: meson
config-opts:
- -Ddocs=false
- - -Dbackends=gtk4
+ - -Dbackend-gtk4=enabled
sources:
- type: git
url: https://github.com/flatpak/libportal
From 86bb53da33657317dc8f93275d1bf60ede951048 Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Tue, 3 Oct 2023 10:17:07 +0200
Subject: [PATCH 08/20] Update com.usebottles.bottles.yml
---
com.usebottles.bottles.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml
index ca45b917956..587b687587c 100644
--- a/com.usebottles.bottles.yml
+++ b/com.usebottles.bottles.yml
@@ -16,7 +16,6 @@ finish-args:
- --socket=wayland
- --socket=pulseaudio
- --device=all
- - --filesystem=xdg-download
- --system-talk-name=org.freedesktop.UDisks2
- --env=LD_LIBRARY_PATH=/app/lib:/app/lib32
- --env=PATH=/app/bin:/app/utils/bin:/usr/bin:/usr/lib/extensions/vulkan/MangoHud/bin/:/usr/bin:/usr/lib/extensions/vulkan/OBSVkCapture/bin/:/usr/lib/extensions/vulkan/gamescope/bin/
From 60d40554e060392138121d8406ff7899dfe9baea Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Tue, 3 Oct 2023 12:13:08 +0200
Subject: [PATCH 09/20] When running update-manifest workflow manually, do not
require important update to create PR
---
.github/workflows/update-manifest.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/update-manifest.yml b/.github/workflows/update-manifest.yml
index fe15ce4e3d9..eed3aa74cef 100644
--- a/.github/workflows/update-manifest.yml
+++ b/.github/workflows/update-manifest.yml
@@ -10,6 +10,7 @@ on:
env:
PR_BRANCH: pr/ci-manifest/${{ github.ref_name }}
+ FEDC_ARGS: --update --require-important-update --commit-only --never-fork "bottles-repository/com.usebottles.bottles.yml"
jobs:
update-manifest:
@@ -43,6 +44,12 @@ jobs:
git commit -m "Update PyPI dependencies"
fi
+ - name: Update requirements
+ if: github.event_name == 'workflow_dispatch'
+ run: |
+ remove_important_update_only=$(sed 's/--require-important-update//g' <<< '${{ env.FEDC_ARGS }}')
+ echo "FEDC_ARGS=$remove_important_update_only" >> $GITHUB_ENV
+
- uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest
env:
GIT_AUTHOR_NAME: github-actions[bot]
@@ -52,7 +59,7 @@ jobs:
EMAIL: github-actions[bot]@users.noreply.github.com
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
- args: --update --require-important-update --commit-only --never-fork "bottles-repository/com.usebottles.bottles.yml"
+ args: ${{ env.FEDC_ARGS }}
- name: Create PR if necessary
working-directory: "bottles-repository"
From 94ed6bf0c730d14e8cd70955aa9288eb85264d06 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 3 Oct 2023 10:14:47 +0000
Subject: [PATCH 10/20] :robot:: Update manifest (important) (#18)
* Update PyPI dependencies
* Update 2 modules
Update vmtouch
Update ImageMagick to 7.1.1-19
---------
Co-authored-by: github-actions[bot]
---
com.usebottles.bottles.pypi-deps.yaml | 8 ++++----
com.usebottles.bottles.yml | 6 +++---
requirements.txt | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/com.usebottles.bottles.pypi-deps.yaml b/com.usebottles.bottles.pypi-deps.yaml
index 2a2c007c68f..a94326cd1b2 100644
--- a/com.usebottles.bottles.pypi-deps.yaml
+++ b/com.usebottles.bottles.pypi-deps.yaml
@@ -28,8 +28,8 @@ sources:
url: https://files.pythonhosted.org/packages/38/6f/f5fbc992a329ee4e0f288c1fe0e2ad9485ed064cac731ed2fe47dcc38cbf/chardet-5.2.0-py3-none-any.whl
sha256: e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970
- type: file
- url: https://files.pythonhosted.org/packages/bc/85/ef25d4ba14c7653c3020a1c6e1a7413e6791ef36a0ac177efa605fc2c737/charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
- sha256: 246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6
+ url: https://files.pythonhosted.org/packages/ff/b6/9222090f396f33cd58aa5b08b9bbf8871416b746a0c7b412a41a973674a5/charset_normalizer-3.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+ sha256: f0d1e3732768fecb052d90d62b220af62ead5748ac51ef61e7b32c266cac9293
only-arches:
- x86_64
- type: file
@@ -62,8 +62,8 @@ sources:
url: https://files.pythonhosted.org/packages/70/8e/0e2d847013cb52cd35b38c009bb167a1a26b2ce6cd6965bf26b47bc0bf44/requests-2.31.0-py3-none-any.whl
sha256: 58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f
- type: file
- url: https://files.pythonhosted.org/packages/37/dc/399e63f5d1d96bb643404ee830657f4dfcf8503f5ba8fa3c6d465d0c57fe/urllib3-2.0.5-py3-none-any.whl
- sha256: ef16afa8ba34a1f989db38e1dbbe0c302e4289a47856990d0682e374563ce35e
+ url: https://files.pythonhosted.org/packages/26/40/9957270221b6d3e9a3b92fdfba80dd5c9661ff45a664b47edd5d00f707f5/urllib3-2.0.6-py3-none-any.whl
+ sha256: 7a7c7003b000adf9e7ca2a377c9688bbc54ed41b985789ed576570342a375cd2
- type: file
url: https://files.pythonhosted.org/packages/b8/8b/31273bf66016be6ad22bb7345c37ff350276cfd46e389a0c2ac5da9d9073/wheel-0.41.2-py3-none-any.whl
sha256: 75909db2664838d015e3d9139004ee16711748a52c8f336b52882266540215d8
diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml
index 587b687587c..6927c669c0b 100644
--- a/com.usebottles.bottles.yml
+++ b/com.usebottles.bottles.yml
@@ -99,7 +99,7 @@ modules:
sources:
- type: git
url: https://github.com/hoytech/vmtouch
- commit: 8f6898e3c027f445962e223ca7a7b33d40395fc6
+ commit: af86e27675843b3c7e4ddfee66ddbaf44eff43c4
x-checker-data:
type: json
url: https://api.github.com/repos/hoytech/vmtouch/commits
@@ -191,8 +191,8 @@ modules:
sources:
- type: git
url: https://github.com/ImageMagick/ImageMagick
- tag: 7.1.1-18
- commit: 44b2ac8c0326c895a1663071e129d01cc221bc79
+ tag: 7.1.1-19
+ commit: 99da019efe78c44808f2a1c88684e7822a1fd692
x-checker-data:
type: git
tag-pattern: ^([\d.]+-[\d]+)$
diff --git a/requirements.txt b/requirements.txt
index efe6504cade..bad2b4b540f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,8 +12,8 @@ FVS==0.3.4
orjson==3.9.7
pycairo==1.25.0
PyGObject==3.46.0
-charset-normalizer==3.2.0
+charset-normalizer==3.3.0
idna==3.4
-urllib3==2.0.5
+urllib3==2.0.6
certifi==2023.7.22
pefile==2023.2.7
From 7c034d3745c32056eca5b6d5888df41fdd384b0d Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Tue, 3 Oct 2023 18:15:07 +0200
Subject: [PATCH 11/20] automatiion: Update step name
---
.github/workflows/update-manifest.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/update-manifest.yml b/.github/workflows/update-manifest.yml
index eed3aa74cef..3f4f0e2b70f 100644
--- a/.github/workflows/update-manifest.yml
+++ b/.github/workflows/update-manifest.yml
@@ -44,7 +44,7 @@ jobs:
git commit -m "Update PyPI dependencies"
fi
- - name: Update requirements
+ - name: Update arguments
if: github.event_name == 'workflow_dispatch'
run: |
remove_important_update_only=$(sed 's/--require-important-update//g' <<< '${{ env.FEDC_ARGS }}')
From 3bdfcfe426e711b7a4acaa7ae5afc8bebcf41ea6 Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Tue, 3 Oct 2023 22:17:09 +0200
Subject: [PATCH 12/20] Update com.usebottles.bottles.metainfo.xml.in
---
data/com.usebottles.bottles.metainfo.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/com.usebottles.bottles.metainfo.xml.in b/data/com.usebottles.bottles.metainfo.xml.in
index fd1fd707d32..bddaed36cbe 100644
--- a/data/com.usebottles.bottles.metainfo.xml.in
+++ b/data/com.usebottles.bottles.metainfo.xml.in
@@ -65,7 +65,7 @@
-
+
Clean FSR settings
Improve bad connections handling
Update Flatpak runtime
From 39709460e762643881a96232acafa4b412070345 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 1 Dec 2023 14:23:50 +0000
Subject: [PATCH 13/20] :robot:: Update manifest (important) (#21)
* Update PyPI dependencies
* Update 2 modules
Update ImageMagick to 7.1.1-21
Update vte to 0.74.1
---------
Co-authored-by: github-actions[bot]
---
com.usebottles.bottles.yml | 8 ++++----
requirements.dev.txt | 4 ++--
requirements.txt | 18 +++++++++---------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml
index 6927c669c0b..9a6bc9f3598 100644
--- a/com.usebottles.bottles.yml
+++ b/com.usebottles.bottles.yml
@@ -191,8 +191,8 @@ modules:
sources:
- type: git
url: https://github.com/ImageMagick/ImageMagick
- tag: 7.1.1-19
- commit: 99da019efe78c44808f2a1c88684e7822a1fd692
+ tag: 7.1.1-21
+ commit: 58d86e4e107603a95f2f35da99540a2eb69b458d
x-checker-data:
type: git
tag-pattern: ^([\d.]+-[\d]+)$
@@ -261,8 +261,8 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/vte
- tag: 0.74.0
- commit: 7fb5b2395c9e9c786c2277bc98d7e2661485fb10
+ tag: 0.74.1
+ commit: eee37c871173d04387cd0004dde7f8676f390f62
x-checker-data:
type: git
tag-pattern: ^([\d.]+)$
diff --git a/requirements.dev.txt b/requirements.dev.txt
index dfd9350e085..c3d21ac8e84 100644
--- a/requirements.dev.txt
+++ b/requirements.dev.txt
@@ -1,7 +1,7 @@
# Updated using pur -r requirements.txt
-pytest==7.4.2
+pytest==7.4.3
requirements-parser==0.5.0
-mypy==1.5.1
+mypy==1.7.1
types_Markdown
types-PyYAML
types-Pygments
diff --git a/requirements.txt b/requirements.txt
index bad2b4b540f..5df06198d58 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,19 @@
# Updated using pur -r requirements.txt
-wheel==0.41.2
+wheel==0.42.0
PyYAML==6.0.1
pycurl==7.45.2
chardet==5.2.0
requests[use_chardet_on_py3]==2.31.0
-Markdown==3.4.4
+Markdown==3.5.1
icoextract==0.1.4
-patool==1.12
+patool==2.0.0
pathvalidate==3.2.0
FVS==0.3.4
-orjson==3.9.7
-pycairo==1.25.0
+orjson==3.9.10
+pycairo==1.25.1
PyGObject==3.46.0
-charset-normalizer==3.3.0
-idna==3.4
-urllib3==2.0.6
-certifi==2023.7.22
+charset-normalizer==3.3.2
+idna==3.6
+urllib3==2.1.0
+certifi==2023.11.17
pefile==2023.2.7
From a057d36810838486e43bd124d16d6b3e13a99c7f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 19:20:07 +0100
Subject: [PATCH 14/20] Update 2 modules (#23)
Update gamemode to 1.8
Update ImageMagick to 7.1.1-22
Co-authored-by: github-actions[bot]
---
com.usebottles.bottles.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml
index 9a6bc9f3598..531c2dfeb86 100644
--- a/com.usebottles.bottles.yml
+++ b/com.usebottles.bottles.yml
@@ -143,8 +143,8 @@ modules:
sources: &gamemode_sources
- type: git
url: https://github.com/FeralInteractive/gamemode
- tag: '1.7'
- commit: 4dc99dff76218718763a6b07fc1900fa6d1dafd9
+ tag: '1.8'
+ commit: bb403740671551c2acbbb5c00c84689914966ba2
x-checker-data:
type: git
is-important: true
@@ -191,8 +191,8 @@ modules:
sources:
- type: git
url: https://github.com/ImageMagick/ImageMagick
- tag: 7.1.1-21
- commit: 58d86e4e107603a95f2f35da99540a2eb69b458d
+ tag: 7.1.1-22
+ commit: f3bacd19f67c81cdc764bf95ee3e55a526fccbf9
x-checker-data:
type: git
tag-pattern: ^([\d.]+-[\d]+)$
From 4bdd67072897d87d90bf18338d97445657f1d910 Mon Sep 17 00:00:00 2001
From: koplo199 <85577251+koplo199@users.noreply.github.com>
Date: Wed, 6 Dec 2023 19:22:41 +0100
Subject: [PATCH 15/20] Remove gamemode patch
---
com.usebottles.bottles.yml | 4 ----
gamemode.patch | 13 -------------
2 files changed, 17 deletions(-)
delete mode 100644 gamemode.patch
diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml
index 531c2dfeb86..c4469131a29 100644
--- a/com.usebottles.bottles.yml
+++ b/com.usebottles.bottles.yml
@@ -149,10 +149,6 @@ modules:
type: git
is-important: true
tag-pattern: ^([\d.]+)$
- # https://github.com/FeralInteractive/gamemode/commit/4934191b1928ef695c3e8af21e75781f8591745f
- # Build workaround, please remove once gamemode > 1.7 is released!
- - type: patch
- path: gamemode.patch
- name: gamemode-32bit
build-options:
diff --git a/gamemode.patch b/gamemode.patch
deleted file mode 100644
index 82042c1fe63..00000000000
--- a/gamemode.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/common/common-pidfds.c b/common/common-pidfds.c
-index 00929f70..61442e34 100644
---- a/common/common-pidfds.c
-+++ b/common/common-pidfds.c
-@@ -58,6 +58,8 @@ static int pidfd_open(pid_t pid, unsigned int flags)
- {
- return (int)syscall(__NR_pidfd_open, pid, flags);
- }
-+#else
-+#include
- #endif
-
- /* pidfd functions */
From a7340783780017bc9e8b5decf523fbe4e191dabd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 21:11:09 +0100
Subject: [PATCH 16/20] Update 2 modules (#25)
Update gamemode to 1.8.1
Update ImageMagick to 7.1.1-23
Co-authored-by: github-actions[bot]
---
com.usebottles.bottles.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml
index c4469131a29..19da86a73bf 100644
--- a/com.usebottles.bottles.yml
+++ b/com.usebottles.bottles.yml
@@ -143,8 +143,8 @@ modules:
sources: &gamemode_sources
- type: git
url: https://github.com/FeralInteractive/gamemode
- tag: '1.8'
- commit: bb403740671551c2acbbb5c00c84689914966ba2
+ tag: 1.8.1
+ commit: 5180d89e66830d87f69687b95fb86f622552b94b
x-checker-data:
type: git
is-important: true
@@ -187,8 +187,8 @@ modules:
sources:
- type: git
url: https://github.com/ImageMagick/ImageMagick
- tag: 7.1.1-22
- commit: f3bacd19f67c81cdc764bf95ee3e55a526fccbf9
+ tag: 7.1.1-23
+ commit: 54b13e91d262b1083e27fc8c02532c89d3ff649c
x-checker-data:
type: git
tag-pattern: ^([\d.]+-[\d]+)$
From cd9877e5168b73b6aa9b68b1c4f75381ecc036b0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 23 Dec 2023 12:49:48 +0100
Subject: [PATCH 17/20] :robot:: Update manifest (important) (#27)
* Update PyPI dependencies
* Update vte to 0.74.2
---------
Co-authored-by: github-actions[bot]
---
com.usebottles.bottles.yml | 4 ++--
requirements.dev.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/com.usebottles.bottles.yml b/com.usebottles.bottles.yml
index 19da86a73bf..cb397a3bc57 100644
--- a/com.usebottles.bottles.yml
+++ b/com.usebottles.bottles.yml
@@ -257,8 +257,8 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/vte
- tag: 0.74.1
- commit: eee37c871173d04387cd0004dde7f8676f390f62
+ tag: 0.74.2
+ commit: 3f66edbf598129bafde3baa91ccfb345056418c3
x-checker-data:
type: git
tag-pattern: ^([\d.]+)$
diff --git a/requirements.dev.txt b/requirements.dev.txt
index c3d21ac8e84..fa2997e8476 100644
--- a/requirements.dev.txt
+++ b/requirements.dev.txt
@@ -1,7 +1,7 @@
# Updated using pur -r requirements.txt
pytest==7.4.3
requirements-parser==0.5.0
-mypy==1.7.1
+mypy==1.8.0
types_Markdown
types-PyYAML
types-Pygments
From 3cbf9067869d03ca8141cef326514535330f3c20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 23 Dec 2023 12:50:03 +0100
Subject: [PATCH 18/20] build(deps): bump actions/upload-artifact from 3 to 4
(#26)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)
---
updated-dependencies:
- dependency-name: actions/upload-artifact
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/pylint-checker.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pylint-checker.yml b/.github/workflows/pylint-checker.yml
index 8ac323ad61a..36abc80f67d 100644
--- a/.github/workflows/pylint-checker.yml
+++ b/.github/workflows/pylint-checker.yml
@@ -31,7 +31,7 @@ jobs:
python3 utils/pylint-parser.py > output/pylint-result
cat output/pylint-result
echo ${{ github.event.number }} > output/pr-number
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
with:
name: pylint-result
path: output/
From b80af130bf1a8beb4ce77fbe4972864440557638 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 23 Dec 2023 12:50:17 +0100
Subject: [PATCH 19/20] build(deps): bump actions/setup-python from 4 to 5
(#22)
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)
---
updated-dependencies:
- dependency-name: actions/setup-python
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/mypy.yml | 2 +-
.github/workflows/pylint-checker.yml | 2 +-
.github/workflows/pytest.yml | 2 +-
.github/workflows/update-manifest.yml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 24e3ac55ed3..133b6ad92a9 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -12,7 +12,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up Python 3.10
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install Ubuntu dependencies
diff --git a/.github/workflows/pylint-checker.yml b/.github/workflows/pylint-checker.yml
index 36abc80f67d..b76c5840fc7 100644
--- a/.github/workflows/pylint-checker.yml
+++ b/.github/workflows/pylint-checker.yml
@@ -9,7 +9,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up Python 3.10
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install Ubuntu dependencies
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 89c61e8c44c..043f0b57b58 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -9,7 +9,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install Ubuntu dependencies
diff --git a/.github/workflows/update-manifest.yml b/.github/workflows/update-manifest.yml
index 3f4f0e2b70f..44d88339843 100644
--- a/.github/workflows/update-manifest.yml
+++ b/.github/workflows/update-manifest.yml
@@ -21,7 +21,7 @@ jobs:
path: "bottles-repository"
ref: ${{ github.ref_name }}
- - uses: actions/setup-python@v4
+ - uses: actions/setup-python@v5
with:
python-version: '3.x'
cache: 'pip'
From c9970957b483d69067dca7c24780501dc55c8df8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 23 Dec 2023 12:50:28 +0100
Subject: [PATCH 20/20] build(deps): bump actions/github-script from 6.4.1 to
7.0.1 (#20)
Bumps [actions/github-script](https://github.com/actions/github-script) from 6.4.1 to 7.0.1.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6.4.1...v7.0.1)
---
updated-dependencies:
- dependency-name: actions/github-script
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/pylint-commenter.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pylint-commenter.yml b/.github/workflows/pylint-commenter.yml
index aab56cecd4f..ed012f34752 100644
--- a/.github/workflows/pylint-commenter.yml
+++ b/.github/workflows/pylint-commenter.yml
@@ -16,7 +16,7 @@ jobs:
github.event.workflow_run.conclusion == 'success'
steps:
- name: 'Download artifact'
- uses: actions/github-script@v6.4.1
+ uses: actions/github-script@v7.0.1
with:
script: |
var artifacts = await github.rest.actions.listWorkflowRunArtifacts ({