* [gentoo-commits] proj/kde:master commit in: dev-util/kdevplatform/, dev-util/kdevplatform/files/
@ 2011-03-31 8:11 Vladimir Smirnov
0 siblings, 0 replies; 3+ messages in thread
From: Vladimir Smirnov @ 2011-03-31 8:11 UTC (permalink / raw
To: gentoo-commits
commit: fa05496dfe3a8689055ae0563c4f62588a504aac
Author: Vladimir Smirnov <civil.over <AT> gmail <DOT> com>
AuthorDate: Thu Mar 31 08:10:36 2011 +0000
Commit: Vladimir Smirnov <civil.over <AT> gmail <DOT> com>
CommitDate: Thu Mar 31 08:10:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fa05496d
kdevelop-1.2.0: Fix FTBFS with gcc 4.6. See bug 361421.
---
.../files/kdevplatform-1.2.0-gcc46.patch | 24 +++++++
dev-util/kdevplatform/kdevplatform-1.2.0.ebuild | 67 ++++++++++++++++++++
2 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch b/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch
new file mode 100644
index 0000000..4c789a3
--- /dev/null
+++ b/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch
@@ -0,0 +1,24 @@
+diff -ur kdevplatform-1.2.0/language/duchain/repositories/itemrepository.h kdevplatform-1.2.0-gcc46/language/duchain/repositories/itemrepository.h
+--- kdevplatform-1.2.0/language/duchain/repositories/itemrepository.h 2011-01-23 20:29:25.000000000 +0100
++++ kdevplatform-1.2.0-gcc46/language/duchain/repositories/itemrepository.h 2011-01-29 02:54:27.000000000 +0100
+@@ -236,7 +236,7 @@
+
+ QString m_name;
+ int m_version;
+- mutable ItemRepositoryRegistry& m_registry;
++ ItemRepositoryRegistry& m_registry;
+ AbstractRepositoryManager* (*m_shareMutex)();
+ };
+
+diff -ur kdevplatform-1.2.0/language/util/basicsetrepository.h kdevplatform-1.2.0-gcc46/language/util/basicsetrepository.h
+--- kdevplatform-1.2.0/language/util/basicsetrepository.h 2011-01-23 20:29:25.000000000 +0100
++++ kdevplatform-1.2.0-gcc46/language/util/basicsetrepository.h 2011-01-29 02:53:21.000000000 +0100
+@@ -129,7 +129,7 @@
+ SetNodeData data;
+
+ uint m_hash;
+- mutable SetDataRepository& repository;
++ SetDataRepository& repository;
+ mutable BasicSetRepository* setRepository; //May be zero when no notifications are wanted
+ mutable bool m_created;
+ };
diff --git a/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild b/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild
new file mode 100644
index 0000000..0c09f03
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild,v 1.3 2011/02/27 14:40:39 dilfridge Exp $
+
+EAPI=3
+
+# Bug 276208
+RESTRICT="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"
+
+KMNAME="kdevelop"
+KDE_MINIMAL="4.6"
+inherit kde4-base
+
+DESCRIPTION="KDE development support libraries and apps"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# Moved to playground for now
+# bazaar kompare mercurial
+LICENSE="GPL-2 LGPL-2"
+IUSE="cvs debug git reviewboard subversion"
+
+# Moved to playground for now
+# bazaar? ( dev-vcs/bzr )
+# kompare? ( >=kde-base/kompare-${KDE_MINIMAL} )
+# mercurial? ( dev-vcs/mercurial )
+# block - some plugins moved to kdevplatform from kdevelop
+DEPEND="
+ dev-libs/boost
+ reviewboard? ( dev-libs/qjson )
+ subversion? ( >=dev-vcs/subversion-1.3 )
+"
+RDEPEND="${DEPEND}
+ !<dev-util/kdevelop-${KDEVELOP_VERSION}:4
+ !dev-util/kdevelop-git
+ $(add_kdebase_dep konsole)
+ cvs? ( dev-vcs/cvs )
+ git? ( dev-vcs/git )
+"
+
+PATCHES="${FILESDIR}/${P}-gcc46.patch"
+
+src_prepare() {
+ kde4-base_src_prepare
+
+ # FindKDevPlatform.cmake is installed by kdelibs
+ sed -i \
+ -e '/cmakeFiles/s/^/#DONOTINSTALL/' \
+ cmake/modules/CMakeLists.txt || die
+}
+
+# Moved to playground for now
+# $(cmake-utils_use_build bazaar)
+# $(cmake-utils_use_with kompare)
+# $(cmake-utils_use_build mercurial)
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_build cvs)
+ $(cmake-utils_use_build git)
+ $(cmake-utils_use_with reviewboard QJSON)
+ $(cmake-utils_use_build subversion)
+ $(cmake-utils_use_with subversion SubversionLibrary)
+ )
+
+ kde4-base_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/kdevplatform/, dev-util/kdevplatform/files/
@ 2011-04-10 11:29 Tomas Chvatal
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal @ 2011-04-10 11:29 UTC (permalink / raw
To: gentoo-commits
commit: 8c633369474f9c3b529a2c8bd1a684d669b8e41e
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 11:20:21 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 11:29:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c633369
[kdevplatform] Sync with main tree.
---
.../files/kdevplatform-1.2.0-gcc46.patch | 24 -------
dev-util/kdevplatform/kdevplatform-1.2.0.ebuild | 67 --------------------
2 files changed, 0 insertions(+), 91 deletions(-)
diff --git a/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch b/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch
deleted file mode 100644
index 4c789a3..0000000
--- a/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur kdevplatform-1.2.0/language/duchain/repositories/itemrepository.h kdevplatform-1.2.0-gcc46/language/duchain/repositories/itemrepository.h
---- kdevplatform-1.2.0/language/duchain/repositories/itemrepository.h 2011-01-23 20:29:25.000000000 +0100
-+++ kdevplatform-1.2.0-gcc46/language/duchain/repositories/itemrepository.h 2011-01-29 02:54:27.000000000 +0100
-@@ -236,7 +236,7 @@
-
- QString m_name;
- int m_version;
-- mutable ItemRepositoryRegistry& m_registry;
-+ ItemRepositoryRegistry& m_registry;
- AbstractRepositoryManager* (*m_shareMutex)();
- };
-
-diff -ur kdevplatform-1.2.0/language/util/basicsetrepository.h kdevplatform-1.2.0-gcc46/language/util/basicsetrepository.h
---- kdevplatform-1.2.0/language/util/basicsetrepository.h 2011-01-23 20:29:25.000000000 +0100
-+++ kdevplatform-1.2.0-gcc46/language/util/basicsetrepository.h 2011-01-29 02:53:21.000000000 +0100
-@@ -129,7 +129,7 @@
- SetNodeData data;
-
- uint m_hash;
-- mutable SetDataRepository& repository;
-+ SetDataRepository& repository;
- mutable BasicSetRepository* setRepository; //May be zero when no notifications are wanted
- mutable bool m_created;
- };
diff --git a/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild b/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild
deleted file mode 100644
index 0c09f03..0000000
--- a/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild,v 1.3 2011/02/27 14:40:39 dilfridge Exp $
-
-EAPI=3
-
-# Bug 276208
-RESTRICT="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"
-
-KMNAME="kdevelop"
-KDE_MINIMAL="4.6"
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# Moved to playground for now
-# bazaar kompare mercurial
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs debug git reviewboard subversion"
-
-# Moved to playground for now
-# bazaar? ( dev-vcs/bzr )
-# kompare? ( >=kde-base/kompare-${KDE_MINIMAL} )
-# mercurial? ( dev-vcs/mercurial )
-# block - some plugins moved to kdevplatform from kdevelop
-DEPEND="
- dev-libs/boost
- reviewboard? ( dev-libs/qjson )
- subversion? ( >=dev-vcs/subversion-1.3 )
-"
-RDEPEND="${DEPEND}
- !<dev-util/kdevelop-${KDEVELOP_VERSION}:4
- !dev-util/kdevelop-git
- $(add_kdebase_dep konsole)
- cvs? ( dev-vcs/cvs )
- git? ( dev-vcs/git )
-"
-
-PATCHES="${FILESDIR}/${P}-gcc46.patch"
-
-src_prepare() {
- kde4-base_src_prepare
-
- # FindKDevPlatform.cmake is installed by kdelibs
- sed -i \
- -e '/cmakeFiles/s/^/#DONOTINSTALL/' \
- cmake/modules/CMakeLists.txt || die
-}
-
-# Moved to playground for now
-# $(cmake-utils_use_build bazaar)
-# $(cmake-utils_use_with kompare)
-# $(cmake-utils_use_build mercurial)
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_build cvs)
- $(cmake-utils_use_build git)
- $(cmake-utils_use_with reviewboard QJSON)
- $(cmake-utils_use_build subversion)
- $(cmake-utils_use_with subversion SubversionLibrary)
- )
-
- kde4-base_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/kdevplatform/, dev-util/kdevplatform/files/
@ 2012-02-14 15:39 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2012-02-14 15:39 UTC (permalink / raw
To: gentoo-commits
commit: c68fcbaeb20084ee74d235b741f021da05c9ac49
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 14:51:38 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 14:51:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c68fcbae
[dev-util/kdevplatform] Cleanup.
(Portage version: 2.2.0_alpha85/git/Linux x86_64, unsigned Manifest commit)
---
.../files/kdevplatform-1.2.3-svn17-1.patch | 32 -------
.../files/kdevplatform-1.2.3-svn17-2.patch | 95 --------------------
dev-util/kdevplatform/kdevplatform-1.2.81.ebuild | 7 +-
dev-util/kdevplatform/kdevplatform-9999.ebuild | 4 +-
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 c1ca758..0000000
--- 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 a240eed..0000000
--- 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 571066f..c213439 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 0ae4914..6a82cef 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-14 15:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-10 11:29 [gentoo-commits] proj/kde:master commit in: dev-util/kdevplatform/, dev-util/kdevplatform/files/ Tomas Chvatal
-- strict thread matches above, loose matches on Subject: below --
2012-02-14 15:39 Johannes Huber
2011-03-31 8:11 Vladimir Smirnov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox