Hello community,
here is the log from the commit of package wxWidgets-3_2 for openSUSE:Factory
checked in at 2020-09-25 16:28:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wxWidgets-3_2 (Old)
and /work/SRC/openSUSE:Factory/.wxWidgets-3_2.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxWidgets-3_2"
Fri Sep 25 16:28:32 2020 rev:11 rq:831918 version:3.1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/wxWidgets-3_2/wxWidgets-3_2.changes
2020-06-17 14:51:08.549146591 +0200
+++ /work/SRC/openSUSE:Factory/.wxWidgets-3_2.new.4249/wxWidgets-3_2.changes
2020-09-25 16:30:42.363846277 +0200
@@ -1,0 +2,50 @@
+Wed Aug 19 18:01:10 UTC 2020 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Use _multibuild to avoid changes and spec files of the variants
+ getting out of sync.
+
+-------------------------------------------------------------------
+Sun Jul 26 07:45:42 UTC 2020 - Stefan Brüns <stefan.bru...@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.bru...@rwth-aachen.de>
+
+- Update to new upstream release 3.1.4:
+ * Incompatible to 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.
+ * Add natural sort functions.
+ * Add wxTempFFile class (Dummy).
+ * Fix bug with multiple leading ".." in wxFileName::Normalize().
+ * Improve brush transparency support in wxSVGFileDC.
+ * Optionally forbid implicit wxString/char* conversions.
+ * Add support for wxGenericAnimationCtrl to XRC.
+ * Add wxDD_SHOW_HIDDEN and wxDD_MULTIPLE wxDirDialog flags.
+ * Add wxWebView::SetZoomFactor(float).
+ * Add wxWindow::DisableFocusFromKeyboard().
+ * Allow overriding wxDataViewModal::HasValue().
+ * Call wxAuiManager::UnInit() automatically now.
+ * Fix crash and layout problem in wxGenericDirCtrl
+ * wxQt: Fix build with Qt 5.15
+ * GTK backend:
+ * Add native wxSearchCtrl implementation.
+ * Implement wxBU_EXACTFIT support in wxButton.
+ * 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
+ * Fix caret colour in wxTextCtrl with custom colours.
+- Drop obsolete patches:
+ * 0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch
+ * 0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Add-missing-QPainterPath-include-required-with-Qt-5..patch
0002-Make-the-wxUIActionSimulator-Text-implementation-mat.patch
pre_checkin.sh
wxGTK3-3_2.changes
wxGTK3-3_2.spec
wxQt-3_2.changes
wxQt-3_2.spec
wxWidgets-3.1.3.tar.bz2
wxWidgets-3_2-nostl.changes
wxWidgets-3_2-nostl.spec
New:
----
_multibuild
wxWidgets-3.1.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wxWidgets-3_2.spec ++++++
--- /var/tmp/diff_new_pack.QyPv9E/_old 2020-09-25 16:30:43.123846952 +0200
+++ /var/tmp/diff_new_pack.QyPv9E/_new 2020-09-25 16:30:43.131846959 +0200
@@ -16,18 +16,66 @@
#
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == ""
Name: wxWidgets-3_2
+ExclusiveArch: do_not_build
+%endif
+
+%if "%{flavor}" == "GTK2"
+Name: wxWidgets-3_2
+%define pkgname wxWidgets-3_2
+%define variant suse
+%define gtk_version 2
+%define toolkit gtk%gtk_version
+%define base_packages 0
+%bcond_with webview
+%endif
+
+%if "%{flavor}" == "GTK3"
+Name: wxGTK3-3_2
+%define pkgname wxGTK3-3_2
+%define variant suse
+%define gtk_version 3
+%define toolkit gtk%gtk_version
+# build non-UI toolkit related packages
+%define base_packages 1
+%bcond_without webview
+%endif
+
+%if "%{flavor}" == "GTK3-nostl"
+Name: wxWidgets-3_2-nostl
+%define pkgname wxWidgets-3_2-nostl
+%define variant suse-nostl
+%define gtk_version 3
+%define toolkit gtk%gtk_version
+%define base_packages 1
+%bcond_with webview
+%define extra_description 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.
+%endif
+
+%if "%{flavor}" == "Qt"
+Name: wxQt-3_2
+%define pkgname wxQt-3_2
+%define variant suse
+%define toolkit qt
+%define base_packages 0
+%bcond_with webview
+%endif
+
%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
+# 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
Release: 0
%define wx_minor 3.1
-%define wx_micro 3.1.3
-# build non-UI toolkit related packages
-%define base_packages 1
+%define wx_micro 3.1.4
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,19 +87,11 @@
# 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
-BuildRequires: gtk2-devel
-%define gtk_version 2
-%define toolkit gtk%gtk_version
BuildRequires: libSM-devel
BuildRequires: libexpat-devel
BuildRequires: libjpeg-devel
@@ -60,6 +100,24 @@
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: zlib-devel
+%if %{toolkit} == "gtk2"
+BuildRequires: gnome-vfs2-devel
+BuildRequires: gtk2-devel
+%endif
+%if %{toolkit} == "gtk3"
+BuildRequires: pkgconfig(gtk+-3.0)
+%if %{with webview}
+BuildRequires: pkgconfig(webkit2gtk-4.0)
+%endif
+%endif
+%if %{toolkit} == "qt"
+BuildRequires: pkgconfig(Qt5Core) >= 5.2.1
+BuildRequires: pkgconfig(Qt5Gui) >= 5.2.1
+BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.1
+BuildRequires: pkgconfig(Qt5Test) >= 5.2.1
+BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.1
+BuildRequires: pkgconfig(cairo)
+%endif
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(liblzma)
%if 0%{?sle_version} < 150000 && !0%{?is_opensuse}
@@ -90,6 +148,7 @@
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.
+%{?extra_description}
%package -n libwx_baseu_net-%variant%psonum
Summary: wxWidgets networking library
@@ -143,8 +202,9 @@
%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.
+%{?extra_description}
%package -n libwx_%{toolkit}u_media-%variant%psonum
Summary: wxWidgets media class library
@@ -203,7 +263,7 @@
%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
@@ -214,17 +274,26 @@
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
-Summary: Development files for GTK2-backed wxWidgets 3.2
+Summary: Development files for %{name}
Group: Development/Libraries/C and C++
-Requires: gtk%gtk_version-devel
+%if %{toolkit} == "gtk2"
+Requires: gtk2-devel
+%endif
+%if %{toolkit} == "gtk3"
+Requires: pkgconfig(gtk+-3.0)
+%endif
+%if %{toolkit} == "qt"
+Requires: pkgconfig(Qt5OpenGL) >= 5.2.1
+Requires: pkgconfig(Qt5Widgets) >= 5.2.1
+%endif
Requires: libwx_%{toolkit}u_adv-%variant%psonum = %version
Requires: libwx_%{toolkit}u_aui-%variant%psonum = %version
Requires: libwx_%{toolkit}u_core-%variant%psonum = %version
@@ -236,19 +305,32 @@
Requires: libwx_%{toolkit}u_ribbon-%variant%psonum = %version
Requires: libwx_%{toolkit}u_richtext-%variant%psonum = %version
Requires: libwx_%{toolkit}u_stc-%variant%psonum = %version
+%if %{with webview}
+Requires: libwx_%{toolkit}u_webview-%variant%psonum = %version
+%endif
Requires: libwx_%{toolkit}u_xrc-%variant%psonum = %version
Requires: libwx_baseu-%variant%psonum = %version
Requires: libwx_baseu_net-%variant%psonum = %version
Requires: libwx_baseu_xml-%variant%psonum = %version
Requires: pkgconfig(gl)
Requires: pkgconfig(glu)
-Provides: wxGTK2-devel = %version-%release
Provides: wxWidgets-any-devel
-Provides: wxWidgets-devel = %version-%release
Conflicts: wxWidgets-any-devel
+%if %{toolkit} == "gtk2"
+Provides: wxGTK2-devel = %version-%release
+Provides: wxWidgets-devel = %version-%release
# 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
+%endif
+%if %{toolkit} == "gtk3"
+%if "%{flavor}" != "GTK3-nostl"
+Provides: wxGTK3-devel = %version-%release
+%endif
+%endif
+%if %{toolkit} == "qt"
+Provides: wxQt-devel = %version-%release
+%endif
%description devel
wxWidgets is a C++ library abstraction layer for a number of GUI
@@ -256,20 +338,20 @@
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 package contains all files needed for developing with %{name}.
+%{?extra_description}
Note: wxWidgets variant devel packages are mutually exclusive. Please
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
+%autosetup -n %tarball_name-%version -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
@@ -277,23 +359,31 @@
%configure \
--enable-vendor=%variant \
+%if %{toolkit} == "qt"
+ --with-qt \
+%else
--with-gtk=%gtk_version \
+%if %{gtk_version} == 2
+ --with-gnomevfs \
+%endif
+%endif
--enable-unicode \
--with-opengl \
--with-libmspack \
--with-sdl \
- --with-gnomevfs \
--enable-ipv6 \
--enable-mediactrl \
--enable-optimise \
-%if 0%{?WX_DEBUG}
- --enable-debug \
-%else
- --disable-debug \
-%endif
+ %{wx_debug:--enable-debug=%{wx_debug}} \
--enable-repro-build \
+%if "%{flavor}" == "GTK3-nostl"
+ --disable-stl \
+ --disable-plugins
+%else
--enable-stl \
--enable-plugins
+%endif
+
make %{?_smp_mflags}
%install
@@ -386,15 +476,25 @@
%files -n libwx_%{toolkit}u_stc-%variant%psonum
%_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}*
+%if %{with webview}
+%files -n libwx_%{toolkit}u_webview-%variant%psonum
+%_libdir/libwx_%{toolkit}u_webview-%variant.so.%{sonum}*
+%dir %_libdir/wx
+%dir %_libdir/wx/%wx_micro
+%_libdir/wx/%wx_micro/web-extensions/
+%endif
+
%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
+%if "%{flavor}" != "GTK3-nostl"
+%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
+%endif
%files devel
# Complete documentation is available in the docs packages.
++++++ _multibuild ++++++
<multibuild>
<package>GTK2</package>
<package>GTK3</package>
<package>GTK3-nostl</package>
<package>Qt</package>
</multibuild>
++++++ soversion.diff ++++++
--- /var/tmp/diff_new_pack.QyPv9E/_old 2020-09-25 16:30:43.267847079 +0200
+++ /var/tmp/diff_new_pack.QyPv9E/_new 2020-09-25 16:30:43.267847079 +0200
@@ -20,7 +20,7 @@
===================================================================
--- 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 @@
@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 @@
@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
++++++ wxWidgets-3.1.3.tar.bz2 -> wxWidgets-3.1.4.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/wxWidgets-3_2/wxWidgets-3.1.3.tar.bz2
/work/SRC/openSUSE:Factory/.wxWidgets-3_2.new.4249/wxWidgets-3.1.4.tar.bz2
differ: char 11, line 1
