diff options
author | Andreas Hüttel <dilfridge@gentoo.org> | 2011-08-07 18:13:06 +0000 |
---|---|---|
committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-08-07 18:13:06 +0000 |
commit | 61cdbe598e4a74263263224ec6e760d0cf34ae3d (patch) | |
tree | bb774be6716a736b79c0672fc1b76b84619c767c /dev-util | |
parent | Add ~ia64/~sparc wrt #351835 (diff) | |
download | historical-61cdbe598e4a74263263224ec6e760d0cf34ae3d.tar.gz historical-61cdbe598e4a74263263224ec6e760d0cf34ae3d.tar.bz2 historical-61cdbe598e4a74263263224ec6e760d0cf34ae3d.zip |
Add upstream patch to restore functionality, bug 374521
Package-Manager: portage-2.1.10.10/cvs/Linux x86_64
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/kscope/ChangeLog | 10 | ||||
-rw-r--r-- | dev-util/kscope/Manifest | 24 | ||||
-rw-r--r-- | dev-util/kscope/files/kscope-1.9.4-actions.patch | 90 | ||||
-rw-r--r-- | dev-util/kscope/kscope-1.9.4-r1.ebuild | 38 |
4 files changed, 159 insertions, 3 deletions
diff --git a/dev-util/kscope/ChangeLog b/dev-util/kscope/ChangeLog index cb81d178a33d..0860e6b06a50 100644 --- a/dev-util/kscope/ChangeLog +++ b/dev-util/kscope/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/kscope -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/ChangeLog,v 1.50 2010/02/01 17:48:01 hwoarang Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/ChangeLog,v 1.51 2011/08/07 18:13:06 dilfridge Exp $ + +*kscope-1.9.4-r1 (07 Aug 2011) + + 07 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> + +kscope-1.9.4-r1.ebuild, +files/kscope-1.9.4-actions.patch: + Add upstream patch to restore functionality, bug 374521 01 Feb 2010; Markos Chandras <hwoarang@gentoo.org> kscope-1.9.4.ebuild: Various clean up and installation fixes based on new qscintilla diff --git a/dev-util/kscope/Manifest b/dev-util/kscope/Manifest index b2d4c209606d..c05e15592b80 100644 --- a/dev-util/kscope/Manifest +++ b/dev-util/kscope/Manifest @@ -1,4 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +AUX kscope-1.9.4-actions.patch 3325 RMD160 abb9f3dbb90d840d7956b1346b259a0bc0135afa SHA1 1f0a52557747a530a0fb16ac6e0da2b20ec02c6c SHA256 6404f7f30657473237cb2a992baa80ef5a5aef072192dc5e2edee046464d2744 DIST kscope-1.9.4.tar.gz 127892 RMD160 a86bc524664390e6f3f076567370f4106542f4f4 SHA1 60b00601539367e60367ba9bd2532e7d8fbfee0c SHA256 7bd35960afa29026f8e0c4a827868e93b4d7c6e81796ceb89f086efbc24636df +EBUILD kscope-1.9.4-r1.ebuild 1014 RMD160 1e9767a1b6617b63708084799d1e907482e7cc31 SHA1 5897badad3ad37bc46adf0fa70af318849b65576 SHA256 b9183c44508ab84d018b61779ebd314a770ab998bf10817cf895345ecdd42dcd EBUILD kscope-1.9.4.ebuild 961 RMD160 174ac02468c57e1cf5b523c83b614cb307d1710b SHA1 c0d2c468e80f702d9e081c3244120728b70cbc5d SHA256 092f539ecd056698269d407774de02a1fa1b48e9a76b2aba0ea0470fe42c3c2d -MISC ChangeLog 6289 RMD160 fbd04c81df23aeeada7ca018f3867e523a1b23f8 SHA1 988aace48f8e5906b7c13641544c8e1e2e2f7533 SHA256 bad284110a4a37f6d796a6b7cbbc7a58b494ff69d9e8c9455b2922b386dd873d +MISC ChangeLog 6500 RMD160 e774daa88c34a07bc2f7e8d59b180758fad59f77 SHA1 5365bcd272e31b68ade1381ee2382a05118bc9cf SHA256 e10b3b5eeaf14695ac0cc278767dce4060d1413f75ebb1209445f0005fe8a536 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAEBCgAGBQJOPtXTAAoJEEb+UGWnxTyH1YEP+wSZwrDfaJwKHtbqAFtd/41s +PmRuDBZGOxvlLF4RxZI7JTwWahdiMypCRbjY9ybMFXgmgwQe+yZI8G5kllwItkF6 +6sTrtV2kIJDg9iNQooxPDjqPlox9gXMfu7QSS7VrmekUiBYKjgTo0CR3dC9/3jEp +NgV/EyVUWQoyokfcu/4BjgcZ7mGvxHN6A/rBGMzBvbax3rEgE42kcg+aEugEzhRF +372bZRSccZfFeS3NR3O1EgoUj4BnE/Qv6SC575AWgxOBDLl4T2fWSUFdMQXqPqDq +XEv4Pmfq00tcfmPiq1tb30LaeYb3elVoqsNdmmp0SpexrMw0MD0//qinqVYnUa8l +ii5YZe+fVLZCz3YFmC3UWUb+/tHsXOcKPwK+KbCxq+aDnf+wijsT06ONNqPb0zTP +D2U+WmDT4yw5E3dLOs/kkxndSLHvHGRUCiNVet2yXblWAHKyIe/P7/9lwheQ5skk +uHuyDvfeB1hmt2oj8t36GMbm7Kn99ODN7SH8ODwGkXKXcNqF73xwWpovIWfHNblt +ywMstLt5Dx7znlaumCEaEJJ6HF4Xp5rQ++6MTSdK472pj19NA2qHgr93gtfr8lKs +yGkPZwE2YbzJq5Lfdjn1S5+Nw2V5hTWpJlOUFyHOqTkyxJji2I9B3zYgtmcurLT5 +xARxicbLsqshz99oTvrx +=wyMT +-----END PGP SIGNATURE----- diff --git a/dev-util/kscope/files/kscope-1.9.4-actions.patch b/dev-util/kscope/files/kscope-1.9.4-actions.patch new file mode 100644 index 000000000000..d333efb0ab09 --- /dev/null +++ b/dev-util/kscope/files/kscope-1.9.4-actions.patch @@ -0,0 +1,90 @@ +--- trunk/app/actions.cpp 2009/08/26 13:17:03 203 ++++ trunk/app/actions.cpp 2009/09/07 19:58:30 204 +@@ -264,69 +264,58 @@ + QActionGroup* queryGroup = new QActionGroup(this); + connect(queryGroup, SIGNAL(triggered(QAction*)), this, + SLOT(query(QAction*))); ++ connect(ProjectManager::signalProxy(), SIGNAL(hasProject(bool)), ++ queryGroup, SLOT(setEnabled(bool))); ++ queryGroup->setEnabled(false); + + // Query references. +- action = new QAction(tr("&References"), this); ++ action = new QAction(tr("&References"), queryGroup); + action->setShortcut(tr("Ctrl+0")); + action->setStatusTip(tr("Find all symbol references")); + action->setData(Core::Query::References); + menu->addAction(action); +- projectGroup->addAction(action); +- queryGroup->addAction(action); + + // Query definition. +- action = new QAction(tr("&Definition"), this); ++ action = new QAction(tr("&Definition"), queryGroup); + action->setShortcut(tr("Ctrl+1")); + action->setStatusTip(tr("Find symbol definition")); + action->setData(Core::Query::Definition); + menu->addAction(action); +- projectGroup->addAction(action); +- queryGroup->addAction(action); + + // Query called functions. +- action = new QAction(tr("&Called Functions"), this); ++ action = new QAction(tr("&Called Functions"), queryGroup); + action->setShortcut(tr("Ctrl+2")); + action->setStatusTip(tr("Show functions called from function")); + action->setData(Core::Query::CalledFunctions); + menu->addAction(action); +- projectGroup->addAction(action); +- queryGroup->addAction(action); + + // Query calling functions. +- action = new QAction(tr("C&alling Functions"), this); ++ action = new QAction(tr("C&alling Functions"), queryGroup); + action->setShortcut(tr("Ctrl+3")); + action->setStatusTip(tr("Find functions calling function")); + action->setData(Core::Query::CallingFunctions); + menu->addAction(action); +- projectGroup->addAction(action); +- queryGroup->addAction(action); + + // Query text. +- action = new QAction(tr("&Text"), this); ++ action = new QAction(tr("&Text"), queryGroup); + action->setShortcut(tr("Ctrl+4")); + action->setStatusTip(tr("Find text in files")); + action->setData(Core::Query::Text); + menu->addAction(action); +- projectGroup->addAction(action); +- queryGroup->addAction(action); + + // Find file. +- action = new QAction(tr("&File"), this); ++ action = new QAction(tr("&File"), queryGroup); + action->setShortcut(tr("Ctrl+7")); + action->setStatusTip(tr("Find a file")); + action->setData(Core::Query::FindFile); + menu->addAction(action); +- projectGroup->addAction(action); +- queryGroup->addAction(action); + + // Find including files. +- action = new QAction(tr("&Including Files"), this); ++ action = new QAction(tr("&Including Files"), queryGroup); + action->setShortcut(tr("Ctrl+8")); + action->setStatusTip(tr("Find files #including a given file")); + action->setData(Core::Query::IncludingFiles); + menu->addAction(action); +- projectGroup->addAction(action); +- queryGroup->addAction(action); + + // Show local tags. + action = new QAction(tr("Local &Tags"), this); +@@ -348,6 +337,7 @@ + action->setStatusTip(tr("Create a call tree")); + connect(action, SIGNAL(triggered()), mainWnd(), SLOT(promptCallTree())); + menu->addAction(action); ++ projectGroup->addAction(action); + + // Settings menu. + menu = mainWnd()->menuBar()->addMenu(tr("&Settings")); diff --git a/dev-util/kscope/kscope-1.9.4-r1.ebuild b/dev-util/kscope/kscope-1.9.4-r1.ebuild new file mode 100644 index 000000000000..dee87f5ad03c --- /dev/null +++ b/dev-util/kscope/kscope-1.9.4-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/kscope-1.9.4-r1.ebuild,v 1.1 2011/08/07 18:13:06 dilfridge Exp $ + +EAPI=4 + +inherit eutils multilib qt4-r2 + +DESCRIPTION="Source Editing Environment for KDE" +HOMEPAGE="http://kscope.sourceforge.net/" +SRC_URI="mirror://sourceforge/kscope/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="4" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="" + +RDEPEND="x11-libs/qt-core:4 + x11-libs/qt-gui:4 + x11-libs/qscintilla" +DEPEND="${RDEPEND}" + +DOCS="ChangeLog" + +src_prepare() { + sed -i -e "s:/usr/local:/usr:" config || die + sed -i \ + -e "s:\$\${QSCI_ROOT_PATH}/include/Qsci:& /usr/include/qt4/Qsci:g" \ + -e "s:\$\${QSCI_ROOT_PATH}/lib:& -L/usr/lib/qt4:g" \ + -e "s:/lib:/$(get_libdir):g" \ + app/app.pro core/core.pro cscope/cscope.pro editor/editor.pro \ + || die + + # fix build failure with parallel make + echo "CONFIG += ordered" >> kscope.pro + + epatch "${FILESDIR}/${P}-actions.patch" +} |