From 14aa68390212c9ae0e8e17ec7900fa93aba1de88 Mon Sep 17 00:00:00 2001
From: alois <>
Date: Oct 08 2020 15:36:17 +0000
Subject: Update 4pane to rev 6 via SR 840119


https://build.opensuse.org/request/show/840119
by user alois + dimstar_suse
- Add 4pane-fix_for_wx3.1.4.patch
- Fix Factory build

---

diff --git a/.files b/.files
index 8dd68a2..319df65 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 0e2c30a..8f0df8b 100644
--- a/.rev
+++ b/.rev
@@ -39,4 +39,14 @@
     <comment></comment>
     <requestid>789332</requestid>
   </revision>
+  <revision rev="6" vrev="2">
+    <srcmd5>1a1a6478c981105a7ae22c4bd3929d24</srcmd5>
+    <version>6.0</version>
+    <time>1602155617</time>
+    <user>dimstar_suse</user>
+    <comment>- Add 4pane-fix_for_wx3.1.4.patch
+- Fix Factory build
+</comment>
+    <requestid>840119</requestid>
+  </revision>
 </revisionlist>
diff --git a/4pane-fix_for_wx3.1.4.patch b/4pane-fix_for_wx3.1.4.patch
new file mode 100644
index 0000000..c843911
--- /dev/null
+++ b/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
+
diff --git a/4pane.changes b/4pane.changes
index 8a55252..999554f 100644
--- a/4pane.changes
+++ b/4pane.changes
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+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>
+
+- Fix Factory build
+
+-------------------------------------------------------------------
 Sat Mar 28 15:10:58 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
 
 - Update to version 6.0
diff --git a/4pane.spec b/4pane.spec
index f6d4575..4d6d0b8 100644
--- a/4pane.spec
+++ b/4pane.spec
@@ -24,17 +24,13 @@ 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
-%if 0%{?is_opensuse}
-BuildRequires:  wxWidgets-devel >= 3
-%else
-BuildRequires:  wxWidgets_3.0-devel
-%define _use_internal_dependency_generator 0
-%define __find_requires %wx_requires
-%endif
+# 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:  xz-devel
+BuildRequires:  wxWidgets-devel >= 3.0
+BuildRequires:  pkgconfig(liblzma)
 
 %description
 4Pane is a multi-pane detailed-list file manager.
@@ -47,16 +43,16 @@ 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
 
 %build
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 %find_lang 4Pane
 mkdir -vp %{buildroot}/%{_datadir}/applications
 cd %{buildroot}/%{_datadir}/applications