subversion-1.7.5-kwallet-gcc47.patch

   1 --- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/06/03 18:50:48     1345739
   2 +++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/06/03 18:54:26     1345740
   3 @@ -60,6 +60,9 @@
   4  /* KWallet simple provider, puts passwords in KWallet                    */
   5  /*-----------------------------------------------------------------------*/
   6
   7 +static int q_argc = 1;
   8 +static char q_argv0[] = "svn"; // Build non-const char * from string constant
   9 +static char *q_argv[] = { q_argv0 };
  10
  11  static const char *
  12  get_application_name(apr_hash_t *parameters,
  13 @@ -212,12 +215,11 @@
  14    QCoreApplication *app;
  15    if (! qApp)
  16      {
  17 -      int argc = 1;
  18 -      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
  19 +      int argc = q_argc;
  20 +      app = new QCoreApplication(argc, q_argv);
  21      }
  22
  23 -  KCmdLineArgs::init(1,
  24 -                     (char *[1]) {(char *) "svn"},
  25 +  KCmdLineArgs::init(q_argc, q_argv,
  26                       get_application_name(parameters, pool),
  27                       "subversion",
  28                       ki18n(get_application_name(parameters, pool)),
  29 @@ -289,12 +291,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)),