From 9685750c0d921e5d3cfcf0b12e3f2f76a7a6eff2 Mon Sep 17 00:00:00 2001 From: Chris Hobday Date: Sun, 11 Aug 2024 10:28:13 -0400 Subject: [PATCH] Update to 9.15, and add script that builds Flatpaks --- BuildFlatpaks.sh | 8 ++++++++ README.md | 8 ++++---- org.winehq.WineStaging.appdata.xml | 1 + org.winehq.WineStaging.yml | 6 +++--- 4 files changed, 16 insertions(+), 7 deletions(-) create mode 100755 BuildFlatpaks.sh diff --git a/BuildFlatpaks.sh b/BuildFlatpaks.sh new file mode 100755 index 0000000..2f1e7a1 --- /dev/null +++ b/BuildFlatpaks.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# Build Flatpaks in repo directory +flatpak run org.flatpak.Builder --force-clean --repo=repo build-dir org.winehq.WineStaging.yml + +# Build Flatpak bundles for WineStaging. WineStaging.mono and WineStaging.gecko +flatpak build-bundle repo WineStaging9.15.flatpak org.winehq.WineStaging stable-23.08 +flatpak build-bundle --runtime repo WineStaging.mono9.2.0.flatpak org.winehq.WineStaging.mono stable-23.08 +flatpak build-bundle --runtime repo WineStaging.gecko2.47.4.flatpak org.winehq.WineStaging.gecko stable-23.08 \ No newline at end of file diff --git a/README.md b/README.md index 39d395d..ec27c95 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # WineStaging, WineStaging.mono, and WineStaging.gecko Flatpaks ## Installing -- Download WineStaging9.14.flatpak, WineStaging.mono9.2.0.flatpak, and WineStaging.gecko2.47.4.flatpak from releases -- Install WineStaging9.14.flatpak, WineStaging.mono9.2.0.flatpak, and WineStaging.gecko2.47.4.flatpak (sudo needed for installing single use Flatpak bundle) +- Download WineStaging9.15.flatpak, WineStaging.mono9.2.0.flatpak, and WineStaging.gecko2.47.4.flatpak from releases +- Install WineStaging9.15.flatpak, WineStaging.mono9.2.0.flatpak, and WineStaging.gecko2.47.4.flatpak (sudo needed for installing single use Flatpak bundle) ```console -sudo flatpak install WineStaging9.14.flatpak +sudo flatpak install WineStaging9.15.flatpak ``` ```console sudo flatpak install WineStaging.mono9.2.0.flatpak @@ -49,7 +49,7 @@ flatpak run org.flatpak.Builder --force-clean --repo=repo --user --install build ## Building single use Flatpak bundles like in the releases (After having followed the Building steps above) - Build the Flatpak bundles (Run this from within the org.winehq.WineStaging directory after having followed the Building steps above) ```console -flatpak build-bundle repo WineStaging9.14.flatpak org.winehq.WineStaging stable-23.08 +flatpak build-bundle repo WineStaging9.15.flatpak org.winehq.WineStaging stable-23.08 ``` ```console flatpak build-bundle --runtime repo WineStaging.mono9.2.0.flatpak org.winehq.WineStaging.mono stable-23.08 diff --git a/org.winehq.WineStaging.appdata.xml b/org.winehq.WineStaging.appdata.xml index cf9cba6..61a295c 100644 --- a/org.winehq.WineStaging.appdata.xml +++ b/org.winehq.WineStaging.appdata.xml @@ -56,6 +56,7 @@ + diff --git a/org.winehq.WineStaging.yml b/org.winehq.WineStaging.yml index dd92d3a..20899c1 100644 --- a/org.winehq.WineStaging.yml +++ b/org.winehq.WineStaging.yml @@ -387,8 +387,8 @@ modules: - INSTALL_PROGRAM_FLAGS=-s sources: &wine-sources - type: archive - url: https://dl.winehq.org/wine/source/9.x/wine-9.14.tar.xz - sha256: 24572f49cf3473fc9ef2a1ad1cddf511ce0ef43daa55413b4720a6c3e3c89ea6 + url: https://dl.winehq.org/wine/source/9.x/wine-9.15.tar.xz + sha256: 79adef436dd68ddbd70178670a3c23aa98e8afd5540ac0f42345894c458b78dd x-addons-url: &wine-addons-url >- https://source.winehq.org/git/wine.git/blob_plain/refs/heads/stable:/dlls/appwiz.cpl/addons.c x-checker-data: @@ -399,7 +399,7 @@ modules: is-main-source: true - type: git url: https://gitlab.winehq.org/wine/wine-staging - commit: a59a98678f9c5aa7491d20494394591ec480f217 + commit: 92374493ee7d657b198ca9db2f3ef32e3dc27a82 dest: wine-staging - type: shell commands: