From 35183caa31d74723a6a79d809b475247941925e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A8=D0=B0=D1=88=D0=BA=D0=B8=D0=BD=20=D0=9D=D0=B8=D0=BA?= =?UTF-8?q?=D0=BE=D0=BB=D0=B0=D0=B9?= Date: Tue, 31 Oct 2023 12:12:58 +0300 Subject: [PATCH] playonlinux updated --- app-emulation/playonlinux/Manifest | 2 +- .../files/playonlinux-4.4-python.patch | 110 ------------------ ....4-r2.ebuild => playonlinux-4.4-r4.ebuild} | 9 +- profiles/desktop/package.use | 1 - 4 files changed, 5 insertions(+), 117 deletions(-) delete mode 100644 app-emulation/playonlinux/files/playonlinux-4.4-python.patch rename app-emulation/playonlinux/{playonlinux-4.4-r2.ebuild => playonlinux-4.4-r4.ebuild} (94%) diff --git a/app-emulation/playonlinux/Manifest b/app-emulation/playonlinux/Manifest index 08c2fccb..180d298c 100644 --- a/app-emulation/playonlinux/Manifest +++ b/app-emulation/playonlinux/Manifest @@ -1 +1 @@ -DIST PlayOnLinux_4.4.tar.gz 3103240 SHA256 aaeedec5249df3ffd56cd8b3e3e06ea7117828ffc868eb2653d232c48e488058 SHA512 31b89106d55f9fccad526a83958a9e54973a659d9463fc0a8911935712eeb6bd7c07254a5163350bd746518658a46bd5d602c551e7387e38184e3a0782f80d12 WHIRLPOOL 5f2bc9daf0460ffc56e4da5382d8047a77f39f4bf13dac84171a69ee26952dbb21568ca3e091d14cf8e50da614821440260a2a401b52799fac05c4b2b3c964ae +DIST PlayOnLinux_4.4.tar.gz 3103240 BLAKE2B fa74dab52c45304bdc963b4d5019748c52dfb51ee6baf910419567338cc4f4bb83ed735c906dc837764b211bf4c642dd160072b5d72c600563586fab2e0362d5 SHA512 31b89106d55f9fccad526a83958a9e54973a659d9463fc0a8911935712eeb6bd7c07254a5163350bd746518658a46bd5d602c551e7387e38184e3a0782f80d12 diff --git a/app-emulation/playonlinux/files/playonlinux-4.4-python.patch b/app-emulation/playonlinux/files/playonlinux-4.4-python.patch deleted file mode 100644 index f1201a5e..00000000 --- a/app-emulation/playonlinux/files/playonlinux-4.4-python.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/python/mainwindow.py -+++ b/python/mainwindow.py -@@ -240,7 +240,6 @@ - - ## List game - self.list_game = wx.TreeCtrl(self, 105, style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT) -- self.list_game.SetSpacing(0) - self.list_game.SetIndent(5) - self.list_game.SetImageList(self.images) - self.menu_gauche = wx.Panel(self, -1) - ---- a/python/install/InstallWindow.py -+++ b/python/install/InstallWindow.py -@@ -183,7 +183,6 @@ - self.appsList = wx.TreeCtrl(self.appNavigationPanel, 106, - style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders) - self.appsList.SetImageList(self.imagesapps) -- self.appsList.SetSpacing(0) - - self.appNavigationSizer.AddSpacer(10) - self.appNavigationSizer.Add(self.appsList, 4, wx.EXPAND, 5) - ---- a/python/setupwindow/POL_SetupFrame.py -+++ b/python/setupwindow/POL_SetupFrame.py -@@ -212,7 +212,6 @@ - style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders, - pos=(25, 25), size=(460, 220)) - self.MenuGames.SetImageList(self.images) -- self.MenuGames.SetSpacing(0) - - # Login - ---- a/python/debug.py -+++ b/python/debug.py -@@ -60,7 +60,6 @@ - self.Bind(wx.EVT_TREE_SEL_CHANGED, self.analyseLog, id=900) - - -- self.list_game.SetSpacing(0); - self.list_game.SetImageList(self.images) - - ---- a/python/wine_versions/WineVersionsNotebook.py -+++ b/python/wine_versions/WineVersionsNotebook.py -@@ -39,7 +39,6 @@ - self.installedWineVersionsTreeSelector[arch] = wx.TreeCtrl(installedWineVersionsPanel, 107 + self.calculateEventDelta(arch), - style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders) - self.installedWineVersionsTreeSelector[arch].SetImageList(self.imagesapps_i[arch]) -- self.installedWineVersionsTreeSelector[arch].SetSpacing(0) - installedWineVersionsSizer.Add(self.installedWineVersionsTreeSelector[arch], 1, wx.EXPAND) - installedWineVersionsSizer.AddSpacer(10) - - ---- a/python/wine_versions/WineVersionsNotebook.py -+++ b/python/wine_versions/WineVersionsNotebook.py -@@ -55,7 +54,6 @@ - style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders, - size=(320, 300), pos=(10, 35)) - self.availableWineVersionsTreeSelector[arch].SetImageList(self.imagesapps[arch]) -- self.availableWineVersionsTreeSelector[arch].SetSpacing(0) - availableWineVersionsSizer.Add(self.availableWineVersionsTreeSelector[arch], 1, wx.EXPAND) - availableWineVersionsSizer.AddSpacer(10) - - ---- a/python/options.py -+++ b/python/options.py -@@ -187,7 +187,6 @@ - self.txtPlugin = wx.StaticText(self.panelPlugins, -1, _("Installed plugins"), size=wx.DefaultSize) - self.txtPlugin.SetFont(self.fontTitle) - self.pluginlist = wx.TreeCtrl(self.panelPlugins, 220, style=Variables.widget_borders|wx.TR_HIDE_ROOT|wx.TR_FULL_ROW_HIGHLIGHT) -- self.pluginlist.SetSpacing(0) - - self.pluginImgList = wx.ImageList(16,16) - ---- a/python/configurewindow/ConfigureWindowNotebook.py -+++ b/python/configurewindow/ConfigureWindowNotebook.py -@@ -269,7 +269,6 @@ - - self.Menu = wx.TreeCtrl(self.panelPackages, 99, pos=(15, 75), size=(530, 260), - style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders) -- self.Menu.SetSpacing(0); - self.Menu.SetImageList(self.imagePackages) - self.imagePackages.RemoveAll() - ---- a/python/configurewindow/ConfigureWindow.py -+++ b/python/configurewindow/ConfigureWindow.py -@@ -75,7 +75,6 @@ - self.Bind(wx.EVT_BUTTON, self.DeletePrefix, id=1002) - - -- self.list_game.SetSpacing(0) - self.list_game.SetImageList(self.images) - - ---- a/python/lib/playonlinux.py -+++ b/python/lib/playonlinux.py -@@ -278,11 +278,11 @@ - else: - return False - -- version1 = [ int(digit) for digit in version1[0].split(".") ] -+ version1 = [ int(digit if digit.isdecimal() else 0) for digit in version1[0].split(".") ] - while len(version1) < 3: - version1.append(0) - -- version2 = [ int(digit) for digit in version2[0].split(".") ] -+ version2 = [ int(digit if digit.isdecimal() else 0) for digit in version2[0].split(".") ] - while len(version2) < 3: - version2.append(0) - diff --git a/app-emulation/playonlinux/playonlinux-4.4-r2.ebuild b/app-emulation/playonlinux/playonlinux-4.4-r4.ebuild similarity index 94% rename from app-emulation/playonlinux/playonlinux-4.4-r2.ebuild rename to app-emulation/playonlinux/playonlinux-4.4-r4.ebuild index b55c6854..fa4a8fae 100644 --- a/app-emulation/playonlinux/playonlinux-4.4-r2.ebuild +++ b/app-emulation/playonlinux/playonlinux-4.4-r4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{10..11} ) -inherit desktop python-single-r1 xdg +inherit desktop python-single-r1 wrapper xdg MY_PN="PlayOnLinux" @@ -54,7 +54,6 @@ PATCHES=( "${FILESDIR}/${PN}-4.2.4-pol-bash.patch" "${FILESDIR}/${PN}-4.2.4-binary-plugin.patch" "${FILESDIR}/${PN}-4.2.6-stop-update-warning.patch" - "${FILESDIR}/${PN}-4.4-python.patch" ) src_prepare() { diff --git a/profiles/desktop/package.use b/profiles/desktop/package.use index a5f45698..65f1eef8 100644 --- a/profiles/desktop/package.use +++ b/profiles/desktop/package.use @@ -7,7 +7,6 @@ app-crypt/qca gpg app-editors/gvim cscope gtk python app-editors/vim cscope perl python vim-pager app-emulation/fuse -alsa joystick -app-emulation/playonlinux python_single_target_python3_10 app-emulation/qemu spice virgl app-emulation/wine-staging gstreamer openal prelink vaapi app-emulation/wine-vanilla gstreamer openal prelink