diff options
| author | lotation | 2025-03-25 19:08:12 +0100 |
|---|---|---|
| committer | lotation | 2025-03-25 19:08:12 +0100 |
| commit | 086093942c39ad178399c65fbe082756e113c49a (patch) | |
| tree | 2f117c923c5caf891650e3f782ec2f3ffeebeabf | |
| parent | 30097f8db8c054d582591482c99b0c448f751baf (diff) | |
| download | aur-086093942c39ad178399c65fbe082756e113c49a.tar.gz | |
updated bottles to latest version
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | disable-flatpak-check.patch | 77 |
3 files changed, 86 insertions, 23 deletions
@@ -1,7 +1,7 @@ pkgbase = bottles pkgdesc = Easily manage wine and proton prefix - pkgver = 51.17 - pkgrel = 2 + pkgver = 51.21 + pkgrel = 1 epoch = 2 url = https://github.com/bottlesdevs/Bottles arch = any @@ -43,11 +43,9 @@ pkgbase = bottles optdepends = vkd3d optdepends = vulkan-icd-loader optdepends = wine - source = Bottles-51.17.tar.gz::https://github.com/bottlesdevs/Bottles/archive/refs/tags/51.17.tar.gz - source = allow-non-flatpak.patch + source = Bottles-51.21.tar.gz::https://github.com/bottlesdevs/Bottles/archive/refs/tags/51.21.tar.gz source = disable-flatpak-check.patch - sha256sums = f0fdb62e2093206e46f9ceda94726927fc28436e253c89be3e0c248c975baf91 - sha256sums = 51e33e3227db9d42162df32bd6f77f318b34aac50192ded9c2399188efc636af - sha256sums = 013a88ff60d66a011f3c2c0e4b8d01a25d24b2cca52695737f34d4fd09ac3010 + sha256sums = 3a5653464839d5dbe36d44eabb823d422421897325f3c7944cddc9475575869d + sha256sums = eec371407a6a8cc196330e68535e15a1332c31e38f47eb1891be1cf754d76802 pkgname = bottles @@ -3,8 +3,8 @@ pkgname=bottles _pkgname=Bottles -pkgver=51.17 -pkgrel=2 +pkgver=51.21 +pkgrel=1 epoch=2 pkgdesc='Easily manage wine and proton prefix' arch=(any) @@ -55,23 +55,19 @@ makedepends=( ) source=( "${_pkgname}-${pkgver}.tar.gz::https://github.com/bottlesdevs/Bottles/archive/refs/tags/${pkgver}.tar.gz" - allow-non-flatpak.patch disable-flatpak-check.patch ) sha256sums=( - f0fdb62e2093206e46f9ceda94726927fc28436e253c89be3e0c248c975baf91 - 51e33e3227db9d42162df32bd6f77f318b34aac50192ded9c2399188efc636af - 013a88ff60d66a011f3c2c0e4b8d01a25d24b2cca52695737f34d4fd09ac3010 + 3a5653464839d5dbe36d44eabb823d422421897325f3c7944cddc9475575869d + eec371407a6a8cc196330e68535e15a1332c31e38f47eb1891be1cf754d76802 ) prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" + patch --forward --directory="${srcdir}/${_pkgname}-${pkgver}" --strip=1 --input="${srcdir}/disable-flatpak-check.patch" + # cd "${srcdir}/${_pkgname}-${pkgver}" - # Disable check for the .flatpak-info file - patch -Np1 -i ../allow-non-flatpak.patch - - # Fix warning about needed sandbox environment - patch -Np1 -i ../disable-flatpak-check.patch + # Fix warning about flatpak and sandbox environment + # patch -Np0 -i ../disable-flatpak-check.patch } build() { diff --git a/disable-flatpak-check.patch b/disable-flatpak-check.patch index cdeb0b0c385b..4cbc6c2b8efd 100644 --- a/disable-flatpak-check.patch +++ b/disable-flatpak-check.patch @@ -1,8 +1,12 @@ ---- Bottles-51.17-orig/bottles/frontend/meson.build 2024-12-16 15:51:36.698984715 +0100 -+++ Bottles-51.17/bottles/frontend/meson.build 2024-12-16 15:52:01.939748363 +0100 -@@ -25,9 +25,9 @@ +diff --unified --recursive --no-dereference Bottles-51.21-orig/bottles/frontend/meson.build Bottles-51.21/bottles/frontend/meson.build +--- Bottles-51.21-orig/bottles/frontend/meson.build 2025-03-17 04:14:40.000000000 +0100 ++++ Bottles-51.21/bottles/frontend/meson.build 2025-03-25 18:46:32.682909892 +0100 +@@ -23,11 +23,11 @@ + configuration: conf + ) - fs = import('fs') +-fs = import('fs') ++#fs = import('fs') -if not fs.is_file('/' + '.flatpak-info') - error('file does not exist') @@ -13,3 +17,68 @@ bottles_sources = [ '__init__.py', +diff --unified --recursive --no-dereference Bottles-51.21-orig/bottles/frontend/windows/window.py Bottles-51.21/bottles/frontend/windows/window.py +--- Bottles-51.21-orig/bottles/frontend/windows/window.py 2025-03-17 04:14:40.000000000 +0100 ++++ Bottles-51.21/bottles/frontend/windows/window.py 2025-03-25 18:46:42.483301689 +0100 +@@ -97,34 +97,34 @@ + manager = Adw.StyleManager.get_default() + manager.set_color_scheme(Adw.ColorScheme.FORCE_DARK) + +- # Be VERY explicit that non-sandboxed environments are unsupported +- if not Xdp.Portal.running_under_sandbox(): ++ # # Be VERY explicit that non-sandboxed environments are unsupported ++ # if not Xdp.Portal.running_under_sandbox(): + +- def response(dialog, response, *args): +- if response == "close": +- quit(1) +- +- body = _( +- "Bottles is only supported within a sandboxed environment. Official sources of Bottles are available at" +- ) +- download_url = "usebottles.com/download" +- +- error_dialog = Adw.AlertDialog.new( +- _("Unsupported Environment"), +- f"{body} <a href='https://{download_url}' title='https://{download_url}'>{download_url}.</a>", +- ) +- +- error_dialog.add_response("close", _("Close")) +- error_dialog.set_body_use_markup(True) +- error_dialog.connect("response", response) +- error_dialog.present(self) +- logging.error( +- _( +- "Bottles is only supported within a sandboxed format. Official sources of Bottles are available at:" +- ) +- ) +- logging.error("https://usebottles.com/download/") +- return ++ # def response(dialog, response, *args): ++ # if response == "close": ++ # quit(1) ++ ++ # body = _( ++ # "Bottles is only supported within a sandboxed environment. Official sources of Bottles are available at" ++ # ) ++ # download_url = "usebottles.com/download" ++ ++ # error_dialog = Adw.AlertDialog.new( ++ # _("Unsupported Environment"), ++ # f"{body} <a href='https://{download_url}' title='https://{download_url}'>{download_url}.</a>", ++ # ) ++ ++ # error_dialog.add_response("close", _("Close")) ++ # error_dialog.set_body_use_markup(True) ++ # error_dialog.connect("response", response) ++ # error_dialog.present(self) ++ # logging.error( ++ # _( ++ # "Bottles is only supported within a sandboxed format. Official sources of Bottles are available at:" ++ # ) ++ # ) ++ # logging.error("https://usebottles.com/download/") ++ # return + + # Loading view + self.page_loading = LoadingView() |