pool/subversion
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 242106 from devel:tools:scm:svn

Browse Source 
- do not undef bool in swig, it breaks modern perl versions

OBS-URL: https://build.opensuse.org/request/show/242106
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=117
This commit is contained in:
Stephan Kulow 2014-07-24 05:32:04 +00:00 committed by Git OBS Bridge
commit 57dda343da
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
subversion.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 22 17:09:01 CEST 2014 - mls@suse.de
- do not undef bool in swig, it breaks modern perl versions
new patch: swig.noembed.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 4 22:30:27 UTC 2014 - andreas.stieger@gmx.de Wed Jun 4 22:30:27 UTC 2014 - andreas.stieger@gmx.de

4
subversion.spec
View File

@ -179,6 +179,7 @@ Patch23: subversion.libtool-pie-flags.patch
Patch31: subversion.perl.LD_RUN_PATH.patch Patch31: subversion.perl.LD_RUN_PATH.patch
Patch37: subversion-no-build-date.patch Patch37: subversion-no-build-date.patch
Patch38: subversion-1.8.9-allow-httpd-2.4.6.patch Patch38: subversion-1.8.9-allow-httpd-2.4.6.patch
Patch39: swig.noembed.patch
# #
%if %with_ruby %if %with_ruby
%define rb_arch %(echo "%{_host_cpu}-%{_os}" | sed -e "s/i686/i586/" -e "s/armv5tel/armv4l/" -e "s/hppa2.0/hppa/") %define rb_arch %(echo "%{_host_cpu}-%{_os}" | sed -e "s/i686/i586/" -e "s/armv5tel/armv4l/" -e "s/hppa2.0/hppa/")
@ -326,6 +327,9 @@ parameters and keywords for the svn command and other tools.
%prep %prep
%if %with_intree_swig %if %with_intree_swig
%setup -q -n subversion-%{version} -a 4 -b 90 %setup -q -n subversion-%{version} -a 4 -b 90
pushd "../swig-%{swig_version}"
%patch39
popd
%else %else
%setup -q -n subversion-%{version} -a 4 %setup -q -n subversion-%{version} -a 4
%endif %endif

28
swig.noembed.patch Normal file
View File

@ -0,0 +1,28 @@
From: Michael Schröder <mls@suse.com>
Date: Tue, 22 Jul 2014 17:09:01 +0100
Subject: do not undef bool in swig, it breaks modern perl versions
References: https://github.com/swig/swig/commit/4305a3cef9b210541c3b88ab2fd03d787c3bca66
Upstream: committed
Fixes swig compilation errors like:
[ 778s] /usr/lib/perl5/5.20.0/i586-linux-thread-multi/CORE/handy.h:124:39: error: expected ':' before numeric constant
[ 778s] #define cBOOL(cbool) ((cbool) ? (bool)1 : (bool)0)
[ 778s] core.c: In function '_wrap_svn_diff_open_patch_file':
[ 778s] /usr/lib/perl5/5.20.0/i586-linux-thread-multi/CORE/handy.h:124:34: error: 'bool' undeclared (first use in this function)
[ 778s] #define cBOOL(cbool) ((cbool) ? (bool)1 : (bool)0)
etc.
--- ./Lib/perl5/noembed.h.orig 2014-07-22 15:04:46.921825843 +0000
+++ ./Lib/perl5/noembed.h 2014-07-22 15:04:58.983770532 +0000
@@ -61,9 +61,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif