Compare commits
16 Commits
Author | SHA256 | Date | |
---|---|---|---|
d336ff7a50 | |||
eac178af84 | |||
af5365366b | |||
08e3098154 | |||
accc639084 | |||
b80324c47b | |||
0c4e48f77e | |||
842b67f926 | |||
5af5487f2a | |||
fd86d0bbda | |||
4f73079cf2 | |||
79cfb31c27 | |||
2df551cde5 | |||
|
241650b413 | ||
071d574776 | |||
96fa1f9078 |
@@ -1,27 +1,32 @@
|
|||||||
From: Jan Engelhardt <jengelh@inai.de>
|
From: Jan Engelhardt <jengelh@inai.de>
|
||||||
Date: 2014-11-07 10:41:58.650412802 +0100
|
Date: 2014-11-07 10:41:58.650412802 +0100
|
||||||
|
|
||||||
Because it is so easy to change the ABI with just one configure option,
|
https://github.com/wxWidgets/wxWidgets/releases/tag/v3.2.6 claims
|
||||||
explicitly mark our build with a vendor tag.
|
it's ABI compatible with 3.2.5, but then you see virtual function
|
||||||
(We do the same in windows:mingw: where this issue is even more pressing.)
|
changes...
|
||||||
|
|
||||||
In addition, because wxWidgets changes the ABI midway (for example,
|
- virtual void SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent);
|
||||||
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.
|
+ using MouseEvents = std::vector<wxMouseEvent>;
|
||||||
|
+ virtual MouseEvents TranslateMouseEvent(NSEvent * nsEvent);
|
||||||
|
|
||||||
One needs to look at the diff between versions. If in doubt, just
|
So their promise means nothing.
|
||||||
always bump, specifically(!) the SO major.
|
|
||||||
|
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 +++--
|
Makefile.in | 5 +++--
|
||||||
build/aclocal/bakefile.m4 | 3 +--
|
build/aclocal/bakefile.m4 | 3 +--
|
||||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
Index: wxWidgets-3.2.5/Makefile.in
|
Index: wxWidgets-3.2.8/Makefile.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- wxWidgets-3.2.5.orig/Makefile.in
|
--- wxWidgets-3.2.8.orig/Makefile.in
|
||||||
+++ wxWidgets-3.2.5/Makefile.in
|
+++ wxWidgets-3.2.8/Makefile.in
|
||||||
@@ -2225,6 +2225,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr
|
@@ -2226,6 +2226,7 @@ LOCALE_LINGUAS = af an ar ca ca@valencia
|
||||||
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
|
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
|
||||||
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
|
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
|
||||||
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ = _gcc$(COMPILER_VERSION)
|
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ = _gcc$(COMPILER_VERSION)
|
||||||
@@ -29,7 +34,7 @@ Index: wxWidgets-3.2.5/Makefile.in
|
|||||||
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
|
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
|
||||||
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
|
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
|
||||||
@COND_BUILD_debug@WXDEBUGFLAG = d
|
@COND_BUILD_debug@WXDEBUGFLAG = d
|
||||||
@@ -2236,7 +2237,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr
|
@@ -2237,7 +2238,7 @@ LOCALE_LINGUAS = af an ar ca ca@valencia
|
||||||
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
|
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
|
||||||
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
|
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
|
||||||
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
|
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
|
||||||
@@ -38,19 +43,19 @@ Index: wxWidgets-3.2.5/Makefile.in
|
|||||||
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
|
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
|
||||||
COND_wxUSE_REGEX_builtin___wxregex___depname = \
|
COND_wxUSE_REGEX_builtin___wxregex___depname = \
|
||||||
$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
|
$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
|
||||||
@@ -13982,7 +13983,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
|
@@ -13984,7 +13985,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
|
||||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.2.3.$(SO_SUFFIX)
|
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.4.1.$(SO_SUFFIX)
|
||||||
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -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_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).0
|
||||||
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).11.0.0
|
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).16.0.0
|
||||||
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
|
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
|
||||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||||
@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
|
@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
|
||||||
Index: wxWidgets-3.2.5/build/aclocal/bakefile.m4
|
Index: wxWidgets-3.2.8/build/aclocal/bakefile.m4
|
||||||
===================================================================
|
===================================================================
|
||||||
--- wxWidgets-3.2.5.orig/build/aclocal/bakefile.m4
|
--- wxWidgets-3.2.8.orig/build/aclocal/bakefile.m4
|
||||||
+++ wxWidgets-3.2.5/build/aclocal/bakefile.m4
|
+++ wxWidgets-3.2.8/build/aclocal/bakefile.m4
|
||||||
@@ -408,8 +408,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
|
@@ -408,8 +408,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
|
||||||
SONAME_FLAG="-Wl,-soname,"
|
SONAME_FLAG="-Wl,-soname,"
|
||||||
fi
|
fi
|
||||||
|
29
textfiletest-fix-file-exists.diff
Normal file
29
textfiletest-fix-file-exists.diff
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
https://github.com/wxWidgets/wxWidgets/pull/24768
|
||||||
|
|
||||||
|
|
||||||
|
From 2d943fd8f34816b3ad16b532132992a2523179e2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christian Boltz <github-wxwidgets@cboltz.de>
|
||||||
|
Date: Tue, 20 Aug 2024 23:28:27 +0200
|
||||||
|
Subject: [PATCH] textfiletest: fix skip condition
|
||||||
|
|
||||||
|
... so that condition and skip message match.
|
||||||
|
|
||||||
|
As a side effect, it also prevents a test failure if /sys/power/state
|
||||||
|
doesn't exist.
|
||||||
|
---
|
||||||
|
tests/textfile/textfiletest.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp
|
||||||
|
index 646d6818c90c..1a1347e85475 100644
|
||||||
|
--- a/tests/textfile/textfiletest.cpp
|
||||||
|
+++ b/tests/textfile/textfiletest.cpp
|
||||||
|
@@ -342,7 +342,7 @@ TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]")
|
||||||
|
|
||||||
|
SECTION("/sys")
|
||||||
|
{
|
||||||
|
- if ( wxFile::Exists("/sys/power/state") )
|
||||||
|
+ if ( !wxFile::Exists("/sys/power/state") )
|
||||||
|
{
|
||||||
|
WARN("/sys/power/state doesn't exist, skipping test");
|
||||||
|
return;
|
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51
|
|
||||||
size 27539152
|
|
BIN
wxWidgets-3.2.8.tar.bz2
(Stored with Git LFS)
Normal file
BIN
wxWidgets-3.2.8.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -1,3 +1,86 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 29 17:11:39 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
|
||||||
|
|
||||||
|
- Do not build the Qt flavor in SLE16 where Qt5 will not be
|
||||||
|
available.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Apr 28 09:39:40 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Update to release 3.2.8
|
||||||
|
* Fix crash in wxPropertyGrid with wxGTK3 after recent change.
|
||||||
|
* Fix key codes in WXK_NUMPADx events in wxGTK.
|
||||||
|
* Add wxVector(std::initializer_list<U> list) constructor.
|
||||||
|
* Add mouse scrolling support to generic wxSpinCtrl.
|
||||||
|
* Compute wxStaticText best size ourselves if GTK does it wrongly.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 20 12:11:36 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Update to release 3.2.7
|
||||||
|
* Fix crash in wxWebRequestCURL when connection was refused
|
||||||
|
* Fix buffer read overflow when compiling RE ending with
|
||||||
|
backslash
|
||||||
|
* Fix crash in wxWebRequest::Close() with recent libcurl
|
||||||
|
* Improve wxPropGrid checkboxes in high DPI
|
||||||
|
* Many fixes to key event generation (#25053, #25199, #25200)
|
||||||
|
* Fix copy-pasting text under more Wayland compositors (Weston,
|
||||||
|
kwin)
|
||||||
|
* Don't consume Ctrl-C when using SDL-based wxSound
|
||||||
|
* Avoid repaint problems when using wxWindow::Update() with
|
||||||
|
Wayland
|
||||||
|
* Fix crash when connection is refused in wxWebRequestCURL
|
||||||
|
(gh#wxWidgets/wxWidgets#24885, CVE-2024-58249, bsc#1239902)
|
||||||
|
- Delete doxygen111.patch (merged)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Mar 9 22:04:26 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Build with --enable-secretstore [boo#1239137].
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Mar 1 09:12:56 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Build with --enable-glcanvasegl [boo#1235150]. This turns off GLX
|
||||||
|
and enables EGL instead. Sibling toolkits need to do this at the
|
||||||
|
same time for this to work, e.g. hugin needs both wx and GLEW to
|
||||||
|
be built for EGL.
|
||||||
|
- Bump SO version since the base for wxGLCanvas changed. [boo#1239101]
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Oct 7 14:14:45 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- 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>
|
Thu May 16 13:40:01 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package wxWidgets-3_2
|
# spec file for package wxWidgets-3_2
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -27,10 +27,10 @@
|
|||||||
%bcond_with webview
|
%bcond_with webview
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if "%{flavor}" == "doc"
|
%if "%flavor" == "doc"
|
||||||
%define this_spec wxWidgets-3_2-doc
|
%define this_spec wxWidgets-3_2-doc
|
||||||
%define variant %{nil}
|
%define variant %nil
|
||||||
%define toolkit %{nil}
|
%define toolkit %nil
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if "%flavor" == "GTK3"
|
%if "%flavor" == "GTK3"
|
||||||
@@ -65,10 +65,10 @@ wxString and instead rely on the wxChar pointer API.
|
|||||||
# At most one Name: line to not confuse quilt(1)
|
# At most one Name: line to not confuse quilt(1)
|
||||||
%define base_name wxWidgets-3_2
|
%define base_name wxWidgets-3_2
|
||||||
%define wx_minor 3.2
|
%define wx_minor 3.2
|
||||||
%define psonum 11_0_0
|
%define psonum 16_0_0
|
||||||
%define sonum 11.0.0
|
%define sonum 16.0.0
|
||||||
Name: %this_spec
|
Name: %this_spec
|
||||||
Version: 3.2.5
|
Version: 3.2.8
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: C++ Library for Cross-Platform Development
|
Summary: C++ Library for Cross-Platform Development
|
||||||
License: LGPL-2.1-or-later WITH WxWindows-exception-3.1
|
License: LGPL-2.1-or-later WITH WxWindows-exception-3.1
|
||||||
@@ -82,7 +82,8 @@ Source5: wxWidgets-3_2-rpmlintrc
|
|||||||
Source6: wxpython-mkdiff.sh
|
Source6: wxpython-mkdiff.sh
|
||||||
Patch0: soversion.diff
|
Patch0: soversion.diff
|
||||||
Patch1: autoconf-2_72.diff
|
Patch1: autoconf-2_72.diff
|
||||||
%if "%{flavor}" == "doc"
|
Patch2: textfiletest-fix-file-exists.diff
|
||||||
|
%if "%flavor" == "doc"
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
@@ -100,6 +101,7 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
|
|||||||
BuildRequires: pkgconfig(libcurl)
|
BuildRequires: pkgconfig(libcurl)
|
||||||
BuildRequires: pkgconfig(libmspack)
|
BuildRequires: pkgconfig(libmspack)
|
||||||
BuildRequires: pkgconfig(libnotify)
|
BuildRequires: pkgconfig(libnotify)
|
||||||
|
BuildRequires: pkgconfig(libsecret-1)
|
||||||
BuildRequires: pkgconfig(sm)
|
BuildRequires: pkgconfig(sm)
|
||||||
%if "%toolkit" == "gtk2"
|
%if "%toolkit" == "gtk2"
|
||||||
BuildRequires: pkgconfig(gtk+-2.0)
|
BuildRequires: pkgconfig(gtk+-2.0)
|
||||||
@@ -107,7 +109,7 @@ BuildRequires: pkgconfig(gtk+-2.0)
|
|||||||
%if "%toolkit" == "gtk3"
|
%if "%toolkit" == "gtk3"
|
||||||
BuildRequires: pkgconfig(gtk+-3.0)
|
BuildRequires: pkgconfig(gtk+-3.0)
|
||||||
%if %{with webview}
|
%if %{with webview}
|
||||||
BuildRequires: pkgconfig(webkit2gtk-4.0)
|
BuildRequires: pkgconfig(webkit2gtk-4.1)
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%if "%toolkit" == "qt"
|
%if "%toolkit" == "qt"
|
||||||
@@ -117,6 +119,9 @@ BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.1
|
|||||||
BuildRequires: pkgconfig(Qt5Test) >= 5.2.1
|
BuildRequires: pkgconfig(Qt5Test) >= 5.2.1
|
||||||
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.1
|
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.1
|
||||||
BuildRequires: pkgconfig(cairo)
|
BuildRequires: pkgconfig(cairo)
|
||||||
|
%if 0%{?suse_version} >= 1600
|
||||||
|
ExclusiveArch: donotbuild
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: pkgconfig(glu)
|
BuildRequires: pkgconfig(glu)
|
||||||
BuildRequires: pkgconfig(liblzma)
|
BuildRequires: pkgconfig(liblzma)
|
||||||
@@ -388,7 +393,7 @@ This package contains the API documentation in HTML format.
|
|||||||
cp %{S:2} .
|
cp %{S:2} .
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if "%{flavor}" == "doc"
|
%if "%flavor" == "doc"
|
||||||
pushd docs/doxygen
|
pushd docs/doxygen
|
||||||
echo "DOT_IMAGE_FORMAT = svg" >> Doxyfile
|
echo "DOT_IMAGE_FORMAT = svg" >> Doxyfile
|
||||||
WX_SKIP_DOXYGEN_VERSION_CHECK=1 ./regen.sh xml
|
WX_SKIP_DOXYGEN_VERSION_CHECK=1 ./regen.sh xml
|
||||||
@@ -416,10 +421,11 @@ autoconf -f -i
|
|||||||
--enable-ipv6 \
|
--enable-ipv6 \
|
||||||
--enable-mediactrl \
|
--enable-mediactrl \
|
||||||
--enable-optimise \
|
--enable-optimise \
|
||||||
%{wx_debug:--enable-debug=%{wx_debug}} \
|
%{wx_debug:--enable-debug=%wx_debug} \
|
||||||
--enable-repro-build \
|
--enable-repro-build \
|
||||||
--disable-glcanvasegl \
|
--enable-glcanvasegl \
|
||||||
--enable-webrequest \
|
--enable-webrequest \
|
||||||
|
--enable-secretstore \
|
||||||
%if "%flavor" == "GTK3-nostl"
|
%if "%flavor" == "GTK3-nostl"
|
||||||
--disable-stl \
|
--disable-stl \
|
||||||
--disable-plugins
|
--disable-plugins
|
||||||
@@ -432,7 +438,7 @@ autoconf -f -i
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%if "%{flavor}" == "doc"
|
%if "%flavor" == "doc"
|
||||||
find docs/doxygen/out/xml/ -iname \*.png -print -delete
|
find docs/doxygen/out/xml/ -iname \*.png -print -delete
|
||||||
find docs/doxygen/out/html/ -iname \*.dot -print -delete
|
find docs/doxygen/out/html/ -iname \*.dot -print -delete
|
||||||
%fdupes -s docs/doxygen/out/html/
|
%fdupes -s docs/doxygen/out/html/
|
||||||
@@ -453,7 +459,7 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if "%{flavor}" != "doc"
|
%if "%flavor" != "doc"
|
||||||
%make_build -C tests all
|
%make_build -C tests all
|
||||||
pushd tests
|
pushd tests
|
||||||
# Disable webrequest tests requiring network access
|
# Disable webrequest tests requiring network access
|
||||||
@@ -466,40 +472,24 @@ export WX_TEST_WEBREQUEST_URL=0
|
|||||||
# ./test_gui -l || true
|
# ./test_gui -l || true
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%post -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_baseu-%variant%psonum
|
||||||
%postun -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_baseu_net-%variant%psonum
|
||||||
%post -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_baseu_xml-%variant%psonum
|
||||||
%postun -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_adv-%variant%psonum
|
||||||
%post -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_aui-%variant%psonum
|
||||||
%postun -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_core-%variant%psonum
|
||||||
%post -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_gl-%variant%psonum
|
||||||
%postun -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_html-%variant%psonum
|
||||||
%post -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_media-%variant%psonum
|
||||||
%postun -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_propgrid-%variant%psonum
|
||||||
%post -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_qa-%variant%psonum
|
||||||
%postun -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_ribbon-%variant%psonum
|
||||||
%post -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_richtext-%variant%psonum
|
||||||
%postun -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_stc-%variant%psonum
|
||||||
%post -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_webview-%variant%psonum
|
||||||
%postun -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libwx_%{toolkit}u_xrc-%variant%psonum
|
||||||
%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
|
|
||||||
|
|
||||||
%if "%{flavor}" == "doc"
|
%if "%flavor" == "doc"
|
||||||
%files xml
|
%files xml
|
||||||
%doc docs/doxygen/out/xml/*.{xml,xslt}
|
%doc docs/doxygen/out/xml/*.{xml,xslt}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user