From a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 20:02:04 +0100 Subject: gentoo resync : 28.04.2018 --- sci-astronomy/kstars/Manifest | 5 +- .../kstars/files/kstars-2.9.5-qt-5.11.patch | 31 +++++++++ sci-astronomy/kstars/kstars-2.9.4.ebuild | 74 --------------------- sci-astronomy/kstars/kstars-2.9.5.ebuild | 76 ++++++++++++++++++++++ 4 files changed, 110 insertions(+), 76 deletions(-) create mode 100644 sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch delete mode 100644 sci-astronomy/kstars/kstars-2.9.4.ebuild create mode 100644 sci-astronomy/kstars/kstars-2.9.5.ebuild (limited to 'sci-astronomy/kstars') diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest index 2dcfb336aa6a..2cd2e265f8af 100644 --- a/sci-astronomy/kstars/Manifest +++ b/sci-astronomy/kstars/Manifest @@ -1,5 +1,6 @@ +AUX kstars-2.9.5-qt-5.11.patch 776 BLAKE2B ab6d180fb89b526e4a50df17f24dad512bc25705611636076d287109d8ab6c4109030819458e0760339a59f3185451966c70e3970324cd152d486a18f3a5d6bb SHA512 6287dfdb0720e53d38ca6b24bd5c1c5cfd01af5db36de2b7d45551ac0c57d50d892a31830d8a3328fa1f36ebefc87635380593af97f6d5db0f17705dcb7742d3 DIST kstars-17.08.3.tar.xz 61485232 BLAKE2B 7ddf318ed9659814b49a5f8efe6ecc3b65d2ba30b4a368d00c6c46f96e42fe36be8e16244b097d665a95b82682bbac1d948999889c9dca56010d1cc4978ddc68 SHA512 fbd409a506f93283f1104ee40eae1f5b306db52483f56ee20a57398576449a0c702d5c6578dceac6543892c16459e3bff594538d801bb80c413d70792c2c68df -DIST kstars-2.9.4.tar.xz 63924708 BLAKE2B b67d77dd87b3d833a0aea572bbf9f20cb8796f0637b1ff185aaabfefa314382ba124fee4cb998654db3fd6da5ec0b53be1c45593bf74bbeae704a7853fca33b7 SHA512 913cfc1ea91b28248ba8baec8a3ddc8b8a1ae9563cc9b32b91f55e781d61cf6020480722598780dbeeb8a5309819bd5237e3b263c5e52b9c709272591a050c29 +DIST kstars-2.9.5.tar.xz 64033600 BLAKE2B 1d858d40d1ebccb1ae3217d8f3a464089171a6a9777cf759902017b373ceac3c7e56febf6ec3b2bed5db6cef779252e2d653e3c513545bf55261465465df2274 SHA512 850e3ad31f0c60547c406dc24bf3064f86867557f97acd63fb951d49fb09d7d20462a85016f8c645f316de0310cf7969e08c19e00fc0bedb5c1b006dfda0622b EBUILD kstars-17.08.3.ebuild 1897 BLAKE2B 78346da0af3f0f854b79130f26086edd5d8506de9f6c713e94f22dd0e27bd6dc9d87ec7a2234b92e8da0a6e12d24fc08066d0f165c27c7df30413f87288e77f0 SHA512 19735f1309ec5368bea65a1f3eaf24536fc1f452b4426b0c87fdeb23e8d61879fde560b84fc93181e7b12aabdfe07b3ce5cd5b2fd45437e7eb053de449f7f2ae -EBUILD kstars-2.9.4.ebuild 1911 BLAKE2B 9f5b868bb541c8fa104de3a385922570249c33c86c0eb58e64fa534fff3416ca915c02d98f0e1bb4ef21e1cb9f7f63da0d9e4254065e845e133c86b54e2256d6 SHA512 741dbb50907eef15eafb658a42fb82b1b11a6a861a166240936587ea3d11d89d02b78da9c5a01c8ec1161ff71090d6a9640b02828527cf69c1ae8efd50592f0e +EBUILD kstars-2.9.5.ebuild 1957 BLAKE2B 05fed53e5ef1f4d97fb92921c9c0a76cb438a93dd928f6e2baed1f09d6eebab62090f655753b58be0bb196c7cc003e5377ae8fdacb64234fa1b1ca44de73fb79 SHA512 be55db06571d17ace568ef48a08de6a5e169667986a6953592b5eb6cafd99fd16d8b82bc0287bfb9baddd171f22de33017cd224eaafd34561b750433a3f638c3 MISC metadata.xml 589 BLAKE2B 2615369c55a548e9263b3544a571c343ea5f1a60dc79b32c1124e06b1feef782f4631f31ecf4c52f37b8370ee8766198364008d3c77a310f5c1c2b34589f5d85 SHA512 e18188aaab2d0b650d7494849df568234e3e385917c70770652895e2907e4bed49ebb76d8874867eb54d008ac958b43eb0bf6486de49694ab299ac37ed8ab9d2 diff --git a/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch b/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch new file mode 100644 index 000000000000..72d4b8e4a48a --- /dev/null +++ b/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch @@ -0,0 +1,31 @@ +From cf510e4aee93bf1392df8e35931ba9bb9a07fc16 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 25 Apr 2018 22:05:50 +0200 +Subject: [PATCH] Fix build with Qt 5.11 (missing QDoubleValidator) + +Reviewers: mutlaqja + +Subscribers: #kde_edu + +Tags: #kde_edu + +Differential Revision: https://phabricator.kde.org/D12525 +--- + kstars/dialogs/focusdialog.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kstars/dialogs/focusdialog.cpp b/kstars/dialogs/focusdialog.cpp +index d09ce9273..b264ee5c9 100644 +--- a/kstars/dialogs/focusdialog.cpp ++++ b/kstars/dialogs/focusdialog.cpp +@@ -24,6 +24,7 @@ + #include "skyobjects/skypoint.h" + + #include ++#include + #include + #include + +-- +2.17.0 + diff --git a/sci-astronomy/kstars/kstars-2.9.4.ebuild b/sci-astronomy/kstars/kstars-2.9.4.ebuild deleted file mode 100644 index a481533f1106..000000000000 --- a/sci-astronomy/kstars/kstars-2.9.4.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -PYTHON_COMPAT=( python2_7 ) -inherit kde5 python-single-r1 - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Desktop Planetarium" -HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars" -IUSE="fits indi raw wcs xplanet" - -REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}" - -# TODO: AstrometryNet requires new package -COMMON_DEPEND=" - $(add_frameworks_dep kauth) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kplotting) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - sys-libs/zlib - fits? ( sci-libs/cfitsio ) - indi? ( >=sci-libs/indilib-1.4.0 ) - raw? ( media-libs/libraw:= ) - wcs? ( sci-astronomy/wcslib ) - xplanet? ( x11-misc/xplanet ) -" -# TODO: Add back when re-enabled by upstream -# opengl? ( -# $(add_qt_dep qtopengl) -# virtual/opengl -# ) -DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtconcurrent) - dev-cpp/eigen:3 -" -RDEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package fits CFitsio) - $(cmake-utils_use_find_package indi INDI) - $(cmake-utils_use_find_package raw LibRaw) - $(cmake-utils_use_find_package wcs WCSLIB) - $(cmake-utils_use_find_package xplanet Xplanet) - ) - - kde5_src_configure -} diff --git a/sci-astronomy/kstars/kstars-2.9.5.ebuild b/sci-astronomy/kstars/kstars-2.9.5.ebuild new file mode 100644 index 000000000000..cb8577f01377 --- /dev/null +++ b/sci-astronomy/kstars/kstars-2.9.5.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +PYTHON_COMPAT=( python2_7 ) +inherit kde5 python-single-r1 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Desktop Planetarium" +HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars" +IUSE="fits indi raw wcs xplanet" + +REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}" + +# TODO: AstrometryNet requires new package +COMMON_DEPEND=" + $(add_frameworks_dep kauth) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kplotting) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsql) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + sys-libs/zlib + fits? ( sci-libs/cfitsio ) + indi? ( >=sci-libs/indilib-1.4.0 ) + raw? ( media-libs/libraw:= ) + wcs? ( sci-astronomy/wcslib ) + xplanet? ( x11-misc/xplanet ) +" +# TODO: Add back when re-enabled by upstream +# opengl? ( +# $(add_qt_dep qtopengl) +# virtual/opengl +# ) +DEPEND="${COMMON_DEPEND} + $(add_qt_dep qtconcurrent) + dev-cpp/eigen:3 +" +RDEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} +" + +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package fits CFitsio) + $(cmake-utils_use_find_package indi INDI) + $(cmake-utils_use_find_package raw LibRaw) + $(cmake-utils_use_find_package wcs WCSLIB) + $(cmake-utils_use_find_package xplanet Xplanet) + ) + + kde5_src_configure +} -- cgit v1.2.3