subversion: Rebuild.
This commit is contained in:
71
subversion/18-fix-comment-quotes.patch
Normal file
71
subversion/18-fix-comment-quotes.patch
Normal file
@@ -0,0 +1,71 @@
|
||||
diff -Naur subversion-1.8.13-orig/subversion/bindings/swig/core.i subversion-1.8.13/subversion/bindings/swig/core.i
|
||||
--- subversion-1.8.13-orig/subversion/bindings/swig/core.i 2014-01-06 08:04:07.000000000 +0400
|
||||
+++ subversion-1.8.13/subversion/bindings/swig/core.i 2015-04-09 09:52:00.443000000 +0300
|
||||
@@ -788,11 +788,13 @@
|
||||
%ignore svn_opt_parse_all_args;
|
||||
#endif
|
||||
|
||||
+/*
|
||||
+ * 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.
|
||||
+ */
|
||||
#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.
|
||||
%feature("pythonappend") svn_auth_open %{
|
||||
val.__dict__["_deps"] = list(args[0])
|
||||
%}
|
||||
diff -Naur subversion-1.8.13-orig/subversion/bindings/swig/include/proxy.swg subversion-1.8.13/subversion/bindings/swig/include/proxy.swg
|
||||
--- subversion-1.8.13-orig/subversion/bindings/swig/include/proxy.swg 2010-02-10 02:12:51.000000000 +0300
|
||||
+++ subversion-1.8.13/subversion/bindings/swig/include/proxy.swg 2015-04-09 09:54:13.273600000 +0300
|
||||
@@ -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)
|
||||
diff -Naur subversion-1.8.13-orig/subversion/bindings/swig/svn_delta.i subversion-1.8.13/subversion/bindings/swig/svn_delta.i
|
||||
--- subversion-1.8.13-orig/subversion/bindings/swig/svn_delta.i 2012-09-23 18:12:33.000000000 +0400
|
||||
+++ subversion-1.8.13/subversion/bindings/swig/svn_delta.i 2015-04-09 09:55:21.553200000 +0300
|
||||
@@ -209,8 +209,9 @@
|
||||
|
||||
#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,8 @@
|
||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||
|
||||
pkgname=subversion
|
||||
pkgver=1.8.11
|
||||
pkgrel=1
|
||||
pkgver=1.8.13
|
||||
pkgrel=2
|
||||
pkgdesc="A Modern Concurrent Version Control System"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://subversion.apache.org/"
|
||||
@@ -35,9 +35,10 @@ source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc
|
||||
15-XFAIL_case_sensitive_tree_conflict.patch
|
||||
16-XFAIL_sqlite3_temp_table_tests.patch
|
||||
17-dont-build-tests.patch
|
||||
18-fix-comment-quotes.patch
|
||||
subversion-1.8.0-msys2.patch
|
||||
remove-checking-symlink.patch)
|
||||
md5sums=('766a89bbbb388f8eb76166672d3b9e49'
|
||||
md5sums=('4413417b529d7bdf82f74e50df02e88b'
|
||||
'SKIP'
|
||||
'07ee0cb01bdf8468cb8d4c22c0d6bc04'
|
||||
'dbf63cb39ddea409a37bc6647065fae9'
|
||||
@@ -57,6 +58,7 @@ md5sums=('766a89bbbb388f8eb76166672d3b9e49'
|
||||
'70ea60f69961e2282a28f3bbf2772d0a'
|
||||
'906757eb7d836d91d8659621a2a8e6e8'
|
||||
'75e6f9210afa69d1838d85169012a59f'
|
||||
'7c608350472b2a398d861fc7fe139c75'
|
||||
'97df6f58cc6b2d27d7870a5f7d5378f2'
|
||||
'be151d5feeab94774c1366382044f821')
|
||||
|
||||
@@ -93,6 +95,7 @@ prepare() {
|
||||
patch -p1 -i ${srcdir}/15-XFAIL_case_sensitive_tree_conflict.patch
|
||||
patch -p1 -i ${srcdir}/16-XFAIL_sqlite3_temp_table_tests.patch
|
||||
patch -p1 -i ${srcdir}/17-dont-build-tests.patch
|
||||
patch -p1 -i ${srcdir}/18-fix-comment-quotes.patch
|
||||
patch -p1 -i ${srcdir}/subversion-1.8.0-msys2.patch
|
||||
patch -p1 -i ${srcdir}/remove-checking-symlink.patch
|
||||
|
||||
|
||||
Reference in New Issue
Block a user