diff --git a/0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch b/0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch deleted file mode 100644 index a4a2ffd..0000000 --- a/0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 318ee15..0000000 --- a/0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch +++ /dev/null @@ -1,49 +0,0 @@ -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/soversion.diff b/soversion.diff index e33baec..9d01369 100644 --- a/soversion.diff +++ b/soversion.diff @@ -20,7 +20,7 @@ Index: wxWidgets-3.1.0.2244/Makefile.in =================================================================== --- wxWidgets-3.1.0.2244.orig/Makefile.in +++ wxWidgets-3.1.0.2244/Makefile.in -@@ -2105,6 +2105,7 @@ LOCALE_MSW_LINGUAS = it +@@ -2158,6 +2158,7 @@ LOCALE_MSW_LINGUAS = it @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ = _gcc$(COMPILER_VERSION) @@ -28,7 +28,7 @@ Index: wxWidgets-3.1.0.2244/Makefile.in @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR) @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_BUILD_debug@WXDEBUGFLAG = d -@@ -2116,7 +2117,7 @@ LOCALE_MSW_LINGUAS = it +@@ -2169,7 +2170,7 @@ LOCALE_MSW_LINGUAS = it @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \ @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT) @@ -37,15 +37,15 @@ Index: wxWidgets-3.1.0.2244/Makefile.in @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = COND_wxUSE_REGEX_builtin___wxregex___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) -@@ -13690,7 +13691,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE - @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .3.0.0.$(SO_SUFFIX) - @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -3.$(SO_SUFFIX) +@@ -13775,7 +13776,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ + @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .4.0.0.$(SO_SUFFIX) + @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -4.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) --@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3 -+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3.1.3 +-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).4 ++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).4.0.0 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) - @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \ + @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ Index: wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4 =================================================================== --- wxWidgets-3.1.0.2244.orig/build/aclocal/bakefile.m4 diff --git a/wxGTK3-3_2.changes b/wxGTK3-3_2.changes index 45580ed..638c61e 100644 --- a/wxGTK3-3_2.changes +++ b/wxGTK3-3_2.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Sat Jul 25 15:20:26 UTC 2020 - Stefan Brüns + +- Update to new upstream release 3.1.4: + + INCOMPATIBLE CHANGES SINCE 3.1.3: + * CMake library targets were renamed and now start with 'wx'. In addition, + aliases for the libraries have been added using the 'wx::' namespace. For + example, the core library is now named wxcore and has alias wx::core. + + All: + * Add natural sort functions (Hugo Elias, PB). + * Add wxTempFFile class (Dummy). + * Fix bug with multiple leading ".." in wxFileName::Normalize() (Fabian Cenedese). + * Improve brush transparency support in wxSVGFileDC (Maarten Bent). + * Optionally forbid implicit wxString/char* conversions (Arrigo Marchiori). + * Add --disable-tests configure option (Hertatijanto Hartono). + + All (GUI): + * Many wxGrid improvements: + - Live-resize wxGrid columns/rows, making it work with wxGTK3 and wxOSX too. + - Add activatable editors support, use it for boolean cells. + - Add support for copying selected cells to clipboard (Kvaz1r). + - Many bug fixes and usability improvements to selection. + - Improve wxGridCellChoiceEditor usability (Ian McInerney). + - Significantly optimize wxGrid::AutoSizeColumns() for big grids. + - Add ellipsization support. + * Add support for wxGenericAnimationCtrl to XRC (Ilya Sinitsin). + * Add wxDD_SHOW_HIDDEN and wxDD_MULTIPLE wxDirDialog flags (Ian McInerney, PB). + * Add wxWebView::SetZoomFactor(float) (Hertatijanto Hartono). + * Add wxWindow::DisableFocusFromKeyboard() (Tomay). + * Allow overriding wxDataViewModal::HasValue() (Jorge Moraleda). + * Call wxAuiManager::UnInit() automatically now. + * Fix crash and layout problem in wxGenericDirCtrl (Maarten Bent). + * Improve AUI appearance in dark mode (Daniel Kulp, Michel Le Bihan). + + wxGTK: + * Add native wxSearchCtrl implementation (AliKet). + * Several bug fixes and improvements in wxSpinCtrl. + * Implement wxBU_EXACTFIT support in wxButton (Artur Wieczorek). + * Allow using generic wxAnimationCtrl if wanted. + * Fix a regression with crashes when using wxBufferedPaintDC. + * Fix drawing bitmaps with masks using wxGraphicsContext under GTK2. + * Fix position of popup menus on non-primary display. + * Make wxUIActionSimulator much more reliable (AliKet). + * Fix caret colour in wxTextCtrl with custom colours. + + wxQt: + * Fix build with Qt 5.15 (Stefan Brüns). +- Drop obsolete patches: + + 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch + + 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch + +------------------------------------------------------------------- +Tue Jun 16 10:04:20 UTC 2020 - Dave Plater + +- Build nostl package against gtk3, audacity crashes with gtk2 + +------------------------------------------------------------------- +Tue Jun 9 12:05:18 UTC 2020 - Dave Plater + +- Add nostl package for audacity + ------------------------------------------------------------------- Mon Jun 1 12:39:06 UTC 2020 - Stefan Brüns diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index 510e501..576db81 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -20,12 +20,12 @@ Name: wxGTK3-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define psonum 3_1_3 -%define sonum 3.1.3 -Version: 3.1.3 +%define psonum 4_0_0 +%define sonum 4.0.0 +Version: 3.1.4 Release: 0 %define wx_minor 3.1 -%define wx_micro 3.1.3 +%define wx_micro 3.1.4 # build non-UI toolkit related packages %define base_packages 0 Summary: C++ Library for Cross-Platform Development @@ -39,10 +39,6 @@ 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++ @@ -143,7 +139,7 @@ Group: System/Libraries %description -n libwx_%{toolkit}u_html-%variant%psonum The wxHTML library provides classes for parsing and displaying HTML. It is not intended to be a high-end HTML browser. wxHTML can be used -as a generic rich text viewer — for example, to display an About Box +as a generic rich text viewer - for example, to display an About Box or the result of a database search. %package -n libwx_%{toolkit}u_media-%variant%psonum @@ -203,7 +199,7 @@ Group: System/Libraries %description -n libwx_%{toolkit}u_webview-%variant%psonum Library for a wxWidgets control that can be used to render web -(HTML / CSS / javascript) documents. +(HTML / CSS / javascript) documents. %package -n libwx_%{toolkit}u_xrc-%variant%psonum Summary: wxWidgets's XML-based resource system @@ -261,8 +257,6 @@ 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 45580ed..638c61e 100644 --- a/wxQt-3_2.changes +++ b/wxQt-3_2.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Sat Jul 25 15:20:26 UTC 2020 - Stefan Brüns + +- Update to new upstream release 3.1.4: + + INCOMPATIBLE CHANGES SINCE 3.1.3: + * CMake library targets were renamed and now start with 'wx'. In addition, + aliases for the libraries have been added using the 'wx::' namespace. For + example, the core library is now named wxcore and has alias wx::core. + + All: + * Add natural sort functions (Hugo Elias, PB). + * Add wxTempFFile class (Dummy). + * Fix bug with multiple leading ".." in wxFileName::Normalize() (Fabian Cenedese). + * Improve brush transparency support in wxSVGFileDC (Maarten Bent). + * Optionally forbid implicit wxString/char* conversions (Arrigo Marchiori). + * Add --disable-tests configure option (Hertatijanto Hartono). + + All (GUI): + * Many wxGrid improvements: + - Live-resize wxGrid columns/rows, making it work with wxGTK3 and wxOSX too. + - Add activatable editors support, use it for boolean cells. + - Add support for copying selected cells to clipboard (Kvaz1r). + - Many bug fixes and usability improvements to selection. + - Improve wxGridCellChoiceEditor usability (Ian McInerney). + - Significantly optimize wxGrid::AutoSizeColumns() for big grids. + - Add ellipsization support. + * Add support for wxGenericAnimationCtrl to XRC (Ilya Sinitsin). + * Add wxDD_SHOW_HIDDEN and wxDD_MULTIPLE wxDirDialog flags (Ian McInerney, PB). + * Add wxWebView::SetZoomFactor(float) (Hertatijanto Hartono). + * Add wxWindow::DisableFocusFromKeyboard() (Tomay). + * Allow overriding wxDataViewModal::HasValue() (Jorge Moraleda). + * Call wxAuiManager::UnInit() automatically now. + * Fix crash and layout problem in wxGenericDirCtrl (Maarten Bent). + * Improve AUI appearance in dark mode (Daniel Kulp, Michel Le Bihan). + + wxGTK: + * Add native wxSearchCtrl implementation (AliKet). + * Several bug fixes and improvements in wxSpinCtrl. + * Implement wxBU_EXACTFIT support in wxButton (Artur Wieczorek). + * Allow using generic wxAnimationCtrl if wanted. + * Fix a regression with crashes when using wxBufferedPaintDC. + * Fix drawing bitmaps with masks using wxGraphicsContext under GTK2. + * Fix position of popup menus on non-primary display. + * Make wxUIActionSimulator much more reliable (AliKet). + * Fix caret colour in wxTextCtrl with custom colours. + + wxQt: + * Fix build with Qt 5.15 (Stefan Brüns). +- Drop obsolete patches: + + 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch + + 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch + +------------------------------------------------------------------- +Tue Jun 16 10:04:20 UTC 2020 - Dave Plater + +- Build nostl package against gtk3, audacity crashes with gtk2 + +------------------------------------------------------------------- +Tue Jun 9 12:05:18 UTC 2020 - Dave Plater + +- Add nostl package for audacity + ------------------------------------------------------------------- Mon Jun 1 12:39:06 UTC 2020 - Stefan Brüns diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index 246c85d..1a03d18 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -20,12 +20,12 @@ Name: wxQt-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define psonum 3_1_3 -%define sonum 3.1.3 -Version: 3.1.3 +%define psonum 4_0_0 +%define sonum 4.0.0 +Version: 3.1.4 Release: 0 %define wx_minor 3.1 -%define wx_micro 3.1.3 +%define wx_micro 3.1.4 # build non-UI toolkit related packages %define base_packages 0 Summary: C++ Library for Cross-Platform Development @@ -39,10 +39,6 @@ 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++ @@ -146,7 +142,7 @@ Group: System/Libraries %description -n libwx_%{toolkit}u_html-%variant%psonum The wxHTML library provides classes for parsing and displaying HTML. It is not intended to be a high-end HTML browser. wxHTML can be used -as a generic rich text viewer — for example, to display an About Box +as a generic rich text viewer - for example, to display an About Box or the result of a database search. %package -n libwx_%{toolkit}u_media-%variant%psonum @@ -206,7 +202,7 @@ Group: System/Libraries %description -n libwx_%{toolkit}u_webview-%variant%psonum Library for a wxWidgets control that can be used to render web -(HTML / CSS / javascript) documents. +(HTML / CSS / javascript) documents. %package -n libwx_%{toolkit}u_xrc-%variant%psonum Summary: wxWidgets's XML-based resource system @@ -260,8 +256,6 @@ 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.1.3.tar.bz2 b/wxWidgets-3.1.3.tar.bz2 deleted file mode 100644 index 302c4c5..0000000 --- a/wxWidgets-3.1.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fffc1d34dac54ff7008df327907984b156c50cff5a2f36ee3da6052744ab554a -size 21345268 diff --git a/wxWidgets-3.1.4.tar.bz2 b/wxWidgets-3.1.4.tar.bz2 new file mode 100644 index 0000000..eb4541a --- /dev/null +++ b/wxWidgets-3.1.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ca3a19a14b407d0cdda507a7930c2e84ae1c8e74f946e0144d2fa7d881f1a94 +size 21581661 diff --git a/wxWidgets-3_2-nostl.changes b/wxWidgets-3_2-nostl.changes index 8f9cfad..638c61e 100644 --- a/wxWidgets-3_2-nostl.changes +++ b/wxWidgets-3_2-nostl.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Sat Jul 25 15:20:26 UTC 2020 - Stefan Brüns + +- Update to new upstream release 3.1.4: + + INCOMPATIBLE CHANGES SINCE 3.1.3: + * CMake library targets were renamed and now start with 'wx'. In addition, + aliases for the libraries have been added using the 'wx::' namespace. For + example, the core library is now named wxcore and has alias wx::core. + + All: + * Add natural sort functions (Hugo Elias, PB). + * Add wxTempFFile class (Dummy). + * Fix bug with multiple leading ".." in wxFileName::Normalize() (Fabian Cenedese). + * Improve brush transparency support in wxSVGFileDC (Maarten Bent). + * Optionally forbid implicit wxString/char* conversions (Arrigo Marchiori). + * Add --disable-tests configure option (Hertatijanto Hartono). + + All (GUI): + * Many wxGrid improvements: + - Live-resize wxGrid columns/rows, making it work with wxGTK3 and wxOSX too. + - Add activatable editors support, use it for boolean cells. + - Add support for copying selected cells to clipboard (Kvaz1r). + - Many bug fixes and usability improvements to selection. + - Improve wxGridCellChoiceEditor usability (Ian McInerney). + - Significantly optimize wxGrid::AutoSizeColumns() for big grids. + - Add ellipsization support. + * Add support for wxGenericAnimationCtrl to XRC (Ilya Sinitsin). + * Add wxDD_SHOW_HIDDEN and wxDD_MULTIPLE wxDirDialog flags (Ian McInerney, PB). + * Add wxWebView::SetZoomFactor(float) (Hertatijanto Hartono). + * Add wxWindow::DisableFocusFromKeyboard() (Tomay). + * Allow overriding wxDataViewModal::HasValue() (Jorge Moraleda). + * Call wxAuiManager::UnInit() automatically now. + * Fix crash and layout problem in wxGenericDirCtrl (Maarten Bent). + * Improve AUI appearance in dark mode (Daniel Kulp, Michel Le Bihan). + + wxGTK: + * Add native wxSearchCtrl implementation (AliKet). + * Several bug fixes and improvements in wxSpinCtrl. + * Implement wxBU_EXACTFIT support in wxButton (Artur Wieczorek). + * Allow using generic wxAnimationCtrl if wanted. + * Fix a regression with crashes when using wxBufferedPaintDC. + * Fix drawing bitmaps with masks using wxGraphicsContext under GTK2. + * Fix position of popup menus on non-primary display. + * Make wxUIActionSimulator much more reliable (AliKet). + * Fix caret colour in wxTextCtrl with custom colours. + + wxQt: + * Fix build with Qt 5.15 (Stefan Brüns). +- Drop obsolete patches: + + 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch + + 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch + ------------------------------------------------------------------- Tue Jun 16 10:04:20 UTC 2020 - Dave Plater diff --git a/wxWidgets-3_2-nostl.spec b/wxWidgets-3_2-nostl.spec index a6eb039..48d3db6 100644 --- a/wxWidgets-3_2-nostl.spec +++ b/wxWidgets-3_2-nostl.spec @@ -20,14 +20,14 @@ Name: wxWidgets-3_2-nostl %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse-nostl -%define psonum 3_1_3 -%define sonum 3.1.3 -Version: 3.1.3 +%define psonum 4_0_0 +%define sonum 4.0.0 +Version: 3.1.4 Release: 0 %define wx_minor 3.1 -%define wx_micro 3.1.3 +%define wx_micro 3.1.4 # build non-UI toolkit related packages -%define base_packages 1 +%define base_packages 0 Summary: C++ Library for Cross-Platform Development License: LGPL-2.1-or-later WITH WxWindows-exception-3.1 Group: Development/Libraries/C and C++ @@ -39,14 +39,9 @@ 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++ -BuildRequires: gnome-vfs2-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel %define gtk_version 3 @@ -223,6 +218,13 @@ The XML-based resource system of wxWidgets, known as XRC, allows user interface elements such as dialogs, menu bars and toolbars, to be stored in text files and loaded into the application at run-time. +%package plugin-sound_sdlu-3_2 +Summary: wxWidgets SDL Plugin +Group: System/Libraries + +%description plugin-sound_sdlu-3_2 +SDL based sound plugin for the wxWidgets cross-platform GUI. + %package devel Summary: Development files for GTK2-backed wxWidgets 3.2 Group: Development/Libraries/C and C++ @@ -264,12 +266,12 @@ 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 autoconf -f -i +# NOTE: gnome-vfs is deprecated. Disabled for GTK3 build +# # With 2.9.1: # --enable-objc_uniquifying is relevant only for Cocoa # --enable-accessibility is currently supported only in msw @@ -282,7 +284,6 @@ autoconf -f -i --with-opengl \ --with-libmspack \ --with-sdl \ - --with-gnomevfs \ --enable-ipv6 \ --enable-mediactrl \ --enable-optimise \ @@ -389,6 +390,13 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %files -n libwx_%{toolkit}u_xrc-%variant%psonum %_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}* +%if %base_packages +%files plugin-sound_sdlu-3_2 +%dir %_libdir/wx +%dir %_libdir/wx/%wx_micro +%_libdir/wx/%wx_micro/sound_sdlu-%wx_micro.so +%endif + %files devel # Complete documentation is available in the docs packages. %doc docs/*.txt README.SUSE diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index 8f9cfad..638c61e 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Sat Jul 25 15:20:26 UTC 2020 - Stefan Brüns + +- Update to new upstream release 3.1.4: + + INCOMPATIBLE CHANGES SINCE 3.1.3: + * CMake library targets were renamed and now start with 'wx'. In addition, + aliases for the libraries have been added using the 'wx::' namespace. For + example, the core library is now named wxcore and has alias wx::core. + + All: + * Add natural sort functions (Hugo Elias, PB). + * Add wxTempFFile class (Dummy). + * Fix bug with multiple leading ".." in wxFileName::Normalize() (Fabian Cenedese). + * Improve brush transparency support in wxSVGFileDC (Maarten Bent). + * Optionally forbid implicit wxString/char* conversions (Arrigo Marchiori). + * Add --disable-tests configure option (Hertatijanto Hartono). + + All (GUI): + * Many wxGrid improvements: + - Live-resize wxGrid columns/rows, making it work with wxGTK3 and wxOSX too. + - Add activatable editors support, use it for boolean cells. + - Add support for copying selected cells to clipboard (Kvaz1r). + - Many bug fixes and usability improvements to selection. + - Improve wxGridCellChoiceEditor usability (Ian McInerney). + - Significantly optimize wxGrid::AutoSizeColumns() for big grids. + - Add ellipsization support. + * Add support for wxGenericAnimationCtrl to XRC (Ilya Sinitsin). + * Add wxDD_SHOW_HIDDEN and wxDD_MULTIPLE wxDirDialog flags (Ian McInerney, PB). + * Add wxWebView::SetZoomFactor(float) (Hertatijanto Hartono). + * Add wxWindow::DisableFocusFromKeyboard() (Tomay). + * Allow overriding wxDataViewModal::HasValue() (Jorge Moraleda). + * Call wxAuiManager::UnInit() automatically now. + * Fix crash and layout problem in wxGenericDirCtrl (Maarten Bent). + * Improve AUI appearance in dark mode (Daniel Kulp, Michel Le Bihan). + + wxGTK: + * Add native wxSearchCtrl implementation (AliKet). + * Several bug fixes and improvements in wxSpinCtrl. + * Implement wxBU_EXACTFIT support in wxButton (Artur Wieczorek). + * Allow using generic wxAnimationCtrl if wanted. + * Fix a regression with crashes when using wxBufferedPaintDC. + * Fix drawing bitmaps with masks using wxGraphicsContext under GTK2. + * Fix position of popup menus on non-primary display. + * Make wxUIActionSimulator much more reliable (AliKet). + * Fix caret colour in wxTextCtrl with custom colours. + + wxQt: + * Fix build with Qt 5.15 (Stefan Brüns). +- Drop obsolete patches: + + 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch + + 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch + ------------------------------------------------------------------- Tue Jun 16 10:04:20 UTC 2020 - Dave Plater diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index db85553..35a4e62 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -20,12 +20,12 @@ Name: wxWidgets-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define psonum 3_1_3 -%define sonum 3.1.3 -Version: 3.1.3 +%define psonum 4_0_0 +%define sonum 4.0.0 +Version: 3.1.4 Release: 0 %define wx_minor 3.1 -%define wx_micro 3.1.3 +%define wx_micro 3.1.4 # build non-UI toolkit related packages %define base_packages 1 Summary: C++ Library for Cross-Platform Development @@ -39,10 +39,6 @@ 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++ @@ -143,7 +139,7 @@ Group: System/Libraries %description -n libwx_%{toolkit}u_html-%variant%psonum The wxHTML library provides classes for parsing and displaying HTML. It is not intended to be a high-end HTML browser. wxHTML can be used -as a generic rich text viewer — for example, to display an About Box +as a generic rich text viewer - for example, to display an About Box or the result of a database search. %package -n libwx_%{toolkit}u_media-%variant%psonum @@ -203,7 +199,7 @@ Group: System/Libraries %description -n libwx_%{toolkit}u_webview-%variant%psonum Library for a wxWidgets control that can be used to render web -(HTML / CSS / javascript) documents. +(HTML / CSS / javascript) documents. %package -n libwx_%{toolkit}u_xrc-%variant%psonum Summary: wxWidgets's XML-based resource system @@ -248,7 +244,7 @@ Provides: wxWidgets-devel = %version-%release Conflicts: wxWidgets-any-devel # Name up to openSUSE 11.3 and up to wxGTK-2.8.x: Provides: wxGTK-devel = %version-%release -Obsoletes: wxGTK-devel <= %version-%release +Obsoletes: wxGTK-devel < %version-%release %description devel wxWidgets is a C++ library abstraction layer for a number of GUI @@ -264,8 +260,6 @@ 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