diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-07 18:36:32 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-07 18:36:32 +0000 |
| commit | 1b1d4aa2de5ca0bbd614b2fa4c84e3c3239ba887 (patch) | |
| tree | b6c66c08d242dc9d5d7a3f8ab3db20fde41152a2 /dev-util | |
| parent | Add ~ia64/~sparc wrt #351835 (diff) | |
| download | gentoo-2-1b1d4aa2de5ca0bbd614b2fa4c84e3c3239ba887.tar.gz gentoo-2-1b1d4aa2de5ca0bbd614b2fa4c84e3c3239ba887.tar.bz2 gentoo-2-1b1d4aa2de5ca0bbd614b2fa4c84e3c3239ba887.zip | |
Fix underlinking, bug 368919
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/kscope/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/kscope/files/kscope-1.9.4-underlinking.patch | 13 | ||||
| -rw-r--r-- | dev-util/kscope/kscope-1.9.4-r1.ebuild | 4 |
3 files changed, 20 insertions, 3 deletions
diff --git a/dev-util/kscope/ChangeLog b/dev-util/kscope/ChangeLog index 0860e6b06a50..fef34c193301 100644 --- a/dev-util/kscope/ChangeLog +++ b/dev-util/kscope/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/kscope # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/ChangeLog,v 1.52 2011/08/07 18:36:32 dilfridge Exp $ + + 07 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> + kscope-1.9.4-r1.ebuild, +files/kscope-1.9.4-underlinking.patch: + Fix underlinking, bug 368919 *kscope-1.9.4-r1 (07 Aug 2011) diff --git a/dev-util/kscope/files/kscope-1.9.4-underlinking.patch b/dev-util/kscope/files/kscope-1.9.4-underlinking.patch new file mode 100644 index 000000000000..90b6fc365594 --- /dev/null +++ b/dev-util/kscope/files/kscope-1.9.4-underlinking.patch @@ -0,0 +1,13 @@ +diff -ruN kscope-1.9.4.orig/app/app.pro kscope-1.9.4/app/app.pro +--- kscope-1.9.4.orig/app/app.pro 2009-03-14 12:45:48.000000000 +0100 ++++ kscope-1.9.4/app/app.pro 2011-08-07 20:33:04.540575855 +0200 +@@ -58,7 +58,8 @@ + -L../cscope \ + -lkscope_cscope \ + -L../editor \ +- -lkscope_editor ++ -lkscope_editor \ ++ -lqscintilla2 + RESOURCES = app.qrc + target.path = $${INSTALL_PATH}/bin + INSTALLS += target diff --git a/dev-util/kscope/kscope-1.9.4-r1.ebuild b/dev-util/kscope/kscope-1.9.4-r1.ebuild index dee87f5ad03c..191faf7b4133 100644 --- a/dev-util/kscope/kscope-1.9.4-r1.ebuild +++ b/dev-util/kscope/kscope-1.9.4-r1.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/kscope-1.9.4-r1.ebuild,v 1.2 2011/08/07 18:36:32 dilfridge Exp $ EAPI=4 @@ -34,5 +34,5 @@ src_prepare() { # fix build failure with parallel make echo "CONFIG += ordered" >> kscope.pro - epatch "${FILESDIR}/${P}-actions.patch" + epatch "${FILESDIR}/${P}"-{actions,underlinking}.patch } |