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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
_service Normal file
View File

@ -0,0 +1,14 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://github.com/wxWidgets/wxWidgets</param>
<param name="revision">master</param>
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

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.1: libwx_*-suse-3.0.so.0
wxWidgets 3.0.2: libwx_*-suse.so.1 wxWidgets 3.0.2: libwx_*-suse.so.1
wxWidgets 3.1.0~g61143(dp only): libwx_*-suse.so.2 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 Since SOVERLINUX does not support TWOSYMLINKS=0, patch and use
a bit on SOVERSOLARIS instead. a bit on SOVERSOLARIS instead.
@ -22,11 +23,11 @@ a bit on SOVERSOLARIS instead.
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-trunk/Makefile.in Index: wxWidgets-3.1.0.2244/Makefile.in
=================================================================== ===================================================================
--- wxWidgets-trunk.orig/Makefile.in --- wxWidgets-3.1.0.2244.orig/Makefile.in
+++ wxWidgets-trunk/Makefile.in +++ wxWidgets-3.1.0.2244/Makefile.in
@@ -2092,6 +2092,7 @@ LOCALE_MSW_LINGUAS = it @@ -2119,6 +2119,7 @@ LOCALE_MSW_LINGUAS = it
@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)
@ -34,7 +35,7 @@ Index: wxWidgets-trunk/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
@@ -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_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \ @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT) @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_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)
@@ -15562,7 +15563,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE @@ -13524,7 +13525,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX)
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -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_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).1
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).2 +@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).4
@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_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \ @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-3.1.0.2244.orig/build/aclocal/bakefile.m4
+++ wxWidgets-trunk/build/aclocal/bakefile.m4 +++ wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
@@ -457,8 +457,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS], @@ -443,8 +443,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
SONAME_FLAG="-Wl,-soname," SONAME_FLAG="-Wl,-soname,"
fi fi
USE_SOVERSION=1 USE_SOVERSION=1

7
wxGTK3-3_2.spec
View File

@ -20,8 +20,8 @@ Name: wxGTK3-3_2
%define base_name wxWidgets %define base_name wxWidgets
%define tarball_name wxWidgets %define tarball_name wxWidgets
%define variant suse %define variant suse
%define sonum 2 %define sonum 4
Version: 3.1.0 Version: 3.1.0.2244
Release: 0 Release: 0
%define wx_minor 3.1 %define wx_minor 3.1
%define wx_micro 3.1.0 %define wx_micro 3.1.0
@ -245,7 +245,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant.
%prep %prep
echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}"
%setup -q -n %tarball_name-%version %setup -q -n %tarball_name-%version
%patch -P 1 -P 2 -p1 %patch -P 1 -p1
cp %{S:2} . cp %{S:2} .
%build %build
@ -260,7 +260,6 @@ autoconf -f -i
%configure\ %configure\
--enable-vendor=%variant \ --enable-vendor=%variant \
--with-gtk=%gtk_version\ --with-gtk=%gtk_version\
--disable-static\
--enable-unicode\ --enable-unicode\
--with-opengl\ --with-opengl\
--with-libmspack\ --with-libmspack\

7
wxQt-3_2.spec
View File

@ -20,8 +20,8 @@ Name: wxQt-3_2
%define base_name wxWidgets %define base_name wxWidgets
%define tarball_name wxWidgets %define tarball_name wxWidgets
%define variant suse %define variant suse
%define sonum 2 %define sonum 4
Version: 3.1.0 Version: 3.1.0.2244
Release: 0 Release: 0
%define wx_minor 3.1 %define wx_minor 3.1
%define wx_micro 3.1.0 %define wx_micro 3.1.0
@ -246,7 +246,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant.
%prep %prep
echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}"
%setup -q -n %tarball_name-%version %setup -q -n %tarball_name-%version
%patch -P 1 -P 2 -p1 %patch -P 1 -p1
cp %{S:2} . cp %{S:2} .
%build %build
@ -263,7 +263,6 @@ export CFLAGS="-O0 -ggdb3"
%configure\ %configure\
--enable-vendor=%variant \ --enable-vendor=%variant \
--with-qt \ --with-qt \
--disable-static\
--enable-unicode\ --enable-unicode\
--with-opengl\ --with-opengl\
--with-libmspack\ --with-libmspack\

3
wxWidgets-3.1.0.2244.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f5683afe475aef049b5700dc052295f03e0173046d93557ee1174a4d4f756f3c
size 21658448

3
wxWidgets-3.1.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e082460fb6bf14b7dd6e8ac142598d1d3d0b08a7b5ba402fdbf8711da7e66da8
size 19693651

9
wxWidgets-3_2.spec
View File

@ -20,8 +20,8 @@ Name: wxWidgets-3_2
%define base_name wxWidgets %define base_name wxWidgets
%define tarball_name wxWidgets %define tarball_name wxWidgets
%define variant suse %define variant suse
%define sonum 2 %define sonum 4
Version: 3.1.0 Version: 3.1.0.2244
Release: 0 Release: 0
%define wx_minor 3.1 %define wx_minor 3.1
%define wx_micro 3.1.0 %define wx_micro 3.1.0
@ -37,7 +37,7 @@ Summary: C++ Library for Cross-Platform Development
License: GPL-2.0+ License: GPL-2.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Url: http://www.wxwidgets.org/ 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 Source2: README.SUSE
Source5: rpmlintrc Source5: rpmlintrc
# This script is not used during build, but it makes possible to # 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 %prep
echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}"
%setup -q -n %tarball_name-%version %setup -q -n %tarball_name-%version
%patch -P 1 -P 2 -p1 %patch -P 1 -p1
cp %{S:2} . cp %{S:2} .
%build %build
@ -262,7 +262,6 @@ autoconf -f -i
%configure\ %configure\
--enable-vendor=%variant \ --enable-vendor=%variant \
--with-gtk=%gtk_version\ --with-gtk=%gtk_version\
--disable-static\
--enable-unicode\ --enable-unicode\
--with-opengl\ --with-opengl\
--with-libmspack\ --with-libmspack\