Package: flamerobin Version: 0.9.3~+20140206.3f9645c-3 Severity: wishlist Tags: patch
The bug which wx3.0-vs-gcc4.9.patch works around was fixed in gcc-4.9 version 4.9.1-14 (already in jessie): gcc-4.9 (4.9.1-14) unstable; urgency=medium * Update to SVN 20140912 (r215228) from the gcc-4_9-branch. * Update the Linaro support to the 4.9-2014.09 release. * Fix installation of the libstdc++ documentation. Closes: #760872. -- Matthias Klose <[email protected]> Fri, 12 Sep 2014 19:15:23 +0200 The version of gcc in wheezy was never affected, so that patch can now be dropped - I rebuilt flamerobin with the attached changes against wxwidgets3.0 3.0.2-1 and it builds OK, starts up, and I can open the about and preferences dialogs (I don't have a suitable database to test with). (It also works with 3.0.1-3 as that version contains a patch to workaround this issue in the wx headers). Cheers, Olly
diff -Nru flamerobin-0.9.3~+20140206.3f9645c/debian/changelog flamerobin-0.9.3~+20140206.3f9645c/debian/changelog --- flamerobin-0.9.3~+20140206.3f9645c/debian/changelog 2014-06-03 20:59:24.000000000 +1200 +++ flamerobin-0.9.3~+20140206.3f9645c/debian/changelog 2014-10-07 12:49:31.000000000 +1300 @@ -1,3 +1,10 @@ +flamerobin (0.9.3~+20140206.3f9645c-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Drop patch wx3.0-vs-gcc4.9.patch - gcc-4.9 has now been fixed. + + -- Olly Betts <[email protected]> Tue, 07 Oct 2014 12:48:33 +1300 + flamerobin (0.9.3~+20140206.3f9645c-3) unstable; urgency=medium * Add patch from Michael Hieke to work around issues between wx3.0 and diff -Nru flamerobin-0.9.3~+20140206.3f9645c/debian/patches/series flamerobin-0.9.3~+20140206.3f9645c/debian/patches/series --- flamerobin-0.9.3~+20140206.3f9645c/debian/patches/series 2014-06-03 19:40:14.000000000 +1200 +++ flamerobin-0.9.3~+20140206.3f9645c/debian/patches/series 2014-10-07 12:48:30.000000000 +1300 @@ -1,2 +1 @@ -wx3.0-vs-gcc4.9.patch keep-revisioninfo.h.patch diff -Nru flamerobin-0.9.3~+20140206.3f9645c/debian/patches/wx3.0-vs-gcc4.9.patch flamerobin-0.9.3~+20140206.3f9645c/debian/patches/wx3.0-vs-gcc4.9.patch --- flamerobin-0.9.3~+20140206.3f9645c/debian/patches/wx3.0-vs-gcc4.9.patch 2014-06-03 19:39:55.000000000 +1200 +++ flamerobin-0.9.3~+20140206.3f9645c/debian/patches/wx3.0-vs-gcc4.9.patch 1970-01-01 12:00:00.000000000 +1200 @@ -1,33 +0,0 @@ -Description: workaround issues of wx3.0 (with 2.8 compat enabled) and g++ 4.9 - Without these, a link-time failure breaks the build -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746847 -Author: Michael Hieke <[email protected]> -Forwarded: http://sourceforge.net/p/flamerobin/mailman/flamerobin-devel/thread/[email protected]/ - ---- a/src/gui/AdvancedSearchFrame.cpp -+++ b/src/gui/AdvancedSearchFrame.cpp -@@ -299,6 +299,11 @@ void AdvancedSearchFrame::rebuildList() - } - // send size event - wxSizeEvent ev(listctrl_criteria->GetSize()); -+ -+ // workaround a problem with wx 3.0 and g++ 4.9. See -+ // https://bugs.debian.org/746847 -+ std::auto_ptr<wxEvent> tmp_ev(ev.Clone()); -+ - listctrl_criteria->GetEventHandler()->AddPendingEvent(ev); - } - //----------------------------------------------------------------------------- ---- a/src/gui/MainFrame.cpp -+++ b/src/gui/MainFrame.cpp -@@ -1359,6 +1359,10 @@ void MainFrame::OnMenuToggleStatusBar(wx - config().setValue(wxT("showStatusBar"), show); - s->Show(show); - SendSizeEvent(); -+ -+ // workaround a problem with wx 3.0 and g++ 4.9. See -+ // https://bugs.debian.org/746847 -+ std::auto_ptr<wxEvent> tmp_ev(event.Clone()); - } - //----------------------------------------------------------------------------- - void MainFrame::OnMenuToggleSearchBar(wxCommandEvent& event)
