From 9a780d71d66186a60c84d839734bb93079b00394555b09146d06e813abbbaec5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 15 Apr 2019 18:35:58 +0000 Subject: [PATCH 1/3] - Update to new snapshot 3.1.3~g673 (6cc1d63d) - Enabled webkit2 backend for wxWebView (wxGTK3 only) OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=51 --- _service | 4 +- soversion.diff | 2 +- wxGTK3-3_2.changes | 7 +++ wxGTK3-3_2.spec | 122 ++++++++++++++++++++++++------------ wxQt-3_2.changes | 7 +++ wxQt-3_2.spec | 113 +++++++++++++++++++++------------ wxWidgets-3.1.2.g198.tar.xz | 3 - wxWidgets-3.1.3~g673.tar.xz | 3 + wxWidgets-3_2.changes | 7 +++ wxWidgets-3_2.spec | 113 +++++++++++++++++++++------------ 10 files changed, 252 insertions(+), 129 deletions(-) delete mode 100644 wxWidgets-3.1.2.g198.tar.xz create mode 100644 wxWidgets-3.1.3~g673.tar.xz diff --git a/_service b/_service index 7ad7186..3e84a09 100644 --- a/_service +++ b/_service @@ -2,9 +2,9 @@ git git://github.com/wxWidgets/wxWidgets - master + 6cc1d63d68f746cf9e48b75edd119a4cb4309f25 v3.1.2 - 3.1.2.g@TAG_OFFSET@ + 3.1.3~g@TAG_OFFSET@ v(.*) diff --git a/soversion.diff b/soversion.diff index 7fcbb95..e33baec 100644 --- a/soversion.diff +++ b/soversion.diff @@ -42,7 +42,7 @@ Index: wxWidgets-3.1.0.2244/Makefile.in @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -3.$(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.2 ++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3.1.3 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \ diff --git a/wxGTK3-3_2.changes b/wxGTK3-3_2.changes index 61995ad..0194342 100644 --- a/wxGTK3-3_2.changes +++ b/wxGTK3-3_2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 15 08:55:06 UTC 2019 - Jan Engelhardt + +- Update to new snapshot 3.1.3~g673 (6cc1d63d) + * Graphics context methods for the Qt platform +- Enabled webkit2 backend for wxWebView (wxGTK3 only) + ------------------------------------------------------------------- Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index e80a08e..58b3039 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -20,9 +20,9 @@ Name: wxGTK3-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define psonum 3_1_2 -%define sonum 3.1.2 -Version: 3.1.2.g198 +%define psonum 3_1_3 +%define sonum 3.1.3 +Version: 3.1.3~g673 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.3 @@ -31,7 +31,7 @@ Release: 0 Summary: C++ Library for Cross-Platform Development License: LGPL-2.1+ WITH WxWindows-exception-3.1 Group: Development/Libraries/C and C++ -Url: http://www.wxwidgets.org/ +URL: https://www.wxwidgets.org/ Source: %tarball_name-%version.tar.xz Source2: README.SUSE Source5: wxWidgets-3_2-rpmlintrc @@ -47,6 +47,7 @@ BuildRequires: gcc-c++ BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(webkit2gtk-4.0) %define gtk_version 3 %define toolkit gtk%gtk_version %if 0%{?suse_version} >= 1220 @@ -66,12 +67,13 @@ BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) %description -wxWidgets is a 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. +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. %package -n libwx_baseu-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets base library # Name up to openSUSE 11.3 and up to wxGTK-2.8: Group: System/Libraries Obsoletes: wxGTK <= %version.0 @@ -81,105 +83,133 @@ Provides: wxWidgets = %version Recommends: wxWidgets-lang >= 3.0 %description -n libwx_baseu-%variant%psonum -Library for the wxWidgets cross-platform GUI. +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. %package -n libwx_baseu_net-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets networking library Group: System/Libraries %description -n libwx_baseu_net-%variant%psonum -Library for the wxWidgets cross-platform GUI. +Classes for network access with wxWidgets. %package -n libwx_baseu_xml-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets XML parser library Group: System/Libraries %description -n libwx_baseu_xml-%variant%psonum -Library for the wxWidgets cross-platform GUI. +This library contains classes for parsing XML documents. %package -n libwx_%{toolkit}u_adv-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets advanced widgets and rarely-used widgets Group: System/Libraries %description -n libwx_%{toolkit}u_adv-%variant%psonum -Library for the wxWidgets cross-platform GUI. +Advanced or rarely-used GUI classes for wxWidgets. %package -n libwx_%{toolkit}u_aui-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets advanced user interface docking library Group: System/Libraries %description -n libwx_%{toolkit}u_aui-%variant%psonum -Library for the wxWidgets cross-platform GUI. +The Advanced User Interface docking library of wxWidgets. %package -n libwx_%{toolkit}u_core-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets basic GUI class library Group: System/Libraries %description -n libwx_%{toolkit}u_core-%variant%psonum -Library for the wxWidgets cross-platform GUI. +Basic GUI classes such as GDI classes or controls are in this +library. All wxWidgets GUI applications must link against this +library, only console mode applications need not. %package -n libwx_%{toolkit}u_gl-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets OpenGL integration library Group: System/Libraries %description -n libwx_%{toolkit}u_gl-%variant%psonum -Library for the wxWidgets cross-platform GUI. +This library contains the wxGLCanvas class for integration of OpenGL +with wxWidgets. %package -n libwx_%{toolkit}u_html-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets HTML parser and renderer library Group: System/Libraries %description -n libwx_%{toolkit}u_html-%variant%psonum -Library for the wxWidgets cross-platform GUI. +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 +or the result of a database search. %package -n libwx_%{toolkit}u_media-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets media class library Group: System/Libraries %description -n libwx_%{toolkit}u_media-%variant%psonum -Library for the wxWidgets cross-platform GUI. +wxMediaCtrl is a class for displaying types of media, such as videos, +audio files, natively through native codecs. %package -n libwx_%{toolkit}u_propgrid-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets property grid class library Group: System/Libraries %description -n libwx_%{toolkit}u_propgrid-%variant%psonum -Library for the wxWidgets cross-platform GUI. +wxPropertyGrid is a specialized grid for editing properties, in other +words, name=value pairs. %package -n libwx_%{toolkit}u_qa-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets quality assurance class library Group: System/Libraries %description -n libwx_%{toolkit}u_qa-%variant%psonum -Library for the wxWidgets cross-platform GUI. +This is the library containing extra classes for quality +assurance, containing the wxDebugReport class. wxDebugReport is +used to generate a debug report, containing information about the +program current state. %package -n libwx_%{toolkit}u_ribbon-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets's ribbon user interface library Group: System/Libraries %description -n libwx_%{toolkit}u_ribbon-%variant%psonum -Library for the wxWidgets cross-platform GUI. +The wxRibbon library is a set of classes for writing a ribbon user +interface. %package -n libwx_%{toolkit}u_richtext-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets Rich Text editor class library Group: System/Libraries %description -n libwx_%{toolkit}u_richtext-%variant%psonum -Library for the wxWidgets cross-platform GUI. +wxRichTextCtrl provides a generic implementation of a rich text +editor that can handle different character styles, paragraph +formatting, and images. It is intended for "natural" text in the +sense that source code is better served by wxStyledTextCtrl. %package -n libwx_%{toolkit}u_stc-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets styled text class library Group: System/Libraries %description -n libwx_%{toolkit}u_stc-%variant%psonum -Library for the wxWidgets cross-platform GUI. +A wxWidgets implementation of the Scintilla source code editing component. + +%package -n libwx_%{toolkit}u_webview-%variant%psonum +Summary: wxWidgets HTML/browser class library +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. %package -n libwx_%{toolkit}u_xrc-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets's XML-based resource system Group: System/Libraries %description -n libwx_%{toolkit}u_xrc-%variant%psonum -Library for the wxWidgets cross-platform GUI. +The XML-based resource system of wxWidgets, known as XRC, allows user +interface elements such as dialogs, menu bars and toolbars, to be +stored in text files and loaded into the application at run-time. %package plugin-sound_sdlu-3_2 Summary: wxWidgets SDL Plugin @@ -203,6 +233,7 @@ Requires: libwx_%{toolkit}u_qa-%variant%psonum = %version Requires: libwx_%{toolkit}u_ribbon-%variant%psonum = %version Requires: libwx_%{toolkit}u_richtext-%variant%psonum = %version Requires: libwx_%{toolkit}u_stc-%variant%psonum = %version +Requires: libwx_%{toolkit}u_webview-%variant%psonum = %version Requires: libwx_%{toolkit}u_xrc-%variant%psonum = %version Requires: libwx_baseu-%variant%psonum = %version Requires: libwx_baseu_net-%variant%psonum = %version @@ -214,9 +245,10 @@ Provides: wxWidgets-any-devel Conflicts: wxWidgets-any-devel %description devel -wxWidgets is a 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. +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 package contains all files needed for developing with wxGTK%gtk_version. @@ -224,7 +256,6 @@ Note: wxWidgets variant devel packages are mutually exclusive. Please 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 cp %{S:2} . @@ -298,6 +329,8 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %postun -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig %post -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig %postun -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_webview-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_webview-%variant%psonum -p /sbin/ldconfig %post -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig %postun -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig @@ -359,6 +392,13 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}* +%files -n libwx_%{toolkit}u_webview-%variant%psonum +%defattr (-,root,root) +%_libdir/libwx_%{toolkit}u_webview-%variant.so.%{sonum}* +%dir %_libdir/wx +%dir %_libdir/wx/%wx_micro +%_libdir/wx/%wx_micro/web-extensions/ + %files -n libwx_%{toolkit}u_xrc-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}* diff --git a/wxQt-3_2.changes b/wxQt-3_2.changes index 61995ad..0194342 100644 --- a/wxQt-3_2.changes +++ b/wxQt-3_2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 15 08:55:06 UTC 2019 - Jan Engelhardt + +- Update to new snapshot 3.1.3~g673 (6cc1d63d) + * Graphics context methods for the Qt platform +- Enabled webkit2 backend for wxWebView (wxGTK3 only) + ------------------------------------------------------------------- Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index b22b461..a8683c0 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -20,9 +20,9 @@ Name: wxQt-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define psonum 3_1_2 -%define sonum 3.1.2 -Version: 3.1.2.g198 +%define psonum 3_1_3 +%define sonum 3.1.3 +Version: 3.1.3~g673 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.3 @@ -31,7 +31,7 @@ Release: 0 Summary: C++ Library for Cross-Platform Development License: LGPL-2.1+ WITH WxWindows-exception-3.1 Group: Development/Libraries/C and C++ -Url: http://www.wxwidgets.org/ +URL: https://www.wxwidgets.org/ Source: %tarball_name-%version.tar.xz Source2: README.SUSE Source5: wxWidgets-3_2-rpmlintrc @@ -70,12 +70,13 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(glu) %description -wxWidgets is a 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. +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. %package -n libwx_baseu-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets base library # Name up to openSUSE 11.3 and up to wxGTK-2.8: Group: System/Libraries Obsoletes: wxGTK <= %version.0 @@ -85,105 +86,133 @@ Provides: wxWidgets = %version Recommends: wxWidgets-lang >= 3.0 %description -n libwx_baseu-%variant%psonum -Library for the wxWidgets cross-platform GUI. +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. %package -n libwx_baseu_net-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets networking library Group: System/Libraries %description -n libwx_baseu_net-%variant%psonum -Library for the wxWidgets cross-platform GUI. +Classes for network access with wxWidgets. %package -n libwx_baseu_xml-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets XML parser library Group: System/Libraries %description -n libwx_baseu_xml-%variant%psonum -Library for the wxWidgets cross-platform GUI. +This library contains classes for parsing XML documents. %package -n libwx_%{toolkit}u_adv-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets advanced widgets and rarely-used widgets Group: System/Libraries %description -n libwx_%{toolkit}u_adv-%variant%psonum -Library for the wxWidgets cross-platform GUI. +Advanced or rarely-used GUI classes for wxWidgets. %package -n libwx_%{toolkit}u_aui-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets advanced user interface docking library Group: System/Libraries %description -n libwx_%{toolkit}u_aui-%variant%psonum -Library for the wxWidgets cross-platform GUI. +The Advanced User Interface docking library of wxWidgets. %package -n libwx_%{toolkit}u_core-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets basic GUI class library Group: System/Libraries %description -n libwx_%{toolkit}u_core-%variant%psonum -Library for the wxWidgets cross-platform GUI. +Basic GUI classes such as GDI classes or controls are in this +library. All wxWidgets GUI applications must link against this +library, only console mode applications need not. %package -n libwx_%{toolkit}u_gl-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets OpenGL integration library Group: System/Libraries %description -n libwx_%{toolkit}u_gl-%variant%psonum -Library for the wxWidgets cross-platform GUI. +This library contains the wxGLCanvas class for integration of OpenGL +with wxWidgets. %package -n libwx_%{toolkit}u_html-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets HTML parser and renderer library Group: System/Libraries %description -n libwx_%{toolkit}u_html-%variant%psonum -Library for the wxWidgets cross-platform GUI. +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 +or the result of a database search. %package -n libwx_%{toolkit}u_media-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets media class library Group: System/Libraries %description -n libwx_%{toolkit}u_media-%variant%psonum -Library for the wxWidgets cross-platform GUI. +wxMediaCtrl is a class for displaying types of media, such as videos, +audio files, natively through native codecs. %package -n libwx_%{toolkit}u_propgrid-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets property grid class library Group: System/Libraries %description -n libwx_%{toolkit}u_propgrid-%variant%psonum -Library for the wxWidgets cross-platform GUI. +wxPropertyGrid is a specialized grid for editing properties, in other +words, name=value pairs. %package -n libwx_%{toolkit}u_qa-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets quality assurance class library Group: System/Libraries %description -n libwx_%{toolkit}u_qa-%variant%psonum -Library for the wxWidgets cross-platform GUI. +This is the library containing extra classes for quality +assurance, containing the wxDebugReport class. wxDebugReport is +used to generate a debug report, containing information about the +program current state. %package -n libwx_%{toolkit}u_ribbon-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets's ribbon user interface library Group: System/Libraries %description -n libwx_%{toolkit}u_ribbon-%variant%psonum -Library for the wxWidgets cross-platform GUI. +The wxRibbon library is a set of classes for writing a ribbon user +interface. %package -n libwx_%{toolkit}u_richtext-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets Rich Text editor class library Group: System/Libraries %description -n libwx_%{toolkit}u_richtext-%variant%psonum -Library for the wxWidgets cross-platform GUI. +wxRichTextCtrl provides a generic implementation of a rich text +editor that can handle different character styles, paragraph +formatting, and images. It is intended for "natural" text in the +sense that source code is better served by wxStyledTextCtrl. %package -n libwx_%{toolkit}u_stc-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets styled text class library Group: System/Libraries %description -n libwx_%{toolkit}u_stc-%variant%psonum -Library for the wxWidgets cross-platform GUI. +A wxWidgets implementation of the Scintilla source code editing component. + +%package -n libwx_%{toolkit}u_webview-%variant%psonum +Summary: wxWidgets HTML/browser class library +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. %package -n libwx_%{toolkit}u_xrc-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets's XML-based resource system Group: System/Libraries %description -n libwx_%{toolkit}u_xrc-%variant%psonum -Library for the wxWidgets cross-platform GUI. +The XML-based resource system of wxWidgets, known as XRC, allows user +interface elements such as dialogs, menu bars and toolbars, to be +stored in text files and loaded into the application at run-time. %package plugin-sound_sdlu-3_2 Summary: wxWidgets SDL Plugin @@ -215,9 +244,10 @@ Provides: wxWidgets-any-devel Conflicts: wxWidgets-any-devel %description devel -wxWidgets is a 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. +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 package contains all files needed for developing with wxQt. @@ -225,7 +255,6 @@ Note: wxWidgets variant devel packages are mutually exclusive. Please 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 cp %{S:2} . @@ -299,6 +328,8 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %postun -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig %post -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig %postun -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_webview-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_webview-%variant%psonum -p /sbin/ldconfig %post -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig %postun -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig diff --git a/wxWidgets-3.1.2.g198.tar.xz b/wxWidgets-3.1.2.g198.tar.xz deleted file mode 100644 index 4360919..0000000 --- a/wxWidgets-3.1.2.g198.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d96bf0c5150be0b2ce56b1eed1068fadfa13ff24d9d8b03423a8ce5407ae1e4 -size 22350936 diff --git a/wxWidgets-3.1.3~g673.tar.xz b/wxWidgets-3.1.3~g673.tar.xz new file mode 100644 index 0000000..5cdf6ba --- /dev/null +++ b/wxWidgets-3.1.3~g673.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf31e73d6732001beae34c9b8dd4cd3a2ecb79d1fecaa5c5be7e6a45431a3d43 +size 22397212 diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index 61995ad..0194342 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 15 08:55:06 UTC 2019 - Jan Engelhardt + +- Update to new snapshot 3.1.3~g673 (6cc1d63d) + * Graphics context methods for the Qt platform +- Enabled webkit2 backend for wxWebView (wxGTK3 only) + ------------------------------------------------------------------- Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index e21aaca..7d3fcdd 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -20,9 +20,9 @@ Name: wxWidgets-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define psonum 3_1_2 -%define sonum 3.1.2 -Version: 3.1.2.g198 +%define psonum 3_1_3 +%define sonum 3.1.3 +Version: 3.1.3~g673 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.3 @@ -31,7 +31,7 @@ Release: 0 Summary: C++ Library for Cross-Platform Development License: LGPL-2.1+ WITH WxWindows-exception-3.1 Group: Development/Libraries/C and C++ -Url: http://www.wxwidgets.org/ +URL: https://www.wxwidgets.org/ Source: %tarball_name-%version.tar.xz Source2: README.SUSE Source5: wxWidgets-3_2-rpmlintrc @@ -67,12 +67,13 @@ BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) %description -wxWidgets is a 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. +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. %package -n libwx_baseu-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets base library # Name up to openSUSE 11.3 and up to wxGTK-2.8: Group: System/Libraries Obsoletes: wxGTK <= %version.0 @@ -82,105 +83,133 @@ Provides: wxWidgets = %version Recommends: wxWidgets-lang >= 3.0 %description -n libwx_baseu-%variant%psonum -Library for the wxWidgets cross-platform GUI. +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. %package -n libwx_baseu_net-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets networking library Group: System/Libraries %description -n libwx_baseu_net-%variant%psonum -Library for the wxWidgets cross-platform GUI. +Classes for network access with wxWidgets. %package -n libwx_baseu_xml-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets XML parser library Group: System/Libraries %description -n libwx_baseu_xml-%variant%psonum -Library for the wxWidgets cross-platform GUI. +This library contains classes for parsing XML documents. %package -n libwx_%{toolkit}u_adv-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets advanced widgets and rarely-used widgets Group: System/Libraries %description -n libwx_%{toolkit}u_adv-%variant%psonum -Library for the wxWidgets cross-platform GUI. +Advanced or rarely-used GUI classes for wxWidgets. %package -n libwx_%{toolkit}u_aui-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets advanced user interface docking library Group: System/Libraries %description -n libwx_%{toolkit}u_aui-%variant%psonum -Library for the wxWidgets cross-platform GUI. +The Advanced User Interface docking library of wxWidgets. %package -n libwx_%{toolkit}u_core-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets basic GUI class library Group: System/Libraries %description -n libwx_%{toolkit}u_core-%variant%psonum -Library for the wxWidgets cross-platform GUI. +Basic GUI classes such as GDI classes or controls are in this +library. All wxWidgets GUI applications must link against this +library, only console mode applications need not. %package -n libwx_%{toolkit}u_gl-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets OpenGL integration library Group: System/Libraries %description -n libwx_%{toolkit}u_gl-%variant%psonum -Library for the wxWidgets cross-platform GUI. +This library contains the wxGLCanvas class for integration of OpenGL +with wxWidgets. %package -n libwx_%{toolkit}u_html-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets HTML parser and renderer library Group: System/Libraries %description -n libwx_%{toolkit}u_html-%variant%psonum -Library for the wxWidgets cross-platform GUI. +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 +or the result of a database search. %package -n libwx_%{toolkit}u_media-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets media class library Group: System/Libraries %description -n libwx_%{toolkit}u_media-%variant%psonum -Library for the wxWidgets cross-platform GUI. +wxMediaCtrl is a class for displaying types of media, such as videos, +audio files, natively through native codecs. %package -n libwx_%{toolkit}u_propgrid-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets property grid class library Group: System/Libraries %description -n libwx_%{toolkit}u_propgrid-%variant%psonum -Library for the wxWidgets cross-platform GUI. +wxPropertyGrid is a specialized grid for editing properties, in other +words, name=value pairs. %package -n libwx_%{toolkit}u_qa-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets quality assurance class library Group: System/Libraries %description -n libwx_%{toolkit}u_qa-%variant%psonum -Library for the wxWidgets cross-platform GUI. +This is the library containing extra classes for quality +assurance, containing the wxDebugReport class. wxDebugReport is +used to generate a debug report, containing information about the +program current state. %package -n libwx_%{toolkit}u_ribbon-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets's ribbon user interface library Group: System/Libraries %description -n libwx_%{toolkit}u_ribbon-%variant%psonum -Library for the wxWidgets cross-platform GUI. +The wxRibbon library is a set of classes for writing a ribbon user +interface. %package -n libwx_%{toolkit}u_richtext-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets Rich Text editor class library Group: System/Libraries %description -n libwx_%{toolkit}u_richtext-%variant%psonum -Library for the wxWidgets cross-platform GUI. +wxRichTextCtrl provides a generic implementation of a rich text +editor that can handle different character styles, paragraph +formatting, and images. It is intended for "natural" text in the +sense that source code is better served by wxStyledTextCtrl. %package -n libwx_%{toolkit}u_stc-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets styled text class library Group: System/Libraries %description -n libwx_%{toolkit}u_stc-%variant%psonum -Library for the wxWidgets cross-platform GUI. +A wxWidgets implementation of the Scintilla source code editing component. + +%package -n libwx_%{toolkit}u_webview-%variant%psonum +Summary: wxWidgets HTML/browser class library +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. %package -n libwx_%{toolkit}u_xrc-%variant%psonum -Summary: wxWidgets Library +Summary: wxWidgets's XML-based resource system Group: System/Libraries %description -n libwx_%{toolkit}u_xrc-%variant%psonum -Library for the wxWidgets cross-platform GUI. +The XML-based resource system of wxWidgets, known as XRC, allows user +interface elements such as dialogs, menu bars and toolbars, to be +stored in text files and loaded into the application at run-time. %package plugin-sound_sdlu-3_2 Summary: wxWidgets SDL Plugin @@ -219,9 +248,10 @@ Provides: wxGTK-devel = %version-%release Obsoletes: wxGTK-devel <= %version-%release %description devel -wxWidgets is a 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. +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 package contains all files needed for developing with wxGTK%gtk_version. @@ -229,7 +259,6 @@ Note: wxWidgets variant devel packages are mutually exclusive. Please 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 cp %{S:2} . @@ -302,6 +331,8 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %postun -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig %post -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig %postun -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_webview-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_webview-%variant%psonum -p /sbin/ldconfig %post -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig %postun -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig From e51f758e4fcdf375c4d56ccda0e3036df6df5f2ba2f25ffe2166f90edd226a33 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 15 Apr 2019 20:28:20 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=52 --- wxWidgets-3_2.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index 0194342..7183c76 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -3,7 +3,7 @@ Mon Apr 15 08:55:06 UTC 2019 - Jan Engelhardt - Update to new snapshot 3.1.3~g673 (6cc1d63d) * Graphics context methods for the Qt platform -- Enabled webkit2 backend for wxWebView (wxGTK3 only) +- Enabled webkit2 backend for wxWebView (wxGTK3 only) [boo#1107337] ------------------------------------------------------------------- Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at From b520fd964995a7e1e417b122fa145ad4b7c2fc875dd1d5555fee2d5b8a3edaae Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 15 Apr 2019 20:28:36 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=53 --- wxGTK3-3_2.changes | 2 +- wxQt-3_2.changes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wxGTK3-3_2.changes b/wxGTK3-3_2.changes index 0194342..7183c76 100644 --- a/wxGTK3-3_2.changes +++ b/wxGTK3-3_2.changes @@ -3,7 +3,7 @@ Mon Apr 15 08:55:06 UTC 2019 - Jan Engelhardt - Update to new snapshot 3.1.3~g673 (6cc1d63d) * Graphics context methods for the Qt platform -- Enabled webkit2 backend for wxWebView (wxGTK3 only) +- Enabled webkit2 backend for wxWebView (wxGTK3 only) [boo#1107337] ------------------------------------------------------------------- Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at diff --git a/wxQt-3_2.changes b/wxQt-3_2.changes index 0194342..7183c76 100644 --- a/wxQt-3_2.changes +++ b/wxQt-3_2.changes @@ -3,7 +3,7 @@ Mon Apr 15 08:55:06 UTC 2019 - Jan Engelhardt - Update to new snapshot 3.1.3~g673 (6cc1d63d) * Graphics context methods for the Qt platform -- Enabled webkit2 backend for wxWebView (wxGTK3 only) +- Enabled webkit2 backend for wxWebView (wxGTK3 only) [boo#1107337] ------------------------------------------------------------------- Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at