From 7e9bfd71caeaaa9a6c5809cea700c108d949430c Mon Sep 17 00:00:00 2001
From: alois <>
Date: Dec 07 2020 14:01:09 +0000
Subject: Update 4pane to version 7.0 / rev 7 via SR 853512


https://build.opensuse.org/request/show/853512
by user alois + dimstar_suse

---

diff --git a/.files b/.files
index 319df65..0fea3d6 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 8f0df8b..7ae32a2 100644
--- a/.rev
+++ b/.rev
@@ -49,4 +49,12 @@
 </comment>
     <requestid>840119</requestid>
   </revision>
+  <revision rev="7" vrev="1">
+    <srcmd5>ceddf795dae9092ac01d49eca3eea000</srcmd5>
+    <version>7.0</version>
+    <time>1607349639</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>853512</requestid>
+  </revision>
 </revisionlist>
diff --git a/4pane-6.0.tar.gz b/4pane-6.0.tar.gz
deleted file mode 120000
index 2c0900c..0000000
--- a/4pane-6.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeicwbl5iae7kjd2ljkolzis4acjz7yre3ckiv5kug2mekjrfdcufga
\ No newline at end of file
diff --git a/4pane-7.0.tar.gz b/4pane-7.0.tar.gz
new file mode 120000
index 0000000..0ee4202
--- /dev/null
+++ b/4pane-7.0.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeiedm7o3e2ukwipqqo3iw7drxsigoyzd4yswk6ve22zly2w23kk5sq
\ No newline at end of file
diff --git a/4pane-fix_for_wx3.1.4.patch b/4pane-fix_for_wx3.1.4.patch
deleted file mode 100644
index c843911..0000000
--- a/4pane-fix_for_wx3.1.4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 999554f..b257932 100644
--- a/4pane.changes
+++ b/4pane.changes
@@ -1,4 +1,19 @@
 -------------------------------------------------------------------
+Mon Dec  7 07:17:47 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 7.0
+  * Added support for GIO mounts
+    + Recent distro versions use GIO to mount some usb devices
+      inside /run/user/<id>/gvfs/
+      4Pane now looks there for automounted DVDs, cameras and
+      smart devices e.g. android phones, and adds a toolbar
+      button for each, just as would happen for a usb flash
+      drive.
+  * Improvements to the QuickFind dialog
+  * Compilation fix for >=wxWidgets 3.1.4
+- Drop 4pane-fix_for_wx3.1.4.patch (merged upstream)
+
+-------------------------------------------------------------------
 Wed Oct  7 17:56:47 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
 
 - Add 4pane-fix_for_wx3.1.4.patch
diff --git a/4pane.spec b/4pane.spec
index 4d6d0b8..14e27a0 100644
--- a/4pane.spec
+++ b/4pane.spec
@@ -18,14 +18,12 @@
 
 
 Name:           4pane
-Version:        6.0
+Version:        7.0
 Release:        0
 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++