Hello community, here is the log from the commit of package wxWidgets-3_0 for openSUSE:Factory checked in at 2017-05-03 15:53:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxWidgets-3_0 (Old) and /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxWidgets-3_0" Wed May 3 15:53:25 2017 rev:18 rq:491965 version:3.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/wxWidgets-3_0/wxWidgets-3_0-nostl.changes 2017-03-18 20:48:53.292008440 +0100 +++ /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new/wxWidgets-3_0-nostl.changes 2017-05-03 15:53:26.951913454 +0200 @@ -2 +2 @@ -Tue Mar 14 08:53:03 UTC 2017 - [email protected] +Tue Apr 18 13:13:26 UTC 2017 - [email protected] @@ -4 +4,8 @@ -- Actually apply relax-abi.diff and fix devel package description. +- Bump __GXX_ABI_VERSION to 1011 for gcc7 +- Add 0001-Fix-spurious-assert-in-wxGTK-wxDataViewCtrl-EditItem.patch + to resolve crash [boo#1034350] + +------------------------------------------------------------------- +Tue Mar 14 08:56:12 UTC 2017 - [email protected] + +- Fix devel package description. --- /work/SRC/openSUSE:Factory/wxWidgets-3_0/wxWidgets-3_0.changes 2017-03-18 20:48:53.451985776 +0100 +++ /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new/wxWidgets-3_0.changes 2017-05-03 15:53:27.047899904 +0200 @@ -1,0 +2,7 @@ +Tue Apr 18 13:13:26 UTC 2017 - [email protected] + +- Bump __GXX_ABI_VERSION to 1011 for gcc7 +- Add 0001-Fix-spurious-assert-in-wxGTK-wxDataViewCtrl-EditItem.patch + to resolve crash [boo#1034350] + +------------------------------------------------------------------- New: ---- 0001-Fix-spurious-assert-in-wxGTK-wxDataViewCtrl-EditItem.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxWidgets-3_0-nostl.spec ++++++ --- /var/tmp/diff_new_pack.JrfKo9/_old 2017-05-03 15:53:28.535689864 +0200 +++ /var/tmp/diff_new_pack.JrfKo9/_new 2017-05-03 15:53:28.539689299 +0200 @@ -57,10 +57,10 @@ Patch12: 0003-Don-t-use-frame-extents-when-not-using-X11-in-wxGTK.patch Patch13: 0004-Don-t-crash-when-switching-to-full-screen-in-non-X11.patch Patch14: 0005-Don-t-use-X11-only-functions-when-not-using-X11-in-w.patch -# PATCH-FIX-UPSTREAM wxWidgets-3_0-gstreamer-1.0.patch [email protected] -- Port wxcntrl to use gstreamer 1.0; patch taken from upstream bug report: http://trac.wxwidgets.org/ticket/14976 Patch16: wxWidgets-3_0-gstreamer-1.0.patch Patch15: abs.diff Patch17: relax-abi.diff +Patch18: 0001-Fix-spurious-assert-in-wxGTK-wxDataViewCtrl-EditItem.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf @@ -275,7 +275,7 @@ echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version %patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -p1 -%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -p1 +%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -p1 cp %{S:2} . %build ++++++ wxWidgets-3_0.spec ++++++ --- /var/tmp/diff_new_pack.JrfKo9/_old 2017-05-03 15:53:28.567685347 +0200 +++ /var/tmp/diff_new_pack.JrfKo9/_new 2017-05-03 15:53:28.571684782 +0200 @@ -60,8 +60,17 @@ Patch15: abs.diff Patch16: wxWidgets-3_0-gstreamer-1.0.patch Patch17: relax-abi.diff +Patch18: 0001-Fix-spurious-assert-in-wxGTK-wxDataViewCtrl-EditItem.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: SDL-devel + +#Link SDL2 for newer distros +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +BuildRequires: pkgconfig(sdl2) +%else +BuildRequires: pkgconfig(sdl) +%endif + + BuildRequires: autoconf BuildRequires: cppunit-devel BuildRequires: gcc-c++ @@ -276,7 +285,7 @@ echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version %patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -p1 -%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -p1 +%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -p1 cp %{S:2} . %build @@ -286,6 +295,10 @@ # --enable-accessibility is currently supported only in msw # --enable-extended_rtti does not compile +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +export SDL_CONFIG=/usr/bin/sdl2-config +%endif + %configure\ --enable-vendor=suse \ --with-gtk=%gtk_version\ ++++++ 0001-Fix-spurious-assert-in-wxGTK-wxDataViewCtrl-EditItem.patch ++++++ >From ed88188be7e97a0503f3471f7b0452740b732902 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin <[email protected]> Date: Tue, 10 Feb 2015 23:14:53 +0000 Subject: [PATCH] Fix spurious assert in wxGTK wxDataViewCtrl::EditItem(). The assert in wxGtkTreeSelectionLock ctor failed after the first time this object was created as it doesn't reset the selection function to NULL with wxGTK2, fix this by checking for different values depending on whether it's actually the first time we do it or not. In the future we should just reset the selection function to NULL as it does work in GTK+ 3, also update the comment explaining the problem to mention this. (cherry picked from commit 24c0401e81a4d0206f89b21775adb90fb11bf32a) --- src/gtk/dataview.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 87217e2fbc..0be3273495 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -135,9 +135,11 @@ public: // Implementation note: it could be expected that setting the selection // function in this class ctor and resetting it back to the old value in its -// dtor would work. However currently gtk_tree_selection_get_select_function() -// can't be passed NULL (see https://bugzilla.gnome.org/show_bug.cgi?id=626276) -// so we can't do this. Instead, we always use the selection function (which +// dtor would work, However in GTK+2 gtk_tree_selection_get_select_function() +// can't be passed NULL (see https://bugzilla.gnome.org/show_bug.cgi?id=626276 +// which was only fixed in 2.90.5-304-g316b9da) so we can't do this. +// +// Instead, we always use the selection function (which // imposes extra overhead, albeit minimal one, on all selection operations) and // just set/reset the flag telling it whether it should allow or forbid the // selection. @@ -168,7 +170,15 @@ public: ms_instance = this; - CheckCurrentSelectionFunc(NULL); + if ( ms_firstTime ) + { + ms_firstTime = false; + CheckCurrentSelectionFunc(NULL); + } + else + { + CheckCurrentSelectionFunc(wxdataview_selection_func); + } // Pass some non-NULL pointer as "data" for the callback, it doesn't // matter what it is as long as it's non-NULL. @@ -215,6 +225,7 @@ private: } static wxGtkTreeSelectionLock *ms_instance; + static bool ms_firstTime; GtkTreeSelection * const m_selection; @@ -222,6 +233,7 @@ private: }; wxGtkTreeSelectionLock *wxGtkTreeSelectionLock::ms_instance = NULL; +bool wxGtkTreeSelectionLock::ms_firstTime = true; //----------------------------------------------------------------------------- // wxDataViewCtrlInternal -- 2.12.2 ++++++ relax-abi.diff ++++++ --- /var/tmp/diff_new_pack.JrfKo9/_old 2017-05-03 15:53:28.735661633 +0200 +++ /var/tmp/diff_new_pack.JrfKo9/_new 2017-05-03 15:53:28.735661633 +0200 @@ -24,7 +24,7 @@ + // https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html + // under -fabi-version) don't affect wxWidgets, so we allow a library + // and an application to differ within that range. -+ #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1010)) ++ #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1011)) + #define wxGXX_EFFECTIVE_ABI_VERSION 1002 + #else + #define wxGXX_EFFECTIVE_ABI_VERSION __GXX_ABI_VERSION
