[gentoo-commits] proj/kde:master commit in: kde-apps/kgeography/files/

[gentoo-commits] proj/kde:master commit in: kde-apps/kgeography/files/

[Johannes Huber]

commit:     2a03dcfacfa7263ff1cdc3d516da2738d89364ec
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 17:34:19 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 17:34:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a03dcfa

kde-apps/kgeography: Remove unused patches

Package-Manager: portage-2.2.28

 .../files/kgeography-15.12.0-kcrash.patch          | 54 ----------------------
 .../files/kgeography-15.12.0-kservice.patch        | 33 -------------
 2 files changed, 87 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
deleted file mode 100644
index 94ee6ec..0000000
--- a/kde-apps/kgeography/files/kgeography-15.12.0-kcrash.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
-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
deleted file mode 100644
index 3eacfb9..0000000
--- a/kde-apps/kgeography/files/kgeography-15.12.0-kservice.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 509c48f9040172e555e2243234bc2f8a853d80c7
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-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} )
-