forked from jengelh/wxWidgets-3_2
Jan Engelhardt
ced3af6978
- Update to version 3.1.7:
* CMake build system improvements (better precompiled headers
support).
* Many updated translations and new wxTRANSLATE_IN_CONTEXT().
* Several previously missing attributes added to multiple XRC
handlers.
* Row reordering by dragging and UI enhancements in wxGrid.
* Ability to suppress selected (or all) GTK warning messages in
wxGTK.
* And many bugs fixes, including for the regressions in 3.1.6.
- Remove wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch:
Fixed upstream.
OBS-URL: https://build.opensuse.org/request/show/981365
OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=91
57 lines
2.6 KiB
Diff
57 lines
2.6 KiB
Diff
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.)
|
|
|
|
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.
|
|
|
|
The ABI may not always change, so one needs to look at the diff
|
|
between versions for whether or not soversion.diff needs an update.
|
|
|
|
diff -Nur wxWidgets-3.1.7/build/aclocal/bakefile.m4 new/build/aclocal/bakefile.m4
|
|
--- wxWidgets-3.1.7/build/aclocal/bakefile.m4 2022-06-07 22:02:56.047531296 +0200
|
|
+++ new/build/aclocal/bakefile.m4 2022-06-07 22:06:07.355539227 +0200
|
|
@@ -408,8 +408,7 @@
|
|
SONAME_FLAG="-Wl,-soname,"
|
|
fi
|
|
USE_SOVERSION=1
|
|
- USE_SOVERLINUX=1
|
|
- USE_SOTWOSYMLINKS=1
|
|
+ USE_SOVERSOLARIS=1
|
|
;;
|
|
|
|
*-*-solaris2* )
|
|
diff -Nur wxWidgets-3.1.7/Makefile.in new/Makefile.in
|
|
--- wxWidgets-3.1.7/Makefile.in 2022-06-07 22:04:21.491534839 +0200
|
|
+++ new/Makefile.in 2022-06-07 22:09:04.099546555 +0200
|
|
@@ -2226,6 +2226,7 @@
|
|
@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)
|
|
+VENDORTAG = -$(VENDOR)
|
|
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
|
|
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
|
|
@COND_BUILD_debug@WXDEBUGFLAG = d
|
|
@@ -2237,7 +2238,7 @@
|
|
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
|
|
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
|
|
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
|
|
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
|
|
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
|
|
@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_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .7.0.0.$(SO_SUFFIX)
|
|
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -7.$(SO_SUFFIX)
|
|
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
|
|
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).7
|
|
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).7.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 \
|