commit: 57fc1cec79ab390bce46b3559ee242641b20be63 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Thu Dec 31 20:01:13 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Fri Jan 1 16:28:01 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=57fc1cec
kde-apps/kgeography: Add dependencies Package-Manager: portage-2.2.24 .../files/kgeography-15.12.0-kcrash.patch | 54 ++++++++++++++++++++++ .../files/kgeography-15.12.0-kservice.patch | 33 +++++++++++++ kde-apps/kgeography/kgeography-15.08.3-r1.ebuild | 37 +++++++++++++++ kde-apps/kgeography/kgeography-15.08.3.ebuild | 14 ------ kde-apps/kgeography/kgeography-15.12.0-r1.ebuild | 37 +++++++++++++++ kde-apps/kgeography/kgeography-15.12.0.ebuild | 14 ------ .../kgeography/kgeography-15.12.49.9999.ebuild | 25 +++++++++- kde-apps/kgeography/kgeography-9999.ebuild | 18 +++++++- 8 files changed, 202 insertions(+), 30 deletions(-) diff --git a/kde-apps/kgeography/files/kgeography-15.12.0-kcrash.patch b/kde-apps/kgeography/files/kgeography-15.12.0-kcrash.patch new file mode 100644 index 0000000..94ee6ec --- /dev/null +++ b/kde-apps/kgeography/files/kgeography-15.12.0-kcrash.patch @@ -0,0 +1,54 @@ +From: Andreas Cord-Landwehr <[email protected]> +Date: Thu, 31 Dec 2015 13:02:56 +0000 +Subject: Enable KCrash. +X-Git-Url: http://quickgit.kde.org/?p=kgeography.git&a=commitdiff&h=099cc1be8431e5e3b7109287cc0168aa35815df9 +--- +Enable KCrash. +--- + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,8 +14,8 @@ + + find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets) + +-find_package (KF5 REQUIRED COMPONENTS +- XmlGui WidgetsAddons CoreAddons ConfigWidgets I18n ItemViews IconThemes Service DocTools ++find_package (KF5 5.15 REQUIRED COMPONENTS ++ XmlGui WidgetsAddons CoreAddons ConfigWidgets I18n ItemViews IconThemes Service Crash DocTools + ) + + include(KDEInstallDirs) + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -38,6 +38,7 @@ + KF5::WidgetsAddons + KF5::CoreAddons + KF5::ConfigWidgets ++ KF5::Crash + KF5::I18n + KF5::ItemViews + KF5::IconThemes + +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -13,6 +13,7 @@ + #include <qapplication.h> + #include <qcommandlineparser.h> + #include <Kdelibs4ConfigMigrator> ++#include <KCrash> + #include "kgeography.h" + + int main(int argc, char *argv[]) +@@ -33,6 +34,8 @@ + + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kgeography"))); + ++ KCrash::initialize(); ++ + QCommandLineParser parser; + about.setupCommandLine(&parser); + parser.process(app); + diff --git a/kde-apps/kgeography/files/kgeography-15.12.0-kservice.patch b/kde-apps/kgeography/files/kgeography-15.12.0-kservice.patch new file mode 100644 index 0000000..3eacfb9 --- /dev/null +++ b/kde-apps/kgeography/files/kgeography-15.12.0-kservice.patch @@ -0,0 +1,33 @@ +commit 509c48f9040172e555e2243234bc2f8a853d80c7 +Author: Andreas Sturmlechner <[email protected]> +Date: Thu Dec 31 20:39:40 2015 +0100 + + Remove unused dependency + + REVIEW: 126586 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7f7b76..9c1f6c1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,7 +15,7 @@ set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets) + + find_package (KF5 5.15 REQUIRED COMPONENTS +- XmlGui WidgetsAddons CoreAddons ConfigWidgets I18n ItemViews IconThemes Service Crash DocTools ++ XmlGui WidgetsAddons CoreAddons ConfigWidgets I18n ItemViews IconThemes Crash DocTools + ) + + include(KDEInstallDirs) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 8307954..a07ba4e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -42,7 +42,6 @@ target_link_libraries(kgeography KF5::XmlGui + KF5::I18n + KF5::ItemViews + KF5::IconThemes +- KF5::Service + ) + install(TARGETS kgeography EXPORT KGeography ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) + diff --git a/kde-apps/kgeography/kgeography-15.08.3-r1.ebuild b/kde-apps/kgeography/kgeography-15.08.3-r1.ebuild new file mode 100644 index 0000000..7634f5d --- /dev/null +++ b/kde-apps/kgeography/kgeography-15.08.3-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="Geography learning tool" +HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography +https://edu.kde.org/applications/all/kgeography"; +KEYWORDS=" ~amd64 ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${PN}-15.12.0-kcrash.patch" \ + "${FILESDIR}/${PN}-15.12.0-kservice.patch" + + kde5_src_prepare +} diff --git a/kde-apps/kgeography/kgeography-15.08.3.ebuild b/kde-apps/kgeography/kgeography-15.08.3.ebuild deleted file mode 100644 index 0785a2b..0000000 --- a/kde-apps/kgeography/kgeography-15.08.3.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_HANDBOOK=true -inherit kde5 - -DESCRIPTION="Geography learning tool" -HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography -https://edu.kde.org/applications/all/kgeography"; -KEYWORDS=" ~amd64 ~x86" -IUSE="" diff --git a/kde-apps/kgeography/kgeography-15.12.0-r1.ebuild b/kde-apps/kgeography/kgeography-15.12.0-r1.ebuild new file mode 100644 index 0000000..d3730b4 --- /dev/null +++ b/kde-apps/kgeography/kgeography-15.12.0-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="Geography learning tool" +HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography +https://edu.kde.org/applications/all/kgeography"; +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${PN}-15.12.0-kcrash.patch" \ + "${FILESDIR}/${PN}-15.12.0-kservice.patch" + + kde5_src_prepare +} diff --git a/kde-apps/kgeography/kgeography-15.12.0.ebuild b/kde-apps/kgeography/kgeography-15.12.0.ebuild deleted file mode 100644 index 7ccd2fa..0000000 --- a/kde-apps/kgeography/kgeography-15.12.0.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_HANDBOOK=true -inherit kde5 - -DESCRIPTION="Geography learning tool" -HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography -https://edu.kde.org/applications/all/kgeography"; -KEYWORDS="~amd64 ~x86" -IUSE="" diff --git a/kde-apps/kgeography/kgeography-15.12.49.9999.ebuild b/kde-apps/kgeography/kgeography-15.12.49.9999.ebuild index 9ff8fe0..1243283 100644 --- a/kde-apps/kgeography/kgeography-15.12.49.9999.ebuild +++ b/kde-apps/kgeography/kgeography-15.12.49.9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -KDE_HANDBOOK=true +KDE_HANDBOOK="forceoptional" inherit kde5 DESCRIPTION="Geography learning tool" @@ -12,3 +12,26 @@ HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography"; KEYWORDS="" IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${PN}-15.12.0-kcrash.patch" \ + "${FILESDIR}/${PN}-15.12.0-kservice.patch" + + kde5_src_prepare +} diff --git a/kde-apps/kgeography/kgeography-9999.ebuild b/kde-apps/kgeography/kgeography-9999.ebuild index 9ff8fe0..1ce63af 100644 --- a/kde-apps/kgeography/kgeography-9999.ebuild +++ b/kde-apps/kgeography/kgeography-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -KDE_HANDBOOK=true +KDE_HANDBOOK="forceoptional" inherit kde5 DESCRIPTION="Geography learning tool" @@ -12,3 +12,19 @@ HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography"; KEYWORDS="" IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" +RDEPEND="${DEPEND}"
