From 3051ed2045320c3ffd05f724a7f551922e3713d4817dc947a86f72743c37aa7c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 28 Nov 2017 10:59:33 +0000 Subject: [PATCH] update to new snapshot g2244 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=23 --- _service | 14 ++++++++++++++ soversion.diff | 29 +++++++++++++++-------------- wxGTK3-3_2.spec | 7 +++---- wxQt-3_2.spec | 7 +++---- wxWidgets-3.1.0.2244.tar.xz | 3 +++ wxWidgets-3.1.0.tar.bz2 | 3 --- wxWidgets-3_2.spec | 9 ++++----- 7 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 _service create mode 100644 wxWidgets-3.1.0.2244.tar.xz delete mode 100644 wxWidgets-3.1.0.tar.bz2 diff --git a/_service b/_service new file mode 100644 index 0000000..327de2d --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + git://github.com/wxWidgets/wxWidgets + master + @PARENT_TAG@.@TAG_OFFSET@ + v(.*) + + + *.tar + xz + + + diff --git a/soversion.diff b/soversion.diff index 2a34409..229ea83 100644 --- a/soversion.diff +++ b/soversion.diff @@ -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 diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index 8d83e1e..ba4b5b5 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -20,8 +20,8 @@ Name: wxGTK3-3_2 %define base_name wxWidgets %define tarball_name wxWidgets %define variant suse -%define sonum 2 -Version: 3.1.0 +%define sonum 4 +Version: 3.1.0.2244 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.0 @@ -245,7 +245,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant. %prep echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version -%patch -P 1 -P 2 -p1 +%patch -P 1 -p1 cp %{S:2} . %build @@ -260,7 +260,6 @@ autoconf -f -i %configure\ --enable-vendor=%variant \ --with-gtk=%gtk_version\ - --disable-static\ --enable-unicode\ --with-opengl\ --with-libmspack\ diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index 575c564..f44f7b0 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -20,8 +20,8 @@ Name: wxQt-3_2 %define base_name wxWidgets %define tarball_name wxWidgets %define variant suse -%define sonum 2 -Version: 3.1.0 +%define sonum 4 +Version: 3.1.0.2244 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.0 @@ -246,7 +246,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant. %prep echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version -%patch -P 1 -P 2 -p1 +%patch -P 1 -p1 cp %{S:2} . %build @@ -263,7 +263,6 @@ export CFLAGS="-O0 -ggdb3" %configure\ --enable-vendor=%variant \ --with-qt \ - --disable-static\ --enable-unicode\ --with-opengl\ --with-libmspack\ diff --git a/wxWidgets-3.1.0.2244.tar.xz b/wxWidgets-3.1.0.2244.tar.xz new file mode 100644 index 0000000..b37add8 --- /dev/null +++ b/wxWidgets-3.1.0.2244.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5683afe475aef049b5700dc052295f03e0173046d93557ee1174a4d4f756f3c +size 21658448 diff --git a/wxWidgets-3.1.0.tar.bz2 b/wxWidgets-3.1.0.tar.bz2 deleted file mode 100644 index e2a0e0a..0000000 --- a/wxWidgets-3.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e082460fb6bf14b7dd6e8ac142598d1d3d0b08a7b5ba402fdbf8711da7e66da8 -size 19693651 diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 99189d4..2dc3f51 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -20,8 +20,8 @@ Name: wxWidgets-3_2 %define base_name wxWidgets %define tarball_name wxWidgets %define variant suse -%define sonum 2 -Version: 3.1.0 +%define sonum 4 +Version: 3.1.0.2244 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.0 @@ -37,7 +37,7 @@ Summary: C++ Library for Cross-Platform Development License: GPL-2.0+ Group: Development/Libraries/C and C++ Url: http://www.wxwidgets.org/ -Source: https://github.com/wxWidgets/wxWidgets/releases/download/v%version/%tarball_name-%version.tar.bz2 +Source: %tarball_name-%version.tar.xz Source2: README.SUSE Source5: rpmlintrc # This script is not used during build, but it makes possible to @@ -249,7 +249,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant. %prep echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version -%patch -P 1 -P 2 -p1 +%patch -P 1 -p1 cp %{S:2} . %build @@ -262,7 +262,6 @@ autoconf -f -i %configure\ --enable-vendor=%variant \ --with-gtk=%gtk_version\ - --disable-static\ --enable-unicode\ --with-opengl\ --with-libmspack\