Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package Bottles for openSUSE:Factory checked
in at 2024-10-16 23:45:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Bottles (Old)
and /work/SRC/openSUSE:Factory/.Bottles.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Bottles"
Wed Oct 16 23:45:11 2024 rev:5 rq:1208179 version:51.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/Bottles/Bottles.changes 2024-10-13
17:34:28.692233478 +0200
+++ /work/SRC/openSUSE:Factory/.Bottles.new.19354/Bottles.changes
2024-10-16 23:46:14.563706069 +0200
@@ -1,0 +2,6 @@
+Tue Oct 15 10:04:49 UTC 2024 - Richard Rahl <rra...@opensuse.org>
+
+- update to 51.15:
+ * fix a bug, where win11 as on option was not shown
+
+-------------------------------------------------------------------
Old:
----
Bottles-51.14.tar.gz
New:
----
Bottles-51.15.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Bottles.spec ++++++
--- /var/tmp/diff_new_pack.DcvMVH/_old 2024-10-16 23:46:15.883761122 +0200
+++ /var/tmp/diff_new_pack.DcvMVH/_new 2024-10-16 23:46:15.887761289 +0200
@@ -18,7 +18,7 @@
%global appid com.usebottles.bottles
Name: Bottles
-Version: 51.14
+Version: 51.15
Release: 0
Summary: Easily manage wineprefix using environments
License: GPL-3.0-or-later
++++++ Bottles-51.14.tar.gz -> Bottles-51.15.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Bottles-51.14/VERSION new/Bottles-51.15/VERSION
--- old/Bottles-51.14/VERSION 2024-10-12 21:21:02.000000000 +0200
+++ new/Bottles-51.15/VERSION 2024-10-15 09:54:51.000000000 +0200
@@ -1 +1 @@
-51.14
+51.15
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Bottles-51.14/bottles/backend/managers/dependency.py
new/Bottles-51.15/bottles/backend/managers/dependency.py
--- old/Bottles-51.14/bottles/backend/managers/dependency.py 2024-10-12
21:21:02.000000000 +0200
+++ new/Bottles-51.15/bottles/backend/managers/dependency.py 2024-10-15
09:54:51.000000000 +0200
@@ -632,7 +632,7 @@
def __step_set_windows(config: BottleConfig, step: dict):
"""Set the Windows version."""
rk = RegKeys(config)
- rk.set_windows(step.get("version"))
+ rk.lg_set_windows(step.get("version"))
return True
@staticmethod
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Bottles-51.14/bottles/backend/managers/manager.py
new/Bottles-51.15/bottles/backend/managers/manager.py
--- old/Bottles-51.14/bottles/backend/managers/manager.py 2024-10-12
21:21:02.000000000 +0200
+++ new/Bottles-51.15/bottles/backend/managers/manager.py 2024-10-15
09:54:51.000000000 +0200
@@ -819,7 +819,7 @@
def process_bottle(bottle):
_name = bottle
- _bottle = os.path.join(Paths.bottles, bottle)
+ _bottle = str(os.path.join(Paths.bottles, bottle))
_placeholder = os.path.join(_bottle, "placeholder.yml")
_config = os.path.join(_bottle, "bottle.yml")
@@ -852,7 +852,7 @@
# Check if the path in the bottle config corresponds to the folder
name
# if not, change the config to reflect the folder name
- # if the folder name is "illegal" accross all platforms, rename
the folder
+ # if the folder name is "illegal" across all platforms, rename the
folder
# "universal" platform works for all filesystem/OSes
sane_name = pathvalidate.sanitize_filepath(_name,
platform="universal")
@@ -864,7 +864,9 @@
if sane_name != _name:
# This hopefully doesn't happen, but it's managed
logging.warning(f"Broken path in bottle {_name},
fixing...")
- shutil.move(_bottle, os.path.join(Paths.bottles,
sane_name))
+ shutil.move(
+ _bottle, str(os.path.join(Paths.bottles,
sane_name))
+ )
# Restart the process bottle function. Normally, can't
be recursive!
process_bottle(sane_name)
return
@@ -1112,8 +1114,7 @@
res = self.dependency_manager.install(config, dep)
if not res.ok:
logging.error(
- _("Failed to install dependency: %s")
- % dep.get("Description", "n/a"),
+ _("Failed to install dependency: %s") % dependency,
jn=True,
)
return False
@@ -1364,7 +1365,7 @@
if (
"soda" not in runner_name.lower() and "caffe" not in
runner_name.lower()
): # Caffe/Soda came with win10 by default
- rk.set_windows(config.Windows)
+ rk.lg_set_windows(config.Windows)
wineboot.update()
FileUtils.wait_for_files(reg_files)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Bottles-51.14/bottles/backend/wine/catalogs.py
new/Bottles-51.15/bottles/backend/wine/catalogs.py
--- old/Bottles-51.14/bottles/backend/wine/catalogs.py 2024-10-12
21:21:02.000000000 +0200
+++ new/Bottles-51.15/bottles/backend/wine/catalogs.py 2024-10-15
09:54:51.000000000 +0200
@@ -4,7 +4,7 @@
"CSDVersionHex": "0",
"CurrentBuild": "22000",
"CurrentBuildNumber": "22000",
- "CurrentVersion": "10.0",
+ "CurrentVersion": "6.3",
"CurrentMinorVersionNumber": "0",
"CurrentMajorVersionNumber": "a", # 10
"ProductType": "WinNT",
@@ -13,9 +13,9 @@
"win10": {
"CSDVersion": "",
"CSDVersionHex": "0",
- "CurrentBuild": "17763",
- "CurrentBuildNumber": "17763",
- "CurrentVersion": "10.0",
+ "CurrentBuild": "19043",
+ "CurrentBuildNumber": "19043",
+ "CurrentVersion": "6.3",
"CurrentMinorVersionNumber": "0",
"CurrentMajorVersionNumber": "a", # 10
"ProductType": "WinNT",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Bottles-51.14/bottles/backend/wine/regkeys.py
new/Bottles-51.15/bottles/backend/wine/regkeys.py
--- old/Bottles-51.14/bottles/backend/wine/regkeys.py 2024-10-12
21:21:02.000000000 +0200
+++ new/Bottles-51.15/bottles/backend/wine/regkeys.py 2024-10-15
09:54:51.000000000 +0200
@@ -4,6 +4,7 @@
from bottles.backend.wine.catalogs import win_versions
from bottles.backend.wine.reg import Reg
from bottles.backend.wine.wineboot import WineBoot
+from bottles.backend.wine.winecfg import WineCfg
logging = Logger()
@@ -14,6 +15,16 @@
self.config = config
self.reg = Reg(self.config)
+ def lg_set_windows(self, version: str):
+ """
+ Legacy method to change Windows version in a bottle using
+ the Wine Configuration tool.
+ """
+ winecfg = WineCfg(self.config)
+ res = winecfg.set_windows_version(version)
+ if not res.ok:
+ raise ValueError(f"Failed to set Windows version to {version}")
+
def set_windows(self, version: str):
"""
Change Windows version in a bottle from the given
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Bottles-51.14/bottles/backend/wine/winecfg.py
new/Bottles-51.15/bottles/backend/wine/winecfg.py
--- old/Bottles-51.14/bottles/backend/wine/winecfg.py 2024-10-12
21:21:02.000000000 +0200
+++ new/Bottles-51.15/bottles/backend/wine/winecfg.py 2024-10-15
09:54:51.000000000 +0200
@@ -1,5 +1,10 @@
+import os
+import time
+
from bottles.backend.logger import Logger
from bottles.backend.wine.wineprogram import WineProgram
+from bottles.backend.wine.winedbg import WineDbg
+from bottles.backend.wine.wineboot import WineBoot
logging = Logger()
@@ -7,3 +12,26 @@
class WineCfg(WineProgram):
program = "Wine Configuration"
command = "winecfg"
+
+ def set_windows_version(self, version):
+ logging.info(f"Setting Windows version to {version}")
+
+ winedbg = WineDbg(self.config)
+ wineboot = WineBoot(self.config)
+
+ wineboot.kill()
+
+ res = self.launch(
+ args=f"-v {version}",
+ communicate=True,
+ environment={
+ "DISPLAY": os.environ.get("DISPLAY", ":0"),
+ "WAYLAND_DISPLAY": os.environ.get("WAYLAND_DISPLAY", ""),
+ },
+ action_name="set_windows_version",
+ )
+
+ winedbg.wait_for_process("winecfg")
+ wineboot.restart()
+
+ return res
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Bottles-51.14/bottles/backend/wine/wineprogram.py
new/Bottles-51.15/bottles/backend/wine/wineprogram.py
--- old/Bottles-51.14/bottles/backend/wine/wineprogram.py 2024-10-12
21:21:02.000000000 +0200
+++ new/Bottles-51.15/bottles/backend/wine/wineprogram.py 2024-10-15
09:54:51.000000000 +0200
@@ -74,7 +74,10 @@
post_script=post_script,
cwd=cwd,
arguments=program_args,
- ).run()
+ )
+
+ # logging.info("Executing command:", res.command)
+ res = res.run()
return res
def launch_terminal(self, args: Optional[str] = None):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Bottles-51.14/bottles/frontend/cli/cli.py
new/Bottles-51.15/bottles/frontend/cli/cli.py
--- old/Bottles-51.14/bottles/frontend/cli/cli.py 2024-10-12
21:21:02.000000000 +0200
+++ new/Bottles-51.15/bottles/frontend/cli/cli.py 2024-10-15
09:54:51.000000000 +0200
@@ -551,7 +551,7 @@
mng.update_config(bottle, k, v, scope="Environment_Variables")
if _win is not None:
- RegKeys(bottle).set_windows(_win)
+ RegKeys(bottle).lg_set_windows(_win)
if _runner is not None:
Runner.runner_update(bottle, mng, _runner)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Bottles-51.14/bottles/frontend/views/bottle_preferences.py
new/Bottles-51.15/bottles/frontend/views/bottle_preferences.py
--- old/Bottles-51.14/bottles/frontend/views/bottle_preferences.py
2024-10-12 21:21:02.000000000 +0200
+++ new/Bottles-51.15/bottles/frontend/views/bottle_preferences.py
2024-10-15 09:54:51.000000000 +0200
@@ -471,6 +471,7 @@
# versions in the current structure, we will fix this in the future
# with the new Bottles Backend.
self.windows_versions = {
+ "win11": "Windows 11",
"win10": "Windows 10",
"win81": "Windows 8.1",
"win8": "Windows 8",
@@ -1007,7 +1008,7 @@
config=self.config, key="Windows", value=windows_version
).data["config"]
- RunAsync(rk.set_windows, callback=update,
version=windows_version)
+ RunAsync(rk.lg_set_windows, callback=update,
version=windows_version)
break
def __set_language(self, *_args):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Bottles-51.14/data/com.usebottles.bottles.metainfo.xml.in
new/Bottles-51.15/data/com.usebottles.bottles.metainfo.xml.in
--- old/Bottles-51.14/data/com.usebottles.bottles.metainfo.xml.in
2024-10-12 21:21:02.000000000 +0200
+++ new/Bottles-51.15/data/com.usebottles.bottles.metainfo.xml.in
2024-10-15 09:54:51.000000000 +0200
@@ -67,6 +67,11 @@
<display_length compare="ge">768</display_length>
</requires>
<releases>
+ <release version="51.15" date="2024-10-14">
+ <description translatable="no">
+ <p>Fixed a bug where the "win11" option was not available</p>
+ </description>
+ </release>
<release version="51.14" date="2024-10-12">
<description translatable="no">
<p>New "Native" Force Stop all Processes option</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Bottles-51.14/meson.build
new/Bottles-51.15/meson.build
--- old/Bottles-51.14/meson.build 2024-10-12 21:21:02.000000000 +0200
+++ new/Bottles-51.15/meson.build 2024-10-15 09:54:51.000000000 +0200
@@ -1,6 +1,6 @@
project(
'bottles',
- version: '51.14',
+ version: '51.15',
meson_version: '>= 0.59.0',
default_options: [
'warning_level=2',
