diff options
author | Michael Palimaka <kensington@gentoo.org> | 2016-08-25 06:38:45 +1000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-08-25 20:46:59 +1000 |
commit | 37150fa963eb3aa155eb9e94c3d6b233154ca1de (patch) | |
tree | 8bce549e96d6e85c58e00d1b3cbd303869107118 /kde-apps/kjumpingcube/files | |
parent | media-libs/libart_lgpl: eapi bump, fix src_install phase (and, then, really d... (diff) | |
download | gentoo-37150fa963eb3aa155eb9e94c3d6b233154ca1de.tar.gz gentoo-37150fa963eb3aa155eb9e94c3d6b233154ca1de.tar.bz2 gentoo-37150fa963eb3aa155eb9e94c3d6b233154ca1de.zip |
kde-apps: remove 15.12.3
Diffstat (limited to 'kde-apps/kjumpingcube/files')
-rw-r--r-- | kde-apps/kjumpingcube/files/kjumpingcube-15.12.3-dbus.patch | 52 | ||||
-rw-r--r-- | kde-apps/kjumpingcube/files/kjumpingcube-15.12.3-deps.patch | 54 |
2 files changed, 0 insertions, 106 deletions
diff --git a/kde-apps/kjumpingcube/files/kjumpingcube-15.12.3-dbus.patch b/kde-apps/kjumpingcube/files/kjumpingcube-15.12.3-dbus.patch deleted file mode 100644 index 40c3e7758483..000000000000 --- a/kde-apps/kjumpingcube/files/kjumpingcube-15.12.3-dbus.patch +++ /dev/null @@ -1,52 +0,0 @@ -commit d964ffcea9daf08095beecf558db8ddc7cc9da7e -Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Wed Mar 16 22:43:54 2016 +0100 - - Unbreak startup - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0eb2417..13afcd0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -56,6 +56,7 @@ add_executable(kjumpingcube ${kjumpingcube_SRCS}) - target_link_libraries(kjumpingcube - KF5KDEGames - KF5::XmlGui -+ KF5::DBusAddons - KF5::KDELibs4Support - Qt5::Svg - ) -diff --git a/main.cpp b/main.cpp -index d287626..039dd7f 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -26,6 +26,7 @@ - #include <KAboutData> - #include <QApplication> - #include <KLocalizedString> -+#include <KDBusService> - #include <QCommandLineParser> - #include <kdelibs4configmigrator.h> - -@@ -47,6 +48,7 @@ int main(int argc, char *argv[]) - KAboutData aboutData( "kjumpingcube", i18n("KJumpingCube"), - KJC_VERSION, i18n(description), KAboutLicense::GPL, - i18n("(c) 1998-2000, Matthias Kiefer")); -+ aboutData.setOrganizationDomain(QByteArray("kde.org")); - aboutData.addAuthor(i18n("Matthias Kiefer"),QString(), "matthias.kiefer@gmx.de"); - aboutData.addAuthor(i18n("Benjamin Meyer"),i18n("Various improvements"), "ben+kjumpingcube@meyerhome.net"); - aboutData.addCredit(i18n("Ian Wadham"), -@@ -72,8 +74,9 @@ int main(int argc, char *argv[]) - RESTORE(KJumpingCube) - } - else { -- KJumpingCube *kjumpingcube = new KJumpingCube; -- kjumpingcube->show(); -- } -- return app.exec(); -+ KJumpingCube *kjumpingcube = new KJumpingCube; -+ kjumpingcube->show(); -+ } -+ const KDBusService dbusService(KDBusService::Multiple); -+ return app.exec(); - } diff --git a/kde-apps/kjumpingcube/files/kjumpingcube-15.12.3-deps.patch b/kde-apps/kjumpingcube/files/kjumpingcube-15.12.3-deps.patch deleted file mode 100644 index a19144164a61..000000000000 --- a/kde-apps/kjumpingcube/files/kjumpingcube-15.12.3-deps.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit d3a2c46bf255c428220342c05a46f9191d94077c -Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Wed Mar 16 21:03:12 2016 +0100 - - Remove unused deps - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3c341ef..08ed990 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,26 +6,20 @@ 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(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick Svg) - find_package(KF5 REQUIRED COMPONENTS - CoreAddons - Config -- ItemModels - WidgetsAddons -- WindowSystem - Config - DBusAddons - I18n - ConfigWidgets -- TextWidgets - XmlGui -- KIO -- NotifyConfig -- NewStuff -- KDELibs4Support) -+ KDELibs4Support -+) - - find_package(KF5KDEGames 4.9.0 REQUIRED) --find_package(Phonon4Qt5 CONFIG REQUIRED) - - include(FeatureSummary) - include(ECMAddAppIcon) -@@ -60,7 +54,12 @@ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-kjumpingcube.png") - ecm_add_app_icon(kjumpingcube_SRCS ICONS ${ICONS_SRCS}) - add_executable(kjumpingcube ${kjumpingcube_SRCS}) - --target_link_libraries(kjumpingcube KF5::KIOCore KF5KDEGames KF5::XmlGui KF5::KDELibs4Support Qt5::Svg) -+target_link_libraries(kjumpingcube -+ KF5KDEGames -+ KF5::XmlGui -+ KF5::KDELibs4Support -+ Qt5::Svg -+) - - install(TARGETS kjumpingcube ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) - |