diff --git a/_service b/_service index c4ac3ae..7ad7186 100644 --- a/_service +++ b/_service @@ -3,7 +3,8 @@ git git://github.com/wxWidgets/wxWidgets master - 3.1.1.g@TAG_OFFSET@ + v3.1.2 + 3.1.2.g@TAG_OFFSET@ v(.*) diff --git a/soversion.diff b/soversion.diff index 62b5456..7fcbb95 100644 --- a/soversion.diff +++ b/soversion.diff @@ -20,7 +20,7 @@ Index: wxWidgets-3.1.0.2244/Makefile.in =================================================================== --- wxWidgets-3.1.0.2244.orig/Makefile.in +++ wxWidgets-3.1.0.2244/Makefile.in -@@ -2119,6 +2119,7 @@ LOCALE_MSW_LINGUAS = it +@@ -2105,6 +2105,7 @@ LOCALE_MSW_LINGUAS = it @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ = _gcc$(COMPILER_VERSION) @@ -28,7 +28,7 @@ Index: wxWidgets-3.1.0.2244/Makefile.in @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR) @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_BUILD_debug@WXDEBUGFLAG = d -@@ -2130,7 +2131,7 @@ LOCALE_MSW_LINGUAS = it +@@ -2116,7 +2117,7 @@ LOCALE_MSW_LINGUAS = it @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \ @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT) @@ -37,12 +37,12 @@ Index: wxWidgets-3.1.0.2244/Makefile.in @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = COND_wxUSE_REGEX_builtin___wxregex___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) -@@ -13524,7 +13525,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE - @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) - @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(SO_SUFFIX) +@@ -13690,7 +13691,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE + @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .3.0.0.$(SO_SUFFIX) + @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -3.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) --@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).1 -+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3.1.1 +-@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_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 c9ec7a6..61995ad 100644 --- a/wxGTK3-3_2.changes +++ b/wxGTK3-3_2.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at + +- Update to new upstream release 3.1.2 + * Support for non-integer font sizes and arbitrary font + weights. + * New wxLZMA{Input,Output}Stream classes. + * Add wxDataViewToggleRenderer::ShowAsRadio(), + wxDisplay::GetPPI(), wxGrid::SetCornerLabelValue(), + wxHtmlEasyPrinting::SetPromptMode(), + wxJoystickEvent::GetButtonOrdinal(), + wxToolbook::EnablePage(). +- Remove wxqt-compile.diff (no longer needed) + +------------------------------------------------------------------- +Tue Apr 17 10:48:16 UTC 2018 - jengelh@inai.de + +- Update soversion.diff to use the package version, not some + incremental integer. + ------------------------------------------------------------------- Mon Feb 19 00:24:12 UTC 2018 - jengelh@inai.de @@ -316,7 +336,7 @@ Thu Dec 23 19:29:12 CET 2010 - sbrabec@suse.cz Sun Aug 15 00:15:52 UTC 2010 - termim@gmail.com - Updated to version 2.8.11.0 - Adds Python 2.7 builds, PySlices, new pubsub implementation, + Adds Python 2.7 builds, PySlices, new pubsub implementation, lots of updates to AGW, and lots of bugs fixed. - Removed wxGTK-GSocket-clash.patch and wxGTK-editra-ebmlib.patch as already fixed. @@ -331,7 +351,7 @@ Tue Jun 15 16:15:11 CEST 2010 - sbrabec@suse.cz ------------------------------------------------------------------- Mon Feb 22 14:58:36 UTC 2010 - crrodriguez@opensuse.org -- build with PIC +- build with PIC ------------------------------------------------------------------- Thu Jan 28 17:17:47 CET 2010 - sbrabec@suse.cz @@ -417,7 +437,7 @@ Thu Jun 18 19:16:27 CEST 2009 - sbrabec@suse.cz ------------------------------------------------------------------- Tue Feb 17 17:29:57 CET 2009 - crrodriguez@suse.de -- build require libexpat-devel so we dont use the bundled one +- build require libexpat-devel so we dont use the bundled one ------------------------------------------------------------------- Wed Feb 4 13:58:35 CET 2009 - pth@suse.de @@ -540,7 +560,7 @@ Mon Mar 5 15:11:38 CET 2007 - pth@suse.de ------------------------------------------------------------------- Thu Mar 1 13:57:40 CET 2007 - pth@suse.de -- Update to 2.8.1.1. Changes are too numerous to list, see +- Update to 2.8.1.1. Changes are too numerous to list, see changes.txt for a full list. - fix use of uninitialised variables wxPython_int.h - Correct spelling in README.unicode @@ -607,7 +627,7 @@ Mon Aug 7 17:08:36 CEST 2006 - sbrabec@suse.cz ------------------------------------------------------------------- Mon Jul 17 16:20:55 CEST 2006 - mkudlvasr@suse.cz -- fixed a problem in makefiles.in and configure.in. In many cases +- fixed a problem in makefiles.in and configure.in. In many cases the variable top_builddir was not separated by a slash. This caused many 'file not found' errors. @@ -821,7 +841,7 @@ Fri Aug 29 18:40:00 CEST 2003 - tiwai@suse.de ------------------------------------------------------------------- Sat Aug 23 18:37:04 CEST 2003 - ro@suse.de -- fix build on lib64 +- fix build on lib64 ------------------------------------------------------------------- Wed Aug 20 18:54:38 CEST 2003 - mcihar@suse.cz @@ -852,12 +872,12 @@ Tue Mar 4 11:21:34 CET 2003 - mmj@suse.de ------------------------------------------------------------------- Tue Feb 25 10:03:50 CET 2003 - hhetter@suse.de -- devel package requires gtk-devel (Bug Id#22479) +- devel package requires gtk-devel (Bug Id#22479) ------------------------------------------------------------------- Mon Feb 17 11:48:02 CET 2003 - hhetter@suse.de -- package gl-header files too ( Bug Id#23094 ) +- package gl-header files too ( Bug Id#23094 ) ------------------------------------------------------------------- Wed Jan 22 16:13:32 CET 2003 - meissner@suse.de @@ -869,7 +889,7 @@ Tue Jan 14 10:33:22 CET 2003 - hhetter@suse.de - updated to version 2.4.0 - updated documentation to 2.4.0 revision -- remove all outdated patches +- remove all outdated patches ------------------------------------------------------------------- Tue Nov 12 16:30:54 CET 2002 - tcrhak@suse.cz @@ -904,15 +924,15 @@ Mon Apr 15 19:20:13 CEST 2002 - tiwai@suse.de ------------------------------------------------------------------- Tue Feb 19 14:23:36 CET 2002 - hhetter@suse.de -- applied the real patch for the wxgtk-mutex performance problem +- applied the real patch for the wxgtk-mutex performance problem ------------------------------------------------------------------- Fri Feb 15 08:39:08 CET 2002 - hhetter@suse.de -- configure with --enable-std_iostreams for better support +- configure with --enable-std_iostreams for better support for C++ sources using C++ iostreams - apply patch to fix perfomance problem with multithreaded apps - (accepted and already in the wxGTK CVS) + (accepted and already in the wxGTK CVS) ------------------------------------------------------------------- Fri Feb 1 00:26:05 CET 2002 - ro@suse.de @@ -949,22 +969,22 @@ Fri Mar 30 16:09:21 CEST 2001 - pthomas@suse.de ------------------------------------------------------------------- Fri Jan 26 08:42:40 CET 2001 - hhetter@suse.de -- Update to 2.2.4 +- Update to 2.2.4 ------------------------------------------------------------------- Sat Dec 9 06:10:12 CET 2000 - mfabian@suse.de -- Add /usr/X11R6/bin/wxgtk-config to filelist +- Add /usr/X11R6/bin/wxgtk-config to filelist ------------------------------------------------------------------- Mon Nov 6 00:07:29 CET 2000 - ro@suse.de -- fixed neededforbuild +- fixed neededforbuild ------------------------------------------------------------------- Fri Jun 9 08:40:03 CEST 2000 - ro@suse.de -- up to 2.1.16 +- up to 2.1.16 ------------------------------------------------------------------- Mon Feb 21 19:13:50 CET 2000 - uli@suse.de @@ -974,14 +994,14 @@ Mon Feb 21 19:13:50 CET 2000 - uli@suse.de ------------------------------------------------------------------- Mon Feb 21 08:15:21 CET 2000 - ro@suse.de -- update to 2.1.13 +- update to 2.1.13 - use suse_update_config macro - patch to compile with newest gtk ------------------------------------------------------------------- Fri Jan 14 16:08:20 MET 2000 - freitag@suse.de -- update to 2.1.12, URL, doc in seperate tarball +- update to 2.1.12, URL, doc in seperate tarball ------------------------------------------------------------------- Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index e55508b..e80a08e 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -1,7 +1,7 @@ # # spec file for package wxGTK3-3_2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,12 +20,12 @@ Name: wxGTK3-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define psonum 3_1_1 -%define sonum 3.1.1 -Version: 3.1.1.g3 +%define psonum 3_1_2 +%define sonum 3.1.2 +Version: 3.1.2.g198 Release: 0 %define wx_minor 3.1 -%define wx_micro 3.1.1 +%define wx_micro 3.1.3 # build non-UI toolkit related packages %define base_packages 0 Summary: C++ Library for Cross-Platform Development @@ -39,7 +39,6 @@ Source5: wxWidgets-3_2-rpmlintrc # identify and backport wxPython fixes to wxWidgets. Source6: wxpython-mkdiff.sh Patch1: soversion.diff -Patch2: wxqt-compile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf @@ -227,7 +226,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 -P 2 -p1 +%patch -P 1 -p1 cp %{S:2} . %build diff --git a/wxQt-3_2.changes b/wxQt-3_2.changes index c9ec7a6..61995ad 100644 --- a/wxQt-3_2.changes +++ b/wxQt-3_2.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at + +- Update to new upstream release 3.1.2 + * Support for non-integer font sizes and arbitrary font + weights. + * New wxLZMA{Input,Output}Stream classes. + * Add wxDataViewToggleRenderer::ShowAsRadio(), + wxDisplay::GetPPI(), wxGrid::SetCornerLabelValue(), + wxHtmlEasyPrinting::SetPromptMode(), + wxJoystickEvent::GetButtonOrdinal(), + wxToolbook::EnablePage(). +- Remove wxqt-compile.diff (no longer needed) + +------------------------------------------------------------------- +Tue Apr 17 10:48:16 UTC 2018 - jengelh@inai.de + +- Update soversion.diff to use the package version, not some + incremental integer. + ------------------------------------------------------------------- Mon Feb 19 00:24:12 UTC 2018 - jengelh@inai.de @@ -316,7 +336,7 @@ Thu Dec 23 19:29:12 CET 2010 - sbrabec@suse.cz Sun Aug 15 00:15:52 UTC 2010 - termim@gmail.com - Updated to version 2.8.11.0 - Adds Python 2.7 builds, PySlices, new pubsub implementation, + Adds Python 2.7 builds, PySlices, new pubsub implementation, lots of updates to AGW, and lots of bugs fixed. - Removed wxGTK-GSocket-clash.patch and wxGTK-editra-ebmlib.patch as already fixed. @@ -331,7 +351,7 @@ Tue Jun 15 16:15:11 CEST 2010 - sbrabec@suse.cz ------------------------------------------------------------------- Mon Feb 22 14:58:36 UTC 2010 - crrodriguez@opensuse.org -- build with PIC +- build with PIC ------------------------------------------------------------------- Thu Jan 28 17:17:47 CET 2010 - sbrabec@suse.cz @@ -417,7 +437,7 @@ Thu Jun 18 19:16:27 CEST 2009 - sbrabec@suse.cz ------------------------------------------------------------------- Tue Feb 17 17:29:57 CET 2009 - crrodriguez@suse.de -- build require libexpat-devel so we dont use the bundled one +- build require libexpat-devel so we dont use the bundled one ------------------------------------------------------------------- Wed Feb 4 13:58:35 CET 2009 - pth@suse.de @@ -540,7 +560,7 @@ Mon Mar 5 15:11:38 CET 2007 - pth@suse.de ------------------------------------------------------------------- Thu Mar 1 13:57:40 CET 2007 - pth@suse.de -- Update to 2.8.1.1. Changes are too numerous to list, see +- Update to 2.8.1.1. Changes are too numerous to list, see changes.txt for a full list. - fix use of uninitialised variables wxPython_int.h - Correct spelling in README.unicode @@ -607,7 +627,7 @@ Mon Aug 7 17:08:36 CEST 2006 - sbrabec@suse.cz ------------------------------------------------------------------- Mon Jul 17 16:20:55 CEST 2006 - mkudlvasr@suse.cz -- fixed a problem in makefiles.in and configure.in. In many cases +- fixed a problem in makefiles.in and configure.in. In many cases the variable top_builddir was not separated by a slash. This caused many 'file not found' errors. @@ -821,7 +841,7 @@ Fri Aug 29 18:40:00 CEST 2003 - tiwai@suse.de ------------------------------------------------------------------- Sat Aug 23 18:37:04 CEST 2003 - ro@suse.de -- fix build on lib64 +- fix build on lib64 ------------------------------------------------------------------- Wed Aug 20 18:54:38 CEST 2003 - mcihar@suse.cz @@ -852,12 +872,12 @@ Tue Mar 4 11:21:34 CET 2003 - mmj@suse.de ------------------------------------------------------------------- Tue Feb 25 10:03:50 CET 2003 - hhetter@suse.de -- devel package requires gtk-devel (Bug Id#22479) +- devel package requires gtk-devel (Bug Id#22479) ------------------------------------------------------------------- Mon Feb 17 11:48:02 CET 2003 - hhetter@suse.de -- package gl-header files too ( Bug Id#23094 ) +- package gl-header files too ( Bug Id#23094 ) ------------------------------------------------------------------- Wed Jan 22 16:13:32 CET 2003 - meissner@suse.de @@ -869,7 +889,7 @@ Tue Jan 14 10:33:22 CET 2003 - hhetter@suse.de - updated to version 2.4.0 - updated documentation to 2.4.0 revision -- remove all outdated patches +- remove all outdated patches ------------------------------------------------------------------- Tue Nov 12 16:30:54 CET 2002 - tcrhak@suse.cz @@ -904,15 +924,15 @@ Mon Apr 15 19:20:13 CEST 2002 - tiwai@suse.de ------------------------------------------------------------------- Tue Feb 19 14:23:36 CET 2002 - hhetter@suse.de -- applied the real patch for the wxgtk-mutex performance problem +- applied the real patch for the wxgtk-mutex performance problem ------------------------------------------------------------------- Fri Feb 15 08:39:08 CET 2002 - hhetter@suse.de -- configure with --enable-std_iostreams for better support +- configure with --enable-std_iostreams for better support for C++ sources using C++ iostreams - apply patch to fix perfomance problem with multithreaded apps - (accepted and already in the wxGTK CVS) + (accepted and already in the wxGTK CVS) ------------------------------------------------------------------- Fri Feb 1 00:26:05 CET 2002 - ro@suse.de @@ -949,22 +969,22 @@ Fri Mar 30 16:09:21 CEST 2001 - pthomas@suse.de ------------------------------------------------------------------- Fri Jan 26 08:42:40 CET 2001 - hhetter@suse.de -- Update to 2.2.4 +- Update to 2.2.4 ------------------------------------------------------------------- Sat Dec 9 06:10:12 CET 2000 - mfabian@suse.de -- Add /usr/X11R6/bin/wxgtk-config to filelist +- Add /usr/X11R6/bin/wxgtk-config to filelist ------------------------------------------------------------------- Mon Nov 6 00:07:29 CET 2000 - ro@suse.de -- fixed neededforbuild +- fixed neededforbuild ------------------------------------------------------------------- Fri Jun 9 08:40:03 CEST 2000 - ro@suse.de -- up to 2.1.16 +- up to 2.1.16 ------------------------------------------------------------------- Mon Feb 21 19:13:50 CET 2000 - uli@suse.de @@ -974,14 +994,14 @@ Mon Feb 21 19:13:50 CET 2000 - uli@suse.de ------------------------------------------------------------------- Mon Feb 21 08:15:21 CET 2000 - ro@suse.de -- update to 2.1.13 +- update to 2.1.13 - use suse_update_config macro - patch to compile with newest gtk ------------------------------------------------------------------- Fri Jan 14 16:08:20 MET 2000 - freitag@suse.de -- update to 2.1.12, URL, doc in seperate tarball +- update to 2.1.12, URL, doc in seperate tarball ------------------------------------------------------------------- Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index e43f8b4..b22b461 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -1,7 +1,7 @@ # # spec file for package wxQt-3_2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,12 +20,12 @@ Name: wxQt-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define psonum 3_1_1 -%define sonum 3.1.1 -Version: 3.1.1.g3 +%define psonum 3_1_2 +%define sonum 3.1.2 +Version: 3.1.2.g198 Release: 0 %define wx_minor 3.1 -%define wx_micro 3.1.1 +%define wx_micro 3.1.3 # build non-UI toolkit related packages %define base_packages 0 Summary: C++ Library for Cross-Platform Development @@ -39,7 +39,6 @@ Source5: wxWidgets-3_2-rpmlintrc # identify and backport wxPython fixes to wxWidgets. Source6: wxpython-mkdiff.sh Patch1: soversion.diff -Patch2: wxqt-compile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf @@ -228,7 +227,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 -P 2 -p1 +%patch -P 1 -p1 cp %{S:2} . %build diff --git a/wxWidgets-3.1.1.g3.tar.xz b/wxWidgets-3.1.1.g3.tar.xz deleted file mode 100644 index fba0f33..0000000 --- a/wxWidgets-3.1.1.g3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:807d264f7f0ef1d8f5d4cb1fb6fd13e9d31116d4b7fd780e3929c109eccfdeb9 -size 21924192 diff --git a/wxWidgets-3.1.2.g198.tar.xz b/wxWidgets-3.1.2.g198.tar.xz new file mode 100644 index 0000000..4360919 --- /dev/null +++ b/wxWidgets-3.1.2.g198.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d96bf0c5150be0b2ce56b1eed1068fadfa13ff24d9d8b03423a8ce5407ae1e4 +size 22350936 diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index abba480..61995ad 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at + +- Update to new upstream release 3.1.2 + * Support for non-integer font sizes and arbitrary font + weights. + * New wxLZMA{Input,Output}Stream classes. + * Add wxDataViewToggleRenderer::ShowAsRadio(), + wxDisplay::GetPPI(), wxGrid::SetCornerLabelValue(), + wxHtmlEasyPrinting::SetPromptMode(), + wxJoystickEvent::GetButtonOrdinal(), + wxToolbook::EnablePage(). +- Remove wxqt-compile.diff (no longer needed) + ------------------------------------------------------------------- Tue Apr 17 10:48:16 UTC 2018 - jengelh@inai.de @@ -322,7 +336,7 @@ Thu Dec 23 19:29:12 CET 2010 - sbrabec@suse.cz Sun Aug 15 00:15:52 UTC 2010 - termim@gmail.com - Updated to version 2.8.11.0 - Adds Python 2.7 builds, PySlices, new pubsub implementation, + Adds Python 2.7 builds, PySlices, new pubsub implementation, lots of updates to AGW, and lots of bugs fixed. - Removed wxGTK-GSocket-clash.patch and wxGTK-editra-ebmlib.patch as already fixed. @@ -337,7 +351,7 @@ Tue Jun 15 16:15:11 CEST 2010 - sbrabec@suse.cz ------------------------------------------------------------------- Mon Feb 22 14:58:36 UTC 2010 - crrodriguez@opensuse.org -- build with PIC +- build with PIC ------------------------------------------------------------------- Thu Jan 28 17:17:47 CET 2010 - sbrabec@suse.cz @@ -423,7 +437,7 @@ Thu Jun 18 19:16:27 CEST 2009 - sbrabec@suse.cz ------------------------------------------------------------------- Tue Feb 17 17:29:57 CET 2009 - crrodriguez@suse.de -- build require libexpat-devel so we dont use the bundled one +- build require libexpat-devel so we dont use the bundled one ------------------------------------------------------------------- Wed Feb 4 13:58:35 CET 2009 - pth@suse.de @@ -546,7 +560,7 @@ Mon Mar 5 15:11:38 CET 2007 - pth@suse.de ------------------------------------------------------------------- Thu Mar 1 13:57:40 CET 2007 - pth@suse.de -- Update to 2.8.1.1. Changes are too numerous to list, see +- Update to 2.8.1.1. Changes are too numerous to list, see changes.txt for a full list. - fix use of uninitialised variables wxPython_int.h - Correct spelling in README.unicode @@ -613,7 +627,7 @@ Mon Aug 7 17:08:36 CEST 2006 - sbrabec@suse.cz ------------------------------------------------------------------- Mon Jul 17 16:20:55 CEST 2006 - mkudlvasr@suse.cz -- fixed a problem in makefiles.in and configure.in. In many cases +- fixed a problem in makefiles.in and configure.in. In many cases the variable top_builddir was not separated by a slash. This caused many 'file not found' errors. @@ -827,7 +841,7 @@ Fri Aug 29 18:40:00 CEST 2003 - tiwai@suse.de ------------------------------------------------------------------- Sat Aug 23 18:37:04 CEST 2003 - ro@suse.de -- fix build on lib64 +- fix build on lib64 ------------------------------------------------------------------- Wed Aug 20 18:54:38 CEST 2003 - mcihar@suse.cz @@ -858,12 +872,12 @@ Tue Mar 4 11:21:34 CET 2003 - mmj@suse.de ------------------------------------------------------------------- Tue Feb 25 10:03:50 CET 2003 - hhetter@suse.de -- devel package requires gtk-devel (Bug Id#22479) +- devel package requires gtk-devel (Bug Id#22479) ------------------------------------------------------------------- Mon Feb 17 11:48:02 CET 2003 - hhetter@suse.de -- package gl-header files too ( Bug Id#23094 ) +- package gl-header files too ( Bug Id#23094 ) ------------------------------------------------------------------- Wed Jan 22 16:13:32 CET 2003 - meissner@suse.de @@ -875,7 +889,7 @@ Tue Jan 14 10:33:22 CET 2003 - hhetter@suse.de - updated to version 2.4.0 - updated documentation to 2.4.0 revision -- remove all outdated patches +- remove all outdated patches ------------------------------------------------------------------- Tue Nov 12 16:30:54 CET 2002 - tcrhak@suse.cz @@ -910,15 +924,15 @@ Mon Apr 15 19:20:13 CEST 2002 - tiwai@suse.de ------------------------------------------------------------------- Tue Feb 19 14:23:36 CET 2002 - hhetter@suse.de -- applied the real patch for the wxgtk-mutex performance problem +- applied the real patch for the wxgtk-mutex performance problem ------------------------------------------------------------------- Fri Feb 15 08:39:08 CET 2002 - hhetter@suse.de -- configure with --enable-std_iostreams for better support +- configure with --enable-std_iostreams for better support for C++ sources using C++ iostreams - apply patch to fix perfomance problem with multithreaded apps - (accepted and already in the wxGTK CVS) + (accepted and already in the wxGTK CVS) ------------------------------------------------------------------- Fri Feb 1 00:26:05 CET 2002 - ro@suse.de @@ -955,22 +969,22 @@ Fri Mar 30 16:09:21 CEST 2001 - pthomas@suse.de ------------------------------------------------------------------- Fri Jan 26 08:42:40 CET 2001 - hhetter@suse.de -- Update to 2.2.4 +- Update to 2.2.4 ------------------------------------------------------------------- Sat Dec 9 06:10:12 CET 2000 - mfabian@suse.de -- Add /usr/X11R6/bin/wxgtk-config to filelist +- Add /usr/X11R6/bin/wxgtk-config to filelist ------------------------------------------------------------------- Mon Nov 6 00:07:29 CET 2000 - ro@suse.de -- fixed neededforbuild +- fixed neededforbuild ------------------------------------------------------------------- Fri Jun 9 08:40:03 CEST 2000 - ro@suse.de -- up to 2.1.16 +- up to 2.1.16 ------------------------------------------------------------------- Mon Feb 21 19:13:50 CET 2000 - uli@suse.de @@ -980,14 +994,14 @@ Mon Feb 21 19:13:50 CET 2000 - uli@suse.de ------------------------------------------------------------------- Mon Feb 21 08:15:21 CET 2000 - ro@suse.de -- update to 2.1.13 +- update to 2.1.13 - use suse_update_config macro - patch to compile with newest gtk ------------------------------------------------------------------- Fri Jan 14 16:08:20 MET 2000 - freitag@suse.de -- update to 2.1.12, URL, doc in seperate tarball +- update to 2.1.12, URL, doc in seperate tarball ------------------------------------------------------------------- Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 1742979..e21aaca 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -1,7 +1,7 @@ # # spec file for package wxWidgets-3_2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,12 +20,12 @@ Name: wxWidgets-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define psonum 3_1_1 -%define sonum 3.1.1 -Version: 3.1.1.g3 +%define psonum 3_1_2 +%define sonum 3.1.2 +Version: 3.1.2.g198 Release: 0 %define wx_minor 3.1 -%define wx_micro 3.1.1 +%define wx_micro 3.1.3 # build non-UI toolkit related packages %define base_packages 1 Summary: C++ Library for Cross-Platform Development @@ -39,7 +39,6 @@ Source5: wxWidgets-3_2-rpmlintrc # identify and backport wxPython fixes to wxWidgets. Source6: wxpython-mkdiff.sh Patch1: soversion.diff -Patch2: wxqt-compile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf @@ -232,7 +231,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 -P 2 -p1 +%patch -P 1 -p1 cp %{S:2} . %build diff --git a/wxqt-compile.diff b/wxqt-compile.diff deleted file mode 100644 index 15802e3..0000000 --- a/wxqt-compile.diff +++ /dev/null @@ -1,29 +0,0 @@ -From: Jan Engelhardt -Date: 2014-12-05 19:29:16.174123839 +0100 - -build: fix compile errors/warnings - -./src/qt/accel.cpp: In member function 'QList -wxAcceleratorTable::ConvertShortcutTable(QWidget*) const': -./src/qt/accel.cpp:88:11: error: 'Node' is not a member of -'wxAccelList' - -Change code to use full PIMPL so that wx headers do not depend on Qt at all -(this is the declared goal of wx). ---- - src/qt/accel.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: wxWidgets-3.1.1~2244/src/qt/accel.cpp -=================================================================== ---- wxWidgets-3.1.1~2244.orig/src/qt/accel.cpp -+++ wxWidgets-3.1.1~2244/src/qt/accel.cpp -@@ -86,7 +86,7 @@ QList< QShortcut* > *wxAcceleratorTable: - { - QList< QShortcut* > *qtList = new QList< QShortcut* >; - -- for ( wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst(); node; node = node->GetNext() ) -+ for (wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst(); node; node = node->GetNext()) - { - qtList->push_back(ConvertAccelerator( node->GetData(), parent )); - }