From 14c1cf32fb625f3ad37d3d2f4b451fdf9deb4bf1f61ed1d38de6e34af1f6ee7d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 1 Jun 2020 14:47:15 +0000 Subject: [PATCH] Accepting request 810613 from home:StefanBruens:branches:X11:wxWidgets - Fix wxQt build with Qt 5.15, add 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch - Make liblzma build dependency explicit, to have the same feature set on all flavors. - Fix wrong function signature causing build failures in python-wxPython, add: 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch - Add explicit libXtst build dependency, required for Leap 15.1 (already implicit on Leap 15.2 and TW). OBS-URL: https://build.opensuse.org/request/show/810613 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=56 --- ...nterPath-include-required-with-Qt-5..patch | 39 +++++++++++++++ ...ionSimulator-Text-implementation-mat.patch | 49 +++++++++++++++++++ wxGTK3-3_2.changes | 17 +++++++ wxGTK3-3_2.spec | 7 +++ wxQt-3_2.changes | 17 +++++++ wxQt-3_2.spec | 8 +++ wxWidgets-3_2.changes | 17 +++++++ wxWidgets-3_2.spec | 8 +++ 8 files changed, 162 insertions(+) create mode 100644 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch create mode 100644 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch diff --git a/0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch b/0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch new file mode 100644 index 0000000..a4a2ffd --- /dev/null +++ b/0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch @@ -0,0 +1,39 @@ +From 823af8e13d94e6466535fd81b233e8e4b4da2035 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +Date: Mon, 1 Jun 2020 14:05:46 +0200 +Subject: [PATCH] Add missing QPainterPath include required with Qt 5.15 + +The header is no longer pulled in by QPainter, omitting it causes +failing builds due to incomplete type QPainterPath. +--- + src/qt/dc.cpp | 1 + + src/qt/graphics.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp +index 5f1324abe9..e304b54c37 100644 +--- a/src/qt/dc.cpp ++++ b/src/qt/dc.cpp +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + #ifndef WX_PRECOMP + #include "wx/icon.h" +diff --git a/src/qt/graphics.cpp b/src/qt/graphics.cpp +index 9e0614807d..1c4d654acc 100644 +--- a/src/qt/graphics.cpp ++++ b/src/qt/graphics.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + + #ifndef WX_PRECOMP +-- +2.26.2 + diff --git a/0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch b/0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch new file mode 100644 index 0000000..318ee15 --- /dev/null +++ b/0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch @@ -0,0 +1,49 @@ +From dd2f7c31716029171706ff70b56eb66fd082e296 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +Date: Sun, 31 May 2020 20:01:54 +0200 +Subject: [PATCH 2/2] Make the wxUIActionSimulator::Text implementation match + the interface + +interface/uiaction.h declares the parameter as 'const wxString&'. For +non-STL variants, this just makes the char* conversion explicit, while +for STL variants this actually allows to pass a wxString to the method. + +This also fixes a compile error when building wxPython with a system +wxWidgets library which has been built with wxUSE_STL=1. +--- + include/wx/uiaction.h | 1 + + src/common/uiactioncmn.cpp | 6 ++++++ + 2 files changed, 7 insertions(+) + +diff --git a/include/wx/uiaction.h b/include/wx/uiaction.h +index 9b8df1094f..c8d01f52df 100644 +--- a/include/wx/uiaction.h ++++ b/include/wx/uiaction.h +@@ -60,6 +60,7 @@ public: + bool Char(int keycode, int modifiers = wxMOD_NONE); + + bool Text(const char *text); ++ bool Text(const wxString& text); + + // Select the item with the given text in the currently focused control. + bool Select(const wxString& text); +diff --git a/src/common/uiactioncmn.cpp b/src/common/uiactioncmn.cpp +index eeaf01ef93..092825681f 100644 +--- a/src/common/uiactioncmn.cpp ++++ b/src/common/uiactioncmn.cpp +@@ -163,6 +163,12 @@ static bool MapUnshifted(char& ch) + return true; + } + ++bool wxUIActionSimulator::Text(const wxString& text) ++{ ++ const wxScopedCharBuffer ascii = text.ToAscii(); ++ return Text(ascii.data()); ++} ++ + bool wxUIActionSimulator::Text(const char *s) + { + while ( *s != '\0' ) +-- +2.26.2 + diff --git a/wxGTK3-3_2.changes b/wxGTK3-3_2.changes index abc83d8..45580ed 100644 --- a/wxGTK3-3_2.changes +++ b/wxGTK3-3_2.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Jun 1 12:39:06 UTC 2020 - Stefan Brüns + +- Fix wxQt build with Qt 5.15, add + 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch +- Make liblzma build dependency explicit, to have the same feature + set on all flavors. +- Fix wrong function signature causing build failures in + python-wxPython, add: + 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch + +------------------------------------------------------------------- +Fri May 29 22:21:35 UTC 2020 - Stefan Brüns + +- Add explicit libXtst build dependency, required for Leap 15.1 + (already implicit on Leap 15.2 and TW). + ------------------------------------------------------------------- Thu May 28 22:51:52 UTC 2020 - Stefan Brüns diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index a2cafa2..510e501 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -39,6 +39,10 @@ Source5: wxWidgets-3_2-rpmlintrc # identify and backport wxPython fixes to wxWidgets. Source6: wxpython-mkdiff.sh Patch1: soversion.diff +# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/wxWidgets/pull/1879 +Patch2: 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch +# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/wxWidgets/pull/1880 +Patch3: 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch BuildRequires: autoconf BuildRequires: cppunit-devel BuildRequires: gcc-c++ @@ -63,6 +67,7 @@ BuildRequires: pkgconfig(sdl) %else BuildRequires: pkgconfig(sdl2) %endif +BuildRequires: pkgconfig(xtst) %description wxWidgets is a C++ library abstraction layer for a number of GUI @@ -256,6 +261,8 @@ read %_docdir/%name/README.SUSE to pick a correct variant. %prep %setup -q -n %tarball_name-%version %patch -P 1 -p1 +%patch2 -p1 +%patch3 -p1 cp %{S:2} . %build diff --git a/wxQt-3_2.changes b/wxQt-3_2.changes index abc83d8..45580ed 100644 --- a/wxQt-3_2.changes +++ b/wxQt-3_2.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Jun 1 12:39:06 UTC 2020 - Stefan Brüns + +- Fix wxQt build with Qt 5.15, add + 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch +- Make liblzma build dependency explicit, to have the same feature + set on all flavors. +- Fix wrong function signature causing build failures in + python-wxPython, add: + 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch + +------------------------------------------------------------------- +Fri May 29 22:21:35 UTC 2020 - Stefan Brüns + +- Add explicit libXtst build dependency, required for Leap 15.1 + (already implicit on Leap 15.2 and TW). + ------------------------------------------------------------------- Thu May 28 22:51:52 UTC 2020 - Stefan Brüns diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index 5290273..246c85d 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -39,6 +39,10 @@ Source5: wxWidgets-3_2-rpmlintrc # identify and backport wxPython fixes to wxWidgets. Source6: wxpython-mkdiff.sh Patch1: soversion.diff +# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/wxWidgets/pull/1879 +Patch2: 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch +# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/wxWidgets/pull/1880 +Patch3: 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch BuildRequires: autoconf BuildRequires: cppunit-devel BuildRequires: gcc-c++ @@ -60,11 +64,13 @@ BuildRequires: pkgconfig(Qt5Test) >= 5.2.1 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.1 BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(liblzma) %if 0%{?sle_version} < 150000 && !0%{?is_opensuse} BuildRequires: pkgconfig(sdl) %else BuildRequires: pkgconfig(sdl2) %endif +BuildRequires: pkgconfig(xtst) %description wxWidgets is a C++ library abstraction layer for a number of GUI @@ -254,6 +260,8 @@ read %_docdir/%name/README.SUSE to pick a correct variant. %prep %setup -q -n %tarball_name-%version %patch -P 1 -p1 +%patch2 -p1 +%patch3 -p1 cp %{S:2} . %build diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index abc83d8..45580ed 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Jun 1 12:39:06 UTC 2020 - Stefan Brüns + +- Fix wxQt build with Qt 5.15, add + 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch +- Make liblzma build dependency explicit, to have the same feature + set on all flavors. +- Fix wrong function signature causing build failures in + python-wxPython, add: + 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch + +------------------------------------------------------------------- +Fri May 29 22:21:35 UTC 2020 - Stefan Brüns + +- Add explicit libXtst build dependency, required for Leap 15.1 + (already implicit on Leap 15.2 and TW). + ------------------------------------------------------------------- Thu May 28 22:51:52 UTC 2020 - Stefan Brüns diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index e25ceca..db85553 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -39,6 +39,10 @@ Source5: wxWidgets-3_2-rpmlintrc # identify and backport wxPython fixes to wxWidgets. Source6: wxpython-mkdiff.sh Patch1: soversion.diff +# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/wxWidgets/pull/1879 +Patch2: 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch +# PATCH-FIX-UPSTREAM https://github.com/wxWidgets/wxWidgets/pull/1880 +Patch3: 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch BuildRequires: autoconf BuildRequires: cppunit-devel BuildRequires: gcc-c++ @@ -57,11 +61,13 @@ BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(liblzma) %if 0%{?sle_version} < 150000 && !0%{?is_opensuse} BuildRequires: pkgconfig(sdl) %else BuildRequires: pkgconfig(sdl2) %endif +BuildRequires: pkgconfig(xtst) %description wxWidgets is a C++ library abstraction layer for a number of GUI @@ -258,6 +264,8 @@ read %_docdir/%name/README.SUSE to pick a correct variant. %prep %setup -q -n %tarball_name-%version %patch -P 1 -p1 +%patch2 -p1 +%patch3 -p1 cp %{S:2} . %build