summaryrefslogtreecommitdiff
path: root/extra/subversion
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-02-10 01:12:52 -0800
committerroot <root@rshg054.dnsready.net>2013-02-10 01:12:52 -0800
commit1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 (patch)
tree016bfa1969323404c37dbef29cfc7242a5a8e9f3 /extra/subversion
parente9c244cac8e5dc1c59c7e8b7bc885fef04224b70 (diff)
Sun Feb 10 01:12:35 PST 2013
Diffstat (limited to 'extra/subversion')
-rw-r--r--extra/subversion/subversion-1.7.5-kwallet-gcc47.patch56
-rw-r--r--extra/subversion/subversion-1.7.6-kwallet-gcc47.patch56
2 files changed, 0 insertions, 112 deletions
diff --git a/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch
deleted file mode 100644
index a571c3c3c..000000000
--- a/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp
---- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500
-+++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400
-@@ -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,
-@@ -175,6 +178,10 @@
- "kwallet-initialized",
- APR_HASH_KEY_STRING,
- NULL);
-+ apr_hash_set(parameters,
-+ "kwallet-wallet",
-+ APR_HASH_KEY_STRING,
-+ NULL);
- }
- return APR_SUCCESS;
- }
-@@ -203,12 +210,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)),
-@@ -273,12 +279,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/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch
deleted file mode 100644
index a571c3c3c..000000000
--- a/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp
---- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500
-+++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400
-@@ -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,
-@@ -175,6 +178,10 @@
- "kwallet-initialized",
- APR_HASH_KEY_STRING,
- NULL);
-+ apr_hash_set(parameters,
-+ "kwallet-wallet",
-+ APR_HASH_KEY_STRING,
-+ NULL);
- }
- return APR_SUCCESS;
- }
-@@ -203,12 +210,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)),
-@@ -273,12 +279,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)),