mcalabkova/wxWidgets-3_2
SHA256
1
0
Fork 0
forked from jengelh/wxWidgets-3_2
Code Pull Requests Activity

Accepting request 810644 from X11:wxWidgets

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/810644
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wxWidgets-3_2?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2020-06-02 12:36:14 +00:00 committed by Git OBS Bridge
commit 4a756e3b9a
10 changed files with 253 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch Normal file
View File

@ -0,0 +1,39 @@
From 823af8e13d94e6466535fd81b233e8e4b4da2035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
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 <QtGui/QBitmap>
#include <QtGui/QPen>
#include <QtGui/QPainter>
+#include <QtGui/QPainterPath>
#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 <QApplication>
#include <QDesktopWidget>
#include <QPainter>
+#include <QPainterPath>
#include <QPicture>
#ifndef WX_PRECOMP
--
2.26.2

49
0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch Normal file
View File

@ -0,0 +1,49 @@
From dd2f7c31716029171706ff70b56eb66fd082e296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
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

35
wxGTK3-3_2.changes
View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Mon Jun 1 12:39:06 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- 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 <stefan.bruens@rwth-aachen.de>
- 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 <stefan.bruens@rwth-aachen.de>
- Update to new upstream release 3.1.3
For a detailed changelog, see
https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.3/docs/changes.txt
* Support for per-monitor DPI and dynamic DPI changes under MSW.
* More generally, many fixes for various controls appearance in high DPI.
* Long requested support for freezing rows and/or columns in wxGrid.
* New XRC handlers for wxDataViewCtrl, wxInfoBar.
* It is now possible to use gradients when creating wxGraphicsPen.
* Extended compiler (MSVS 2019) and platforms (macOS 10.14+) support.
* Significant improvements to the (still experimental) wxQt port.
* Important bug fixes for focus handling in wxOSX port.
- Cleanup spec file
- Enable reproducible-build option
- Use SDL2 instead of SDL1 (only used by sound plugin)
-------------------------------------------------------------------
Mon Apr 15 08:55:06 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

50
wxGTK3-3_2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package wxGTK3-3_2
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,25 +22,27 @@ Name: wxGTK3-3_2
%define variant suse
%define psonum 3_1_3
%define sonum 3.1.3
Version: 3.1.3~g673
Version: 3.1.3
Release: 0
%define wx_minor 3.1
%define wx_micro 3.1.3
# build non-UI toolkit related packages
%define base_packages 0
Summary: C++ Library for Cross-Platform Development
License: LGPL-2.1+ WITH WxWindows-exception-3.1
License: LGPL-2.1-or-later WITH WxWindows-exception-3.1
Group: Development/Libraries/C and C++
URL: https://www.wxwidgets.org/
Source: %tarball_name-%version.tar.xz
Source: https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/wxWidgets-%{version}.tar.bz2#/%tarball_name-%version.tar.bz2
Source2: README.SUSE
Source5: wxWidgets-3_2-rpmlintrc
# This script is not used during build, but it makes possible to
# identify and backport wxPython fixes to wxWidgets.
Source6: wxpython-mkdiff.sh
Patch1: soversion.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SDL-devel
# 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++
@ -50,13 +52,7 @@ BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(webkit2gtk-4.0)
%define gtk_version 3
%define toolkit gtk%gtk_version
%if 0%{?suse_version} >= 1220
BuildRequires: libSM-devel
%else
%if 0%{?sles_version} >= 11
BuildRequires: xorg-x11-libSM-devel
%endif
%endif
BuildRequires: libexpat-devel
BuildRequires: libjpeg-devel
BuildRequires: libmspack-devel
@ -65,6 +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
@ -216,7 +219,7 @@ Summary: wxWidgets SDL Plugin
Group: System/Libraries
%description plugin-sound_sdlu-3_2
SDL Plugin for the wxWidgets cross-platform GUI.
SDL based sound plugin for the wxWidgets cross-platform GUI.
%package devel
Summary: Development files for GTK3-backed wxWidgets 3.2
@ -258,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
@ -284,6 +289,7 @@ autoconf -f -i
%else
--disable-debug \
%endif
--enable-repro-build \
--enable-stl \
--enable-plugins
make %{?_smp_mflags}
@ -336,83 +342,65 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
%if %base_packages
%files -n libwx_baseu-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_baseu-%variant.so.%{sonum}*
%files -n libwx_baseu_net-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_baseu_net-%variant.so.%{sonum}*
%files -n libwx_baseu_xml-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_baseu_xml-%variant.so.%{sonum}*
%endif
%files -n libwx_%{toolkit}u_adv-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_adv-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_aui-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_aui-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_core-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_core-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_gl-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_gl-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_html-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_html-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_media-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_media-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_propgrid-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_propgrid-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_qa-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_qa-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_ribbon-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_ribbon-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_richtext-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_richtext-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_stc-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_webview-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_webview-%variant.so.%{sonum}*
%dir %_libdir/wx
%dir %_libdir/wx/%wx_micro
%_libdir/wx/%wx_micro/web-extensions/
%files -n libwx_%{toolkit}u_xrc-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}*
%if %base_packages
%files plugin-sound_sdlu-3_2
%defattr (-,root,root)
%dir %_libdir/wx
%dir %_libdir/wx/%wx_micro
%_libdir/wx/%wx_micro/sound_sdlu-%wx_micro.so
%endif
%files devel
%defattr (-,root,root)
# Complete documentation is available in the docs packages.
%doc docs/*.txt README.SUSE
%_bindir/wxrc

35
wxQt-3_2.changes
View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Mon Jun 1 12:39:06 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- 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 <stefan.bruens@rwth-aachen.de>
- 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 <stefan.bruens@rwth-aachen.de>
- Update to new upstream release 3.1.3
For a detailed changelog, see
https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.3/docs/changes.txt
* Support for per-monitor DPI and dynamic DPI changes under MSW.
* More generally, many fixes for various controls appearance in high DPI.
* Long requested support for freezing rows and/or columns in wxGrid.
* New XRC handlers for wxDataViewCtrl, wxInfoBar.
* It is now possible to use gradients when creating wxGraphicsPen.
* Extended compiler (MSVS 2019) and platforms (macOS 10.14+) support.
* Significant improvements to the (still experimental) wxQt port.
* Important bug fixes for focus handling in wxOSX port.
- Cleanup spec file
- Enable reproducible-build option
- Use SDL2 instead of SDL1 (only used by sound plugin)
-------------------------------------------------------------------
Mon Apr 15 08:55:06 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

49
wxQt-3_2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package wxQt-3_2
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,38 +22,34 @@ Name: wxQt-3_2
%define variant suse
%define psonum 3_1_3
%define sonum 3.1.3
Version: 3.1.3~g673
Version: 3.1.3
Release: 0
%define wx_minor 3.1
%define wx_micro 3.1.3
# build non-UI toolkit related packages
%define base_packages 0
Summary: C++ Library for Cross-Platform Development
License: LGPL-2.1+ WITH WxWindows-exception-3.1
License: LGPL-2.1-or-later WITH WxWindows-exception-3.1
Group: Development/Libraries/C and C++
URL: https://www.wxwidgets.org/
Source: %tarball_name-%version.tar.xz
Source: https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/wxWidgets-%{version}.tar.bz2#/%tarball_name-%version.tar.bz2
Source2: README.SUSE
Source5: wxWidgets-3_2-rpmlintrc
# This script is not used during build, but it makes possible to
# identify and backport wxPython fixes to wxWidgets.
Source6: wxpython-mkdiff.sh
Patch1: soversion.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SDL-devel
# 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++
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel
%define toolkit qt
%if 0%{?suse_version} >= 1220
BuildRequires: libSM-devel
%else
%if 0%{?sles_version} >= 11
BuildRequires: xorg-x11-libSM-devel
%endif
%endif
BuildRequires: libexpat-devel
BuildRequires: libjpeg-devel
BuildRequires: libmspack-devel
@ -68,6 +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
@ -219,7 +222,7 @@ Summary: wxWidgets SDL Plugin
Group: System/Libraries
%description plugin-sound_sdlu-3_2
SDL Plugin for the wxWidgets cross-platform GUI.
SDL based sound plugin for the wxWidgets cross-platform GUI.
%package devel
Summary: Development files for Qt-backed wxWidgets 3.2
@ -257,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
@ -283,6 +288,7 @@ autoconf -f -i
%else
--disable-debug \
%endif
--enable-repro-build \
--enable-stl \
--enable-plugins
make %{?_smp_mflags}
@ -335,76 +341,59 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
%if %base_packages
%files -n libwx_baseu-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_baseu-%variant.so.%{sonum}*
%files -n libwx_baseu_net-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_baseu_net-%variant.so.%{sonum}*
%files -n libwx_baseu_xml-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_baseu_xml-%variant.so.%{sonum}*
%endif
%files -n libwx_%{toolkit}u_adv-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_adv-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_aui-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_aui-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_core-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_core-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_gl-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_gl-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_html-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_html-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_media-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_media-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_propgrid-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_propgrid-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_qa-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_qa-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_ribbon-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_ribbon-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_richtext-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_richtext-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_stc-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_xrc-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}*
%if %base_packages
%files plugin-sound_sdlu-3_2
%defattr (-,root,root)
%dir %_libdir/wx
%dir %_libdir/wx/%wx_micro
%_libdir/wx/%wx_micro/sound_sdlu-%wx_micro.so
%endif
%files devel
%defattr (-,root,root)
# Complete documentation is available in the docs packages.
%doc docs/*.txt README.SUSE
%_bindir/wxrc

3
wxWidgets-3.1.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fffc1d34dac54ff7008df327907984b156c50cff5a2f36ee3da6052744ab554a
size 21345268

3
wxWidgets-3.1.3~g673.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cf31e73d6732001beae34c9b8dd4cd3a2ecb79d1fecaa5c5be7e6a45431a3d43
size 22397212

35
wxWidgets-3_2.changes
View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Mon Jun 1 12:39:06 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- 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 <stefan.bruens@rwth-aachen.de>
- 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 <stefan.bruens@rwth-aachen.de>
- Update to new upstream release 3.1.3
For a detailed changelog, see
https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.3/docs/changes.txt
* Support for per-monitor DPI and dynamic DPI changes under MSW.
* More generally, many fixes for various controls appearance in high DPI.
* Long requested support for freezing rows and/or columns in wxGrid.
* New XRC handlers for wxDataViewCtrl, wxInfoBar.
* It is now possible to use gradients when creating wxGraphicsPen.
* Extended compiler (MSVS 2019) and platforms (macOS 10.14+) support.
* Significant improvements to the (still experimental) wxQt port.
* Important bug fixes for focus handling in wxOSX port.
- Cleanup spec file
- Enable reproducible-build option
- Use SDL2 instead of SDL1 (only used by sound plugin)
-------------------------------------------------------------------
Mon Apr 15 08:55:06 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

49
wxWidgets-3_2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package wxWidgets-3_2
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,25 +22,27 @@ Name: wxWidgets-3_2
%define variant suse
%define psonum 3_1_3
%define sonum 3.1.3
Version: 3.1.3~g673
Version: 3.1.3
Release: 0
%define wx_minor 3.1
%define wx_micro 3.1.3
# build non-UI toolkit related packages
%define base_packages 1
Summary: C++ Library for Cross-Platform Development
License: LGPL-2.1+ WITH WxWindows-exception-3.1
License: LGPL-2.1-or-later WITH WxWindows-exception-3.1
Group: Development/Libraries/C and C++
URL: https://www.wxwidgets.org/
Source: %tarball_name-%version.tar.xz
Source: https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/wxWidgets-%{version}.tar.bz2#/%tarball_name-%version.tar.bz2
Source2: README.SUSE
Source5: wxWidgets-3_2-rpmlintrc
# This script is not used during build, but it makes possible to
# identify and backport wxPython fixes to wxWidgets.
Source6: wxpython-mkdiff.sh
Patch1: soversion.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SDL-devel
# 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++
@ -50,13 +52,7 @@ BuildRequires: gstreamer-plugins-base-devel
BuildRequires: gtk2-devel
%define gtk_version 2
%define toolkit gtk%gtk_version
%if 0%{?suse_version} >= 1220
BuildRequires: libSM-devel
%else
%if 0%{?sles_version} >= 11
BuildRequires: xorg-x11-libSM-devel
%endif
%endif
BuildRequires: libexpat-devel
BuildRequires: libjpeg-devel
BuildRequires: libmspack-devel
@ -65,6 +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
@ -216,7 +219,7 @@ Summary: wxWidgets SDL Plugin
Group: System/Libraries
%description plugin-sound_sdlu-3_2
SDL Plugin for the wxWidgets cross-platform GUI.
SDL based sound plugin for the wxWidgets cross-platform GUI.
%package devel
Summary: Development files for GTK2-backed wxWidgets 3.2
@ -261,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
@ -286,6 +291,7 @@ autoconf -f -i
%else
--disable-debug \
%endif
--enable-repro-build \
--enable-stl \
--enable-plugins
make %{?_smp_mflags}
@ -338,76 +344,59 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
%if %base_packages
%files -n libwx_baseu-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_baseu-%variant.so.%{sonum}*
%files -n libwx_baseu_net-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_baseu_net-%variant.so.%{sonum}*
%files -n libwx_baseu_xml-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_baseu_xml-%variant.so.%{sonum}*
%endif
%files -n libwx_%{toolkit}u_adv-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_adv-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_aui-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_aui-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_core-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_core-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_gl-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_gl-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_html-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_html-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_media-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_media-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_propgrid-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_propgrid-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_qa-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_qa-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_ribbon-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_ribbon-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_richtext-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_richtext-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_stc-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}*
%files -n libwx_%{toolkit}u_xrc-%variant%psonum
%defattr (-,root,root)
%_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}*
%if %base_packages
%files plugin-sound_sdlu-3_2
%defattr (-,root,root)
%dir %_libdir/wx
%dir %_libdir/wx/%wx_micro
%_libdir/wx/%wx_micro/sound_sdlu-%wx_micro.so
%endif
%files devel
%defattr (-,root,root)
# Complete documentation is available in the docs packages.
%doc docs/*.txt README.SUSE
%_bindir/wxrc