| 1 |
tommy 12/08/22 20:33:11 |
| 2 |
|
| 3 |
Added: subversion-1.7.6-kwallet.patch |
| 4 |
Log: |
| 5 |
Add patch for kwallet, upstream applied it to trunk, but did not include it in the following release, should now really fix bug 421575 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha116-r1/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: subversion-1.7.6-kwallet.patch |
| 16 |
=================================================================== |
| 17 |
--- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/03/21 18:22:15 1303489 |
| 18 |
+++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/06/03 18:54:26 1345740 |
| 19 |
@@ -60,6 +60,9 @@ |
| 20 |
/* KWallet simple provider, puts passwords in KWallet */ |
| 21 |
/*-----------------------------------------------------------------------*/ |
| 22 |
|
| 23 |
+static int q_argc = 1; |
| 24 |
+static char q_argv0[] = "svn"; // Build non-const char * from string constant |
| 25 |
+static char *q_argv[] = { q_argv0 }; |
| 26 |
|
| 27 |
static const char * |
| 28 |
get_application_name(apr_hash_t *parameters, |
| 29 |
@@ -212,12 +215,11 @@ |
| 30 |
QCoreApplication *app; |
| 31 |
if (! qApp) |
| 32 |
{ |
| 33 |
- int argc = 1; |
| 34 |
- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); |
| 35 |
+ int argc = q_argc; |
| 36 |
+ app = new QCoreApplication(argc, q_argv); |
| 37 |
} |
| 38 |
|
| 39 |
- KCmdLineArgs::init(1, |
| 40 |
- (char *[1]) {(char *) "svn"}, |
| 41 |
+ KCmdLineArgs::init(q_argc, q_argv, |
| 42 |
get_application_name(parameters, pool), |
| 43 |
"subversion", |
| 44 |
ki18n(get_application_name(parameters, pool)), |
| 45 |
@@ -289,12 +291,11 @@ |
| 46 |
QCoreApplication *app; |
| 47 |
if (! qApp) |
| 48 |
{ |
| 49 |
- int argc = 1; |
| 50 |
- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); |
| 51 |
+ int argc = q_argc; |
| 52 |
+ app = new QCoreApplication(argc, q_argv); |
| 53 |
} |
| 54 |
|
| 55 |
- KCmdLineArgs::init(1, |
| 56 |
- (char *[1]) {(char *) "svn"}, |
| 57 |
+ KCmdLineArgs::init(q_argc, q_argv, |
| 58 |
get_application_name(parameters, pool), |
| 59 |
"subversion", |
| 60 |
ki18n(get_application_name(parameters, pool)), |
Archives