revert
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=194
This commit is contained in:
Git OBS Bridge
@@ -1,92 +0,0 @@
|
||||
From: Andreas Stieger <andreas.stieger@gmx.de>
|
||||
Date: Sun, 25 Jan 2015 22:27:26 +0100
|
||||
Subject: [PATCH] Fix build with swig 3.0.4
|
||||
References:
|
||||
Upstream: submitting
|
||||
|
||||
In openSUSE Factory, build fails with swig 3.0.4:
|
||||
[ 318s] ./subversion/bindings/swig/core.i:792: Error: Unknown SWIG preprocessor directive: The (if this is a block of target language code, delimit it with %{ and %})
|
||||
[ 318s] ./subversion/bindings/swig/core.i:793: Error: Unknown SWIG preprocessor directive: reference (if this is a block of target language code, delimit it with %{ and %})
|
||||
[ 318s] ./subversion/bindings/swig/core.i:794: Error: Unknown SWIG preprocessor directive: references (if this is a block of target language code, delimit it with %{ and %})
|
||||
[ 318s] ./subversion/bindings/swig/core.i:795: Error: Unknown SWIG preprocessor directive: keeping (if this is a block of target language code, delimit it wi
|
||||
|
||||
etc. due to incompatible comment format. Change to /* */ style comments.
|
||||
|
||||
---
|
||||
subversion/bindings/swig/core.i | 9 +++++----
|
||||
subversion/bindings/swig/include/proxy.swg | 14 ++++++++------
|
||||
subversion/bindings/swig/svn_delta.i | 5 +++--
|
||||
3 files changed, 16 insertions(+), 12 deletions(-)
|
||||
|
||||
Index: subversion-1.8.11/subversion/bindings/swig/core.i
|
||||
===================================================================
|
||||
--- subversion-1.8.11.orig/subversion/bindings/swig/core.i 2014-01-06 05:04:07.000000000 +0100
|
||||
+++ subversion-1.8.11/subversion/bindings/swig/core.i 2015-01-25 22:25:10.000000000 +0100
|
||||
@@ -789,10 +789,11 @@ svn_swig_pl_set_current_pool (apr_pool_t
|
||||
#endif
|
||||
|
||||
#ifdef SWIGPYTHON
|
||||
-# The auth baton depends on the providers, so we preserve a
|
||||
-# reference to them inside the wrapper. This way, if all external
|
||||
-# references to the providers are gone, they will still be alive,
|
||||
-# keeping the baton valid.
|
||||
+/* The auth baton depends on the providers, so we preserve a
|
||||
+ * reference to them inside the wrapper. This way, if all external
|
||||
+ * references to the providers are gone, they will still be alive,
|
||||
+ * keeping the baton valid.
|
||||
+ */
|
||||
%feature("pythonappend") svn_auth_open %{
|
||||
val.__dict__["_deps"] = list(args[0])
|
||||
%}
|
||||
Index: subversion-1.8.11/subversion/bindings/swig/include/proxy.swg
|
||||
===================================================================
|
||||
--- subversion-1.8.11.orig/subversion/bindings/swig/include/proxy.swg 2010-02-10 00:12:51.000000000 +0100
|
||||
+++ subversion-1.8.11/subversion/bindings/swig/include/proxy.swg 2015-01-25 22:25:10.000000000 +0100
|
||||
@@ -83,13 +83,14 @@
|
||||
|
||||
value = _swig_getattr(self, self.__class__, name)
|
||||
|
||||
- # If we got back a different object than we have, we need to copy all our
|
||||
- # metadata into it, so that it looks identical
|
||||
+ /* If we got back a different object than we have, we need to copy all our
|
||||
+ * metadata into it, so that it looks identical
|
||||
+ */
|
||||
members = self.__dict__.get("_members")
|
||||
if members is not None:
|
||||
_copy_metadata_deep(value, members.get(name))
|
||||
|
||||
- # Verify that the new object is good
|
||||
+ // Verify that the new object is good
|
||||
_assert_valid_deep(value)
|
||||
|
||||
return value
|
||||
@@ -98,9 +99,10 @@
|
||||
"""Set an attribute on this object"""
|
||||
self.assert_valid()
|
||||
|
||||
- # Save a copy of the object, so that the garbage
|
||||
- # collector won't kill the object while it's in
|
||||
- # SWIG-land
|
||||
+ /* Save a copy of the object, so that the garbage
|
||||
+ * collector won't kill the object while it's in
|
||||
+ * SWIG-land
|
||||
+ */
|
||||
self.__dict__.setdefault("_members",{})[name] = value
|
||||
|
||||
return _swig_setattr(self, self.__class__, name, value)
|
||||
Index: subversion-1.8.11/subversion/bindings/swig/svn_delta.i
|
||||
===================================================================
|
||||
--- subversion-1.8.11.orig/subversion/bindings/swig/svn_delta.i 2012-09-23 16:12:33.000000000 +0200
|
||||
+++ subversion-1.8.11/subversion/bindings/swig/svn_delta.i 2015-01-25 22:25:10.000000000 +0100
|
||||
@@ -209,8 +209,9 @@ void _ops_get(int *num_ops, svn_txdelta_
|
||||
|
||||
#ifdef SWIGPYTHON
|
||||
%pythoncode {
|
||||
-# This function is for backwards compatibility only.
|
||||
-# Use svn_txdelta_window_t.ops instead.
|
||||
+/* This function is for backwards compatibility only.
|
||||
+ * Use svn_txdelta_window_t.ops instead.
|
||||
+ */
|
||||
svn_txdelta_window_t_ops_get = svn_txdelta_window_t._ops_get
|
||||
}
|
||||
#endif
|
||||
@@ -1,8 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 25 21:29:38 UTC 2015 - andreas.stieger@gmx.de
|
||||
|
||||
- fix build with swig 3.0.4, add subversion-1.8.11-swig_3.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 8 15:41:32 UTC 2015 - bwiedemann@suse.com
|
||||
|
||||
|
||||
@@ -67,7 +67,6 @@ Patch38: subversion-1.8.9-allow-httpd-2.4.6.patch
|
||||
Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch
|
||||
Patch40: subversion-perl-underlinking.patch
|
||||
Patch41: subversion-1.8.10-fix-bashisms.patch
|
||||
Patch42: subversion-1.8.11-swig_3.patch
|
||||
BuildRequires: apache2-devel
|
||||
BuildRequires: apache2-prefork
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
@@ -235,7 +234,6 @@ parameters and keywords for the svn command and other tools.
|
||||
%patch39
|
||||
%patch40 -p1
|
||||
%patch41 -p1
|
||||
%patch42 -p1
|
||||
|
||||
%build
|
||||
# Re-boot strap, needed for patch37
|
||||
|
||||
Reference in New Issue
Block a user