[arch-commits] Commit in subversion/trunk (PKGBUILD ruby-27.patch)
Felix Yan
felixonmars at archlinux.org
Fri May 29 14:29:52 UTC 2020
Date: Friday, May 29, 2020 @ 14:29:52
Author: felixonmars
Revision: 387823
upgpkg: subversion 1.14.0-1
Modified:
subversion/trunk/PKGBUILD
Deleted:
subversion/trunk/ruby-27.patch
---------------+
PKGBUILD | 32 +++++++++++++++-----------------
ruby-27.patch | 44 --------------------------------------------
2 files changed, 15 insertions(+), 61 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-29 13:03:38 UTC (rev 387822)
+++ PKGBUILD 2020-05-29 14:29:52 UTC (rev 387823)
@@ -5,19 +5,19 @@
# Contributor: Jason Chu <jason at archlinux.org>
pkgname=subversion
-pkgver=1.13.0
-pkgrel=3
+pkgver=1.14.0
+pkgrel=1
pkgdesc="A Modern Concurrent Version Control System"
arch=('x86_64')
url="https://subversion.apache.org/"
license=('APACHE')
depends=('file' 'libutf8proc' 'serf' 'sqlite' 'systemd')
-makedepends=('apache' 'python2' 'perl' 'swig3' 'java-environment>=8'
+makedepends=('apache' 'python' 'python-py3c' 'perl' 'swig' 'java-environment>=8'
'libgnome-keyring' 'kwallet' 'kdelibs4support' 'ruby')
optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials'
'kwallet: for KWallet for auth credentials'
'bash-completion: for svn bash completion'
- 'python2: for some hook scripts'
+ 'python: for some hook scripts'
'java-environment: for Java support'
'ruby: for some hook scripts')
checkdepends=('ruby-test-unit')
@@ -25,7 +25,6 @@
backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
options=('!makeflags' '!emptydirs')
source=(https://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc}
- ruby-27.patch
svn
svnserve.conf
svnserve.tmpfiles
@@ -32,9 +31,8 @@
svnserve.service
subversion.rpath.fix.patch
ruby-frozen-nil.patch)
-sha512sums=('36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2'
+sha512sums=('af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b'
'SKIP'
- '4057e4bb08da476c029629091f5c8a1c7c72104412baaf39b0e2bd69b64ff7963a1c10b210eb6e2275024cd3f697b7793f257a609c3278f31f5dec36d080594e'
'3df59e92aa0314ff6adce26e2e1162bf2872ca03ff1f78891081a60e67b521b6046b4a2f85f718dcd27f9d5709594658817a09548cdb74e3976d371dbe47e7db'
'f7f2ceac2446cc94ac2be3404083cc54a0f1f4d04d5301f600dfafca38819669bcffdfa45f1b90b9f3cdb042469385a764f11dc1a827f10c23ddf73b7ac6c9da'
'7775f4da5003970c9ebdc2f696ba090df194a77d9daed791875488c943f72ae496b5f9cc6f3ff9f3f4de9f352a3b518137babdea38947d1a2d5dd16aa1844036'
@@ -49,18 +47,19 @@
'A844790FB5743606EE95920776D788E1ED1A599C'
'7B8CA7F6451AD89C8ADC077B376A3CFD110B1C95'
'056F8016D9B87B1BDE41746799EC741B57921ACC'
- '3F8E467CB3366E3013E1120D583F00ADF981C39F')
+ '3F8E467CB3366E3013E1120D583F00ADF981C39F'
+ '91BFBF4D6956BD5DF7B72D23DFE691AE331BA3DB')
# Ben Reser / Stefan Sperling / Branko Čibej / Evgeny Kotkov / Bert Huijben / Philip Martin /
-# Stefan Fuhrmann / Stefan Hett (CODE SIGNING KEY) /Nathan Hartman (CODE SIGNING KEY)
+# Stefan Fuhrmann / Stefan Hett (CODE SIGNING KEY) /Nathan Hartman (CODE SIGNING KEY) / James McCoy
prepare() {
cd ${pkgname}-${pkgver}
patch -Np0 -i ../subversion.rpath.fix.patch
patch -p1 -i ../ruby-frozen-nil.patch
- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py subversion/tests/cmdline/*.py
rm subversion/bindings/swig/proxy/*.swg
- patch -p1 < ../ruby-27.patch # https://issues.apache.org/jira/browse/SVN-4841
+ # The command line switch is broken
+ sed -i 's|/include|/include/python3.8/py3c|' build/ac-macros/py3c.m4
./autogen.sh
}
@@ -67,10 +66,9 @@
build() {
cd ${pkgname}-${pkgver}
- export PYTHON=/usr/bin/python2
./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
--with-zlib=/usr --with-serf=/usr --with-apxs \
- --with-sqlite=/usr \
+ --with-sqlite=/usr --with-py3c=/usr \
--enable-javahl --with-jdk=/usr/lib/jvm/default \
--with-gnome-keyring --with-kwallet \
--with-apache-libexecdir=/usr/lib/httpd/modules \
@@ -78,8 +76,8 @@
--disable-static
make LT_LDFLAGS="-L$Fdestdir/usr/lib"
- make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
- swig_pydir_extra=/usr/lib/python2.7/site-packages/svn SWIG=swig-3 swig-py swig-pl javahl swig-rb
+ make swig_pydir=/usr/lib/python3.8/site-packages/libsvn \
+ swig_pydir_extra=/usr/lib/python3.8/site-packages/svn swig-py swig-pl javahl swig-rb
}
check() {
@@ -93,8 +91,8 @@
export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH}
make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
- swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
- swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
+ swig_pydir=/usr/lib/python3.8/site-packages/libsvn \
+ swig_pydir_extra=/usr/lib/python3.8/site-packages/svn \
install install-swig-py install-swig-pl install-javahl install-swig-rb
install -dm755 "${pkgdir}"/usr/share/subversion
Deleted: ruby-27.patch
===================================================================
--- ruby-27.patch 2020-05-29 13:03:38 UTC (rev 387822)
+++ ruby-27.patch 2020-05-29 14:29:52 UTC (rev 387823)
@@ -1,44 +0,0 @@
-commit 7aa586a6e7235bdbc7ad551e6853fe24a0dcf991
-Author: Anatol Pomozov <anatol.pomozov at gmail.com>
-Date: Tue Dec 31 08:48:46 2019 -0800
-
- Fix issue #4841: do not include internal ruby include paths
-
- Building subversion with ruby2.7 produces a compilation warning:
-
- subversion/bindings/swig/ruby/svn_client.c:1666:13: warning: implicit declaration of function ‘assert’ [-Wimplicit-function-declaration]
- 1666 | assert(own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */
- | ^~~~~~
-
- And later tests fail with:
-
- /usr/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in `require': /build/subversion/src/subversion-1.13.0/subversion/bindings/swig/ruby/libsvn_swig_ruby/.libs/libsvn_swig_ruby-1.so.0: undefined symbol: assert - /build/subversion/src/subversion-1.13.0/subversion/bindings/swig/ruby/.ext/svn/ext/core.so (LoadError)
- from /usr/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in `require'
- from /build/subversion/src/subversion-1.13.0/subversion/bindings/swig/ruby/svn/error.rb:21:in `<top (required)>'
- from /usr/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in `require'
- from /usr/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in `require'
- from /build/subversion/src/subversion-1.13.0/subversion/bindings/swig/ruby/svn/core.rb:25:in `<top (required)>'
- from /usr/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in `require'
- from /usr/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:92:in `require'
- from /build/subversion/src/subversion-1.13.0/subversion/bindings/swig/ruby/test/run-test.rb:47:in `<main>'
- make: *** [Makefile:962: check-swig-rb] Error 1
-
- It turns out that ruby 2.7 added a new header file '$RUBY_TOP/ruby/assert.h'.
- Subversion includes both $RUBY_TOP and $RUBY_TOP/ruby and it makes "assert.h" to
- be resolved to ruby's version instead of libc one.
-
- To fix this problem subversion should use only $RUBY_TOP and avoid using internal ruby paths.
-
-diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4
-index bc2599038f..c707a8c282 100644
---- a/build/ac-macros/swig.m4
-+++ b/build/ac-macros/swig.m4
-@@ -230,7 +230,7 @@ AC_DEFUN(SVN_FIND_SWIG,
- AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
- if test -d "$rbconfig_rubyhdrdir"; then
- dnl Ruby >=1.9
-- svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
-+ svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir"
- if test -d "$rbconfig_rubyarchhdrdir"; then
- dnl Ruby >=2.0
- svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
More information about the arch-commits
mailing list