rpm/4pane
SHA256
1
0
Fork 0
forked from pool/4pane
Code Pull Requests Activity

Accepting request 840119 from X11:Utilities

Browse Source 
- Add 4pane-fix_for_wx3.1.4.patch
- Fix Factory build

OBS-URL: https://build.opensuse.org/request/show/840119
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/4pane?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2020-10-08 11:13:37 +00:00 committed by Git OBS Bridge
commit cf2b4d1438
3 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
4pane-fix_for_wx3.1.4.patch Normal file
View File

@ -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

10
4pane.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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>

18
4pane.spec
View File

@ -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