diff options
| author |   Johannes Huber <johu@gentoo.org> | 2014-07-29 16:53:23 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2014-07-29 16:53:23 +0000 |
| commit | 8cefd13b5e32ab9c46ebd09b8df2c9d8b370815b (patch) | |
| tree | b341c6147a2768408872044351a689274fead708 /dev-util | |
| parent | Missing changelog message. (diff) | |
| download | gentoo-2-8cefd13b5e32ab9c46ebd09b8df2c9d8b370815b.tar.gz gentoo-2-8cefd13b5e32ab9c46ebd09b8df2c9d8b370815b.tar.bz2 gentoo-2-8cefd13b5e32ab9c46ebd09b8df2c9d8b370815b.zip | |
Revision bump adds upstream patch to fix new project creation with wizard spotted by Nanzikambe <janus.nanzikambe+gentoobugs@gmail.com>, bug #518486.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/kdevplatform/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch | 24 | ||||
| -rw-r--r-- | dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild (renamed from dev-util/kdevplatform/kdevplatform-1.6.0.ebuild) | 4 |
3 files changed, 36 insertions, 2 deletions
diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog index 53dfce9ed347..19ef05f9dab0 100644 --- a/dev-util/kdevplatform/ChangeLog +++ b/dev-util/kdevplatform/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-util/kdevplatform # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.89 2014/03/12 12:11:00 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.90 2014/07/29 16:53:23 johu Exp $ + +*kdevplatform-1.6.0-r1 (29 Jul 2014) + + 29 Jul 2014; Johannes Huber <johu@gentoo.org> + +files/kdevplatform-1.6.0-appwizard.patch, +kdevplatform-1.6.0-r1.ebuild, + -kdevplatform-1.6.0.ebuild: + Revision bump adds upstream patch to fix new project creation with wizard + spotted by Nanzikambe <janus.nanzikambe+gentoobugs@gmail.com>, bug #518486. *kdevplatform-1.6.0 (12 Mar 2014) diff --git a/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch b/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch new file mode 100644 index 000000000000..d4f93f66277f --- /dev/null +++ b/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch @@ -0,0 +1,24 @@ +commit 33b660dfefe02ecd4391a284f6fd6de9439b2b45 +Author: Milian Wolff <mail@milianw.de> +Date: Thu Mar 20 11:50:07 2014 +0100 + + Keep backwards compatibility: replace "dest" variable. + + Its an alias for PROJECTDIR and used in quite some templates + apparently. + + BUG: 329392 + +diff --git a/plugins/appwizard/appwizardplugin.cpp b/plugins/appwizard/appwizardplugin.cpp +index 3e22183..7948e47 100644 +--- a/plugins/appwizard/appwizardplugin.cpp ++++ b/plugins/appwizard/appwizardplugin.cpp +@@ -238,6 +238,8 @@ QString AppWizardPlugin::createProject(const ApplicationInfo& info) + m_variables["APPNAMELC"] = info.name.toLower(); + m_variables["APPNAMEID"] = generateIdentifier(info.name); + m_variables["PROJECTDIR"] = dest.toLocalFile(); ++ // backwards compatibility ++ m_variables["dest"] = m_variables["PROJECTDIR"]; + m_variables["PROJECTDIRNAME"] = dest.fileName(); + m_variables["VERSIONCONTROLPLUGIN"] = info.vcsPluginName; + diff --git a/dev-util/kdevplatform/kdevplatform-1.6.0.ebuild b/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild index dd4d943046e7..14dbb78cbbff 100644 --- a/dev-util/kdevplatform/kdevplatform-1.6.0.ebuild +++ b/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.6.0.ebuild,v 1.1 2014/03/12 12:11:00 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild,v 1.1 2014/07/29 16:53:23 johu Exp $ EAPI=5 @@ -41,6 +41,8 @@ RDEPEND="${DEPEND} cvs? ( dev-vcs/cvs ) " +PATCHES=( "${FILESDIR}/${P}-appwizard.patch" ) + src_configure() { mycmakeargs=( $(cmake-utils_use_build cvs) |