diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2015-07-15 17:14:09 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-07-15 17:14:09 +0000 |
| commit | 26fbf2fd2d4cd8b3a0392622347b9d6e409e1210 (patch) | |
| tree | 3fb287feaf9cc6d35c3ebe77568ad116d5ba8042 /sci-astronomy | |
| parent | amd64 stable wrt bug #554802 (diff) | |
| download | gentoo-2-26fbf2fd2d4cd8b3a0392622347b9d6e409e1210.tar.gz gentoo-2-26fbf2fd2d4cd8b3a0392622347b9d6e409e1210.tar.bz2 gentoo-2-26fbf2fd2d4cd8b3a0392622347b9d6e409e1210.zip | |
add upstream patch to fix building against qt55 (bug #554616)
(Portage version: 2.2.20/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sci-astronomy')
| -rw-r--r-- | sci-astronomy/stellarium/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-astronomy/stellarium/files/stellarium-0.13.3-qt55.patch | 23 | ||||
| -rw-r--r-- | sci-astronomy/stellarium/stellarium-0.13.3.ebuild | 3 |
3 files changed, 30 insertions, 2 deletions
diff --git a/sci-astronomy/stellarium/ChangeLog b/sci-astronomy/stellarium/ChangeLog index 24efe696ae3a..ba94cf746b9c 100644 --- a/sci-astronomy/stellarium/ChangeLog +++ b/sci-astronomy/stellarium/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-astronomy/stellarium # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.131 2015/05/09 05:36:07 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.132 2015/07/15 17:14:09 mr_bones_ Exp $ + + 15 Jul 2015; Michael Sterrett <mr_bones_@gentoo.org> + +files/stellarium-0.13.3-qt55.patch, stellarium-0.13.3.ebuild: + add upstream patch to fix building against qt55 (bug #554616) 09 May 2015; Michael Sterrett <mr_bones_@gentoo.org> -stellarium-0.13.2.ebuild: diff --git a/sci-astronomy/stellarium/files/stellarium-0.13.3-qt55.patch b/sci-astronomy/stellarium/files/stellarium-0.13.3-qt55.patch new file mode 100644 index 000000000000..b4f7d5a44421 --- /dev/null +++ b/sci-astronomy/stellarium/files/stellarium-0.13.3-qt55.patch @@ -0,0 +1,23 @@ +diff -ur -x CMakeFiles -x Makefile -x 'CMake*' stellarium-0.13.3/work/stellarium-0.13.3/src/CLIProcessor.hpp stellarium-0.13.3-new/work/stellarium-0.13.3/src/CLIProcessor.hpp +--- src/CLIProcessor.hpp 2015-03-08 12:41:55.000000000 +0100 ++++ src/CLIProcessor.hpp 2015-07-12 13:29:36.059179087 +0200 +@@ -21,6 +21,7 @@ + #define CLIPROCESSOR_HPP + + #include <QStringList> ++#include <QVariant> + + class QSettings; + +diff -ur -x CMakeFiles -x Makefile -x 'CMake*' stellarium-0.13.3/work/stellarium-0.13.3/src/core/StelSkyCultureMgr.hpp stellarium-0.13.3-new/work/stellarium-0.13.3/src/core/StelSkyCultureMgr.hpp +--- src/core/StelSkyCultureMgr.hpp 2015-03-08 12:41:55.000000000 +0100 ++++ src/core/StelSkyCultureMgr.hpp 2015-07-12 13:28:32.589064791 +0200 +@@ -23,6 +23,7 @@ + #include <QMap> + #include <QString> + #include <QStringList> ++#include <QObject> + + //! @class StelSkyCulture + //! Store basic info about a sky culture for stellarium. + diff --git a/sci-astronomy/stellarium/stellarium-0.13.3.ebuild b/sci-astronomy/stellarium/stellarium-0.13.3.ebuild index 1826d1ba0fa5..524805b281b0 100644 --- a/sci-astronomy/stellarium/stellarium-0.13.3.ebuild +++ b/sci-astronomy/stellarium/stellarium-0.13.3.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/sci-astronomy/stellarium/stellarium-0.13.3.ebuild,v 1.2 2015/05/08 15:22:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.13.3.ebuild,v 1.3 2015/07/15 17:14:09 mr_bones_ Exp $ EAPI=5 inherit cmake-utils eutils flag-o-matic gnome2-utils @@ -53,6 +53,7 @@ for X in "${LANGS[@]}" ; do done src_prepare() { + epatch "${FILESDIR}"/${P}-qt55.patch if [[ -n ${LINGUAS} ]] ; then sed -i \ -e '/aa ab ae/d' \ |