From b1d118958a7f22a51ad4d5ecada3bffe3e815e2930be476288f4bb584871e2ab Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Mon, 7 Dec 2020 07:36:10 +0000 Subject: [PATCH] Accepting request 853511 from home:alois:branches:X11:Utilities - Update to version 7.0 * Added support for GIO mounts + Recent distro versions use GIO to mount some usb devices inside /run/user//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) OBS-URL: https://build.opensuse.org/request/show/853511 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/4pane?expand=0&rev=18 --- 4pane-6.0.tar.gz | 3 --- 4pane-7.0.tar.gz | 3 +++ 4pane-fix_for_wx3.1.4.patch | 29 ----------------------------- 4pane.changes | 15 +++++++++++++++ 4pane.spec | 4 +--- 5 files changed, 19 insertions(+), 35 deletions(-) delete mode 100644 4pane-6.0.tar.gz create mode 100644 4pane-7.0.tar.gz delete mode 100644 4pane-fix_for_wx3.1.4.patch diff --git a/4pane-6.0.tar.gz b/4pane-6.0.tar.gz deleted file mode 100644 index b023322..0000000 --- a/4pane-6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7739bc02a6a9bba47745bfcc0073ab5664052d38bd5125cf888587d17f0175c8 -size 1849664 diff --git a/4pane-7.0.tar.gz b/4pane-7.0.tar.gz new file mode 100644 index 0000000..01fee8f --- /dev/null +++ b/4pane-7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09716c4000ba193db128d97d04e6bc8c9dfebf11e2755bfc071ce1db339d8b80 +size 2113199 diff --git a/4pane-fix_for_wx3.1.4.patch b/4pane-fix_for_wx3.1.4.patch deleted file mode 100644 index 1eace29..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 -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 98052c6..90584d6 100644 --- a/4pane.changes +++ b/4pane.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Dec 7 07:17:47 UTC 2020 - Luigi Baldoni + +- Update to version 7.0 + * Added support for GIO mounts + + Recent distro versions use GIO to mount some usb devices + inside /run/user//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 diff --git a/4pane.spec b/4pane.spec index c364970..5bb2629 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++