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

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

4 files changed, 89 insertions, 18 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/Manifest b/kde-base/kstars/Manifest
index 0dfdd7d92182..59269b5afb62 100644
--- a/kde-base/kstars/Manifest
+++ b/kde-base/kstars/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kstars-4.14.3-indilib100.patch 923 SHA256 9bee0e827675384628608683cda305df12bf802ca0516898d77467ef8db84060 SHA512 370e688749349c0b3f1a9276b7e7f8b17001c16ed170dc160eae170354658895cc5b1149430c6f0e17ad86c738028acbb3888ae97c0298e12b082a49e9ccefcf WHIRLPOOL f9a179d67bd26b1d899701c446c4be2ca4b8c09c20aafe12e331fe31f5e7b91aca6a5bc805d0015b46faa577659bb77e30b042e4664c735ec57b9ba16ccb3776
 DIST kstars-4.14.3.tar.xz 12374500 SHA256 771c46e8985724d7f5be74f4813bfba0a62cbb48e1c8d0cd27394a6f0ef15bde SHA512 c843506ae0d85e03b9ac3b11be73f35b66f9fc64adddf7a4643cb397fc59628920254aa056d7bf968b54893ce035d40d0c17a7d0fc576d3dae5799fd0f16ec3e WHIRLPOOL 752f69a01d8344aed4c276bb4920c6791bf223aac8c8adfb0ab9833425b625793978316033a1cfba5ae43d221896a9c93a4e5b43f19a42730cbe7fc282318a0a
+EBUILD kstars-4.14.3-r1.ebuild 929 SHA256 8905374df527e20fc1aa802e2737c477fde286c2beb32f9015369e68c00fc96c SHA512 f7d12d24afc5f7e2b7536762314e0bf344feec5ae3fdb3d39a392a0a8b276dfb5feeb563d0c4860e04e4972ecb3bad9d8577ee7dbd11dadb0444256712591b87 WHIRLPOOL ca82662060a6f1b299f89dd0ebb6e1a80c73ff284e80303a2c9a54ec4427959854eebaf3b5db3b985c582964f842cca9983e22bd322ca3a99b121d44320a36b8
 EBUILD kstars-4.14.3.ebuild 866 SHA256 09a61c047d3338a95656de7858b20d5b9b5643f33101e11e37208fa14cfd958b SHA512 a8b65bda361639316d8fad70a4857cfddfe19918f3dbe93e5da0ec74860499424c350370605fe3f516dc6d1239f848c8f1fcfa716262c18fff83ec0eb9ef033b WHIRLPOOL 09ff686a8b38dedfdca6845b0ab54181d71f028159cd4d53dd47bad9e1933aba22d414d295217ee6d63eb241e6b6da9b2005e18ae21afa832d167a7cda2bcf92
-MISC ChangeLog 40508 SHA256 4107a4e683ee02a4dc2eb8f2a72ee4c60795fb77f4feefb527078de27216ee2b SHA512 a875566a4a02f8771cb6893202a37a177607feabadeac7a857d7f08182e5d8e7a1d8d9b2c17f2feb52afeb1a7433be846251232738a7324bedda299af15694aa WHIRLPOOL 287b3b213b49f14c7af35885362b70a042ea98e8d1531ff4004e444a543e042ede910d35300aac6bddd8571ba4697b4ccedf08b44aa1604d52c71ee19fff2c83
+MISC ChangeLog 40769 SHA256 f5f506d90f361949fddb726fe6a7fc9161aba3a1f25d57b79f371bce2f31d769 SHA512 ec25ab98baebdde16b10763eaff163124a4ff7a22a97034b3729d70f00ff32ad7d8f4414a4cc64cc86be89e11fb29a0347f9e6e861595aac4460eb7aa0f7542f WHIRLPOOL 1dfbd37bc55e0b50bf91d96da131d95db5882a2a3aec064cb449c470d92d62f64b7a0d7437b886d43b2e2ca656ceddc8c2f96320ba12e23dc09788d070922e5d
 MISC metadata.xml 340 SHA256 689195a7a93cf44147d58061940bc74b4b0a4c1b44529e70d7010cc6d1ed6e7a SHA512 a2371776990f7c60629fd24e4a72f4f3d00dd0c6a4e7bb283e506ca4aa4dcef81861fb740ae61e6964e0bece9a2c694c8edf69bbf85ed14ec98498c80fb48204 WHIRLPOOL 02eac595120392ae604b0e5a63cdf31ab7612ef1be06f8bb867bb4678f6acd1c7908c20c09694e06fee4f2553abb53ceb47b363529ee8388f9b65633a88835c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU5L1qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOY4wQAIBFDMws/DC5nnZpoeManYMN
-kJLCR01TkYub/3eJyyW56g34+t2adanchhw6i+zIRhT2szu/6odjsYl5Uu0+7p/t
-31bqvELuu+HAQexSNW2wHFAphcI2++rvriplN70uQr25bm98wo8hn2Ob6GYhPrqP
-S+0VOrC6HNTu7jtNWsdonKxxbzv9APL4YYPNYkPKodp4Rhq7qGUgbYQfbyIP/UL7
-Sdp70cLWgXFvGoGNFfn1weWChkfi8N/mRIauF8z5VqPw6L6RvrCFyM8iRMC8zP7Y
-dhD46kE0X+TyDzyexppRjz63O4CBrWXLOe0GppK+FCQoBbFAfbmgnZchjK7ACD8m
-wF/m+wg3g9CDyY6wvPF4dWiie1SOA3Lb1+WNSL9QKXrKCo2zfsULsfsOVZRi6ZG/
-EAhhZC8zetWMayGeTkY/xM+IrovO0u7RjY6lOobNqEbGaSOiiYeh4emW/9leaugz
-H+E8NFFaqF2JfDl2SZvUPDBIZ1h4x+t8WZcaX9DXIQBiF80Rypyj24NVHLBcRO8k
-fVeWeB3uE9lnNMlQo8VYpnlCEMbmEcPkCytniIHz5Zblbo+2GqUoP4aYWHBkTHeP
-b61JSb33FtaLplADUFqK7y1kpS74LV9Ai6nfT5tqg4dlInXmr44SY+TAxeMGO9dU
-JnOlyD4cBMUMfJmyHnUS
-=G2u2
+iQJiBAEBCABMBQJVIrMzRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7CNUEAC1Z85nEipQPccr4ztIltKTjyUuUDw3k0NY9p5IJhzE4DDqleIJ70KnCo9t
+XJOc+hszu1lgm+F6GA/2ldZRdrqNqNUAbQX0SmIvyB3LfbfuxjsvHACt0mv6zbm4
+fY8SKifk4n4KgjFelP/o6O5iuzFokXZXz5Sv5rOdTp1iqxtbHrONhP1BvyH0JmRh
+stAOq3TRIM4H3gxFAYCmP43sNp2LBYwCAQrkinhV+WeJ5h/om/AY1yGRtGKm96Dp
+jCFOXXnA3myNYLfohwjcvwYral3Ah9HJHhQVCKUDYdrkOjCMC1SzHvBklNmkyYeL
+XYqkCsAjN4LMXMx1MNweFKwA/GmY5QIMYK7OI4p1XxkFtmlJfXNHibEB5JI2pOeu
+ZuTysG1P9d9wBvpSbgQrXOBWUpxPiioa1k5PKv000yE2ZtUhpljoLFEPU5imm7b6
+poFR2fuPfdOrB9J4EzX9MoEdwtiaZEF1sfq6pNAQtrwKW9L5ZnIpzHCUfkEXNEpo
+VhhYMPt48dSbDagoEZbBB+Lq4BKTvlQpbumwsLNtU7zyiOiid/fwZaeR7fgCDmiW
+QfGZUN6S+mMaJSeP46OWDaTS3SZBjwc6osV7bTgdriFkpYTGw64LO0gYfKDf2eKr
+h+dtl7GXuH8kYskSsULTjv0+RNX6dCEV7n7HcLjqAu6eH3MDBA==
+=2CuE
 -----END PGP SIGNATURE-----
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
+}