fix kwallet build; patch from altlinux

diff --git a/subversion-1.6.19-alt-g++4.7-fix.patch b/subversion-1.6.19-alt-g++4.7-fix.patch
new file mode 100644 (file)
index 0000000..dd1c975
--- /dev/null
+++ b/subversion-1.6.19-alt-g++4.7-fix.patch
@@ -0,0 +1,49 @@
+ subversion/libsvn_auth_kwallet/kwallet.cpp | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/subversion/libsvn_auth_kwallet/kwallet.cpp b/subversion/libsvn_auth_kwallet/kwallet.cpp
+index 6e5c1f0..ca19806 100644
+--- a/subversion/libsvn_auth_kwallet/kwallet.cpp
++++ b/subversion/libsvn_auth_kwallet/kwallet.cpp
+@@ -51,6 +51,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,12 +178,11 @@ kwallet_password_get(const char **password,
+   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)),
+@@ -245,12 +247,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)),

diff --git a/subversion.spec b/subversion.spec
index 51ef9367ce305145a3e4067b03771ef701cef28c..64845d40f8d4bc05d2db300649ae09fb552e9808 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -79,6 +79,7 @@ Patch0:               %{name}-home_etc.patch
 Patch1:                %{name}-DESTDIR.patch
 Patch2:                %{name}-ruby-datadir-path.patch
 Patch3:                %{name}-tests.patch
+Patch4:                %{name}-1.6.19-alt-g++4.7-fix.patch
 URL:           http://subversion.apache.org/
 %{?with_apache:BuildRequires:  apache-devel < 2.4}
 %{?with_apache:BuildRequires:  apache-devel >= 2.2.0-8}
@@ -435,6 +436,7 @@ uwierzytelniać się przy użyciu Portfela KDE.
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 sed -i -e 's#serf_prefix/lib#serf_prefix/%{_lib}#g' build/ac-macros/serf.m4