[subversion/f17] fix build with recent gcc 4.7 (svn rev 1345740)

[Dan Horák]

commit 6dc3e253c03ce1a439333810158dfbb86c1819bd
Author: Dan Horák <dan at danny.cz>
Date:   Mon Jun 18 16:44:43 2012 +0200

    fix build with recent gcc 4.7 (svn rev 1345740)

 subversion-1.7.5-kwallet-gcc47.patch |   44 ++++++++++++++++++++++++++++++++++
 subversion.spec                      |    7 ++++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/subversion-1.7.5-kwallet-gcc47.patch b/subversion-1.7.5-kwallet-gcc47.patch
new file mode 100644
index 0000000..f718a0b
--- /dev/null
+++ b/subversion-1.7.5-kwallet-gcc47.patch
@@ -0,0 +1,44 @@
+--- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp	2012/06/03 18:50:48	1345739
++++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp	2012/06/03 18:54:26	1345740
+@@ -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,
+@@ -212,12 +215,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)),
+@@ -289,12 +291,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)),
diff --git a/subversion.spec b/subversion.spec
index b9b3eee..3cf8aeb 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -26,7 +26,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.7.5
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: ASL 2.0
 Group: Development/Tools
 URL: http://subversion.apache.org/
@@ -44,6 +44,7 @@ Patch3: subversion-1.7.0-kwallet.patch
 Patch4: subversion-1.7.2-ruby19.patch
 Patch7: subversion-1.7.4-kwallet2.patch
 Patch8: subversion-1.7.4-sqlitever.patch
+Patch9: subversion-1.7.5-kwallet-gcc47.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: %{dbdevel} >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
@@ -182,6 +183,7 @@ This package includes supplementary tools for use with Subversion.
 %patch4 -p1 -b .ruby
 %patch7 -p1 -b .kwallet2
 %patch8 -p1 -b .sqlitever
+%patch9 -p2 -b .kwallet-gcc47
 
 %build
 # Regenerate the buildsystem, so that:
@@ -477,6 +479,9 @@ fi
 %endif
 
 %changelog
+* Mon Jun 18 2012 Dan Horák <dan[at]danny.cz - 1.7.5-3
+- fix build with recent gcc 4.7 (svn rev 1345740)
+
 * Tue May 22 2012 Joe Orton <jorton at redhat.com> - 1.7.5-1
 - update to 1.7.5