From a3f59aa77b40d72bc24a305f7355d69b1fd430a2 Mon Sep 17 00:00:00 2001 From: triallax Date: Sat, 12 Aug 2023 21:47:47 +0100 Subject: [PATCH] playonlinux: update to 4.4. --- srcpkgs/playonlinux/patches/60.patch | 263 +++++++++++++++++++++++++++ srcpkgs/playonlinux/template | 16 +- 2 files changed, 271 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/playonlinux/patches/60.patch diff --git a/srcpkgs/playonlinux/patches/60.patch b/srcpkgs/playonlinux/patches/60.patch new file mode 100644 index 0000000000000..4de58600b916e --- /dev/null +++ b/srcpkgs/playonlinux/patches/60.patch @@ -0,0 +1,263 @@ +From 788fad16eff4904193e4e9c52b23672535a23c33 Mon Sep 17 00:00:00 2001 +From: Gilles +Date: Sat, 30 May 2020 11:19:35 +0200 +Subject: [PATCH 1/4] Removing SetSpacing funtion + +--- +Upstream PR: https://github.com/PlayOnLinux/POL-POM-4/pull/60 + + python/configurewindow/ConfigureWindow.py | 2 +- + python/configurewindow/ConfigureWindowNotebook.py | 2 +- + python/debug.py | 2 +- + python/install/InstallWindow.py | 2 +- + python/mainwindow.py | 2 +- + python/options.py | 2 +- + python/setupwindow/POL_SetupFrame.py | 2 +- + python/wine_versions/WineVersionsNotebook.py | 4 ++-- + 8 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/python/configurewindow/ConfigureWindow.py b/python/configurewindow/ConfigureWindow.py +index 30f779db1..a26321437 100755 +--- a/python/configurewindow/ConfigureWindow.py ++++ b/python/configurewindow/ConfigureWindow.py +@@ -75,7 +75,7 @@ def __init__(self,parent,id,title,shortcut, isPrefix = False): + self.Bind(wx.EVT_BUTTON, self.DeletePrefix, id=1002) + + +- self.list_game.SetSpacing(0) ++ #self.list_game.SetSpacing(0) + self.list_game.SetImageList(self.images) + + +diff --git a/python/configurewindow/ConfigureWindowNotebook.py b/python/configurewindow/ConfigureWindowNotebook.py +index 8b4e387ea..973d9bbd3 100644 +--- a/python/configurewindow/ConfigureWindowNotebook.py ++++ b/python/configurewindow/ConfigureWindowNotebook.py +@@ -269,7 +269,7 @@ def Packages(self, nom): + + 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.SetSpacing(0); + self.Menu.SetImageList(self.imagePackages) + self.imagePackages.RemoveAll() + +diff --git a/python/debug.py b/python/debug.py +index 0221e89c0..43e8cf021 100755 +--- a/python/debug.py ++++ b/python/debug.py +@@ -60,7 +60,7 @@ def __init__(self,parent,id,title,logcheck="/dev/null",logtype=None): + self.Bind(wx.EVT_TREE_SEL_CHANGED, self.analyseLog, id=900) + + +- self.list_game.SetSpacing(0); ++ #self.list_game.SetSpacing(0); + self.list_game.SetImageList(self.images) + + +diff --git a/python/install/InstallWindow.py b/python/install/InstallWindow.py +index 27a6b51a5..5b584774d 100755 +--- a/python/install/InstallWindow.py ++++ b/python/install/InstallWindow.py +@@ -183,7 +183,7 @@ def _createAppNavigation(self): + 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.appsList.SetSpacing(0) + + self.appNavigationSizer.AddSpacer(10) + self.appNavigationSizer.Add(self.appsList, 4, wx.EXPAND, 5) +diff --git a/python/mainwindow.py b/python/mainwindow.py +index 7c21142df..8df1ff14b 100755 +--- a/python/mainwindow.py ++++ b/python/mainwindow.py +@@ -240,7 +240,7 @@ def __init__(self, parent, id, title): + + ## 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.SetSpacing(0) + self.list_game.SetIndent(5) + self.list_game.SetImageList(self.images) + self.menu_gauche = wx.Panel(self, -1) +diff --git a/python/options.py b/python/options.py +index a54c11000..723073ce4 100755 +--- a/python/options.py ++++ b/python/options.py +@@ -187,7 +187,7 @@ def Plugins(self, nom): + 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.pluginlist.SetSpacing(0) + + self.pluginImgList = wx.ImageList(16,16) + +diff --git a/python/setupwindow/POL_SetupFrame.py b/python/setupwindow/POL_SetupFrame.py +index 66bee8533..33d73d38a 100755 +--- a/python/setupwindow/POL_SetupFrame.py ++++ b/python/setupwindow/POL_SetupFrame.py +@@ -212,7 +212,7 @@ def _createUI(self): + 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) ++ #self.MenuGames.SetSpacing(0) + + # Login + self.login = wx.StaticText(self.contentPanel, -1, _("Login: "), pos=(20, 40), size=(460, 20)) +diff --git a/python/wine_versions/WineVersionsNotebook.py b/python/wine_versions/WineVersionsNotebook.py +index e088abeb2..ec5f12535 100644 +--- a/python/wine_versions/WineVersionsNotebook.py ++++ b/python/wine_versions/WineVersionsNotebook.py +@@ -39,7 +39,7 @@ def _createInstalledWineVersionsPanel(self, arch): + 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) ++ #self.installedWineVersionsTreeSelector[arch].SetSpacing(0) + installedWineVersionsSizer.Add(self.installedWineVersionsTreeSelector[arch], 1, wx.EXPAND) + installedWineVersionsSizer.AddSpacer(10) + +@@ -55,7 +55,7 @@ def _createAvailableWineVersionsPanel(self, arch): + 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) ++ #self.availableWineVersionsTreeSelector[arch].SetSpacing(0) + availableWineVersionsSizer.Add(self.availableWineVersionsTreeSelector[arch], 1, wx.EXPAND) + availableWineVersionsSizer.AddSpacer(10) + + +From 77a3ca3be293ebcafa2400703a5dd4079a5f200b Mon Sep 17 00:00:00 2001 +From: Gilles +Date: Sat, 30 May 2020 11:32:13 +0200 +Subject: [PATCH 2/4] Solving pluging manager issue (extension management) + +--- + python/options.py | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/python/options.py b/python/options.py +index 723073ce4..f40f26a70 100755 +--- a/python/options.py ++++ b/python/options.py +@@ -229,9 +229,9 @@ def generateExts(self): + line = line.replace("\n","") + line = line.split("=") + liner = "Line %s" % i +- self.list_ext.InsertStringItem(i, liner) +- self.list_ext.SetStringItem(i, 0, line[0]) +- self.list_ext.SetStringItem(i, 1, line[1]) ++ self.list_ext.InsertItem(i, liner) ++ self.list_ext.SetItem(i, 0, line[0]) ++ self.list_ext.SetItem(i, 1, line[1]) + i += 1 + self.app_installed_text.Hide() + self.app_installed.Hide() +@@ -249,8 +249,9 @@ def editExt(self, event): + self.app_installed.Show() + self.delete_ext.Show() + +- self.app_selected = self.exts[event.m_itemIndex].split("=")[1] +- self.ext_selected = self.exts[event.m_itemIndex].split("=")[0] ++ ind = event.GetIndex() ++ self.app_selected = self.list_ext.GetItem(ind,1).GetText() ++ self.ext_selected = self.list_ext.GetItem(ind,0).GetText() + + self.app_installed.SetValue(self.app_selected.replace("\n","").replace("\r","")) + + +From a656f5b2bdd23375e3d9547a9c38ccf99e2dc670 Mon Sep 17 00:00:00 2001 +From: Gilles +Date: Sat, 30 May 2020 14:34:28 +0200 +Subject: [PATCH 3/4] Solving different issue on debug window + +--- + python/debug.py | 7 ++++--- + python/lib/Variables.py | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/python/debug.py b/python/debug.py +index 43e8cf021..1e344edc8 100755 +--- a/python/debug.py ++++ b/python/debug.py +@@ -38,7 +38,7 @@ def __init__(self,parent,id,title,logcheck="/dev/null",logtype=None): + + wx.Frame.__init__(self, parent, -1, title, size = (810, 600+Variables.windows_add_size), style = wx.CLOSE_BOX | wx.CAPTION | wx.MINIMIZE_BOX) + self.SetIcon(wx.Icon(Variables.playonlinux_env+"/etc/playonlinux.png", wx.BITMAP_TYPE_ANY)) +- self.SetTitle(_('{0} debugger').format(os.environ["APPLICATION_TITLE"])) ++ self.SetTitle(title) + #self.panelFenp = wx.Panel(self, -1) + + self.prefixes_item = {} +@@ -79,7 +79,7 @@ def __init__(self,parent,id,title,logcheck="/dev/null",logtype=None): + self.log_reader = wx.TextCtrl(self.panelText, 100, "", size=wx.Size(590,500), pos=(2,2), style=Variables.widget_borders|wx.TE_RICH2|wx.TE_READONLY|wx.TE_MULTILINE) + self.log_reader.Bind(wx.EVT_SET_FOCUS, self.OnFocus) + self.openTextEdit = wx.Button(self.panelNotEmpty, 101, _("Locate this logfile"), size=(400,30), pos=(70,512)) +- self.reportProblem = wx.Button(self.panelNotEmpty, 102, "", size=(400,30), pos=(70,552)) ++ self.reportProblem = wx.Button(self.panelNotEmpty, 102, _("Bug report"), size=(400,30), pos=(70,552)) + + if(logcheck == "/dev/null"): + self.HideLogFile() +@@ -95,7 +95,8 @@ def bugReport(self, event): + new_env = os.environ + new_env["LOGTITLE"] = self.logname + subprocess.Popen(["bash", Variables.playonlinux_env+"/bash/bug_report"], env=new_env) +- self.reportProblem.Enable(False) ++ # Doesn't work if cancel on POL Window : need to find another way ... ++ #self.reportProblem.Enable(False) + + def locate(self, event): + if(self.logtype == 0): +diff --git a/python/lib/Variables.py b/python/lib/Variables.py +index 055fe17f9..8bed7601b 100755 +--- a/python/lib/Variables.py ++++ b/python/lib/Variables.py +@@ -51,7 +51,7 @@ + windows_add_size = 0 + windows_add_playonmac = 0 + else: +- windows_add_size = dpiFetcher().fetch_extra_pixel() ++ windows_add_size = dpiFetcher().fetch_extra_pixel()+60 + windows_add_playonmac = 0 + + widget_borders = wx.RAISED_BORDER + +From 02beab05d4255802c26db20a18787349e9b15bbc Mon Sep 17 00:00:00 2001 +From: Gilles +Date: Sat, 30 May 2020 15:17:33 +0200 +Subject: [PATCH 4/4] Solving small bugs + +--- + python/configurewindow/ConfigureWindowNotebook.py | 2 ++ + python/install/InstallWindow.py | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/python/configurewindow/ConfigureWindowNotebook.py b/python/configurewindow/ConfigureWindowNotebook.py +index 973d9bbd3..296443e66 100644 +--- a/python/configurewindow/ConfigureWindowNotebook.py ++++ b/python/configurewindow/ConfigureWindowNotebook.py +@@ -467,6 +467,8 @@ def misc_button(self, event): + self.FileDialog.ShowModal() + if (self.FileDialog.GetPath() != ""): + filename = self.FileDialog.GetPath() ++ if not os.path.isfile(filename): ++ return + dirname = os.path.dirname(filename) + if (self.s_isPrefix == True): + subprocess.Popen(["bash", Variables.playonlinux_env + "/bash/POL_Command", "--prefix", +diff --git a/python/install/InstallWindow.py b/python/install/InstallWindow.py +index 5b584774d..2e49e4a18 100755 +--- a/python/install/InstallWindow.py ++++ b/python/install/InstallWindow.py +@@ -333,7 +333,7 @@ def closeapp(self, event): + + def manual(self, event): + self.live = 1 +- self.installapp(self) ++ self.installapp(event) + + def showStars(self, stars): + starWidth = 20 diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template index 780e766509429..ee663b2987210 100644 --- a/srcpkgs/playonlinux/template +++ b/srcpkgs/playonlinux/template @@ -1,18 +1,18 @@ # Template file for 'playonlinux' pkgname=playonlinux -version=4.3.4 -revision=2 +version=4.4 +revision=1 # contains pre-compiled binaries linked against glibc archs="i686 x86_64" -depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo - gnupg xdg-user-dirs libXmu wget p7zip curl jq" +depends="icoutils netcat ImageMagick xterm wxPython4 cabextract unzip glxinfo + gnupg xdg-user-dirs libXmu wget p7zip curl jq python3-natsort xrdb gettext" short_desc="GUI for managing Windows programs under linux" maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="http://www.playonlinux.com" -distfiles="http://www.playonlinux.com/script_files/PlayOnLinux/${version/.0/}/PlayOnLinux_${version/.0/}.tar.gz" -checksum=17c3dfd27962ce5a7a0c014850b33188e203d008c9dc71faa230e35fcada2d05 -python_version=2 #unverified +distfiles="http://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz" +checksum=aaeedec5249df3ffd56cd8b3e3e06ea7117828ffc868eb2653d232c48e488058 +python_version=3 do_install() { vmkdir usr/share/$pkgname @@ -24,5 +24,5 @@ do_install() { chmod +x $DESTDIR/usr/bin/$pkgname vinstall etc/PlayOnLinux.desktop 644 usr/share/applications playonlinux.desktop - sed -i "s/ %F//g" $DESTDIR/usr/share/applications/playonlinux.desktop + vsed -i "s/ %F//g" $DESTDIR/usr/share/applications/playonlinux.desktop }