Hello community, here is the log from the commit of package 4pane for openSUSE:Factory checked in at 2020-10-08 13:13:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/4pane (Old) and /work/SRC/openSUSE:Factory/.4pane.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "4pane" Thu Oct 8 13:13:37 2020 rev:6 rq:840119 version:6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/4pane/4pane.changes 2020-04-01 19:08:51.815275343 +0200 +++ /work/SRC/openSUSE:Factory/.4pane.new.4249/4pane.changes 2020-10-08 13:13:57.387268706 +0200 @@ -1,0 +2,10 @@ +Wed Oct 7 17:56:47 UTC 2020 - Luigi Baldoni <[email protected]> + +- Add 4pane-fix_for_wx3.1.4.patch + +------------------------------------------------------------------- +Wed Oct 7 16:30:16 UTC 2020 - Luigi Baldoni <[email protected]> + +- Fix Factory build + +------------------------------------------------------------------- New: ---- 4pane-fix_for_wx3.1.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 4pane.spec ++++++ --- /var/tmp/diff_new_pack.W5BIOW/_old 2020-10-08 13:13:58.187269430 +0200 +++ /var/tmp/diff_new_pack.W5BIOW/_new 2020-10-08 13:13:58.187269430 +0200 @@ -24,17 +24,13 @@ 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 @@ %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 ++++++ 4pane-fix_for_wx3.1.4.patch ++++++ >From 2143bc32c16e987619f06f9ff0159c0fcdebf924 Mon Sep 17 00:00:00 2001 From: dghart <[email protected]> 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
