From da79f5ddda842bf9b613d545e08067ea01bfdb38 Mon Sep 17 00:00:00 2001 From: Alexpux Date: Tue, 17 Dec 2013 14:05:47 +0400 Subject: [PATCH] subversion: Build without symlink and read link support. --- subversion/PKGBUILD | 18 +++++++++++++----- subversion/remove-checking-symlink.patch | 12 ++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 subversion/remove-checking-symlink.patch diff --git a/subversion/PKGBUILD b/subversion/PKGBUILD index c21ea20d..c1452697 100644 --- a/subversion/PKGBUILD +++ b/subversion/PKGBUILD @@ -2,7 +2,7 @@ pkgname=subversion pkgver=1.8.5 -pkgrel=1 +pkgrel=2 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') url="http://subversion.apache.org/" @@ -34,7 +34,8 @@ source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc 14-fix_svnauthz_tests.patch 15-XFAIL_case_sensitive_tree_conflict.patch 16-XFAIL_sqlite3_temp_table_tests.patch - subversion-1.8.0-msys2.patch) + subversion-1.8.0-msys2.patch + remove-checking-symlink.patch) md5sums=('77349caf0ef5a612c9718c53516a9934' 'SKIP' '07ee0cb01bdf8468cb8d4c22c0d6bc04' @@ -54,7 +55,8 @@ md5sums=('77349caf0ef5a612c9718c53516a9934' 'ca7fb78bcd33a12845168e603128aa5d' '19ebc3da4d7735c86195e5c0907ff3cf' 'f4d1dd96a3dd9cb6e19b86cc0bfeb1f6' - '44d3666035747d6fdadb1dff120d56d7') + '44d3666035747d6fdadb1dff120d56d7' + 'be151d5feeab94774c1366382044f821') PYTHON_SITELIB=/usr/lib/python2.7/site-packages @@ -64,8 +66,12 @@ prepare() { cd $srcdir/$pkgname-$pkgver - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gen-make.py + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + tools/hook-scripts/{,mailer/{,tests/}}*.py \ + tools/client-side/mergeinfo-sanitizer.py + + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gen-make.py build/getversion.py + sed -i 's|except IOError,|except IOError as|' build/getversion.py patch -p1 -i ${srcdir}/01-make-build-directories.patch patch -p1 -i ${srcdir}/02-fix-linking.patch @@ -84,7 +90,9 @@ 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}/subversion-1.8.0-msys2.patch + patch -p1 -i ${srcdir}/remove-checking-symlink.patch + PYTHON=/usr/bin/python2 ./autogen.sh } diff --git a/subversion/remove-checking-symlink.patch b/subversion/remove-checking-symlink.patch new file mode 100644 index 00000000..914de6e6 --- /dev/null +++ b/subversion/remove-checking-symlink.patch @@ -0,0 +1,12 @@ +--- subversion-1.8.5/configure.ac.orig 2013-10-24 08:02:16.000000000 +0400 ++++ subversion-1.8.5/configure.ac 2013-12-17 13:27:49.179600000 +0400 +@@ -872,9 +872,6 @@ + dnl svn_error's default warning handler uses vfprintf() + AC_FUNC_VPRINTF + +-dnl check for functions needed in special file handling +-AC_CHECK_FUNCS(symlink readlink) +- + dnl check for uname + AC_CHECK_HEADERS(sys/utsname.h, [AC_CHECK_FUNCS(uname)], []) +