mcalabkova/wxWidgets-3_2
SHA256
1
0
Fork 0
forked from jengelh/wxWidgets-3_2
Code Pull Requests Activity

update to new snapshot g2244

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=23
This commit is contained in:
Jan Engelhardt
2017-11-28 10:59:33 +00:00
committed by Git OBS Bridge
parent 14a664c349
commit 3051ed2045
7 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
soversion.diff
View File

@@ -14,6 +14,7 @@ Record of names used in openSUSE:
wxWidgets 3.0.1: libwx_*-suse-3.0.so.0
wxWidgets 3.0.2: libwx_*-suse.so.1
wxWidgets 3.1.0~g61143(dp only): libwx_*-suse.so.2
wxWidgets 3.1.0.g2244(dp only): libwx_*-suse.so.4
Since SOVERLINUX does not support TWOSYMLINKS=0, patch and use
a bit on SOVERSOLARIS instead.
@@ -22,11 +23,11 @@ a bit on SOVERSOLARIS instead.
build/aclocal/bakefile.m4 | 3 +--
2 files changed, 4 insertions(+), 4 deletions(-)
Index: wxWidgets-trunk/Makefile.in
Index: wxWidgets-3.1.0.2244/Makefile.in
===================================================================
--- wxWidgets-trunk.orig/Makefile.in
+++ wxWidgets-trunk/Makefile.in
@@ -2092,6 +2092,7 @@ LOCALE_MSW_LINGUAS = it
--- wxWidgets-3.1.0.2244.orig/Makefile.in
+++ wxWidgets-3.1.0.2244/Makefile.in
@@ -2119,6 +2119,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)
@@ -34,7 +35,7 @@ Index: wxWidgets-trunk/Makefile.in
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
@COND_BUILD_debug@WXDEBUGFLAG = d
@@ -2103,7 +2104,7 @@ LOCALE_MSW_LINGUAS = it
@@ -2130,7 +2131,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_VERSION_NODOT)
@@ -43,20 +44,20 @@ Index: wxWidgets-trunk/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)
@@ -15562,7 +15563,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX)
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
@@ -13524,7 +13525,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX)
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(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).2
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).1
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).4
@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-trunk/build/aclocal/bakefile.m4
Index: wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
===================================================================
--- wxWidgets-trunk.orig/build/aclocal/bakefile.m4
+++ wxWidgets-trunk/build/aclocal/bakefile.m4
@@ -457,8 +457,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
--- wxWidgets-3.1.0.2244.orig/build/aclocal/bakefile.m4
+++ wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
@@ -443,8 +443,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
SONAME_FLAG="-Wl,-soname,"
fi
USE_SOVERSION=1