Accepting request 825825 from home:StefanBruens:branches:X11:wxWidgets

Fix uninstallable nostl variant in Staging:ADI:20
- Correct base_packages flag for nostl variant, it can not use the
  base libraries of the regular variant

- Do not disable debugging completely, only recommended for
  constrained environments and breaks wxPython tests
- Build base libraries from wxGTK3 build, wxWidgets (GTK2) is no
  longer used by any Factory package.

OBS-URL: https://build.opensuse.org/request/show/825825
OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=66

wxGTK3-3_2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Jul 26 07:45:42 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Do not disable debugging completely, only recommended for
+  constrained environments and breaks wxPython tests
+- Correct base_packages flag for nostl variant, it can not use the
+  base libraries of the regular variant
+- Build base libraries from wxGTK3 build, wxWidgets (GTK2) is no
+  longer used by any Factory package.
+
 -------------------------------------------------------------------
 Sat Jul 25 15:20:26 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

wxGTK3-3_2.spec

@@ -20,6 +20,9 @@ Name:           wxGTK3-3_2
 %define base_name wxWidgets-3_2
 %define tarball_name wxWidgets
 %define variant suse
+# Use default debug level, enabling exceptions
+# Other valid values: yes/no/max
+%define wx_debug %{nil}
 %define psonum 4_0_0
 %define sonum 4.0.0
 Version:        3.1.4
@@ -139,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
@@ -199,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
@@ -249,7 +252,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant.
 
 %prep
 %setup -q -n %tarball_name-%version
-%patch -P 1 -p1
+%patch1 -p1
 cp %{S:2} .
 
 %build
@@ -271,11 +274,7 @@ autoconf -f -i
 	--enable-ipv6 \
 	--enable-mediactrl \
 	--enable-optimise \
-%if 0%{?WX_DEBUG}
+	%{wx_debug:--enable-debug=%{wx_debug}} \
-	--enable-debug \
-%else
-	--disable-debug \
-%endif
         --enable-repro-build \
 	--enable-stl \
 	--enable-plugins
@@ -380,6 +379,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 -n %{base_name}-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

wxQt-3_2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Jul 26 07:45:42 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Do not disable debugging completely, only recommended for
+  constrained environments and breaks wxPython tests
+- Correct base_packages flag for nostl variant, it can not use the
+  base libraries of the regular variant
+- Build base libraries from wxGTK3 build, wxWidgets (GTK2) is no
+  longer used by any Factory package.
+
 -------------------------------------------------------------------
 Sat Jul 25 15:20:26 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

wxQt-3_2.spec

@@ -20,6 +20,9 @@ Name:           wxQt-3_2
 %define base_name wxWidgets-3_2
 %define tarball_name wxWidgets
 %define variant suse
+# Use default debug level, enabling exceptions
+# Other valid values: yes/no/max
+%define wx_debug %{nil}
 %define psonum 4_0_0
 %define sonum 4.0.0
 Version:        3.1.4
@@ -142,7 +145,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
@@ -202,7 +205,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 +251,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant.
 
 %prep
 %setup -q -n %tarball_name-%version
-%patch -P 1 -p1
+%patch1 -p1
 cp %{S:2} .
 
 %build
@@ -270,11 +273,7 @@ autoconf -f -i
 	--enable-ipv6 \
 	--enable-mediactrl \
 	--enable-optimise \
-%if 0%{?WX_DEBUG}
+	%{wx_debug:--enable-debug=%{wx_debug}} \
-	--enable-debug \
-%else
-	--disable-debug \
-%endif
         --enable-repro-build \
 	--enable-stl \
 	--enable-plugins
@@ -373,6 +372,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 -n %{base_name}-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

wxWidgets-3_2-nostl.changes

@@ -1,50 +1,46 @@
+-------------------------------------------------------------------
+Sun Jul 26 07:45:42 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Do not disable debugging completely, only recommended for
+  constrained environments and breaks wxPython tests
+- Correct base_packages flag for nostl variant, it can not use the
+  base libraries of the regular variant
+- Build base libraries from wxGTK3 build, wxWidgets (GTK2) is no
+  longer used by any Factory package.
+
 -------------------------------------------------------------------
 Sat Jul 25 15:20:26 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 
 - Update to new upstream release 3.1.4:
-  + INCOMPATIBLE CHANGES SINCE 3.1.3:
+  * Incompatible to 3.1.3: CMake library targets were renamed and
-    * CMake library targets were renamed and now start with 'wx'. In addition,
+    now start with 'wx'. In addition, aliases for the libraries
-      aliases for the libraries have been added using the 'wx::' namespace. For
+    have been added using the 'wx::' namespace. For example, the
-      example, the core library is now named wxcore and has alias wx::core.
+    core library is now named wxcore and has alias wx::core.
-  + All:
+  * Add natural sort functions.
-    * Add natural sort functions (Hugo Elias, PB).
+  * Add wxTempFFile class (Dummy).
-    * Add wxTempFFile class (Dummy).
+  * Fix bug with multiple leading ".." in wxFileName::Normalize().
-    * Fix bug with multiple leading ".." in wxFileName::Normalize() (Fabian Cenedese).
+  * Improve brush transparency support in wxSVGFileDC.
-    * Improve brush transparency support in wxSVGFileDC (Maarten Bent).
+  * Optionally forbid implicit wxString/char* conversions.
-    * Optionally forbid implicit wxString/char* conversions (Arrigo Marchiori).
+  * Add support for wxGenericAnimationCtrl to XRC.
-    * Add --disable-tests configure option (Hertatijanto Hartono).
+  * Add wxDD_SHOW_HIDDEN and wxDD_MULTIPLE wxDirDialog flags.
-  + All (GUI):
+  * Add wxWebView::SetZoomFactor(float).
-    * Many wxGrid improvements:
+  * Add wxWindow::DisableFocusFromKeyboard().
-      - Live-resize wxGrid columns/rows, making it work with wxGTK3 and wxOSX too.
+  * Allow overriding wxDataViewModal::HasValue().
-      - Add activatable editors support, use it for boolean cells.
+  * Call wxAuiManager::UnInit() automatically now.
-      - Add support for copying selected cells to clipboard (Kvaz1r).
+  * Fix crash and layout problem in wxGenericDirCtrl
-      - Many bug fixes and usability improvements to selection.
+  * wxQt: Fix build with Qt 5.15
-      - Improve wxGridCellChoiceEditor usability (Ian McInerney).
+  * GTK backend:
-      - Significantly optimize wxGrid::AutoSizeColumns() for big grids.
+  * Add native wxSearchCtrl implementation.
-      - Add ellipsization support.
+  * Implement wxBU_EXACTFIT support in wxButton.
-    * Add support for wxGenericAnimationCtrl to XRC (Ilya Sinitsin).
+  * Fix a regression with crashes when using wxBufferedPaintDC.
-    * Add wxDD_SHOW_HIDDEN and wxDD_MULTIPLE wxDirDialog flags (Ian McInerney, PB).
+  * Fix drawing bitmaps with masks using wxGraphicsContext under
-    * Add wxWebView::SetZoomFactor(float) (Hertatijanto Hartono).
+    GTK2.
-    * Add wxWindow::DisableFocusFromKeyboard() (Tomay).
+  * Fix position of popup menus on non-primary display.
-    * Allow overriding wxDataViewModal::HasValue() (Jorge Moraleda).
+  * Make wxUIActionSimulator much more reliable
-    * Call wxAuiManager::UnInit() automatically now.
+  * Fix caret colour in wxTextCtrl with custom colours.
-    * 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
+  * 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch
-  + 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch
+  * 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch
 
 -------------------------------------------------------------------
 Tue Jun 16 10:04:20 UTC 2020 - Dave Plater <davejplater@gmail.com>

wxWidgets-3_2-nostl.spec

@@ -20,6 +20,9 @@ Name:           wxWidgets-3_2-nostl
 %define base_name wxWidgets-3_2
 %define tarball_name wxWidgets
 %define variant suse-nostl
+# Use default debug level, enabling exceptions
+# Other valid values: yes/no/max
+%define wx_debug %{nil}
 %define psonum 4_0_0
 %define sonum 4.0.0
 Version:        3.1.4
@@ -69,7 +72,7 @@ wxWidgets is a C++ library abstraction layer for a number of GUI
 backends. Applications can be created for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source
 code.
-This varaint of wxWidgets is built without STL types (such as
+This variant of wxWidgets is built without STL types (such as
 std::string), and is provided for old programs which fail to use e.g.
 wxString and instead rely on the wxChar pointer API.
 
@@ -88,7 +91,7 @@ Every wxWidgets application must link against this library. It
 contains mandatory classes that any wxWidgets code depends on (e.g.
 wxString) and portability classes that abstract differences between
 platforms. wxBase can be used to develop console-only applications.
-This varaint of wxWidgets is built without STL types (such as
+This variant of wxWidgets is built without STL types (such as
 std::string), and is provided for old programs which fail to use e.g.
 wxString and instead rely on the wxChar pointer API.
 
@@ -144,9 +147,9 @@ 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.
-This varaint of wxWidgets is built without STL types (such as
+This variant of wxWidgets is built without STL types (such as
 std::string), and is provided for old programs which fail to use e.g.
 wxString and instead rely on the wxChar pointer API.
 
@@ -207,7 +210,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
@@ -249,7 +252,7 @@ Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source
 code.
 
 This package contains all files needed for developing with wxGTK%gtk_version.
-This varaint of wxWidgets is built without STL types (such as
+This variant of wxWidgets is built without STL types (such as
 std::string), and is provided for old programs which fail to use e.g.
 wxString and instead rely on the wxChar pointer API.
 
@@ -258,7 +261,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant.
 
 %prep
 %setup -q -n %tarball_name-%version
-%patch -P 1 -p1
+%patch1 -p1
 cp %{S:2} .
 
 %build
@@ -280,11 +283,7 @@ autoconf -f -i
 	--enable-ipv6 \
 	--enable-mediactrl \
 	--enable-optimise \
-%if 0%{?WX_DEBUG}
+	%{wx_debug:--enable-debug=%{wx_debug}} \
-	--enable-debug \
-%else
-	--disable-debug \
-%endif
         --enable-repro-build \
 	--disable-stl \
 	--disable-plugins
@@ -383,6 +382,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 -n %{base_name}-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

wxWidgets-3_2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Jul 26 07:45:42 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Do not disable debugging completely, only recommended for
+  constrained environments and breaks wxPython tests
+- Correct base_packages flag for nostl variant, it can not use the
+  base libraries of the regular variant
+- Build base libraries from wxGTK3 build, wxWidgets (GTK2) is no
+  longer used by any Factory package.
+
 -------------------------------------------------------------------
 Sat Jul 25 15:20:26 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

wxWidgets-3_2.spec

@@ -20,6 +20,9 @@ Name:           wxWidgets-3_2
 %define base_name wxWidgets-3_2
 %define tarball_name wxWidgets
 %define variant suse
+# Use default debug level, enabling exceptions
+# Other valid values: yes/no/max
+%define wx_debug %{nil}
 %define psonum 4_0_0
 %define sonum 4.0.0
 Version:        3.1.4
@@ -27,7 +30,7 @@ Release:        0
 %define wx_minor 3.1
 %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++
@@ -139,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
@@ -199,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
@@ -210,11 +213,11 @@ 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
+%package -n %{base_name}-plugin-sound_sdlu-3_2
 Summary:        wxWidgets SDL Plugin
 Group:          System/Libraries
 
-%description plugin-sound_sdlu-3_2
+%description -n %{base_name}-plugin-sound_sdlu-3_2
 SDL based sound plugin for the wxWidgets cross-platform GUI.
 
 %package devel
@@ -259,7 +262,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant.
 
 %prep
 %setup -q -n %tarball_name-%version
-%patch -P 1 -p1
+%patch1 -p1
 cp %{S:2} .
 
 %build
@@ -280,11 +283,7 @@ autoconf -f -i
 	--enable-ipv6 \
 	--enable-mediactrl \
 	--enable-optimise \
-%if 0%{?WX_DEBUG}
+	%{wx_debug:--enable-debug=%{wx_debug}} \
-	--enable-debug \
-%else
-	--disable-debug \
-%endif
         --enable-repro-build \
 	--enable-stl \
 	--enable-plugins
@@ -384,7 +383,7 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}*
 
 %if %base_packages
-%files plugin-sound_sdlu-3_2
+%files -n %{base_name}-plugin-sound_sdlu-3_2
 %dir %_libdir/wx
 %dir %_libdir/wx/%wx_micro
 %_libdir/wx/%wx_micro/sound_sdlu-%wx_micro.so