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

[Stéphane Gaudreault]

    Date: Friday, April 5, 2013 @ 01:10:18
  Author: stephane
Revision: 181861

upgpkg: subversion 1.7.9-1

upstream update

Modified:
  subversion/trunk/PKGBUILD
Deleted:
  subversion/trunk/subversion-kwallet.patch

--------------------------+
 PKGBUILD                 |   11 +++--------
 subversion-kwallet.patch |   22 ----------------------
 2 files changed, 3 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-04 22:54:14 UTC (rev 181860)
+++ PKGBUILD	2013-04-04 23:10:18 UTC (rev 181861)
@@ -4,7 +4,7 @@
 # Contributor: Jason Chu <jason at 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 @@
         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 @@
    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 \

Deleted: subversion-kwallet.patch
===================================================================
--- subversion-kwallet.patch	2013-04-04 22:54:14 UTC (rev 181860)
+++ subversion-kwallet.patch	2013-04-04 23:10:18 UTC (rev 181861)
@@ -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