Hello community, here is the log from the commit of package wxWidgets-3_0 for openSUSE:Factory checked in at 2017-01-24 10:40: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" Changes: -------- --- /work/SRC/openSUSE:Factory/wxWidgets-3_0/wxWidgets-3_0-nostl.changes 2016-09-28 11:31:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new/wxWidgets-3_0-nostl.changes 2017-01-24 10:40:26.438431233 +0100 @@ -1,0 +2,5 @@ +Mon Jan 16 18:09:14 UTC 2017 - jeng...@inai.de + +- Add relax-abi.diff + +------------------------------------------------------------------- wxWidgets-3_0.changes: same change New: ---- relax-abi.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxWidgets-3_0-nostl.spec ++++++ --- /var/tmp/diff_new_pack.OMA4Pa/_old 2017-01-24 10:40:28.310165426 +0100 +++ /var/tmp/diff_new_pack.OMA4Pa/_new 2017-01-24 10:40:28.310165426 +0100 @@ -1,7 +1,7 @@ # # spec file for package wxWidgets-3_0-nostl # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -104,8 +104,8 @@ %package -n libwx_baseu-suse-nostl1 Summary: wxWidgets Library -Group: System/Libraries # Name up to openSUSE 11.3 and up to wxGTK-2.8: +Group: System/Libraries Obsoletes: wxGTK <= %version.0 # Third party base package name: Obsoletes: wxWidgets < %version ++++++ wxWidgets-3_0.spec ++++++ --- /var/tmp/diff_new_pack.OMA4Pa/_old 2017-01-24 10:40:28.346160315 +0100 +++ /var/tmp/diff_new_pack.OMA4Pa/_new 2017-01-24 10:40:28.350159747 +0100 @@ -1,7 +1,7 @@ # # spec file for package wxWidgets-3_0 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -58,8 +58,8 @@ 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 Patch15: abs.diff -# PATCH-FIX-UPSTREAM wxWidgets-3_0-gstreamer-1.0.patch badshah...@gmail.com -- 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 +Patch17: relax-abi.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf @@ -100,8 +100,8 @@ %package -n libwx_baseu-suse1 Summary: wxWidgets Library -Group: System/Libraries # Name up to openSUSE 11.3 and up to wxGTK-2.8: +Group: System/Libraries Obsoletes: wxGTK <= %version.0 # Third party base package name: Obsoletes: wxWidgets < %version @@ -276,7 +276,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 -p1 +%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -p1 cp %{S:2} . %build ++++++ relax-abi.diff ++++++ From: Nathan Ridge Relax the ABI compatibility requirements for GCC. Allow a library and an application to differ in __GXX_ABI_VERSION within the range 1002-1008. The ABI changes made in this range do not affect wxWidgets. https://github.com/wxWidgets/wxWidgets/commit/ad21cc332ac906b9ae8f238ab135cbe410e78eba https://github.com/wxWidgets/wxWidgets/commit/96f5a24f6dfdfff3466ab7c1736dfc741165aaea --- include/wx/build.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) Index: wxWidgets-3.0.2/include/wx/build.h =================================================================== --- wxWidgets-3.0.2.orig/include/wx/build.h +++ wxWidgets-3.0.2/include/wx/build.h @@ -52,8 +52,17 @@ // GCC and Intel C++ share same C++ ABI (and possibly others in the future), // check if compiler versions are compatible: #if defined(__GXX_ABI_VERSION) + // The changes between ABI versions 1002 through 1008 (documented at + // 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)) + #define wxGXX_EFFECTIVE_ABI_VERSION 1002 + #else + #define wxGXX_EFFECTIVE_ABI_VERSION __GXX_ABI_VERSION + #endif #define __WX_BO_COMPILER \ - ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION) + ",compiler with C++ ABI " __WX_BO_STRINGIZE(wxGXX_EFFECTIVE_ABI_VERSION) #elif defined(__GNUG__) #define __WX_BO_COMPILER ",GCC " \ __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__) ++++++ wxWidgets-3_0-gstreamer-1.0.patch ++++++ --- /var/tmp/diff_new_pack.OMA4Pa/_old 2017-01-24 10:40:28.554130780 +0100 +++ /var/tmp/diff_new_pack.OMA4Pa/_new 2017-01-24 10:40:28.554130780 +0100 @@ -1,3 +1,8 @@ +From: badshah...@gmail.com + +Port wxcntrl to use gstreamer 1.0; patch taken from upstream bug report +http://trac.wxwidgets.org/ticket/14976 + Index: wxwidgets3.0-3.0.2+dfsg/configure.in =================================================================== --- wxwidgets3.0-3.0.2+dfsg.orig/configure.in
