1 |
commit: db503d1a9b52fcad0a1244f0f919a76ad37dfa1e |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 21 17:52:44 2013 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 21 17:52:44 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=db503d1a |
7 |
|
8 |
[kde-frameworks/kpty] Remove patch merged upstream. |
9 |
|
10 |
Package-Manager: portage-2.2.7 |
11 |
|
12 |
--- |
13 |
kde-frameworks/kpty/files/kpty-cmake.patch | 40 ------------------------------ |
14 |
kde-frameworks/kpty/kpty-9999.ebuild | 2 -- |
15 |
2 files changed, 42 deletions(-) |
16 |
|
17 |
diff --git a/kde-frameworks/kpty/files/kpty-cmake.patch b/kde-frameworks/kpty/files/kpty-cmake.patch |
18 |
deleted file mode 100644 |
19 |
index 9681a54..0000000 |
20 |
--- a/kde-frameworks/kpty/files/kpty-cmake.patch |
21 |
+++ /dev/null |
22 |
@@ -1,40 +0,0 @@ |
23 |
-From 8af58e5c5171acff24cf14d79295a0d95deda083 Mon Sep 17 00:00:00 2001 |
24 |
-From: Johannes Huber <johu@g.o> |
25 |
-Date: Wed, 20 Nov 2013 23:36:17 +0100 |
26 |
-Subject: [PATCH] Improve dependency specifications |
27 |
- |
28 |
-Depends only on Qt5 core for src. Move Qt test dependency spec to |
29 |
-subdir. |
30 |
---- |
31 |
- tier3/kpty/CMakeLists.txt | 2 +- |
32 |
- tier3/kpty/autotests/CMakeLists.txt | 2 ++ |
33 |
- 2 files changed, 3 insertions(+), 1 deletion(-) |
34 |
- |
35 |
-diff --git a/tier3/kpty/CMakeLists.txt b/tier3/kpty/CMakeLists.txt |
36 |
-index 12d977e..fc28e03 100644 |
37 |
---- a/tier3/kpty/CMakeLists.txt |
38 |
-+++ b/tier3/kpty/CMakeLists.txt |
39 |
-@@ -10,7 +10,7 @@ set(KF5_VERSION "5.0.0") |
40 |
- include(KDEInstallDirs) |
41 |
- include(KDECompilerSettings) |
42 |
- include(KDECMakeSettings) |
43 |
--find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Test) |
44 |
-+find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Core) |
45 |
- |
46 |
- if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") |
47 |
- find_package(KCoreAddons ${KF5_VERSION} REQUIRED) |
48 |
-diff --git a/tier3/kpty/autotests/CMakeLists.txt b/tier3/kpty/autotests/CMakeLists.txt |
49 |
-index aa28cfc..4f0a164 100644 |
50 |
---- a/tier3/kpty/autotests/CMakeLists.txt |
51 |
-+++ b/tier3/kpty/autotests/CMakeLists.txt |
52 |
-@@ -1,5 +1,7 @@ |
53 |
- include(ECMMarkAsTest) |
54 |
- |
55 |
-+find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Test) |
56 |
-+ |
57 |
- remove_definitions(-DQT_NO_CAST_FROM_ASCII) |
58 |
- |
59 |
- add_executable(kptyprocesstest kptyprocesstest.cpp) |
60 |
--- |
61 |
-1.8.4.3 |
62 |
- |
63 |
|
64 |
diff --git a/kde-frameworks/kpty/kpty-9999.ebuild b/kde-frameworks/kpty/kpty-9999.ebuild |
65 |
index 410649d..c648bf5 100644 |
66 |
--- a/kde-frameworks/kpty/kpty-9999.ebuild |
67 |
+++ b/kde-frameworks/kpty/kpty-9999.ebuild |
68 |
@@ -18,5 +18,3 @@ DEPEND=" |
69 |
sys-libs/libutempter |
70 |
" |
71 |
RDEPEND="${DEPEND}" |
72 |
- |
73 |
-PATCHES=( "${FILESDIR}/${PN}-cmake.patch" ) |