Jan Engelhardt
eddd7f583c
- Update to 3.0.5.1 (boo#1180492):
* Update the soname of the shared libraries for Unix/ELF systems
which was forgotten in 3.0.5.
* Workaround for the problem with overflowing maximum command
line length in MinGW builds not using configure.
* Fix for a problem with wxSpinCtrl in wxGTK, see
https://trac.wxwidgets.org/ticket/18688.
- Changes from version 3.0.5:
* Bug fixes, see
https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.0.5/docs/changes.txt.
- Refresh soversion.diff.
- Remove 0001-spinctrl.patch: Merged upstream.
OBS-URL: https://build.opensuse.org/request/show/859995
OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_0?expand=0&rev=107
70 lines
3.1 KiB
Diff
70 lines
3.1 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: 2014-11-07 10:41:58.650412802 +0100
|
|
References: https://lists.opensuse.org/opensuse-factory/2009-09/msg00386.html
|
|
|
|
The ABI of a wxWidgets build is prone to change at the whim of a configure
|
|
option.
|
|
|
|
In addition, wxWidgets changed the ABI midway (for example, did so between
|
|
3.0.1 and 3.0.2) without changing the SONAME, so that is another source of ABI
|
|
breaks.
|
|
|
|
Hence, the libraries are changed such that the SONAME now changes for every
|
|
version, and, to make that change without introducing a potential clash with
|
|
a future SONAME naming scheme of upstream, vendortag is used to inject
|
|
the string "suse" into the SONAME.
|
|
|
|
For the foreseeable future, this patch ought not be removed, lest the old
|
|
problems of crashing wx programs that are expecting some different ABI would
|
|
return.
|
|
|
|
---
|
|
Makefile.in | 5 +++--
|
|
build/aclocal/bakefile.m4 | 3 +--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
Index: wxWidgets-3.0.5.1/Makefile.in
|
|
===================================================================
|
|
--- wxWidgets-3.0.5.1/Makefile.in
|
|
+++ wxWidgets-3.0.5.1/Makefile.in
|
|
@@ -2107,6 +2107,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)
|
|
+VENDORTAG = -$(VENDOR)
|
|
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
|
|
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
|
|
@COND_BUILD_debug@WXDEBUGFLAG = d
|
|
@@ -2118,7 +2119,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_RELEASE_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)
|
|
@@ -15225,7 +15226,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
|
|
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.5.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).3.0.5
|
|
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
|
|
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
|
@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \
|
|
Index: wxWidgets-3.0.5.1/build/aclocal/bakefile.m4
|
|
===================================================================
|
|
--- wxWidgets-3.0.5.1/build/aclocal/bakefile.m4
|
|
+++ wxWidgets-3.0.5.1/build/aclocal/bakefile.m4
|
|
@@ -443,8 +443,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
|
|
SONAME_FLAG="-Wl,-soname,"
|
|
fi
|
|
USE_SOVERSION=1
|
|
- USE_SOVERLINUX=1
|
|
- USE_SOTWOSYMLINKS=1
|
|
+ USE_SOVERSOLARIS=1
|
|
;;
|
|
|
|
*-*-solaris2* )
|