From 1ea2affde47bd7d8c4bad51dbb2762f797c96d0d Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Wed, 23 Dec 2020 21:43:51 +0300 Subject: [PATCH] PlayOnLinux-4.4: fix Python errors. --- app-emulation/playonlinux/Manifest | 2 +- .../files/playonlinux-4.4-python.patch | 110 ++++++++++++++++++ .../playonlinux/playonlinux-4.4.ebuild | 1 + 3 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 app-emulation/playonlinux/files/playonlinux-4.4-python.patch diff --git a/app-emulation/playonlinux/Manifest b/app-emulation/playonlinux/Manifest index 180d298c..08c2fccb 100644 --- a/app-emulation/playonlinux/Manifest +++ b/app-emulation/playonlinux/Manifest @@ -1 +1 @@ -DIST PlayOnLinux_4.4.tar.gz 3103240 BLAKE2B fa74dab52c45304bdc963b4d5019748c52dfb51ee6baf910419567338cc4f4bb83ed735c906dc837764b211bf4c642dd160072b5d72c600563586fab2e0362d5 SHA512 31b89106d55f9fccad526a83958a9e54973a659d9463fc0a8911935712eeb6bd7c07254a5163350bd746518658a46bd5d602c551e7387e38184e3a0782f80d12 +DIST PlayOnLinux_4.4.tar.gz 3103240 SHA256 aaeedec5249df3ffd56cd8b3e3e06ea7117828ffc868eb2653d232c48e488058 SHA512 31b89106d55f9fccad526a83958a9e54973a659d9463fc0a8911935712eeb6bd7c07254a5163350bd746518658a46bd5d602c551e7387e38184e3a0782f80d12 WHIRLPOOL 5f2bc9daf0460ffc56e4da5382d8047a77f39f4bf13dac84171a69ee26952dbb21568ca3e091d14cf8e50da614821440260a2a401b52799fac05c4b2b3c964ae diff --git a/app-emulation/playonlinux/files/playonlinux-4.4-python.patch b/app-emulation/playonlinux/files/playonlinux-4.4-python.patch new file mode 100644 index 00000000..f1201a5e --- /dev/null +++ b/app-emulation/playonlinux/files/playonlinux-4.4-python.patch @@ -0,0 +1,110 @@ +--- 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.ebuild b/app-emulation/playonlinux/playonlinux-4.4.ebuild index d8d06074..d35293d0 100644 --- a/app-emulation/playonlinux/playonlinux-4.4.ebuild +++ b/app-emulation/playonlinux/playonlinux-4.4.ebuild @@ -54,6 +54,7 @@ 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() {