From: Andreas Sturmlechner Date: Sun, 20 Mar 2016 14:19:39 +0000 (+0100) Subject: kde-apps/kblocks: Unbreak startup X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9df8ef3fdcbdf4e7944f71a7b8bd56249e29489e;p=gentoo.git kde-apps/kblocks: Unbreak startup --- diff --git a/kde-apps/kblocks/files/kblocks-15.12.3-dbus.patch b/kde-apps/kblocks/files/kblocks-15.12.3-dbus.patch new file mode 100644 index 000000000000..7c5d14acc0b3 --- /dev/null +++ b/kde-apps/kblocks/files/kblocks-15.12.3-dbus.patch @@ -0,0 +1,58 @@ +commit 8a574bc194e526a98911e7cffd81cf757e754cf7 +Author: Andreas Sturmlechner +Date: Sun Mar 20 12:48:01 2016 +0100 + + Unbreak startup + + BUG: 357408 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 105a251..c72c584 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,6 +9,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_D + find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg Network ) + find_package(KF5 REQUIRED COMPONENTS + DocTools ++ DBusAddons + I18n + XmlGui + ) +@@ -83,7 +84,16 @@ ecm_add_app_icon(kblocks_SRCS ICONS ${ICONS_SRCS}) + + add_executable(kblocks ${kblocks_SRCS}) + +-target_link_libraries(kblocks KF5KDEGames KF5KDEGamesPrivate Phonon::phonon4qt5 Qt5::Network KF5::XmlGui KF5::I18n Qt5::Svg) ++target_link_libraries(kblocks ++ KF5KDEGames ++ KF5KDEGamesPrivate ++ Phonon::phonon4qt5 ++ Qt5::Network ++ KF5::DBusAddons ++ KF5::XmlGui ++ KF5::I18n ++ Qt5::Svg ++) + + install(TARGETS kblocks ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) + +diff --git a/main.cpp b/main.cpp +index 81ad53d..a42ca17 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -13,6 +13,7 @@ + #include + + #include ++#include + #include + + #include +@@ -333,6 +334,7 @@ int main(int argc, char *argv[]) + aboutData.setupCommandLine(&parser); + parser.process(app); + aboutData.processCommandLine(&parser); ++ KDBusService service; + + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kblocks"))); + diff --git a/kde-apps/kblocks/kblocks-15.12.3-r1.ebuild b/kde-apps/kblocks/kblocks-15.12.3-r1.ebuild new file mode 100644 index 000000000000..d590e14d70f8 --- /dev/null +++ b/kde-apps/kblocks/kblocks-15.12.3-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="A single-player Tetris-like KDE game" +HOMEPAGE="https://www.kde.org/applications/games/kblocks/" +KEYWORDS=" ~amd64 ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_kdeapps_dep libkdegames) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + media-libs/phonon[qt5] +" + +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-dbus.patch" )