* [gentoo-commits] proj/kde:master commit in: kde-apps/kstars/, kde-apps/kstars/files/
@ 2016-01-04 16:21 Michael Palimaka
0 siblings, 0 replies; only message in thread
From: Michael Palimaka @ 2016-01-04 16:21 UTC (permalink / raw
To: gentoo-commits
commit: c25c2faba518383cc58e5efede15b874c2d78603
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan 2 18:26:50 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 16:21:34 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c25c2fab
kde-apps/kstars: Fix 15.12.0, drop unused qt5/kf5 DEPENDs
Package-Manager: portage-2.2.24
.../files/kstars-15.12.0-unused-kf5-deps.patch | 79 ++++++++++++++++++++++
.../files/kstars-15.12.0-unused-qt-deps.patch | 60 ++++++++++++++++
...ars-15.12.0.ebuild => kstars-15.12.0-r1.ebuild} | 42 ++++++------
kde-apps/kstars/kstars-15.12.49.9999.ebuild | 21 +++---
kde-apps/kstars/kstars-9999.ebuild | 20 ++----
kde-apps/kstars/metadata.xml | 1 -
6 files changed, 174 insertions(+), 49 deletions(-)
diff --git a/kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch b/kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch
new file mode 100644
index 0000000..0623845
--- /dev/null
+++ b/kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch
@@ -0,0 +1,79 @@
+From: Akarsh Simha <akarsh@kde.org>
+Date: Thu, 31 Dec 2015 10:40:37 +0000
+Subject: [NEEDS TESTING] Remove "fake" KF5 dependencies from CMakeLists.txt
+X-Git-Url: http://quickgit.kde.org/?p=kstars.git&a=commitdiff&h=14ca537e2676267bed73a40f0b8efd94d7cbc761
+---
+[NEEDS TESTING] Remove "fake" KF5 dependencies from CMakeLists.txt
+
+Removed the following KF5 frameworks: JobWidgets, DBusAddons, TextEditor
+
+Moved the Notifications KF5 framework as required only if INDI is
+present.
+
+Builds both with and without INDI (but not in a completely thorough
+test) on my setup (ArchLinux)
+
+Jasem: please double check that it builds correctly for you too
+with/without INDI.
+
+CCMAIL: mutlaqja@ikarustech.com
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,16 +32,13 @@
+ GuiAddons
+ WidgetsAddons
+ NewStuff
+- DBusAddons
++# DBusAddons
+ I18n
+ Init
+- JobWidgets
+ KIO
+ XmlGui
+ Plotting
+- TextEditor
+ IconThemes
+- Notifications
+ )
+
+ find_package(Eigen3 REQUIRED)
+@@ -61,6 +58,8 @@
+ find_package(INDI 1.2.0)
+ #FIXME is there a better way to do this?
+ if (INDI_FOUND)
++#FIXME is the following the right way of doing this?
++find_package(KF5 REQUIRED COMPONENTS Notifications)
+ SET(HAVE_INDI 1)
+ else(INDI_FOUND)
+ SET(HAVE_INDI 0)
+
+--- a/kstars/CMakeLists.txt
++++ b/kstars/CMakeLists.txt
+@@ -541,10 +541,9 @@
+ KF5::KIOFileWidgets
+ KF5::WidgetsAddons
+ KF5::Plotting
+- KF5::TextEditor
+- KF5::DBusAddons
++# KF5::TextEditor
++# KF5::DBusAddons
+ KF5::IconThemes
+- KF5::Notifications
+ Qt5::Gui
+ Qt5::PrintSupport
+ Qt5::Sql
+@@ -561,7 +560,9 @@
+ target_link_libraries(KStarsLib ${CFITSIO_LIBRARIES})
+ endif (CFITSIO_FOUND)
+ if (INDI_FOUND)
+- target_link_libraries(KStarsLib ${CMAKE_THREAD_LIBS_INIT} ${INDI_LIBRARIES} ${INDI_CLIENT_LIBRARIES} z)
++ target_link_libraries(KStarsLib ${CMAKE_THREAD_LIBS_INIT}
++ ${INDI_LIBRARIES} ${INDI_CLIENT_LIBRARIES}
++ KF5::Notifications z)
+ endif (INDI_FOUND)
+ if (WCSLIB_FOUND)
+ target_link_libraries(KStarsLib ${WCSLIB_LIBRARIES})
+
diff --git a/kde-apps/kstars/files/kstars-15.12.0-unused-qt-deps.patch b/kde-apps/kstars/files/kstars-15.12.0-unused-qt-deps.patch
new file mode 100644
index 0000000..f819ec4
--- /dev/null
+++ b/kde-apps/kstars/files/kstars-15.12.0-unused-qt-deps.patch
@@ -0,0 +1,60 @@
+From: Jasem Mutlaq <mutlaqja@ikarustech.com>
+Date: Wed, 30 Dec 2015 17:02:20 +0000
+Subject: Removing unncessary dependencies on Qt modules for Test OpenGL QML QtQuick QtMultimedia. We should re-enable QML/QtQuick if someone manager to migrate what is interesting tonight tool
+X-Git-Url: http://quickgit.kde.org/?p=kstars.git&a=commitdiff&h=2f09f40aca053048ffb65621e3c18780cdc5cbe3
+---
+Removing unncessary dependencies on Qt modules for Test OpenGL QML QtQuick QtMultimedia. We should re-enable QML/QtQuick if someone manager to migrate what is interesting tonight tool
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,8 @@
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
+
+-find_package(Qt5 5.2 REQUIRED COMPONENTS Gui Qml Quick Xml Sql Svg OpenGL PrintSupport Multimedia Test)
++#find_package(Qt5 5.2 REQUIRED COMPONENTS Gui Qml Quick Xml Sql Svg PrintSupport)
++find_package(Qt5 5.2 REQUIRED COMPONENTS Gui Xml Sql Svg PrintSupport)
+ include(KDEInstallDirs)
+ include(KDECompilerSettings)
+ include(KDECMakeSettings)
+--- a/kstars/CMakeLists.txt
++++ b/kstars/CMakeLists.txt
+@@ -549,9 +549,8 @@
+ Qt5::PrintSupport
+ Qt5::Sql
+ Qt5::Svg
+- Qt5::Multimedia
+- Qt5::Qml
+- Qt5::Quick
++ #Qt5::Qml
++ #Qt5::Quick
+ ${ZLIB_LIBRARIES}
+ )
+
+--- a/kstars/kstars.cpp
++++ b/kstars/kstars.cpp
+@@ -39,7 +39,7 @@
+ #include "dialogs/finddialog.h"
+ #include "dialogs/exportimagedialog.h"
+ #include "observinglist.h"
+-#include "whatsinteresting/wiview.h"
++//#include "whatsinteresting/wiview.h"
+
+ #include "kstarsadaptor.h"
+
+--- a/kstars/kstarsactions.cpp
++++ b/kstars/kstarsactions.cpp
+@@ -30,8 +30,8 @@
+ #include <QDockWidget>
+ #include <QPointer>
+ #include <QInputDialog>
+-#include <QQuickWindow>
+-#include <QQuickView>
++//#include <QQuickWindow>
++//#include <QQuickView>
+ #include <QDebug>
+ #include <QAction>
+ #include <QFileDialog>
+
diff --git a/kde-apps/kstars/kstars-15.12.0.ebuild b/kde-apps/kstars/kstars-15.12.0-r1.ebuild
similarity index 65%
rename from kde-apps/kstars/kstars-15.12.0.ebuild
rename to kde-apps/kstars/kstars-15.12.0-r1.ebuild
index f25824f..63ecc44 100644
--- a/kde-apps/kstars/kstars-15.12.0.ebuild
+++ b/kde-apps/kstars/kstars-15.12.0-r1.ebuild
@@ -4,58 +4,60 @@
EAPI=5
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="forceoptional"
+KDE_PUNT_BOGUS_DEPS="true"
PYTHON_COMPAT=( python2_7 )
inherit kde5 python-single-r1
DESCRIPTION="Desktop Planetarium"
HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
KEYWORDS="~amd64 ~x86"
-IUSE="fits indi wcs xplanet"
-
-REQUIRED_USE="indi? ( fits )"
+IUSE="indi wcs xplanet"
# TODO: AstrometryNet requires new package
# FIXME: doesn't build without sci-libs/cfitsio as of 15.04.0
-DEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep kconfig)
- $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kinit)
- $(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep kio)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep kplotting)
- $(add_frameworks_dep ktexteditor)
$(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
- dev-cpp/eigen:3
- dev-qt/qtdeclarative:5
+ dev-qt/qtdbus:5
dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
>=sci-libs/cfitsio-0.390
sys-libs/zlib
- indi? ( >=sci-libs/indilib-1.0.0 )
+ indi? (
+ $(add_frameworks_dep knotifications)
+ >=sci-libs/indilib-1.0.0
+ )
wcs? ( sci-astronomy/wcslib )
xplanet? ( x11-misc/xplanet )
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+"
+RDEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
"
-# Regression from commit e9f1b544eda238c068fbbbbf612f291c734ea5aa
-# Inspiration from https://git.reviewboard.kde.org/r/110787/
-PATCHES=( "${FILESDIR}/${PN}-15.04.0-use-python2-explicitly.patch" )
+PATCHES=(
+ # Regression from commit e9f1b544eda238c068fbbbbf612f291c734ea5aa
+ # Inspiration from https://git.reviewboard.kde.org/r/110787/
+ "${FILESDIR}/${PN}-15.04.0-use-python2-explicitly.patch"
+ "${FILESDIR}/${PN}-15.12.0-unused-qt-deps.patch"
+ "${FILESDIR}/${PN}-15.12.0-unused-kf5-deps.patch"
+)
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/kstars/kstars-15.12.49.9999.ebuild b/kde-apps/kstars/kstars-15.12.49.9999.ebuild
index 19a8311..edbf535 100644
--- a/kde-apps/kstars/kstars-15.12.49.9999.ebuild
+++ b/kde-apps/kstars/kstars-15.12.49.9999.ebuild
@@ -20,31 +20,27 @@ COMMON_DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kinit)
- $(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep kio)
$(add_frameworks_dep knewstuff)
- $(add_frameworks_dep knotifications)
$(add_frameworks_dep kplotting)
- $(add_frameworks_dep ktexteditor)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
- dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
>=sci-libs/cfitsio-0.390
sys-libs/zlib
- indi? ( >=sci-libs/indilib-1.0.0 )
+ indi? (
+ $(add_frameworks_dep knotifications)
+ >=sci-libs/indilib-1.0.0
+ )
wcs? ( sci-astronomy/wcslib )
xplanet? ( x11-misc/xplanet )
"
@@ -55,11 +51,10 @@ RDEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
"
-src_prepare() {
- epatch "${FILESDIR}/${PN}-15.08.3-qtopengl-optional.patch"
-
- kde5_src_prepare
-}
+PATCHES=(
+ "${FILESDIR}/${PN}-15.12.0-unused-qt-deps.patch"
+ "${FILESDIR}/${PN}-15.12.0-unused-kf5-deps.patch"
+)
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/kstars/kstars-9999.ebuild b/kde-apps/kstars/kstars-9999.ebuild
index 57a19a7..9eccdbc 100644
--- a/kde-apps/kstars/kstars-9999.ebuild
+++ b/kde-apps/kstars/kstars-9999.ebuild
@@ -16,35 +16,31 @@ IUSE="indi wcs xplanet"
# TODO: AstrometryNet requires new package
# FIXME: doesn't build without sci-libs/cfitsio as of 15.04.0
-DEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kinit)
- $(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep kio)
$(add_frameworks_dep knewstuff)
- $(add_frameworks_dep knotifications)
$(add_frameworks_dep kplotting)
- $(add_frameworks_dep ktexteditor)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
- dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
>=sci-libs/cfitsio-0.390
sys-libs/zlib
- indi? ( >=sci-libs/indilib-1.1.0 )
+ indi? (
+ $(add_frameworks_dep knotifications)
+ >=sci-libs/indilib-1.1.0
+ )
wcs? ( sci-astronomy/wcslib )
xplanet? ( x11-misc/xplanet )
"
@@ -60,12 +56,6 @@ RDEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
"
-src_prepare() {
- epatch "${FILESDIR}/${PN}-15.08.3-qtopengl-optional.patch"
-
- kde5_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package indi)
diff --git a/kde-apps/kstars/metadata.xml b/kde-apps/kstars/metadata.xml
index 730c4cb..800700c 100644
--- a/kde-apps/kstars/metadata.xml
+++ b/kde-apps/kstars/metadata.xml
@@ -2,7 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<use>
- <flag name="fits">Enable support for the FITS image format through cfitsio</flag>
<flag name="indi">Enable support for Astronomical control library using libindi</flag>
<flag name="wcs">Enable support for World Coordinate System library using wcslib</flag>
<flag name="xplanet">Enable support for Xplanet</flag>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-01-04 16:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-04 16:21 [gentoo-commits] proj/kde:master commit in: kde-apps/kstars/, kde-apps/kstars/files/ Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox