Backport patch from upstream solving build failure with sci-libs/indilib-1.0.0 wrt bug #545542.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

3 files changed, 71 insertions, 1 deletions

diff --git a/kde-base/kstars/ChangeLog b/kde-base/kstars/ChangeLog
index 1d4af570d390..f4e260c32d01 100644
--- a/kde-base/kstars/ChangeLog
+++ b/kde-base/kstars/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kstars
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.348 2015/02/18 16:26:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.349 2015/04/06 16:24:00 kensington Exp $
+
+*kstars-4.14.3-r1 (06 Apr 2015)
+
+  06 Apr 2015; Michael Palimaka <kensington@gentoo.org>
+  +files/kstars-4.14.3-indilib100.patch, +kstars-4.14.3-r1.ebuild:
+  Backport patch from upstream solving build failure with sci-libs/indilib-1.0.0
+  wrt bug #545542.
 
   18 Feb 2015; Michał Górny <mgorny@gentoo.org> -kstars-4.12.5.ebuild:
   Remove KDE SC 4.12
diff --git a/kde-base/kstars/files/kstars-4.14.3-indilib100.patch b/kde-base/kstars/files/kstars-4.14.3-indilib100.patch
new file mode 100644
index 000000000000..9b26cec4f0ac
--- /dev/null
+++ b/kde-base/kstars/files/kstars-4.14.3-indilib100.patch
@@ -0,0 +1,26 @@
+From 97c3d53af2998420f7646b3a482417d00c291ec8 Mon Sep 17 00:00:00 2001
+From: Jasem Mutlaq <mutlaqja@ikarustech.com>
+Date: Mon, 1 Dec 2014 00:50:27 +0300
+Subject: [PATCH] use std::string from libindi
+
+---
+ kstars/indi/indidevice.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kstars/indi/indidevice.cpp b/kstars/indi/indidevice.cpp
+index f52decc..2a05ca6 100644
+--- a/kstars/indi/indidevice.cpp
++++ b/kstars/indi/indidevice.cpp
+@@ -268,7 +268,8 @@ void INDI_D::updateMessageLog(INDI::BaseDevice *idv, int messageID)
+         return;
+ 
+     msgST_w->ensureCursorVisible();
+-    msgST_w->insertPlainText(dv->messageQueue(messageID) + QString("\n"));
++    msgST_w->insertPlainText(QString::fromStdString(dv->messageQueue(messageID)));
++    msgST_w->insertPlainText("\n");
+     QTextCursor c = msgST_w->textCursor();
+     c.movePosition(QTextCursor::Start);
+     msgST_w->setTextCursor(c);
+-- 
+2.0.5
+
diff --git a/kde-base/kstars/kstars-4.14.3-r1.ebuild b/kde-base/kstars/kstars-4.14.3-r1.ebuild
new file mode 100644
index 000000000000..f094a2601ab0
--- /dev/null
+++ b/kde-base/kstars/kstars-4.14.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.14.3-r1.ebuild,v 1.1 2015/04/06 16:24:00 kensington Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="KDE Desktop Planetarium"
+HOMEPAGE="http://www.kde.org/applications/education/kstars http://edu.kde.org/kstars"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug fits indi"
+
+REQUIRED_USE="indi? ( fits )"
+
+DEPEND="
+	dev-cpp/eigen:3
+	$(add_kdebase_dep libkdeedu)
+	fits? ( >=sci-libs/cfitsio-0.390 )
+	indi? ( >=sci-libs/indilib-0.9.8 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-indilib100.patch" )
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	local mycmakeargs=(
+		$(cmake-utils_use_with fits CFitsio)
+		$(cmake-utils_use_with indi)
+	)
+
+	kde4-base_src_configure
+}