Sync from SUSE:SLFO:Main wxWidgets-3_2 revision fecd019a6181e6481b03890179a9af5e
This commit is contained in:
parent
e44acd9f25
commit
25ad8298ac
4
_scmsync.obsinfo
Normal file
4
_scmsync.obsinfo
Normal file
@ -0,0 +1,4 @@
|
||||
mtime: 1728310587
|
||||
commit: 2df551cde54b2a4d6bf7be4bd8d5e1344c8e85cd93e7aa4568321d89ba91e8a8
|
||||
url: https://src.opensuse.org/jengelh/wxWidgets-3_2
|
||||
revision: master
|
||||
BIN
build.specials.obscpio
(Stored with Git LFS)
Normal file
BIN
build.specials.obscpio
(Stored with Git LFS)
Normal file
Binary file not shown.
48
doxygen111.patch
Normal file
48
doxygen111.patch
Normal file
@ -0,0 +1,48 @@
|
||||
From 2d79dfc7a2a8dd42021ff0ea3dcc8ed05f7c23ef Mon Sep 17 00:00:00 2001
|
||||
From: Scott Talbert <swt@techie.net>
|
||||
Date: Mon, 16 Sep 2024 22:38:13 -0400
|
||||
Subject: [PATCH] Fix docs generation for datetime with doxygen 1.11.0
|
||||
References: https://github.com/wxWidgets/wxWidgets/pull/24814
|
||||
|
||||
It seems that as of the below commit, doxygen changed its handling of
|
||||
parsing backticks in comments such that it now fails to properly
|
||||
generate documentation for the entire datetime.h file. Fix this by
|
||||
closing the open backtick.
|
||||
|
||||
Also update the actual, non-documentation, header to match for
|
||||
consistency, even if non-matching backticks are not a problem there.
|
||||
|
||||
See: https://github.com/doxygen/doxygen/commit/f18767307be20ca8d2ca81f74cc1f3446205282b
|
||||
|
||||
Closes #24814.
|
||||
---
|
||||
include/wx/datetime.h | 2 +-
|
||||
interface/wx/datetime.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/wx/datetime.h b/include/wx/datetime.h
|
||||
index 445c3dbb3929..55292f008408 100644
|
||||
--- a/include/wx/datetime.h
|
||||
+++ b/include/wx/datetime.h
|
||||
@@ -149,7 +149,7 @@ class WXDLLIMPEXP_BASE wxDateTime
|
||||
Local,
|
||||
|
||||
// zones from GMT (= Greenwich Mean Time): they're guaranteed to be
|
||||
- // consequent numbers, so writing something like `GMT0 + offset' is
|
||||
+ // consequent numbers, so writing something like `GMT0 + offset` is
|
||||
// safe if abs(offset) <= 12
|
||||
|
||||
// underscore stands for minus
|
||||
diff --git a/interface/wx/datetime.h b/interface/wx/datetime.h
|
||||
index ea3df2323338..1a0222435565 100644
|
||||
--- a/interface/wx/datetime.h
|
||||
+++ b/interface/wx/datetime.h
|
||||
@@ -96,7 +96,7 @@ class wxDateTime
|
||||
|
||||
///@{
|
||||
/// zones from GMT (= Greenwich Mean Time): they're guaranteed to be
|
||||
- /// consequent numbers, so writing something like `GMT0 + offset' is
|
||||
+ /// consequent numbers, so writing something like `GMT0 + offset` is
|
||||
/// safe if abs(offset) <= 12
|
||||
|
||||
// underscore stands for minus
|
||||
@ -1,26 +1,31 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2014-11-07 10:41:58.650412802 +0100
|
||||
|
||||
Because it is so easy to change the ABI with just one configure option,
|
||||
explicitly mark our build with a vendor tag.
|
||||
(We do the same in windows:mingw: where this issue is even more pressing.)
|
||||
https://github.com/wxWidgets/wxWidgets/releases/tag/v3.2.6 claims
|
||||
it's ABI compatible with 3.2.5, but then you see virtual function
|
||||
changes...
|
||||
|
||||
In addition, because wxWidgets changes the ABI midway (for example,
|
||||
did so between 3.0.1 and 3.0.2) without changing the SONAME, we have
|
||||
to do it. As we have a vendor suffix, no filename conflicts can occur.
|
||||
- virtual void SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent);
|
||||
+
|
||||
+ using MouseEvents = std::vector<wxMouseEvent>;
|
||||
+ virtual MouseEvents TranslateMouseEvent(NSEvent * nsEvent);
|
||||
|
||||
One needs to look at the diff between versions. If in doubt, just
|
||||
always bump, specifically(!) the SO major.
|
||||
So their promise means nothing.
|
||||
|
||||
It is also possible for distributions to accidentally cause ABI
|
||||
changes with the flick of a configure option (e.g. enable-stl), since
|
||||
that can change the set of class bases, members or member function
|
||||
signatures.
|
||||
|
||||
---
|
||||
Makefile.in | 5 +++--
|
||||
build/aclocal/bakefile.m4 | 3 +--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: wxWidgets-3.2.4/Makefile.in
|
||||
Index: wxWidgets-3.2.6/Makefile.in
|
||||
===================================================================
|
||||
--- wxWidgets-3.2.4.orig/Makefile.in
|
||||
+++ wxWidgets-3.2.4/Makefile.in
|
||||
--- wxWidgets-3.2.6.orig/Makefile.in
|
||||
+++ wxWidgets-3.2.6/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 +43,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.3.0.$(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).12.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.6/build/aclocal/bakefile.m4
|
||||
===================================================================
|
||||
--- wxWidgets-3.2.4.orig/build/aclocal/bakefile.m4
|
||||
+++ wxWidgets-3.2.4/build/aclocal/bakefile.m4
|
||||
--- wxWidgets-3.2.6.orig/build/aclocal/bakefile.m4
|
||||
+++ wxWidgets-3.2.6/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.
BIN
wxWidgets-3.2.6.tar.bz2
(Stored with Git LFS)
Normal file
BIN
wxWidgets-3.2.6.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -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,8 +1,50 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 7 11:04:00 UTC 2024 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
|
||||
Mon Oct 7 14:14:45 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Add textfiletest-fix-file-exists.diff to fix /sys/power/state
|
||||
condition check (backported from Factory, see obs#1194957)
|
||||
- Use webkit2gtk-4.1 pkgconfig file instead of 4.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 1 09:33:13 UTC 2024 - Markéta Machová <mmachova@suse.com>
|
||||
|
||||
- Add upstream doxygen111.patch to fix the docs with new doxygen
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 9 16:24:15 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 3.2.6
|
||||
* Add wxTranslations::AddAvailableCatalog() overload with msgid
|
||||
language
|
||||
* Dark mode appearance fixes for wxActivityIndicator,
|
||||
wxHyperlinkCtrl, etc.
|
||||
* Improve wxWizard appearance in high DPI
|
||||
* Fix wxPropertyGrid row height in high DPI
|
||||
* Fix possible crash during drag-and-drop
|
||||
* Fix wxListBox minimum size regression introduced in 3.2.5
|
||||
* Fix wxBitmapComboBox bitmaps scaling in high DPI
|
||||
* Allow positioning wxDialog at specified position, at least
|
||||
under X11
|
||||
* Fix incorrect handling of ligatures in wxStyledTextCtrl
|
||||
* Fix using wrong keyboard layout in key events
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 20 19:05:50 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
|
||||
|
||||
- Add textfiletest-fix-file-exists.diff to fix a wrong skip
|
||||
condition in the test (fixes the build on s390x)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
#
|
||||
@ -65,10 +65,10 @@ wxString and instead rely on the wxChar pointer API.
|
||||
# At most one Name: line to not confuse quilt(1)
|
||||
%define base_name wxWidgets-3_2
|
||||
%define wx_minor 3.2
|
||||
%define psonum 10_0_0
|
||||
%define sonum 10.0.0
|
||||
%define psonum 12_0_0
|
||||
%define sonum 12.0.0
|
||||
Name: %this_spec
|
||||
Version: 3.2.4
|
||||
Version: 3.2.6
|
||||
Release: 0
|
||||
Summary: C++ Library for Cross-Platform Development
|
||||
License: LGPL-2.1-or-later WITH WxWindows-exception-3.1
|
||||
@ -82,8 +82,8 @@ 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
|
||||
Patch3: textfiletest-fix-file-exists.diff
|
||||
Patch2: textfiletest-fix-file-exists.diff
|
||||
Patch3: doxygen111.patch
|
||||
%if "%{flavor}" == "doc"
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: fdupes
|
||||
@ -109,7 +109,7 @@ BuildRequires: pkgconfig(gtk+-2.0)
|
||||
%if "%toolkit" == "gtk3"
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
%if %{with webview}
|
||||
BuildRequires: pkgconfig(webkit2gtk-4.0)
|
||||
BuildRequires: pkgconfig(webkit2gtk-4.1)
|
||||
%endif
|
||||
%endif
|
||||
%if "%toolkit" == "qt"
|
||||
@ -468,38 +468,22 @@ export WX_TEST_WEBREQUEST_URL=0
|
||||
# ./test_gui -l || true
|
||||
%endif
|
||||
|
||||
%post -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_media-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_media-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_propgrid-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_propgrid-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_qa-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_qa-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_ribbon-%variant%psonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_ribbon-%variant%psonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig
|
||||
%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
|
||||
%ldconfig_scriptlets -n libwx_baseu-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_baseu_net-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_baseu_xml-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_adv-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_aui-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_core-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_gl-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_html-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_media-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_propgrid-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_qa-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_ribbon-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_richtext-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_stc-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_webview-%variant%psonum
|
||||
%ldconfig_scriptlets -n libwx_%{toolkit}u_xrc-%variant%psonum
|
||||
|
||||
%if "%{flavor}" == "doc"
|
||||
%files xml
|
||||
|
||||
Loading…
Reference in New Issue
Block a user