diff options
4 files changed, 6 insertions, 132 deletions
diff --git a/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-1.patch b/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-1.patch deleted file mode 100644 index c1ca7582e19..00000000000 --- a/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-1.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 74dec52749e3c3af2ac6492f50e2676128f35b27 -Author: Milian Wolff <mail@milianw.de> -Date: Fri Nov 18 16:26:06 2011 +0100 - - fix svn api usage: use svn_dirent_canonicalize instead of svn_path_internal_style - - this was suggested by Stephan Sperling - - CCBUG: 284061 - -diff --git a/plugins/subversion/kdevsvncpp/path.cpp b/plugins/subversion/kdevsvncpp/path.cpp -index eaa84c1..4dced08 100644 ---- a/plugins/subversion/kdevsvncpp/path.cpp -+++ b/plugins/subversion/kdevsvncpp/path.cpp -@@ -24,6 +24,7 @@ - - // subversion api - #include "svn_path.h" -+#include "svn_dirent_uri.h" - - // apr api - #include "apr_file_io.h" -@@ -63,8 +64,7 @@ namespace svn - m_path = ""; - else - { -- const char * int_path = -- svn_path_internal_style(path, pool.pool()); -+ const char * int_path = svn_dirent_canonicalize(path, pool); - - m_path = int_path; - diff --git a/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-2.patch b/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-2.patch deleted file mode 100644 index a240eedc438..00000000000 --- a/dev-util/kdevplatform/files/kdevplatform-1.2.3-svn17-2.patch +++ /dev/null @@ -1,95 +0,0 @@ -commit cc7f0798d314cdac14b90e427abe22e99c6bd591 -Author: Milian Wolff <mail@milianw.de> -Date: Fri Nov 18 16:23:36 2011 +0100 - - properly initialize client context for compatibility with subversion API - - this should hopefully fix the crash with svn 1.7 in kdevelop, please test - - BUG: 284061 - -diff --git a/plugins/subversion/kdevsvncpp/context.cpp b/plugins/subversion/kdevsvncpp/context.cpp -index d277591..ddbb657 100644 ---- a/plugins/subversion/kdevsvncpp/context.cpp -+++ b/plugins/subversion/kdevsvncpp/context.cpp -@@ -65,7 +65,7 @@ public: - bool logIsSet; - int promptCounter; - Pool pool; -- svn_client_ctx_t ctx; -+ svn_client_ctx_t * ctx; - std::string username; - std::string password; - std::string logMessage; -@@ -205,26 +205,26 @@ public: - svn_auth_open(&ab, providers, pool); - - // initialize ctx structure -- memset(&ctx, 0, sizeof(ctx)); -+ svn_client_create_context(&ctx, pool); - - // get the config based on the configDir passed in -- svn_config_get_config(&ctx.config, c_configDir, pool); -+ svn_config_get_config(&ctx->config, c_configDir, pool); - - // tell the auth functions where the config is - svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR, - c_configDir); - -- ctx.auth_baton = ab; -- ctx.log_msg_func = onLogMsg; -- ctx.log_msg_baton = this; -- ctx.notify_func = onNotify; -- ctx.notify_baton = this; -- ctx.cancel_func = onCancel; -- ctx.cancel_baton = this; -+ ctx->auth_baton = ab; -+ ctx->log_msg_func = onLogMsg; -+ ctx->log_msg_baton = this; -+ ctx->notify_func = onNotify; -+ ctx->notify_baton = this; -+ ctx->cancel_func = onCancel; -+ ctx->cancel_baton = this; - - #if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 2) -- ctx.notify_func2 = onNotify2; -- ctx.notify_baton2 = this; -+ ctx->notify_func2 = onNotify2; -+ ctx->notify_baton2 = this; - #endif - } - -@@ -234,7 +234,7 @@ public: - if (!value) - param = (void *)"1"; - -- svn_auth_set_parameter(ctx.auth_baton, -+ svn_auth_set_parameter(ctx->auth_baton, - SVN_AUTH_PARAM_NO_AUTH_CACHE, - param); - } -@@ -245,7 +245,7 @@ public: - username = usr; - password = pwd; - -- svn_auth_baton_t * ab = ctx.auth_baton; -+ svn_auth_baton_t * ab = ctx->auth_baton; - svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME, - username.c_str()); - svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD, -@@ -654,13 +654,13 @@ public: - - Context::operator svn_client_ctx_t * () - { -- return &(m->ctx); -+ return m->ctx; - } - - svn_client_ctx_t * - Context::ctx() - { -- return &(m->ctx); -+ return m->ctx; - } - - void diff --git a/dev-util/kdevplatform/kdevplatform-1.2.81.ebuild b/dev-util/kdevplatform/kdevplatform-1.2.81.ebuild index 571066fa6d1..c21343958d9 100644 --- a/dev-util/kdevplatform/kdevplatform-1.2.81.ebuild +++ b/dev-util/kdevplatform/kdevplatform-1.2.81.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -12,6 +12,7 @@ VIRTUALX_REQUIRED=test KDE_LINGUAS="ca ca@valencia da de en_GB es et fr it nb nds nl pt pt_BR ru sl sv th uk zh_CN zh_TW" inherit kde4-base +SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" DESCRIPTION="KDE development support libraries and apps" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" @@ -19,7 +20,6 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" # bazaar kompare mercurial LICENSE="GPL-2 LGPL-2" IUSE="cvs debug git reviewboard subversion" -SLOT=0 # Moved to playground for now # bazaar? ( dev-vcs/bzr ) @@ -32,7 +32,8 @@ DEPEND=" subversion? ( dev-vcs/subversion ) " RDEPEND="${DEPEND} - !<dev-util/kdevelop-${KDEVELOP_VERSION} + !<dev-util/kdevelop-${KDEVELOP_VERSION}:4 + !dev-util/kdevelop-git $(add_kdebase_dep konsole) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild index 0ae491495d0..6a82cef47ac 100644 --- a/dev-util/kdevplatform/kdevplatform-9999.ebuild +++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild @@ -7,7 +7,7 @@ EAPI=4 KMNAME="kdevelop" KDE_SCM="git" EGIT_REPONAME="${PN}" -KDE_MINIMAL="4.6" +KDE_MINIMAL="4.7" VIRTUALX_REQUIRED=test KDE_LINGUAS="ca ca@valencia da de en_GB es et fi gl it nds nl pt pt_BR sl sv th uk zh_CN zh_TW" inherit kde4-base @@ -28,7 +28,7 @@ IUSE="cvs debug git reviewboard subversion" DEPEND=" dev-libs/boost reviewboard? ( dev-libs/qjson ) - subversion? ( >=dev-vcs/subversion-1.3 ) + subversion? ( dev-vcs/subversion ) " RDEPEND="${DEPEND} !<dev-util/kdevelop-${KDEVELOP_VERSION}:4 |