[arch-commits] Commit in subversion/trunk (3 files)
Stéphane Gaudreault
stephane at archlinux.org
Wed Aug 15 13:09:29 UTC 2012
Date: Wednesday, August 15, 2012 @ 09:09:29
Author: stephane
Revision: 165313
upgpkg: subversion 1.7.6-1
upstream update
Added:
subversion/trunk/subversion-1.7.6-kwallet-gcc47.patch
(from rev 165312, subversion/trunk/subversion-1.7.5-kwallet-gcc47.patch)
Modified:
subversion/trunk/PKGBUILD
Deleted:
subversion/trunk/subversion-1.7.5-kwallet-gcc47.patch
--------------------------------------+
PKGBUILD | 18 +++++-----
subversion-1.7.5-kwallet-gcc47.patch | 56 ---------------------------------
subversion-1.7.6-kwallet-gcc47.patch | 56 +++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 65 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-08-15 11:35:19 UTC (rev 165312)
+++ PKGBUILD 2012-08-15 13:09:29 UTC (rev 165313)
@@ -4,14 +4,14 @@
# Contributor: Jason Chu <jason at archlinux.org>
pkgname=subversion
-pkgver=1.7.5
-pkgrel=3
+pkgver=1.7.6
+pkgrel=1
pkgdesc="A Modern Concurrent Version Control System"
arch=('i686' 'x86_64')
license=('APACHE')
depends=('neon' 'apr-util' 'sqlite' 'file')
optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
- 'python2: for some hook scripts') # 'ruby: for some hook scripts' 'java-environment')
+ 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts')
makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
@@ -24,10 +24,10 @@
svnserve.conf
svnserve.tmpfiles
svnserve.service
- subversion-1.7.5-kwallet-gcc47.patch
+ subversion-1.7.6-kwallet-gcc47.patch
subversion.rpath.fix.patch)
-sha1sums=('05c079762690d5ac1ccd2549742e7ef70fa45cf1'
- 'b267cba19b4f56360657a5bf5b231950e027a45a'
+sha1sums=('5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068'
+ 'd8d99c01c49b189047389816b720923f1d9dbf2a'
'64ba3e6ebafc08ac62f59d788f7a825fdce69573'
'73b36c046c09cec2093354911c89e3ba8056af6c'
'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
@@ -43,7 +43,7 @@
patch -p0 -i ../subversion.rpath.fix.patch
sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
- patch -Np1 -i ../subversion-1.7.5-kwallet-gcc47.patch
+ patch -Np1 -i ../subversion-1.7.6-kwallet-gcc47.patch
./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
--with-zlib=/usr --with-neon=/usr --with-apxs \
@@ -53,7 +53,7 @@
make external-all
make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
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-py swig-pl javahl #swig-rb
}
#check() {
@@ -69,7 +69,7 @@
make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
- install install-swig-py install-swig-pl install-javahl # install-swig-rb
+ install install-swig-py install-swig-pl install-javahl #install-swig-rb
install -dm755 "${pkgdir}"/usr/share/subversion
cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
Deleted: subversion-1.7.5-kwallet-gcc47.patch
===================================================================
--- subversion-1.7.5-kwallet-gcc47.patch 2012-08-15 11:35:19 UTC (rev 165312)
+++ subversion-1.7.5-kwallet-gcc47.patch 2012-08-15 13:09:29 UTC (rev 165313)
@@ -1,56 +0,0 @@
-diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp
---- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500
-+++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400
-@@ -60,6 +60,9 @@
- /* KWallet simple provider, puts passwords in KWallet */
- /*-----------------------------------------------------------------------*/
-
-+static int q_argc = 1;
-+static char q_argv0[] = "svn"; // Build non-const char * from string constant
-+static char *q_argv[] = { q_argv0 };
-
- static const char *
- get_application_name(apr_hash_t *parameters,
-@@ -175,6 +178,10 @@
- "kwallet-initialized",
- APR_HASH_KEY_STRING,
- NULL);
-+ apr_hash_set(parameters,
-+ "kwallet-wallet",
-+ APR_HASH_KEY_STRING,
-+ NULL);
- }
- return APR_SUCCESS;
- }
-@@ -203,12 +210,11 @@
- QCoreApplication *app;
- if (! qApp)
- {
-- int argc = 1;
-- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+ int argc = q_argc;
-+ app = new QCoreApplication(argc, q_argv);
- }
-
-- KCmdLineArgs::init(1,
-- (char *[1]) {(char *) "svn"},
-+ KCmdLineArgs::init(q_argc, q_argv,
- get_application_name(parameters, pool),
- "subversion",
- ki18n(get_application_name(parameters, pool)),
-@@ -273,12 +279,11 @@
- QCoreApplication *app;
- if (! qApp)
- {
-- int argc = 1;
-- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+ int argc = q_argc;
-+ app = new QCoreApplication(argc, q_argv);
- }
-
-- KCmdLineArgs::init(1,
-- (char *[1]) {(char *) "svn"},
-+ KCmdLineArgs::init(q_argc, q_argv,
- get_application_name(parameters, pool),
- "subversion",
- ki18n(get_application_name(parameters, pool)),
Copied: subversion/trunk/subversion-1.7.6-kwallet-gcc47.patch (from rev 165312, subversion/trunk/subversion-1.7.5-kwallet-gcc47.patch)
===================================================================
--- subversion-1.7.6-kwallet-gcc47.patch (rev 0)
+++ subversion-1.7.6-kwallet-gcc47.patch 2012-08-15 13:09:29 UTC (rev 165313)
@@ -0,0 +1,56 @@
+diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp
+--- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500
++++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400
+@@ -60,6 +60,9 @@
+ /* KWallet simple provider, puts passwords in KWallet */
+ /*-----------------------------------------------------------------------*/
+
++static int q_argc = 1;
++static char q_argv0[] = "svn"; // Build non-const char * from string constant
++static char *q_argv[] = { q_argv0 };
+
+ static const char *
+ get_application_name(apr_hash_t *parameters,
+@@ -175,6 +178,10 @@
+ "kwallet-initialized",
+ APR_HASH_KEY_STRING,
+ NULL);
++ apr_hash_set(parameters,
++ "kwallet-wallet",
++ APR_HASH_KEY_STRING,
++ NULL);
+ }
+ return APR_SUCCESS;
+ }
+@@ -203,12 +210,11 @@
+ QCoreApplication *app;
+ if (! qApp)
+ {
+- int argc = 1;
+- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
++ int argc = q_argc;
++ app = new QCoreApplication(argc, q_argv);
+ }
+
+- KCmdLineArgs::init(1,
+- (char *[1]) {(char *) "svn"},
++ KCmdLineArgs::init(q_argc, q_argv,
+ get_application_name(parameters, pool),
+ "subversion",
+ ki18n(get_application_name(parameters, pool)),
+@@ -273,12 +279,11 @@
+ QCoreApplication *app;
+ if (! qApp)
+ {
+- int argc = 1;
+- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
++ int argc = q_argc;
++ app = new QCoreApplication(argc, q_argv);
+ }
+
+- KCmdLineArgs::init(1,
+- (char *[1]) {(char *) "svn"},
++ KCmdLineArgs::init(q_argc, q_argv,
+ get_application_name(parameters, pool),
+ "subversion",
+ ki18n(get_application_name(parameters, pool)),
More information about the arch-commits
mailing list