diff options
| author | root <root@rshg054.dnsready.net> | 2013-04-07 00:54:45 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-04-07 00:54:45 -0700 |
| commit | 5abba8ccfedfb13f07a34eb4b6afbe4f30a8f767 (patch) | |
| tree | 67c71a4fc1f20a59b619c908f6a53c2cde2b46c9 /extra/subversion | |
| parent | afcab02cc1bc97b4090668931e372fd47cedf04d (diff) | |
Sun Apr 7 00:54:38 PDT 2013
Diffstat (limited to 'extra/subversion')
| -rw-r--r-- | extra/subversion/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/subversion/subversion-kwallet.patch | 22 |
2 files changed, 4 insertions, 31 deletions
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 71258a605..d6edcf95e 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173791 2012-12-23 03:50:49Z stephane $ +# $Id: PKGBUILD 182098 2013-04-06 21:41:54Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') @@ -25,16 +25,14 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} svnserve.conf svnserve.tmpfiles svnserve.service - subversion-kwallet.patch subversion.rpath.fix.patch) -sha1sums=('12c7d8d5414bba74c9777c4d1dae74f152df63c2' - '24f8e82fa131c1a1b924d71046f8d38cb00645a7' +sha1sums=('453757bae78a800997559f2232483ab99238ec1e' + '5ce5adc5f5cae5a2d569a89b5e4498623feae84a' '64ba3e6ebafc08ac62f59d788f7a825fdce69573' '73b36c046c09cec2093354911c89e3ba8056af6c' 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' '9f6790d842cf3e0228b007483a43e39a42724068' - 'f2aed28a2e34b8631ee9b69175bac1bac59327ce' '3d1e28408a9abb42af2e531adc0d01ce21acfad6') build() { @@ -44,9 +42,6 @@ build() { patch -Np0 -i ../subversion.rpath.fix.patch sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - # FS#33081 - patch -Np0 -i ../subversion-kwallet.patch - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \ --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ diff --git a/extra/subversion/subversion-kwallet.patch b/extra/subversion/subversion-kwallet.patch deleted file mode 100644 index d2bf17101..000000000 --- a/extra/subversion/subversion-kwallet.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: subversion/libsvn_auth_kwallet/kwallet.cpp -=================================================================== ---- subversion/libsvn_auth_kwallet/kwallet.cpp (revision 1421011) -+++ subversion/libsvn_auth_kwallet/kwallet.cpp (working copy) -@@ -253,7 +253,7 @@ kwallet_password_get(svn_boolean_t *done, - } - } - -- apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL); -+ apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null); - - return SVN_NO_ERROR; - } -@@ -327,7 +327,7 @@ kwallet_password_set(svn_boolean_t *done, - } - } - -- apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL); -+ apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null); - - return SVN_NO_ERROR; - }
\ No newline at end of file |