diff options
author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-03-20 18:15:30 +0100 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-03-26 00:11:58 +1100 |
commit | b0db5d580b55bd526d8c5f47a48bc2cb0b641b1f (patch) | |
tree | 499e18b5c2706f317beb84a22b66d1a205c70567 /kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch | |
parent | c7580d8a4cdb107f99a969fa4df201c0de8aeaf2 (diff) | |
download | gentoo-b0db5d580b55bd526d8c5f47a48bc2cb0b641b1f.tar.gz gentoo-b0db5d580b55bd526d8c5f47a48bc2cb0b641b1f.tar.xz |
kde-apps: Move kdeedu-meta 15.12.3 from kde overlay
Package-Manager: portage-2.2.27
Diffstat (limited to 'kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch')
-rw-r--r-- | kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch | 79 |
1 files changed, 79 insertions, 0 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 00000000000..0623845a20f --- /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}) + |