* [gentoo-commits] proj/kde:master commit in: kde-apps/ktuberling/files/, kde-apps/ktuberling/
@ 2016-05-06 15:12 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2016-05-06 15:12 UTC (permalink / raw
To: gentoo-commits
commit: 618392fb940724c28c42fb2a0deeaa14c4ce166d
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 15:12:22 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 6 15:12:22 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=618392fb
kde-apps/ktuberling: Sync with main tree
Package-Manager: portage-2.2.28
.../ktuberling/files/ktuberling-15.12.3-deps.patch | 53 ++++++++++++++++++++++
kde-apps/ktuberling/ktuberling-16.04.0.ebuild | 5 +-
.../ktuberling/ktuberling-16.04.49.9999.ebuild | 3 +-
kde-apps/ktuberling/ktuberling-9999.ebuild | 3 +-
4 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch b/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch
new file mode 100644
index 0000000..e948222
--- /dev/null
+++ b/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch
@@ -0,0 +1,53 @@
+commit ed566185fe698c71714009602c4dfbe4a91e0313
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu May 5 00:32:34 2016 +0200
+
+ Fix dependencies (drop unused, add missing)
+
+ REVIEW: 127832
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2df6ca6..884a4b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,23 +6,18 @@ set (QT_MIN_VERSION "5.3.0")
+ find_package(ECM 1.7.0 REQUIRED CONFIG)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test)
+-find_package(KF5 REQUIRED COMPONENTS
+- CoreAddons
+- Config
+- ItemModels
+- WidgetsAddons
+- WindowSystem
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS PrintSupport Svg Widgets Xml)
++find_package(KF5 REQUIRED COMPONENTS
++ Completion
+ Config
++ ConfigWidgets
++ CoreAddons
+ DBusAddons
+ I18n
+- ConfigWidgets
+- TextWidgets
++ KDELibs4Support #TODO eventually remove kdelibs4support
++ WidgetsAddons
+ XmlGui
+- KIO
+- NotifyConfig
+- NewStuff
+- KDELibs4Support) #TODO eventually remove kdelibs4support
++)
+
+ find_package(KF5KDEGames 4.9.0 REQUIRED)
+ find_package(Phonon4Qt5 CONFIG REQUIRED)
+@@ -58,7 +53,7 @@ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-ktuberling.png")
+ ecm_add_app_icon(ktuberling_SRCS ICONS ${ICONS_SRCS})
+ add_executable(ktuberling ${ktuberling_SRCS})
+
+-target_link_libraries(ktuberling KF5::KIOCore KF5KDEGames Phonon::phonon4qt5 Qt5::Svg Phonon::phonon4qt5 KF5::DBusAddons KF5::XmlGui KF5::Completion Qt5::PrintSupport KF5::KDELibs4Support)
++target_link_libraries(ktuberling KF5KDEGames Phonon::phonon4qt5 Qt5::Svg KF5::DBusAddons KF5::XmlGui KF5::Completion Qt5::PrintSupport KF5::KDELibs4Support)
+
+ install(TARGETS ktuberling ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+
diff --git a/kde-apps/ktuberling/ktuberling-16.04.0.ebuild b/kde-apps/ktuberling/ktuberling-16.04.0.ebuild
index 2295d95..c7f5b15 100644
--- a/kde-apps/ktuberling/ktuberling-16.04.0.ebuild
+++ b/kde-apps/ktuberling/ktuberling-16.04.0.ebuild
@@ -4,8 +4,7 @@
EAPI=6
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
+KDE_HANDBOOK="forceoptional"
KDE_SELINUX_MODULE="games"
inherit kde5
@@ -37,3 +36,5 @@ DEPEND="
media-libs/phonon[qt5]
"
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-15.12.3-deps.patch" )
diff --git a/kde-apps/ktuberling/ktuberling-16.04.49.9999.ebuild b/kde-apps/ktuberling/ktuberling-16.04.49.9999.ebuild
index b9ced51..345ebe7 100644
--- a/kde-apps/ktuberling/ktuberling-16.04.49.9999.ebuild
+++ b/kde-apps/ktuberling/ktuberling-16.04.49.9999.ebuild
@@ -4,8 +4,7 @@
EAPI=6
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
+KDE_HANDBOOK="forceoptional"
KDE_SELINUX_MODULE="games"
inherit kde5
diff --git a/kde-apps/ktuberling/ktuberling-9999.ebuild b/kde-apps/ktuberling/ktuberling-9999.ebuild
index b9ced51..345ebe7 100644
--- a/kde-apps/ktuberling/ktuberling-9999.ebuild
+++ b/kde-apps/ktuberling/ktuberling-9999.ebuild
@@ -4,8 +4,7 @@
EAPI=6
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
+KDE_HANDBOOK="forceoptional"
KDE_SELINUX_MODULE="games"
inherit kde5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/ktuberling/files/, kde-apps/ktuberling/
@ 2016-05-06 15:16 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2016-05-06 15:16 UTC (permalink / raw
To: gentoo-commits
commit: 3f232e494278b6524275842dd6ec8b9e3eb65051
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 15:16:52 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 6 15:16:52 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f232e49
kde-apps/ktuberling: Update patch
Package-Manager: portage-2.2.28
.../ktuberling/files/ktuberling-15.12.3-deps.patch | 53 ----------------------
.../ktuberling/files/ktuberling-16.04.0-deps.patch | 38 ++++++++++++++++
kde-apps/ktuberling/ktuberling-16.04.0.ebuild | 2 +-
3 files changed, 39 insertions(+), 54 deletions(-)
diff --git a/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch b/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch
deleted file mode 100644
index e948222..0000000
--- a/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit ed566185fe698c71714009602c4dfbe4a91e0313
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu May 5 00:32:34 2016 +0200
-
- Fix dependencies (drop unused, add missing)
-
- REVIEW: 127832
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2df6ca6..884a4b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,23 +6,18 @@ set (QT_MIN_VERSION "5.3.0")
- find_package(ECM 1.7.0 REQUIRED CONFIG)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-
--find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test)
--find_package(KF5 REQUIRED COMPONENTS
-- CoreAddons
-- Config
-- ItemModels
-- WidgetsAddons
-- WindowSystem
-+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS PrintSupport Svg Widgets Xml)
-+find_package(KF5 REQUIRED COMPONENTS
-+ Completion
- Config
-+ ConfigWidgets
-+ CoreAddons
- DBusAddons
- I18n
-- ConfigWidgets
-- TextWidgets
-+ KDELibs4Support #TODO eventually remove kdelibs4support
-+ WidgetsAddons
- XmlGui
-- KIO
-- NotifyConfig
-- NewStuff
-- KDELibs4Support) #TODO eventually remove kdelibs4support
-+)
-
- find_package(KF5KDEGames 4.9.0 REQUIRED)
- find_package(Phonon4Qt5 CONFIG REQUIRED)
-@@ -58,7 +53,7 @@ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-ktuberling.png")
- ecm_add_app_icon(ktuberling_SRCS ICONS ${ICONS_SRCS})
- add_executable(ktuberling ${ktuberling_SRCS})
-
--target_link_libraries(ktuberling KF5::KIOCore KF5KDEGames Phonon::phonon4qt5 Qt5::Svg Phonon::phonon4qt5 KF5::DBusAddons KF5::XmlGui KF5::Completion Qt5::PrintSupport KF5::KDELibs4Support)
-+target_link_libraries(ktuberling KF5KDEGames Phonon::phonon4qt5 Qt5::Svg KF5::DBusAddons KF5::XmlGui KF5::Completion Qt5::PrintSupport KF5::KDELibs4Support)
-
- install(TARGETS ktuberling ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
-
diff --git a/kde-apps/ktuberling/files/ktuberling-16.04.0-deps.patch b/kde-apps/ktuberling/files/ktuberling-16.04.0-deps.patch
new file mode 100644
index 0000000..542b7a6
--- /dev/null
+++ b/kde-apps/ktuberling/files/ktuberling-16.04.0-deps.patch
@@ -0,0 +1,38 @@
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu, 05 May 2016 21:21:24 +0000
+Subject: Fix dependencies (drop unused, add missing)
+X-Git-Url: http://quickgit.kde.org/?p=ktuberling.git&a=commitdiff&h=dd1831de7ac2944b3cb2c07679be58369cfa1635
+---
+Fix dependencies (drop unused, add missing)
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,22 +7,17 @@
+ find_package(ECM 1.7.0 REQUIRED CONFIG)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test)
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS PrintSupport Svg Widgets Xml)
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
++ Completion
+ Config
+ ConfigWidgets
+ CoreAddons
+ Crash
+ DBusAddons
+ I18n
+- ItemModels
+ KDELibs4Support #TODO eventually remove kdelibs4support
+- KIO
+- NewStuff
+- NotifyConfig
+- TextWidgets
+ WidgetsAddons
+- WindowSystem
+ XmlGui
+ )
+
+@@ -68,7 +63,6 @@
+
diff --git a/kde-apps/ktuberling/ktuberling-16.04.0.ebuild b/kde-apps/ktuberling/ktuberling-16.04.0.ebuild
index c7f5b15..41cff21 100644
--- a/kde-apps/ktuberling/ktuberling-16.04.0.ebuild
+++ b/kde-apps/ktuberling/ktuberling-16.04.0.ebuild
@@ -37,4 +37,4 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-15.12.3-deps.patch" )
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-06 15:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-06 15:16 [gentoo-commits] proj/kde:master commit in: kde-apps/ktuberling/files/, kde-apps/ktuberling/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2016-05-06 15:12 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox