Michael Schröder
a4350a867e
- add subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch from trunk to fix build with gcc 4.7 in openSUSE Factory - move checks for schemes handled by ra modules into %check section - do not run regression tests by default: * too many failed builds * doesn't include http tests - only require iproute2 when running regression tests OBS-URL: https://build.opensuse.org/request/show/124109 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=98
60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
svn diff -c1345740 https://svn.apache.org/repos/asf/subversion/trunk
|
|
|
|
r1345740 | peters | 2012-06-03 19:54:26 +0100 (Sun, 03 Jun 2012) | 7 lines
|
|
Changed paths:
|
|
M /subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
|
|
|
|
Remove a cast that is both ugly, and apparently illegal in g++ 4.7.
|
|
|
|
* subversion/libsvn_auth_kwallet/kwallet.cpp
|
|
(q_argc, q_argv): New.
|
|
(kwallet_password_get, kwallet_password_set):
|
|
Use q_argc and q_argv instead of trying to open-code them.
|
|
|
|
Index: subversion/libsvn_auth_kwallet/kwallet.cpp
|
|
===================================================================
|
|
--- subversion/libsvn_auth_kwallet/kwallet.cpp.orig 2010-12-30 20:46:50.000000000 +0000
|
|
+++ subversion/libsvn_auth_kwallet/kwallet.cpp 2012-06-07 18:01:02.000000000 +0100
|
|
@@ -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,
|
|
@@ -203,12 +206,11 @@ kwallet_password_get(const char **passwo
|
|
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 +275,11 @@ kwallet_password_set(apr_hash_t *creds,
|
|
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)),
|