forked from pool/wxWidgets-3_2
- Update to release 3.2.5
OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=122
This commit is contained in:
Git OBS Bridge
parent
139df4fc99
commit
1c6432f8aa
@ -17,10 +17,10 @@ always bump, specifically(!) the SO major.
|
||||
build/aclocal/bakefile.m4 | 3 +--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: wxWidgets-3.2.4/Makefile.in
|
||||
Index: wxWidgets-3.2.5/Makefile.in
|
||||
===================================================================
|
||||
--- wxWidgets-3.2.4.orig/Makefile.in
|
||||
+++ wxWidgets-3.2.4/Makefile.in
|
||||
--- wxWidgets-3.2.5.orig/Makefile.in
|
||||
+++ wxWidgets-3.2.5/Makefile.in
|
||||
@@ -2225,6 +2225,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr
|
||||
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
|
||||
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
|
||||
@ -38,19 +38,19 @@ Index: wxWidgets-3.2.4/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)
|
||||
@@ -13981,7 +13982,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.2.2.$(SO_SUFFIX)
|
||||
@@ -13982,7 +13983,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.2.3.$(SO_SUFFIX)
|
||||
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
|
||||
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
|
||||
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0
|
||||
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).10.0.0
|
||||
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).11.0.0
|
||||
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
|
||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
|
||||
Index: wxWidgets-3.2.4/build/aclocal/bakefile.m4
|
||||
Index: wxWidgets-3.2.5/build/aclocal/bakefile.m4
|
||||
===================================================================
|
||||
--- wxWidgets-3.2.4.orig/build/aclocal/bakefile.m4
|
||||
+++ wxWidgets-3.2.4/build/aclocal/bakefile.m4
|
||||
--- wxWidgets-3.2.5.orig/build/aclocal/bakefile.m4
|
||||
+++ wxWidgets-3.2.5/build/aclocal/bakefile.m4
|
||||
@@ -408,8 +408,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
|
||||
SONAME_FLAG="-Wl,-soname,"
|
||||
fi
|
||||
|
||||
BIN
wxWidgets-3.2.4.tar.bz2
(Stored with Git LFS)
BIN
wxWidgets-3.2.4.tar.bz2
(Stored with Git LFS)
Binary file not shown.
3
wxWidgets-3.2.5.tar.bz2
Normal file
3
wxWidgets-3.2.5.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51
|
||||
size 27539152
|
||||
@ -1,71 +0,0 @@
|
||||
commit e2cc16ef9c45bdc64d42e4fef4dda46a3077cb35
|
||||
Author: Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
Date: Tue Jan 9 02:38:43 2024 +0100
|
||||
|
||||
Fix test suite on Linux/s390x and maybe other architectures
|
||||
|
||||
We can't rely on file /sys/power/state always existing, so just skip the
|
||||
test (with a warning) instead of failing it if it does not exist, as is
|
||||
the case at least under s390x and seemingly other non-desktop platforms.
|
||||
|
||||
Closes #24197.
|
||||
|
||||
Co-authored-by: Cliff Zhao <qzhao@suse.com>
|
||||
|
||||
diff -Nura wxWidgets-3.2.4/tests/file/filetest.cpp wxWidgets-3.2.4_new/tests/file/filetest.cpp
|
||||
--- wxWidgets-3.2.4/tests/file/filetest.cpp 2023-11-09 06:53:55.000000000 +0800
|
||||
+++ wxWidgets-3.2.4_new/tests/file/filetest.cpp 2024-01-24 17:12:00.649890837 +0800
|
||||
@@ -158,8 +158,13 @@
|
||||
const long pageSize = sysconf(_SC_PAGESIZE);
|
||||
|
||||
wxFile fileSys("/sys/power/state");
|
||||
+ if ( !fileSys.IsOpened() )
|
||||
+ {
|
||||
+ WARN("/sys/power/state can't be opened, skipping test");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
CHECK( fileSys.Length() == pageSize );
|
||||
- CHECK( fileSys.IsOpened() );
|
||||
CHECK( fileSys.ReadAll(&s) );
|
||||
CHECK( !s.empty() );
|
||||
CHECK( s.length() < pageSize );
|
||||
diff -Nura wxWidgets-3.2.4/tests/filename/filenametest.cpp wxWidgets-3.2.4_new/tests/filename/filenametest.cpp
|
||||
--- wxWidgets-3.2.4/tests/filename/filenametest.cpp 2023-11-09 06:53:55.000000000 +0800
|
||||
+++ wxWidgets-3.2.4_new/tests/filename/filenametest.cpp 2024-01-24 17:13:36.039991014 +0800
|
||||
@@ -1040,6 +1040,12 @@
|
||||
INFO( "size of /proc/kcore=" << size );
|
||||
CHECK( size > 0 );
|
||||
|
||||
+ if ( !wxFile::Exists("/sys/power/state") )
|
||||
+ {
|
||||
+ WARN("/sys/power/state doesn't exist, skipping test");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
// All files in /sys are one page in size, irrespectively of the size of
|
||||
// their actual contents.
|
||||
CHECK( wxFileName::GetSize("/sys/power/state") == sysconf(_SC_PAGESIZE) );
|
||||
diff -Nura wxWidgets-3.2.4/tests/textfile/textfiletest.cpp wxWidgets-3.2.4_new/tests/textfile/textfiletest.cpp
|
||||
--- wxWidgets-3.2.4/tests/textfile/textfiletest.cpp 2023-11-09 06:53:55.000000000 +0800
|
||||
+++ wxWidgets-3.2.4_new/tests/textfile/textfiletest.cpp 2024-01-24 17:15:03.777002930 +0800
|
||||
@@ -344,12 +344,18 @@
|
||||
SECTION("/proc")
|
||||
{
|
||||
wxTextFile f;
|
||||
- CHECK( f.Open("/proc/cpuinfo") );
|
||||
+ REQUIRE( f.Open("/proc/cpuinfo") );
|
||||
CHECK( f.GetLineCount() > 1 );
|
||||
}
|
||||
|
||||
SECTION("/sys")
|
||||
{
|
||||
+ if ( wxFile::Exists("/sys/power/state") )
|
||||
+ {
|
||||
+ WARN("/sys/power/state doesn't exist, skipping test");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
wxTextFile f;
|
||||
CHECK( f.Open("/sys/power/state") );
|
||||
REQUIRE( f.GetLineCount() == 1 );
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 16 13:40:01 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 3.2.5
|
||||
* Add support for "%F" format specifier to wxDateTime
|
||||
* Support dates > 2038 if time_t is 64-bit
|
||||
* Restore possible ABI incompatibility with wx < 3.2.3 in wxString
|
||||
* Fix division-by-zero in wxRichTextCtrl
|
||||
* Fix crash in wxImage::InitAlpha() if image is invalid
|
||||
* Fix copying/pasting text under Wayland
|
||||
* Fix crash with GTK3 if console program is using a GUI wxApp class
|
||||
- Delete wxWidgets-3_2-Fix-test-suite-on-Linux-s390x-architectures.patch
|
||||
(merged)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 21 09:21:37 UTC 2024 - Cliff Zhao <qzhao@suse.com>
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file
|
||||
# spec file for package wxWidgets-3_2
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
@ -68,7 +68,7 @@ wxString and instead rely on the wxChar pointer API.
|
||||
%define psonum 10_0_0
|
||||
%define sonum 10.0.0
|
||||
Name: %this_spec
|
||||
Version: 3.2.4
|
||||
Version: 3.2.5
|
||||
Release: 0
|
||||
Summary: C++ Library for Cross-Platform Development
|
||||
License: LGPL-2.1-or-later WITH WxWindows-exception-3.1
|
||||
@ -82,7 +82,6 @@ Source5: wxWidgets-3_2-rpmlintrc
|
||||
Source6: wxpython-mkdiff.sh
|
||||
Patch0: soversion.diff
|
||||
Patch1: autoconf-2_72.diff
|
||||
Patch2: wxWidgets-3_2-Fix-test-suite-on-Linux-s390x-architectures.patch
|
||||
%if "%{flavor}" == "doc"
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: fdupes
|
||||
|
||||
Loading…
Reference in New Issue
Block a user