From 143c7ba112c9d973f08f952fdba862a1dcc65c2ac39de45a95e5434b6407bbc8 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Thu, 24 Jul 2014 04:18:23 +0000
Subject: [PATCH 1/2] Accepting request 241922 from
 home:mlschroe:branches:devel:tools:scm:svn

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

OBS-URL: https://build.opensuse.org/request/show/241922
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=173
---
 subversion.changes |  6 ++++++
 subversion.spec    |  4 ++++
 swig.noembed.patch | 12 ++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 swig.noembed.patch

diff --git a/subversion.changes b/subversion.changes
index 2afddda..881ff20 100644
--- a/subversion.changes
+++ b/subversion.changes
@@ -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
 
diff --git a/subversion.spec b/subversion.spec
index fb25a37..35ee4bb 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -179,6 +179,7 @@ Patch23:        subversion.libtool-pie-flags.patch
 Patch31:        subversion.perl.LD_RUN_PATH.patch
 Patch37:        subversion-no-build-date.patch
 Patch38:        subversion-1.8.9-allow-httpd-2.4.6.patch
+Patch39:        swig.noembed.patch
 #
 %if %with_ruby
 %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
 %if %with_intree_swig
 %setup -q -n subversion-%{version} -a 4 -b 90
+pushd "../swig-%{swig_version}"
+%patch39
+popd
 %else
 %setup -q -n subversion-%{version} -a 4
 %endif
diff --git a/swig.noembed.patch b/swig.noembed.patch
new file mode 100644
index 0000000..1e781d5
--- /dev/null
+++ b/swig.noembed.patch
@@ -0,0 +1,12 @@
+--- ./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

From e82e0d6f30bb8368f090f932156b0d958df97e85f09751ebbb850effc4766c86 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Thu, 24 Jul 2014 04:19:46 +0000
Subject: [PATCH 2/2] Add patch tagging and references for swig.noembed.patch

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=174
---
 swig.noembed.patch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/swig.noembed.patch b/swig.noembed.patch
index 1e781d5..015ffcf 100644
--- a/swig.noembed.patch
+++ b/swig.noembed.patch
@@ -1,3 +1,19 @@
+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 @@