| 1 |
dilfridge 11/11/20 22:32:26 |
| 2 |
|
| 3 |
Added: kdevplatform-1.2.3-svn17-1.patch |
| 4 |
kdevplatform-1.2.3-svn17-2.patch |
| 5 |
Log: |
| 6 |
Fix crash with subversion-1.7, bug 388029 |
| 7 |
|
| 8 |
(Portage version: 2.1.10.36/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-1.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-1.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-1.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: kdevplatform-1.2.3-svn17-1.patch |
| 17 |
=================================================================== |
| 18 |
commit 74dec52749e3c3af2ac6492f50e2676128f35b27 |
| 19 |
Author: Milian Wolff <mail@×××××××.de> |
| 20 |
Date: Fri Nov 18 16:26:06 2011 +0100 |
| 21 |
|
| 22 |
fix svn api usage: use svn_dirent_canonicalize instead of svn_path_internal_style |
| 23 |
|
| 24 |
this was suggested by Stephan Sperling |
| 25 |
|
| 26 |
CCBUG: 284061 |
| 27 |
|
| 28 |
diff --git a/plugins/subversion/kdevsvncpp/path.cpp b/plugins/subversion/kdevsvncpp/path.cpp |
| 29 |
index eaa84c1..4dced08 100644 |
| 30 |
--- a/plugins/subversion/kdevsvncpp/path.cpp |
| 31 |
+++ b/plugins/subversion/kdevsvncpp/path.cpp |
| 32 |
@@ -24,6 +24,7 @@ |
| 33 |
|
| 34 |
// subversion api |
| 35 |
#include "svn_path.h" |
| 36 |
+#include "svn_dirent_uri.h" |
| 37 |
|
| 38 |
// apr api |
| 39 |
#include "apr_file_io.h" |
| 40 |
@@ -63,8 +64,7 @@ namespace svn |
| 41 |
m_path = ""; |
| 42 |
else |
| 43 |
{ |
| 44 |
- const char * int_path = |
| 45 |
- svn_path_internal_style(path, pool.pool()); |
| 46 |
+ const char * int_path = svn_dirent_canonicalize(path, pool); |
| 47 |
|
| 48 |
m_path = int_path; |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
1.1 dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-2.patch |
| 54 |
|
| 55 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-2.patch?rev=1.1&view=markup |
| 56 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-2.patch?rev=1.1&content-type=text/plain |
| 57 |
|
| 58 |
Index: kdevplatform-1.2.3-svn17-2.patch |
| 59 |
=================================================================== |
| 60 |
commit cc7f0798d314cdac14b90e427abe22e99c6bd591 |
| 61 |
Author: Milian Wolff <mail@×××××××.de> |
| 62 |
Date: Fri Nov 18 16:23:36 2011 +0100 |
| 63 |
|
| 64 |
properly initialize client context for compatibility with subversion API |
| 65 |
|
| 66 |
this should hopefully fix the crash with svn 1.7 in kdevelop, please test |
| 67 |
|
| 68 |
BUG: 284061 |
| 69 |
|
| 70 |
diff --git a/plugins/subversion/kdevsvncpp/context.cpp b/plugins/subversion/kdevsvncpp/context.cpp |
| 71 |
index d277591..ddbb657 100644 |
| 72 |
--- a/plugins/subversion/kdevsvncpp/context.cpp |
| 73 |
+++ b/plugins/subversion/kdevsvncpp/context.cpp |
| 74 |
@@ -65,7 +65,7 @@ public: |
| 75 |
bool logIsSet; |
| 76 |
int promptCounter; |
| 77 |
Pool pool; |
| 78 |
- svn_client_ctx_t ctx; |
| 79 |
+ svn_client_ctx_t * ctx; |
| 80 |
std::string username; |
| 81 |
std::string password; |
| 82 |
std::string logMessage; |
| 83 |
@@ -205,26 +205,26 @@ public: |
| 84 |
svn_auth_open(&ab, providers, pool); |
| 85 |
|
| 86 |
// initialize ctx structure |
| 87 |
- memset(&ctx, 0, sizeof(ctx)); |
| 88 |
+ svn_client_create_context(&ctx, pool); |
| 89 |
|
| 90 |
// get the config based on the configDir passed in |
| 91 |
- svn_config_get_config(&ctx.config, c_configDir, pool); |
| 92 |
+ svn_config_get_config(&ctx->config, c_configDir, pool); |
| 93 |
|
| 94 |
// tell the auth functions where the config is |
| 95 |
svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR, |
| 96 |
c_configDir); |
| 97 |
|
| 98 |
- ctx.auth_baton = ab; |
| 99 |
- ctx.log_msg_func = onLogMsg; |
| 100 |
- ctx.log_msg_baton = this; |
| 101 |
- ctx.notify_func = onNotify; |
| 102 |
- ctx.notify_baton = this; |
| 103 |
- ctx.cancel_func = onCancel; |
| 104 |
- ctx.cancel_baton = this; |
| 105 |
+ ctx->auth_baton = ab; |
| 106 |
+ ctx->log_msg_func = onLogMsg; |
| 107 |
+ ctx->log_msg_baton = this; |
| 108 |
+ ctx->notify_func = onNotify; |
| 109 |
+ ctx->notify_baton = this; |
| 110 |
+ ctx->cancel_func = onCancel; |
| 111 |
+ ctx->cancel_baton = this; |
| 112 |
|
| 113 |
#if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 2) |
| 114 |
- ctx.notify_func2 = onNotify2; |
| 115 |
- ctx.notify_baton2 = this; |
| 116 |
+ ctx->notify_func2 = onNotify2; |
| 117 |
+ ctx->notify_baton2 = this; |
| 118 |
#endif |
| 119 |
} |
| 120 |
|
| 121 |
@@ -234,7 +234,7 @@ public: |
| 122 |
if (!value) |
| 123 |
param = (void *)"1"; |
| 124 |
|
| 125 |
- svn_auth_set_parameter(ctx.auth_baton, |
| 126 |
+ svn_auth_set_parameter(ctx->auth_baton, |
| 127 |
SVN_AUTH_PARAM_NO_AUTH_CACHE, |
| 128 |
param); |
| 129 |
} |
| 130 |
@@ -245,7 +245,7 @@ public: |
| 131 |
username = usr; |
| 132 |
password = pwd; |
| 133 |
|
| 134 |
- svn_auth_baton_t * ab = ctx.auth_baton; |
| 135 |
+ svn_auth_baton_t * ab = ctx->auth_baton; |
| 136 |
svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME, |
| 137 |
username.c_str()); |
| 138 |
svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD, |
| 139 |
@@ -654,13 +654,13 @@ public: |
| 140 |
|
| 141 |
Context::operator svn_client_ctx_t * () |
| 142 |
{ |
| 143 |
- return &(m->ctx); |
| 144 |
+ return m->ctx; |
| 145 |
} |
| 146 |
|
| 147 |
svn_client_ctx_t * |
| 148 |
Context::ctx() |
| 149 |
{ |
| 150 |
- return &(m->ctx); |
| 151 |
+ return m->ctx; |
| 152 |
} |
| 153 |
|
| 154 |
void |
Archives