| 1 |
commit: 618392fb940724c28c42fb2a0deeaa14c4ce166d |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 6 15:12:22 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 6 15:12:22 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=618392fb |
| 7 |
|
| 8 |
kde-apps/ktuberling: Sync with main tree |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
.../ktuberling/files/ktuberling-15.12.3-deps.patch | 53 ++++++++++++++++++++++ |
| 13 |
kde-apps/ktuberling/ktuberling-16.04.0.ebuild | 5 +- |
| 14 |
.../ktuberling/ktuberling-16.04.49.9999.ebuild | 3 +- |
| 15 |
kde-apps/ktuberling/ktuberling-9999.ebuild | 3 +- |
| 16 |
4 files changed, 58 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch b/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..e948222 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch |
| 23 |
@@ -0,0 +1,53 @@ |
| 24 |
+commit ed566185fe698c71714009602c4dfbe4a91e0313 |
| 25 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 26 |
+Date: Thu May 5 00:32:34 2016 +0200 |
| 27 |
+ |
| 28 |
+ Fix dependencies (drop unused, add missing) |
| 29 |
+ |
| 30 |
+ REVIEW: 127832 |
| 31 |
+ |
| 32 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 33 |
+index 2df6ca6..884a4b5 100644 |
| 34 |
+--- a/CMakeLists.txt |
| 35 |
++++ b/CMakeLists.txt |
| 36 |
+@@ -6,23 +6,18 @@ set (QT_MIN_VERSION "5.3.0") |
| 37 |
+ find_package(ECM 1.7.0 REQUIRED CONFIG) |
| 38 |
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) |
| 39 |
+ |
| 40 |
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test) |
| 41 |
+-find_package(KF5 REQUIRED COMPONENTS |
| 42 |
+- CoreAddons |
| 43 |
+- Config |
| 44 |
+- ItemModels |
| 45 |
+- WidgetsAddons |
| 46 |
+- WindowSystem |
| 47 |
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS PrintSupport Svg Widgets Xml) |
| 48 |
++find_package(KF5 REQUIRED COMPONENTS |
| 49 |
++ Completion |
| 50 |
+ Config |
| 51 |
++ ConfigWidgets |
| 52 |
++ CoreAddons |
| 53 |
+ DBusAddons |
| 54 |
+ I18n |
| 55 |
+- ConfigWidgets |
| 56 |
+- TextWidgets |
| 57 |
++ KDELibs4Support #TODO eventually remove kdelibs4support |
| 58 |
++ WidgetsAddons |
| 59 |
+ XmlGui |
| 60 |
+- KIO |
| 61 |
+- NotifyConfig |
| 62 |
+- NewStuff |
| 63 |
+- KDELibs4Support) #TODO eventually remove kdelibs4support |
| 64 |
++) |
| 65 |
+ |
| 66 |
+ find_package(KF5KDEGames 4.9.0 REQUIRED) |
| 67 |
+ find_package(Phonon4Qt5 CONFIG REQUIRED) |
| 68 |
+@@ -58,7 +53,7 @@ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-ktuberling.png") |
| 69 |
+ ecm_add_app_icon(ktuberling_SRCS ICONS ${ICONS_SRCS}) |
| 70 |
+ add_executable(ktuberling ${ktuberling_SRCS}) |
| 71 |
+ |
| 72 |
+-target_link_libraries(ktuberling KF5::KIOCore KF5KDEGames Phonon::phonon4qt5 Qt5::Svg Phonon::phonon4qt5 KF5::DBusAddons KF5::XmlGui KF5::Completion Qt5::PrintSupport KF5::KDELibs4Support) |
| 73 |
++target_link_libraries(ktuberling KF5KDEGames Phonon::phonon4qt5 Qt5::Svg KF5::DBusAddons KF5::XmlGui KF5::Completion Qt5::PrintSupport KF5::KDELibs4Support) |
| 74 |
+ |
| 75 |
+ install(TARGETS ktuberling ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) |
| 76 |
+ |
| 77 |
|
| 78 |
diff --git a/kde-apps/ktuberling/ktuberling-16.04.0.ebuild b/kde-apps/ktuberling/ktuberling-16.04.0.ebuild |
| 79 |
index 2295d95..c7f5b15 100644 |
| 80 |
--- a/kde-apps/ktuberling/ktuberling-16.04.0.ebuild |
| 81 |
+++ b/kde-apps/ktuberling/ktuberling-16.04.0.ebuild |
| 82 |
@@ -4,8 +4,7 @@ |
| 83 |
|
| 84 |
EAPI=6 |
| 85 |
|
| 86 |
-KDE_HANDBOOK="true" |
| 87 |
-KDE_PUNT_BOGUS_DEPS="true" |
| 88 |
+KDE_HANDBOOK="forceoptional" |
| 89 |
KDE_SELINUX_MODULE="games" |
| 90 |
inherit kde5 |
| 91 |
|
| 92 |
@@ -37,3 +36,5 @@ DEPEND=" |
| 93 |
media-libs/phonon[qt5] |
| 94 |
" |
| 95 |
RDEPEND="${DEPEND}" |
| 96 |
+ |
| 97 |
+PATCHES=( "${FILESDIR}/${PN}-15.12.3-deps.patch" ) |
| 98 |
|
| 99 |
diff --git a/kde-apps/ktuberling/ktuberling-16.04.49.9999.ebuild b/kde-apps/ktuberling/ktuberling-16.04.49.9999.ebuild |
| 100 |
index b9ced51..345ebe7 100644 |
| 101 |
--- a/kde-apps/ktuberling/ktuberling-16.04.49.9999.ebuild |
| 102 |
+++ b/kde-apps/ktuberling/ktuberling-16.04.49.9999.ebuild |
| 103 |
@@ -4,8 +4,7 @@ |
| 104 |
|
| 105 |
EAPI=6 |
| 106 |
|
| 107 |
-KDE_HANDBOOK="true" |
| 108 |
-KDE_PUNT_BOGUS_DEPS="true" |
| 109 |
+KDE_HANDBOOK="forceoptional" |
| 110 |
KDE_SELINUX_MODULE="games" |
| 111 |
inherit kde5 |
| 112 |
|
| 113 |
|
| 114 |
diff --git a/kde-apps/ktuberling/ktuberling-9999.ebuild b/kde-apps/ktuberling/ktuberling-9999.ebuild |
| 115 |
index b9ced51..345ebe7 100644 |
| 116 |
--- a/kde-apps/ktuberling/ktuberling-9999.ebuild |
| 117 |
+++ b/kde-apps/ktuberling/ktuberling-9999.ebuild |
| 118 |
@@ -4,8 +4,7 @@ |
| 119 |
|
| 120 |
EAPI=6 |
| 121 |
|
| 122 |
-KDE_HANDBOOK="true" |
| 123 |
-KDE_PUNT_BOGUS_DEPS="true" |
| 124 |
+KDE_HANDBOOK="forceoptional" |
| 125 |
KDE_SELINUX_MODULE="games" |
| 126 |
inherit kde5 |
Archives