Accepting request 545531 from home:e9925248:branches:X11:wxWidgets

- Unify packaging
- Drop webkit as in wx3.0 packages
- Fix Qt build errors

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

wxGTK3-3_2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Oct 21 10:39:27 UTC 2017 - martin.koegler@chello.at
+
+- Unify packaging
+- Drop webkit as in wx3.0 packages
+- Fix Qt build errors
+
 -------------------------------------------------------------------
 Sun Oct 15 11:33:14 UTC 2017 - kamikazow@opensuse.org
 

wxGTK3-3_2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package wxGTK3-3_2
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,6 +19,8 @@
 Name:           wxGTK3-3_2
 %define base_name wxWidgets
 %define tarball_name wxWidgets
+%define variant suse
+%define soname 2
 Version:        3.1.0
 Release:        0
 %define wx_minor 3.1
@@ -29,6 +31,8 @@ Release:        0
 %else
 %define BUILD_LANG 0
 %endif
+# build non-UI toolkit related packages
+%define         base_packages 0
 Summary:        C++ Library for Cross-Platform Development
 License:        GPL-2.0+
 Group:          Development/Libraries/C and C++
@@ -49,6 +53,9 @@ BuildRequires:  cppunit-devel
 BuildRequires:  gcc-c++
 BuildRequires:  gstreamer-devel
 BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  pkgconfig(gtk+-3.0)
+%define gtk_version 3
+%define toolkit gtk%{gtk_version}
 %if 0%{?suse_version} >= 1220
 BuildRequires:  libSM-devel
 %else
@@ -64,133 +71,157 @@ BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(glu)
-BuildRequires:  pkgconfig(gtk+-3.0)
-%if 0%{?suse_version} < 1320
-BuildRequires:  pkgconfig(webkitgtk-3.0)
-%endif
-%define gtk_version 3
 
 %description
 wxWidgets is a free C++ library for cross-platform GUI.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-%package -n libwx_gtk%{gtk_version}u_adv-suse2
+%if %{base_packages}
+%package -n libwx_baseu-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+# Name up to openSUSE 11.3 and up to wxGTK-2.8:
+Obsoletes:      wxGTK <= %version.0
+# Third party base package name:
+Obsoletes:      wxWidgets < %version
+# wxWidgets-lang requires wxWidgets. Provide them to fix dependencies:
+Provides:       wxWidgets = %version
+Recommends:     %base_name-lang >= %version
+
+%description -n libwx_baseu-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_baseu_net-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_gtk%{gtk_version}u_adv-suse2
+%description -n libwx_baseu_net-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_gtk%{gtk_version}u_aui-suse2
+%package -n libwx_baseu_xml-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_gtk%{gtk_version}u_aui-suse2
+%description -n libwx_baseu_xml-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_gtk%{gtk_version}u_core-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_core-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_gl-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_gl-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_html-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_html-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_media-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_media-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_propgrid-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_propgrid-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_qa-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_qa-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_ribbon-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_ribbon-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_richtext-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_richtext-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_stc-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_stc-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%if 0%{?suse_version} < 1320
-%package -n libwx_gtk%{gtk_version}u_webview-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_webview-suse2
-Library for the wxWidgets cross-platform GUI.
 %endif
 
-%package -n libwx_gtk%{gtk_version}u_xrc-suse2
+%package -n libwx_%{toolkit}u_adv-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_gtk%{gtk_version}u_xrc-suse2
+%description -n libwx_%{toolkit}u_adv-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
+%package -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_core-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_core-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_html-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_html-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_media-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_media-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%if %{base_packages}
+%package plugin-sound_sdlu-3_2
+Summary:        wxWidgets SDL Plugin
+Group:          System/Libraries
+
+%description plugin-sound_sdlu-3_2
+SDL Plugin for the wxWidgets cross-platform GUI.
+
+%endif
+
 %package devel
 Summary:        Everything needed for development with wxWidgets
 Group:          Development/Libraries/C and C++
 Requires:       gtk%gtk_version-devel
-Requires:       libwx_baseu-suse2 = %version
+Requires:       libwx_baseu-%{variant}%{soname} = %version
-Requires:       libwx_baseu_net-suse2 = %version
+Requires:       libwx_baseu_net-%{variant}%{soname} = %version
-Requires:       libwx_baseu_xml-suse2 = %version
+Requires:       libwx_baseu_xml-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_adv-suse2 = %version
+Requires:       libwx_%{toolkit}u_adv-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_aui-suse2 = %version
+Requires:       libwx_%{toolkit}u_aui-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_core-suse2 = %version
+Requires:       libwx_%{toolkit}u_core-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_gl-suse2 = %version
+Requires:       libwx_%{toolkit}u_gl-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_html-suse2 = %version
+Requires:       libwx_%{toolkit}u_html-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_media-suse2 = %version
+Requires:       libwx_%{toolkit}u_media-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_propgrid-suse2 = %version
+Requires:       libwx_%{toolkit}u_propgrid-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_qa-suse2 = %version
+Requires:       libwx_%{toolkit}u_qa-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_ribbon-suse2 = %version
+Requires:       libwx_%{toolkit}u_ribbon-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_richtext-suse2 = %version
+Requires:       libwx_%{toolkit}u_richtext-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_stc-suse2 = %version
+Requires:       libwx_%{toolkit}u_stc-%{variant}%{soname} = %version
 Requires:       pkgconfig(gl)
-%if 0%{?suse_version} < 1320
+Requires:       libwx_%{toolkit}u_xrc-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_webview-suse2 = %version
-%endif
-Requires:       libwx_gtk%{gtk_version}u_xrc-suse2 = %version
 Requires:       pkgconfig(glu)
 Provides:       wxWidgets-experimental-devel = %version-%release
 Provides:       wxGTK3-devel = %version-%release
@@ -202,7 +233,7 @@ wxWidgets is a free C++ library for cross-platform GUI development.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-This package contains all files needed for developing with wxGTK3.
+This package contains all files needed for developing with wxGTK%gtk_version.
 
 Note: wxWidgets variant devel packages are mutually exclusive. Please
 read %_docdir/%name/README.SUSE to pick a correct variant.
@@ -214,7 +245,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant.
 %prep
 echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}"
 %setup -q -n %tarball_name-%version
-%patch -P 1 -p1
+%patch -P 1 -P 2 -p1
 cp %{S:2} .
 
 %build
@@ -227,7 +258,7 @@ autoconf -f -i
 # --enable-extended_rtti does not compile
 
 %configure\
-	--enable-vendor=suse \
+	--enable-vendor=%{variant} \
 	--with-gtk=%gtk_version\
 	--disable-static\
 	--enable-unicode\
@@ -251,11 +282,17 @@ make allmo
 cd ..
 %endif
 
+%clean
+:
+
 %install
+export VENDORTAG='-${variant}' # only needed for non-MSW
 make install DESTDIR="%buildroot"
+%if %{base_packages}==0
 # Drop libraries already supplied by another packages
-rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-suse.so.2* \
+rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{soname}* \
-	"%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
+   "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
+%endif
 %if %BUILD_LANG
 # Locales for MS Windows:
 rm -Rf %buildroot/%_datadir/locale/*/LC_MESSAGES/wxmsw.mo
@@ -267,93 +304,113 @@ rm -Rf %buildroot/%_datadir/locale
 # HACK: Fix wx-config symlink (bug introduced in 2.9.4).
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
-%post   -n libwx_gtk%{gtk_version}u_adv-suse2 -p /sbin/ldconfig
+%if %{base_packages}
-%postun -n libwx_gtk%{gtk_version}u_adv-suse2 -p /sbin/ldconfig
+%post   -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_aui-suse2 -p /sbin/ldconfig
+%postun -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_aui-suse2 -p /sbin/ldconfig
+%post   -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_core-suse2 -p /sbin/ldconfig
+%postun -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_core-suse2 -p /sbin/ldconfig
+%post   -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_gl-suse2 -p /sbin/ldconfig
+%postun -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_gl-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_html-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_html-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_media-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_media-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_propgrid-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_propgrid-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_qa-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_qa-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_ribbon-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_ribbon-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_richtext-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_richtext-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_stc-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_stc-suse2 -p /sbin/ldconfig
-%if 0%{?suse_version} < 1320
-%post   -n libwx_gtk%{gtk_version}u_webview-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_webview-suse2 -p /sbin/ldconfig
 %endif
-%post   -n libwx_gtk%{gtk_version}u_xrc-suse2 -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_adv-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_xrc-suse2 -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_adv-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -p /sbin/ldconfig
 
 %if %BUILD_LANG
 
 %files lang -f wxstd.lang
 %endif
 
-%files -n libwx_gtk%{gtk_version}u_adv-suse2
+%if %{base_packages}
+%files -n libwx_baseu-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_adv-suse.so.2*
+%_libdir/libwx_baseu-%{variant}.so.%{soname}*
 
-%files -n libwx_gtk%{gtk_version}u_aui-suse2
+%files -n libwx_baseu_net-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_aui-suse.so.2*
+%_libdir/libwx_baseu_net-%{variant}.so.%{soname}*
 
-%files -n libwx_gtk%{gtk_version}u_core-suse2
+%files -n libwx_baseu_xml-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_core-suse.so.2*
+%_libdir/libwx_baseu_xml-%{variant}.so.%{soname}*
-
-%files -n libwx_gtk%{gtk_version}u_gl-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_gl-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_html-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_html-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_media-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_media-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_propgrid-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_propgrid-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_qa-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_qa-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_ribbon-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_ribbon-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_richtext-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_richtext-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_stc-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_stc-suse.so.2*
-
-%if 0%{?suse_version} < 1320
-%files -n libwx_gtk%{gtk_version}u_webview-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_webview-suse.so.2*
 %endif
 
-%files -n libwx_gtk%{gtk_version}u_xrc-suse2
+%files -n libwx_%{toolkit}u_adv-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_xrc-suse.so.2*
+%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_core-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_html-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_media-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{soname}*
+
+%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)

wxQt-3_2.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Oct 21 10:39:27 UTC 2017 - martin.koegler@chello.at
+
+- Unify packaging
+- Drop webkit as in wx3.0 packages
+- Fix Qt build errors
+
+-------------------------------------------------------------------
+Sun Oct 15 11:33:14 UTC 2017 - kamikazow@opensuse.org
+
+- Disable WebView for TW and upcoming Leap 15.
+
 -------------------------------------------------------------------
 Fri Jul 22 17:25:44 UTC 2016 - mailaender@opensuse.org
 

wxQt-3_2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package wxQt-3_2
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,6 +19,8 @@
 Name:           wxQt-3_2
 %define base_name wxWidgets
 %define tarball_name wxWidgets
+%define variant suse
+%define soname 2
 Version:        3.1.0
 Release:        0
 %define wx_minor 3.1
@@ -29,6 +31,8 @@ Release:        0
 %else
 %define BUILD_LANG 0
 %endif
+# build non-UI toolkit related packages
+%define         base_packages 0
 Summary:        C++ Library for Cross-Platform Development
 License:        GPL-2.0+
 Group:          Development/Libraries/C and C++
@@ -49,6 +53,7 @@ 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
@@ -69,114 +74,156 @@ BuildRequires:  pkgconfig(Qt5OpenGL) >= 5.2.1
 BuildRequires:  pkgconfig(Qt5Test) >= 5.2.1
 BuildRequires:  pkgconfig(Qt5Widgets) >= 5.2.1
 BuildRequires:  pkgconfig(glu)
+BuildRequires:  pkgconfig(cairo)
 
 %description
 wxWidgets is a free C++ library for cross-platform GUI.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-%package -n libwx_qtu_adv-suse2
+%if %{base_packages}
+%package -n libwx_baseu-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+# Name up to openSUSE 11.3 and up to wxGTK-2.8:
+Obsoletes:      wxGTK <= %version.0
+# Third party base package name:
+Obsoletes:      wxWidgets < %version
+# wxWidgets-lang requires wxWidgets. Provide them to fix dependencies:
+Provides:       wxWidgets = %version
+Recommends:     %base_name-lang >= %version
+
+%description -n libwx_baseu-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_baseu_net-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_adv-suse2
+%description -n libwx_baseu_net-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_qtu_aui-suse2
+%package -n libwx_baseu_xml-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_aui-suse2
+%description -n libwx_baseu_xml-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_qtu_core-suse2
+%endif
+
+%package -n libwx_%{toolkit}u_adv-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_core-suse2
+%description -n libwx_%{toolkit}u_adv-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_qtu_gl-suse2
+%package -n libwx_%{toolkit}u_aui-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_gl-suse2
+%description -n libwx_%{toolkit}u_aui-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_qtu_html-suse2
+%package -n libwx_%{toolkit}u_core-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_html-suse2
+%description -n libwx_%{toolkit}u_core-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_qtu_media-suse2
+%package -n libwx_%{toolkit}u_gl-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_media-suse2
+%description -n libwx_%{toolkit}u_gl-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_qtu_propgrid-suse2
+%package -n libwx_%{toolkit}u_html-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_propgrid-suse2
+%description -n libwx_%{toolkit}u_html-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_qtu_qa-suse2
+%package -n libwx_%{toolkit}u_media-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_qa-suse2
+%description -n libwx_%{toolkit}u_media-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_qtu_ribbon-suse2
+%package -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_ribbon-suse2
+%description -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_qtu_richtext-suse2
+%package -n libwx_%{toolkit}u_qa-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_richtext-suse2
+%description -n libwx_%{toolkit}u_qa-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_qtu_stc-suse2
+%package -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_stc-suse2
+%description -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_qtu_xrc-suse2
+%package -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_qtu_xrc-suse2
+%description -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
+%package -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%if %{base_packages}
+%package plugin-sound_sdlu-3_2
+Summary:        wxWidgets SDL Plugin
+Group:          System/Libraries
+
+%description plugin-sound_sdlu-3_2
+SDL Plugin for the wxWidgets cross-platform GUI.
+
+%endif
+
 %package devel
 Summary:        Everything needed for development with wxWidgets
 Group:          Development/Libraries/C and C++
-Requires:       libwx_baseu-suse2 = %version
+Requires:       libwx_baseu-%{variant}%{soname} = %version
-Requires:       libwx_baseu_net-suse2 = %version
+Requires:       libwx_baseu_net-%{variant}%{soname} = %version
-Requires:       libwx_baseu_xml-suse2 = %version
+Requires:       libwx_baseu_xml-%{variant}%{soname} = %version
-Requires:       libwx_qtu_adv-suse2 = %version
+Requires:       libwx_%{toolkit}u_adv-%{variant}%{soname} = %version
-Requires:       libwx_qtu_aui-suse2 = %version
+Requires:       libwx_%{toolkit}u_aui-%{variant}%{soname} = %version
-Requires:       libwx_qtu_core-suse2 = %version
+Requires:       libwx_%{toolkit}u_core-%{variant}%{soname} = %version
-Requires:       libwx_qtu_gl-suse2 = %version
+Requires:       libwx_%{toolkit}u_gl-%{variant}%{soname} = %version
-Requires:       libwx_qtu_html-suse2 = %version
+Requires:       libwx_%{toolkit}u_html-%{variant}%{soname} = %version
-Requires:       libwx_qtu_media-suse2 = %version
+Requires:       libwx_%{toolkit}u_media-%{variant}%{soname} = %version
-Requires:       libwx_qtu_propgrid-suse2 = %version
+Requires:       libwx_%{toolkit}u_propgrid-%{variant}%{soname} = %version
-Requires:       libwx_qtu_qa-suse2 = %version
+Requires:       libwx_%{toolkit}u_qa-%{variant}%{soname} = %version
-Requires:       libwx_qtu_ribbon-suse2 = %version
+Requires:       libwx_%{toolkit}u_ribbon-%{variant}%{soname} = %version
-Requires:       libwx_qtu_richtext-suse2 = %version
+Requires:       libwx_%{toolkit}u_richtext-%{variant}%{soname} = %version
-Requires:       libwx_qtu_stc-suse2 = %version
+Requires:       libwx_%{toolkit}u_stc-%{variant}%{soname} = %version
-Requires:       libwx_qtu_xrc-suse2 = %version
+Requires:       libwx_%{toolkit}u_xrc-%{variant}%{soname} = %version
 Provides:       wxWidgets-experimental-devel = %version-%release
 Provides:       wxQt-devel = %version-%release
 Conflicts:      wxWidgets-devel
@@ -187,7 +234,7 @@ wxWidgets is a free C++ library for cross-platform GUI development.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-This package contains all files needed for developing with wxGTK3.
+This package contains all files needed for developing with wxQt.
 
 Note: wxWidgets variant devel packages are mutually exclusive. Please
 read %_docdir/%name/README.SUSE to pick a correct variant.
@@ -214,7 +261,7 @@ autoconf -f -i
 export CXXFLAGS="-O0 -ggdb3"
 export CFLAGS="-O0 -ggdb3"
 %configure\
-	--enable-vendor=suse \
+	--enable-vendor=%{variant} \
 	--with-qt \
 	--disable-static\
 	--enable-unicode\
@@ -238,11 +285,17 @@ make allmo
 cd ..
 %endif
 
+%clean
+:
+
 %install
+export VENDORTAG='-${variant}' # only needed for non-MSW
 make install DESTDIR="%buildroot"
+%if %{base_packages}==0
 # Drop libraries already supplied by another packages
-rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-suse.so.2* \
+rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{soname}* \
-	"%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
+   "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
+%endif
 %if %BUILD_LANG
 # Locales for MS Windows:
 rm -Rf %buildroot/%_datadir/locale/*/LC_MESSAGES/wxmsw.mo
@@ -254,83 +307,113 @@ rm -Rf %buildroot/%_datadir/locale
 # HACK: Fix wx-config symlink (bug introduced in 2.9.4).
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
-%post   -n libwx_qtu_adv-suse2 -p /sbin/ldconfig
+%if %{base_packages}
-%postun -n libwx_qtu_adv-suse2 -p /sbin/ldconfig
+%post   -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_qtu_aui-suse2 -p /sbin/ldconfig
+%postun -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_qtu_aui-suse2 -p /sbin/ldconfig
+%post   -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_qtu_core-suse2 -p /sbin/ldconfig
+%postun -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_qtu_core-suse2 -p /sbin/ldconfig
+%post   -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_qtu_gl-suse2 -p /sbin/ldconfig
+%postun -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_qtu_gl-suse2 -p /sbin/ldconfig
+%endif
-%post   -n libwx_qtu_html-suse2 -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_adv-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_qtu_html-suse2 -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_adv-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_qtu_media-suse2 -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_qtu_media-suse2 -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_qtu_propgrid-suse2 -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_qtu_propgrid-suse2 -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_qtu_qa-suse2 -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_qtu_qa-suse2 -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_qtu_ribbon-suse2 -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_qtu_ribbon-suse2 -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_qtu_richtext-suse2 -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_qtu_richtext-suse2 -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_qtu_stc-suse2 -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_qtu_stc-suse2 -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_qtu_xrc-suse2 -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_qtu_xrc-suse2 -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -p /sbin/ldconfig
 
 %if %BUILD_LANG
 
 %files lang -f wxstd.lang
 %endif
 
-%files -n libwx_qtu_adv-suse2
+%if %{base_packages}
+%files -n libwx_baseu-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_adv-suse.so.2*
+%_libdir/libwx_baseu-%{variant}.so.%{soname}*
 
-%files -n libwx_qtu_aui-suse2
+%files -n libwx_baseu_net-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_aui-suse.so.2*
+%_libdir/libwx_baseu_net-%{variant}.so.%{soname}*
 
-%files -n libwx_qtu_core-suse2
+%files -n libwx_baseu_xml-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_core-suse.so.2*
+%_libdir/libwx_baseu_xml-%{variant}.so.%{soname}*
+%endif
 
-%files -n libwx_qtu_gl-suse2
+%files -n libwx_%{toolkit}u_adv-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_gl-suse.so.2*
+%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{soname}*
 
-%files -n libwx_qtu_html-suse2
+%files -n libwx_%{toolkit}u_aui-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_html-suse.so.2*
+%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{soname}*
 
-%files -n libwx_qtu_media-suse2
+%files -n libwx_%{toolkit}u_core-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_media-suse.so.2*
+%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{soname}*
 
-%files -n libwx_qtu_propgrid-suse2
+%files -n libwx_%{toolkit}u_gl-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_propgrid-suse.so.2*
+%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{soname}*
 
-%files -n libwx_qtu_qa-suse2
+%files -n libwx_%{toolkit}u_html-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_qa-suse.so.2*
+%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{soname}*
 
-%files -n libwx_qtu_ribbon-suse2
+%files -n libwx_%{toolkit}u_media-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_ribbon-suse.so.2*
+%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{soname}*
 
-%files -n libwx_qtu_richtext-suse2
+%files -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_richtext-suse.so.2*
+%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{soname}*
 
-%files -n libwx_qtu_stc-suse2
+%files -n libwx_%{toolkit}u_qa-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_stc-suse.so.2*
+%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{soname}*
 
-%files -n libwx_qtu_xrc-suse2
+%files -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_qtu_xrc-suse.so.2*
+%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{soname}*
+
+%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)

wxWidgets-3_2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Oct 21 10:39:27 UTC 2017 - martin.koegler@chello.at
+
+- Unify packaging
+- Drop webkit as in wx3.0 packages
+- Fix Qt build errors
+
 -------------------------------------------------------------------
 Sun Oct 15 11:33:14 UTC 2017 - kamikazow@opensuse.org
 

wxWidgets-3_2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package wxWidgets-3_2
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,6 +19,8 @@
 Name:           wxWidgets-3_2
 %define base_name wxWidgets
 %define tarball_name wxWidgets
+%define variant suse
+%define soname 2
 Version:        3.1.0
 Release:        0
 %define wx_minor 3.1
@@ -29,6 +31,8 @@ Release:        0
 %else
 %define BUILD_LANG 0
 %endif
+# build non-UI toolkit related packages
+%define         base_packages 1
 Summary:        C++ Library for Cross-Platform Development
 License:        GPL-2.0+
 Group:          Development/Libraries/C and C++
@@ -41,6 +45,7 @@ Source5:        rpmlintrc
 Source6:        wxpython-mkdiff.sh
 Source50:       baselibs.conf
 Patch1:         soversion.diff
+Patch2:         wxqt-compile.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  SDL-devel
 BuildRequires:  autoconf
@@ -51,6 +56,7 @@ BuildRequires:  gstreamer-devel
 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
@@ -66,16 +72,14 @@ BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(glu)
-%if 0%{?suse_version} < 1320
-BuildRequires:  pkgconfig(webkit-1.0)
-%endif
 
 %description
 wxWidgets is a free C++ library for cross-platform GUI.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-%package -n libwx_baseu-suse2
+%if %{base_packages}
+%package -n libwx_baseu-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 # Name up to openSUSE 11.3 and up to wxGTK-2.8:
@@ -86,116 +90,110 @@ Obsoletes:      wxWidgets < %version
 Provides:       wxWidgets = %version
 Recommends:     %base_name-lang >= %version
 
-%description -n libwx_baseu-suse2
+%description -n libwx_baseu-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_net-suse2
+%package -n libwx_baseu_net-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_net-suse2
+%description -n libwx_baseu_net-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_xml-suse2
+%package -n libwx_baseu_xml-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_xml-suse2
+%description -n libwx_baseu_xml-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_gtk%{gtk_version}u_adv-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_adv-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_aui-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_aui-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_core-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_core-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_gl-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_gl-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_html-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_html-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_media-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_media-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_propgrid-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_propgrid-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_qa-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_qa-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_ribbon-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_ribbon-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_richtext-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_richtext-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%package -n libwx_gtk%{gtk_version}u_stc-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_stc-suse2
-Library for the wxWidgets cross-platform GUI.
-
-%if 0%{?suse_version} < 1320
-%package -n libwx_gtk%{gtk_version}u_webview-suse2
-Summary:        wxWidgets Library
-Group:          System/Libraries
-
-%description -n libwx_gtk%{gtk_version}u_webview-suse2
-Library for the wxWidgets cross-platform GUI.
 %endif
 
-%package -n libwx_gtk%{gtk_version}u_xrc-suse2
+%package -n libwx_%{toolkit}u_adv-%{variant}%{soname}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_gtk%{gtk_version}u_xrc-suse2
+%description -n libwx_%{toolkit}u_adv-%{variant}%{soname}
 Library for the wxWidgets cross-platform GUI.
 
+%package -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_core-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_core-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_html-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_html-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_media-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_media-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+Library for the wxWidgets cross-platform GUI.
+
+%if %{base_packages}
 %package plugin-sound_sdlu-3_2
 Summary:        wxWidgets SDL Plugin
 Group:          System/Libraries
@@ -203,29 +201,28 @@ Group:          System/Libraries
 %description plugin-sound_sdlu-3_2
 SDL Plugin for the wxWidgets cross-platform GUI.
 
+%endif
+
 %package devel
 Summary:        Everything needed for development with wxWidgets
 Group:          Development/Libraries/C and C++
 Requires:       gtk%gtk_version-devel
-Requires:       libwx_baseu-suse2 = %version
+Requires:       libwx_baseu-%{variant}%{soname} = %version
-Requires:       libwx_baseu_net-suse2 = %version
+Requires:       libwx_baseu_net-%{variant}%{soname} = %version
-Requires:       libwx_baseu_xml-suse2 = %version
+Requires:       libwx_baseu_xml-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_adv-suse2 = %version
+Requires:       libwx_%{toolkit}u_adv-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_aui-suse2 = %version
+Requires:       libwx_%{toolkit}u_aui-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_core-suse2 = %version
+Requires:       libwx_%{toolkit}u_core-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_gl-suse2 = %version
+Requires:       libwx_%{toolkit}u_gl-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_html-suse2 = %version
+Requires:       libwx_%{toolkit}u_html-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_media-suse2 = %version
+Requires:       libwx_%{toolkit}u_media-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_propgrid-suse2 = %version
+Requires:       libwx_%{toolkit}u_propgrid-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_qa-suse2 = %version
+Requires:       libwx_%{toolkit}u_qa-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_ribbon-suse2 = %version
+Requires:       libwx_%{toolkit}u_ribbon-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_richtext-suse2 = %version
+Requires:       libwx_%{toolkit}u_richtext-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_stc-suse2 = %version
+Requires:       libwx_%{toolkit}u_stc-%{variant}%{soname} = %version
 Requires:       pkgconfig(gl)
-%if 0%{?suse_version} < 1320
+Requires:       libwx_%{toolkit}u_xrc-%{variant}%{soname} = %version
-Requires:       libwx_gtk%{gtk_version}u_webview-suse2 = %version
-%endif
-Requires:       libwx_gtk%{gtk_version}u_xrc-suse2 = %version
 Requires:       pkgconfig(glu)
 Provides:       wxWidgets-devel = %version-%release
 Provides:       wxGTK2-devel = %version-%release
@@ -240,7 +237,7 @@ wxWidgets is a free C++ library for cross-platform GUI development.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-This package contains all files needed for developing with wxGTK3.
+This package contains all files needed for developing with wxGTK%gtk_version.
 
 Note: wxWidgets variant devel packages are mutually exclusive. Please
 read %_docdir/%name/README.SUSE to pick a correct variant.
@@ -252,7 +249,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant.
 %prep
 echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}"
 %setup -q -n %tarball_name-%version
-%patch -P 1 -p1
+%patch -P 1 -P 2 -p1
 cp %{S:2} .
 
 %build
@@ -263,7 +260,7 @@ autoconf -f -i
 # --enable-extended_rtti does not compile
 
 %configure\
-	--enable-vendor=suse \
+	--enable-vendor=%{variant} \
 	--with-gtk=%gtk_version\
 	--disable-static\
 	--enable-unicode\
@@ -292,8 +289,13 @@ cd ..
 :
 
 %install
-export VENDORTAG='-${VENDOR}' # only needed for non-MSW
+export VENDORTAG='-${variant}' # only needed for non-MSW
 make install DESTDIR="%buildroot"
+%if %{base_packages}==0
+# Drop libraries already supplied by another packages
+rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{soname}* \
+   "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
+%endif
 %if %BUILD_LANG
 # Locales for MS Windows:
 rm -Rf %buildroot/%_datadir/locale/*/LC_MESSAGES/wxmsw.mo
@@ -305,117 +307,113 @@ rm -Rf %buildroot/%_datadir/locale
 # HACK: Fix wx-config symlink (bug introduced in 2.9.4).
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
-%post   -n libwx_baseu-suse2 -p /sbin/ldconfig
+%if %{base_packages}
-%postun -n libwx_baseu-suse2 -p /sbin/ldconfig
+%post   -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_baseu_net-suse2 -p /sbin/ldconfig
+%postun -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_baseu_net-suse2 -p /sbin/ldconfig
+%post   -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_baseu_xml-suse2 -p /sbin/ldconfig
+%postun -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_baseu_xml-suse2 -p /sbin/ldconfig
+%post   -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_adv-suse2 -p /sbin/ldconfig
+%postun -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_adv-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_aui-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_aui-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_core-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_core-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_gl-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_gl-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_html-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_html-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_media-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_media-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_propgrid-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_propgrid-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_qa-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_qa-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_ribbon-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_ribbon-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_richtext-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_richtext-suse2 -p /sbin/ldconfig
-%post   -n libwx_gtk%{gtk_version}u_stc-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_stc-suse2 -p /sbin/ldconfig
-%if 0%{?suse_version} < 1320
-%post   -n libwx_gtk%{gtk_version}u_webview-suse2 -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_webview-suse2 -p /sbin/ldconfig
 %endif
-%post   -n libwx_gtk%{gtk_version}u_xrc-suse2 -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_adv-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_gtk%{gtk_version}u_xrc-suse2 -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_adv-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -p /sbin/ldconfig
 
 %if %BUILD_LANG
 
 %files lang -f wxstd.lang
 %endif
 
-%files -n libwx_baseu-suse2
+%if %{base_packages}
+%files -n libwx_baseu-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_baseu-suse.so.2*
+%_libdir/libwx_baseu-%{variant}.so.%{soname}*
 
-%files -n libwx_baseu_net-suse2
+%files -n libwx_baseu_net-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_baseu_net-suse.so.2*
+%_libdir/libwx_baseu_net-%{variant}.so.%{soname}*
 
-%files -n libwx_baseu_xml-suse2
+%files -n libwx_baseu_xml-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_baseu_xml-suse.so.2*
+%_libdir/libwx_baseu_xml-%{variant}.so.%{soname}*
-
-%files -n libwx_gtk%{gtk_version}u_adv-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_adv-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_aui-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_aui-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_core-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_core-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_gl-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_gl-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_html-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_html-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_media-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_media-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_propgrid-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_propgrid-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_qa-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_qa-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_ribbon-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_ribbon-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_richtext-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_richtext-suse.so.2*
-
-%files -n libwx_gtk%{gtk_version}u_stc-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_stc-suse.so.2*
-
-%if 0%{?suse_version} < 1320
-%files -n libwx_gtk%{gtk_version}u_webview-suse2
-%defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_webview-suse.so.2*
 %endif
 
-%files -n libwx_gtk%{gtk_version}u_xrc-suse2
+%files -n libwx_%{toolkit}u_adv-%{variant}%{soname}
 %defattr (-,root,root)
-%_libdir/libwx_gtk%{gtk_version}u_xrc-suse.so.2*
+%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{soname}*
 
+%files -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_core-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_html-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_media-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{soname}*
+
+%files -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{soname}*
+
+%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)

wxqt-compile.diff

@@ -8,10 +8,6 @@ wxAcceleratorTable::ConvertShortcutTable(QWidget*) const':
 ./src/qt/accel.cpp:88:11: error: 'Node' is not a member of
 'wxAccelList'
 
-gcc: ./src/qt/checkbox.cpp:122:1: warning: control reaches end of non-void function [-Wreturn-type]
-rpmlint: I: Program returns random data in a function
-rpmlint: E: wxQt-3_2 no-return-in-nonvoid-function ./src/qt/checkbox.cpp:122
-
 Change code to use full PIMPL so that wx headers do not depend on Qt at all
 (this is the declared goal of wx).
 ---
@@ -19,18 +15,14 @@ Change code to use full PIMPL so that wx headers do not depend on Qt at all
  include/wx/qt/app.h       |    2 -
  include/wx/qt/colour.h    |   30 ++++++++++-------------
  include/wx/qt/window.h    |    1 
- src/common/colourdata.cpp |    2 +
  src/qt/accel.cpp          |    2 -
  src/qt/app.cpp            |    1 
  src/qt/bitmap.cpp         |    2 -
  src/qt/brush.cpp          |    6 ++--
  src/qt/calctrl.cpp        |   14 +++++-----
- src/qt/checkbox.cpp       |    2 -
- src/qt/clipbrd.cpp        |    1 
  src/qt/colordlg.cpp       |    4 +--
  src/qt/colour.cpp         |   59 ++++++++++++++++++++++++++++++++++++++++++++++
  src/qt/dc.cpp             |   16 ++++++------
- src/qt/dcscreen.cpp       |    1 
  src/qt/evtloop.cpp        |    1 
  src/qt/listctrl.cpp       |    4 +--
  src/qt/pen.cpp            |    6 ++--
@@ -117,7 +109,7 @@ Index: wxWidgets/include/wx/qt/colour.h
 -    QColor m_qtColor;
 +    QColor *m_qtColor;
  
-     DECLARE_DYNAMIC_CLASS(wxColour)
+     wxDECLARE_DYNAMIC_CLASS(wxColour);
  };
 Index: wxWidgets/include/wx/qt/window.h
 ===================================================================
@@ -131,26 +123,6 @@ Index: wxWidgets/include/wx/qt/window.h
  
  class WXDLLIMPEXP_FWD_CORE wxScrollBar;
  class WXDLLIMPEXP_FWD_CORE wxQtShortcutHandler;
-Index: wxWidgets/src/common/colourdata.cpp
-===================================================================
---- wxWidgets.orig/src/common/colourdata.cpp
-+++ wxWidgets/src/common/colourdata.cpp
-@@ -24,6 +24,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourData, wx
- 
- wxColourData::wxColourData()
- {
-+	fprintf(stderr, "%s\n", __PRETTY_FUNCTION__);
-     m_chooseFull = false;
-     m_dataColour.Set(0,0,0);
-     // m_custColours are wxNullColours initially
-@@ -32,6 +33,7 @@ wxColourData::wxColourData()
- wxColourData::wxColourData(const wxColourData& data)
-             : wxObject()
- {
-+	fprintf(stderr, "%s\n", __PRETTY_FUNCTION__);
-     (*this) = data;
- }
- 
 Index: wxWidgets/src/qt/accel.cpp
 ===================================================================
 --- wxWidgets.orig/src/qt/accel.cpp
@@ -174,13 +146,13 @@ Index: wxWidgets/src/qt/app.cpp
  #include <QtCore/QStringList>
 +#include <QApplication>
  
- IMPLEMENT_DYNAMIC_CLASS( wxApp, wxAppBase )
+ wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxAppBase);
  
 Index: wxWidgets/src/qt/bitmap.cpp
 ===================================================================
 --- wxWidgets.orig/src/qt/bitmap.cpp
 +++ wxWidgets/src/qt/bitmap.cpp
-@@ -504,7 +504,7 @@ bool wxMask::Create(const wxBitmap& bitm
+@@ -514,7 +514,7 @@ bool wxMask::Create(const wxBitmap& bitm
      if (m_qtBitmap)
          delete m_qtBitmap;
  
@@ -269,31 +241,6 @@ Index: wxWidgets/src/qt/calctrl.cpp
  
      wxMISSING_IMPLEMENTATION( "Setting font" );
  
-Index: wxWidgets/src/qt/checkbox.cpp
-===================================================================
---- wxWidgets.orig/src/qt/checkbox.cpp
-+++ wxWidgets/src/qt/checkbox.cpp
-@@ -116,7 +116,7 @@ wxCheckBoxState wxCheckBox::DoGet3StateV
-     case Qt::Checked:
-         return wxCHK_CHECKED;
-         
--    case Qt::PartiallyChecked:
-+    default:
-         return wxCHK_UNDETERMINED;
-     }
- }
-Index: wxWidgets/src/qt/clipbrd.cpp
-===================================================================
---- wxWidgets.orig/src/qt/clipbrd.cpp
-+++ wxWidgets/src/qt/clipbrd.cpp
-@@ -13,6 +13,7 @@
- #include "wx/scopeguard.h"
- #include "wx/qt/private/converter.h"
- 
-+#include <QApplication>
- #include <QClipboard>
- 
- // ----------------------------------------------------------------------------
 Index: wxWidgets/src/qt/colordlg.cpp
 ===================================================================
 --- wxWidgets.orig/src/qt/colordlg.cpp
@@ -315,20 +262,15 @@ Index: wxWidgets/src/qt/colour.cpp
 ===================================================================
 --- wxWidgets.orig/src/qt/colour.cpp
 +++ wxWidgets/src/qt/colour.cpp
-@@ -10,11 +10,70 @@
+@@ -29,7 +29,63 @@
- // For compilers that support precompilation, includes "wx.h".
+ #endif // WX_PRECOMP
- #include "wx/wxprec.h"
+
  #include "wx/qt/private/utils.h"
 +#include "wx/colour.h"
  
- #ifdef __BORLANDC__
- #pragma hdrstop
- #endif
- 
 +wxColour::wxColour(const QColor &color) :
 +	m_qtColor(new QColor(color))
 +{
-+	fprintf(stderr, "%s\n", __PRETTY_FUNCTION__);
 +}
 +
 +void wxColour::Init(void)
@@ -379,10 +321,9 @@ Index: wxWidgets/src/qt/colour.cpp
 +void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b,
 +    unsigned char a)
 +{
-+	fprintf(stderr, "%s\n", __PRETTY_FUNCTION__);
 +	m_qtColor->setRgb(r, g, b, a);
 +}
-+
+
  int wxColour::GetPixel() const
  {
      wxMISSING_IMPLEMENTATION( "wxColour::GetPixel" );
@@ -455,18 +396,6 @@ Index: wxWidgets/src/qt/dc.cpp
          
          //Draw
          m_qtPainter->drawText(x, y, 1, 1, Qt::TextDontClip, wxQtConvertString(text));
-Index: wxWidgets/src/qt/dcscreen.cpp
-===================================================================
---- wxWidgets.orig/src/qt/dcscreen.cpp
-+++ wxWidgets/src/qt/dcscreen.cpp
-@@ -14,6 +14,7 @@
- #include <QtWidgets/QDesktopWidget>
- #include <QtGui/QScreen>
- #include <QPixmap>
-+#include <QApplication>
- 
- IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
- 
 Index: wxWidgets/src/qt/evtloop.cpp
 ===================================================================
 --- wxWidgets.orig/src/qt/evtloop.cpp