diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-06-01 08:59:11 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-06-01 08:59:11 +0000 |
| commit | 51959adb6a1803e74842cc2009e32cc55f879a57 (patch) | |
| tree | 77535d6db84f9b57bf806b9883a8485418a58309 /app-office | |
| parent | Bump asn1-parse to 0.9.1 (diff) | |
| download | gentoo-2-51959adb6a1803e74842cc2009e32cc55f879a57.tar.gz gentoo-2-51959adb6a1803e74842cc2009e32cc55f879a57.tar.bz2 gentoo-2-51959adb6a1803e74842cc2009e32cc55f879a57.zip | |
Add patch for missing includes, bug #550162
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/scribus/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/scribus/files/scribus-1.5.0-QObject.patch | 15 | ||||
| -rw-r--r-- | app-office/scribus/scribus-1.5.0-r1.ebuild | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog index 30b1f89b0d19..9ab9451a6899 100644 --- a/app-office/scribus/ChangeLog +++ b/app-office/scribus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/scribus # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.210 2015/05/29 09:37:12 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.211 2015/06/01 08:59:11 jlec Exp $ + + 01 Jun 2015; Justin Lecher <jlec@gentoo.org> + +files/scribus-1.5.0-QObject.patch, scribus-1.5.0-r1.ebuild: + Add patch for missing includes, bug #550162 *scribus-1.5.0-r1 (29 May 2015) diff --git a/app-office/scribus/files/scribus-1.5.0-QObject.patch b/app-office/scribus/files/scribus-1.5.0-QObject.patch new file mode 100644 index 000000000000..1ad2d1a575cc --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.0-QObject.patch @@ -0,0 +1,15 @@ + scribus/sclayer.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scribus/sclayer.cpp b/scribus/sclayer.cpp +index 502112b..4da7bd5 100644 +--- a/scribus/sclayer.cpp ++++ b/scribus/sclayer.cpp +@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place. +
+ #include <QHash> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
+ #include <QVector> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
++#include <QObject>
+ #include <QtAlgorithms>
+
+ ScLayer::ScLayer(void)
diff --git a/app-office/scribus/scribus-1.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild index c6a3b92ab5d5..fde818145dd2 100644 --- a/app-office/scribus/scribus-1.5.0-r1.ebuild +++ b/app-office/scribus/scribus-1.5.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.5.0-r1.ebuild,v 1.1 2015/05/29 09:37:12 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.5.0-r1.ebuild,v 1.2 2015/06/01 08:59:11 jlec Exp $ EAPI=5 @@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/${P}-docdir.patch "${FILESDIR}"/${P}-fpic.patch + "${FILESDIR}"/${P}-QObject.patch ) src_prepare() { |