Accepting request 840118 from home:alois:branches:X11:Utilities

- Add 4pane-fix_for_wx3.1.4.patch

OBS-URL: https://build.opensuse.org/request/show/840118
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/4pane?expand=0&rev=16

4pane-fix_for_wx3.1.4.patch

@@ -0,0 +1,29 @@
+From 2143bc32c16e987619f06f9ff0159c0fcdebf924 Mon Sep 17 00:00:00 2001
+From: dghart <dghart@users.sourceforge.net>
+Date: Tue, 21 Jul 2020 15:54:13 +0100
+Subject: [PATCH] Compilation fix for wx3.1.4
+
+wxWidgets commit 1ec7ae changed two wxGenericTreeCtrl brushes to be objects, not pointers, which broke the copied code in MyTreeCtrl.
+---
+ MyTreeCtrl.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/MyTreeCtrl.cpp b/MyTreeCtrl.cpp
+index 5e692f4..48ace46 100644
+--- a/MyTreeCtrl.cpp
++++ b/MyTreeCtrl.cpp
+@@ -1438,7 +1438,11 @@ static const int NO_IMAGE = -1;                                  // //
+ 
+     if (item->IsSelected())
+     {
++#if wxVERSION_NUMBER < 3104
+         dc.SetBrush(*(m_hasFocus ? m_hilightBrush : m_hilightUnfocusedBrush));
++#else
++        dc.SetBrush(m_hasFocus ? m_hilightBrush : m_hilightUnfocusedBrush);
++#endif
+     }
+     else
+     {
+-- 
+2.28.0
+

4pane.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  7 17:56:47 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
+
+- Add 4pane-fix_for_wx3.1.4.patch
+
 -------------------------------------------------------------------
 Wed Oct  7 16:30:16 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
 

4pane.spec

@@ -24,10 +24,12 @@ Summary:        A multi-pane detailed-list file manager
 License:        GPL-3.0-only
 URL:            http://www.4pane.co.uk/
 Source0:        https://sourceforge.net/projects/fourpane/files/%{version}/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM 4pane-fix_for_wx3.1.4.patch
+Patch0:         4pane-fix_for_wx3.1.4.patch
 BuildRequires:  ImageMagick
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  wxWidgets-3_0-devel
+BuildRequires:  wxWidgets-devel >= 3.0
 BuildRequires:  pkgconfig(liblzma)
 
 %description
@@ -41,7 +43,7 @@ emulator and user-defined tools.
 %lang_package
 
 %prep
-%setup -q
+%autosetup
 sed -i -e "s|\$(datadir)/doc|%{_docdir}|g" Makefile.in
 sed -i -e "s|/usr/doc/4Pane/|%{_docdir}/4Pane/|g" Configure.cpp