diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-03-11 09:18:16 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-03-11 09:18:16 +0000 |
| commit | ac433c48c72cefdb51c9ecfb3753d51969f54830 (patch) | |
| tree | 7de507cd5ca198e4fef64025300ed0d9b3392280 /x11-libs | |
| parent | Stable for amd64 wrt bug #461194 (diff) | |
| download | gentoo-2-ac433c48c72cefdb51c9ecfb3753d51969f54830.tar.gz gentoo-2-ac433c48c72cefdb51c9ecfb3753d51969f54830.tar.bz2 gentoo-2-ac433c48c72cefdb51c9ecfb3753d51969f54830.zip | |
Add patch to fix build of designer plugin when qscintilla is not installed.
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qscintilla/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qscintilla/files/qscintilla-2.7.1-designer.patch | 13 | ||||
| -rw-r--r-- | x11-libs/qscintilla/qscintilla-2.7.1.ebuild | 6 |
3 files changed, 23 insertions, 2 deletions
diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog index d590aeb4162c..212f1221111c 100644 --- a/x11-libs/qscintilla/ChangeLog +++ b/x11-libs/qscintilla/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qscintilla # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.84 2013/03/10 17:42:42 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.85 2013/03/11 09:18:16 kensington Exp $ + + 11 Mar 2013; Michael Palimaka <kensington@gentoo.org> + +files/qscintilla-2.7.1-designer.patch, qscintilla-2.7.1.ebuild: + Add patch to fix build of designer plugin when qscintilla is not installed. *qscintilla-2.7.1 (10 Mar 2013) diff --git a/x11-libs/qscintilla/files/qscintilla-2.7.1-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.7.1-designer.patch new file mode 100644 index 000000000000..3fe2f57992e2 --- /dev/null +++ b/x11-libs/qscintilla/files/qscintilla-2.7.1-designer.patch @@ -0,0 +1,13 @@ +This patch causes the designer plugin to be built against the just-built +qscintilla, rather than trying to build against the system qscintilla +which may not be installed yet. + +--- designer-Qt4Qt5/designer.pro ++++ designer-Qt4Qt5/designer.pro +@@ -26,4 +26,5 @@ + target.path = $$[QT_INSTALL_PLUGINS]/designer + INSTALLS += target + +-LIBS += -L$$[QT_INSTALL_LIBS] -lqscintilla2 ++INCLUDEPATH = ../Qt4Qt5 ++LIBS += -L../Qt4Qt5 -lqscintilla2 diff --git a/x11-libs/qscintilla/qscintilla-2.7.1.ebuild b/x11-libs/qscintilla/qscintilla-2.7.1.ebuild index 02f00e9d6e66..2e415171b450 100644 --- a/x11-libs/qscintilla/qscintilla-2.7.1.ebuild +++ b/x11-libs/qscintilla/qscintilla-2.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.1.ebuild,v 1.1 2013/03/10 17:42:42 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.1.ebuild,v 1.2 2013/03/11 09:18:16 kensington Exp $ EAPI=5 @@ -26,6 +26,10 @@ PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )" S=${WORKDIR}/${MY_P} +PATCHES=( + "${FILESDIR}/${PN}-2.7.1-designer.patch" +) + src_unpack() { qt4-r2_src_unpack |