[arch-commits] Commit in subversion/trunk (PKGBUILD)

[Felix Yan]

    Date: Friday, August 2, 2019 @ 07:09:05
  Author: felixonmars
Revision: 358877

upgpkg: subversion 1.12.2-1

Modified:
  subversion/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-01 23:27:09 UTC (rev 358876)
+++ PKGBUILD	2019-08-02 07:09:05 UTC (rev 358877)
@@ -5,14 +5,14 @@
 # Contributor: Jason Chu <jason at archlinux.org>
 
 pkgname=subversion
-pkgver=1.12.0
-pkgrel=3
+pkgver=1.12.2
+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' 'swig' 'java-environment>=8'
+makedepends=('apache' 'python2' 'perl' 'swig3' 'java-environment>=8'
              'libgnome-keyring' 'kwallet' 'kdelibs4support' 'ruby')
 optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials'
             'kwallet: for KWallet for auth credentials'
@@ -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}
-        apr-1.7.patch::https://github.com/apache/subversion/commit/d67979e61f.patch
         svn
         svnserve.conf
         svnserve.tmpfiles
@@ -32,9 +31,8 @@
         svnserve.service
         subversion.rpath.fix.patch
         ruby-frozen-nil.patch)
-sha512sums=('87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13'
+sha512sums=('b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136'
             'SKIP'
-            'a8363ff4d48a0bc03227ba3b2ec61c66b7c1ba6d84fe10800af2085a8d108033573f77a1967bd359e842ca9866d6841b57427eae139477f143856faff5bd95ec'
             '3df59e92aa0314ff6adce26e2e1162bf2872ca03ff1f78891081a60e67b521b6046b4a2f85f718dcd27f9d5709594658817a09548cdb74e3976d371dbe47e7db'
             'f7f2ceac2446cc94ac2be3404083cc54a0f1f4d04d5301f600dfafca38819669bcffdfa45f1b90b9f3cdb042469385a764f11dc1a827f10c23ddf73b7ac6c9da'
             '7775f4da5003970c9ebdc2f696ba090df194a77d9daed791875488c943f72ae496b5f9cc6f3ff9f3f4de9f352a3b518137babdea38947d1a2d5dd16aa1844036'
@@ -53,10 +51,10 @@
 
 prepare() {
    cd ${pkgname}-${pkgver}
-   patch -p1 -i ../apr-1.7.patch
    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
 
    ./autogen.sh
 }
@@ -75,7 +73,7 @@
 
    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-py swig-pl javahl swig-rb
+     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn SWIG=swig-3 swig-py swig-pl javahl swig-rb
 }
 
 check() {