From 102a97414670175457d49d9a924b8eae0566db16f20f524ce040dfacb019a58a Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 31 Mar 2016 14:32:22 +0000 Subject: [PATCH] Accepting request 381714 from home:wolfi323:branches:KDE:Applications - Add Use-KCrash.patch: initialize KDE's Crash dialog (boo#958086) - Add Unbreak-startup.patch: fixes desktop freezing while kjumpingcube is running and showing an error when it is closed (kde#357408) OBS-URL: https://build.opensuse.org/request/show/381714 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kjumpingcube?expand=0&rev=24 --- Unbreak-startup.patch | 51 +++++++++++++++++ Use-KCrash.patch | 127 ++++++++++++++++++++++++++++++++++++++++++ kjumpingcube.changes | 8 +++ kjumpingcube.spec | 6 ++ 4 files changed, 192 insertions(+) create mode 100644 Unbreak-startup.patch create mode 100644 Use-KCrash.patch diff --git a/Unbreak-startup.patch b/Unbreak-startup.patch new file mode 100644 index 0000000..460ed22 --- /dev/null +++ b/Unbreak-startup.patch @@ -0,0 +1,51 @@ +From: Andreas Sturmlechner +Date: Sun, 20 Mar 2016 12:51:24 +0000 +Subject: Unbreak startup +X-Git-Tag: v16.03.80 +X-Git-Url: http://quickgit.kde.org/?p=kjumpingcube.git&a=commitdiff&h=28b582eae919ee8187c8c466d0b13403a687f6e2 +--- +Unbreak startup + +BUG: 357409 +REVIEW: 127399 +--- + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,6 +60,7 @@ + KF5::KIOCore + KF5KDEGames + KF5::XmlGui ++ KF5::DBusAddons + KF5::KDELibs4Support + Qt5::Svg + ) + +--- a/main.cpp ++++ b/main.cpp +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -48,6 +49,7 @@ + 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"), +@@ -66,6 +68,7 @@ + aboutData.setupCommandLine(&parser); + parser.process(app); + aboutData.processCommandLine(&parser); ++ KDBusService service; + + app.setWindowIcon(QIcon::fromTheme(QLatin1String("kjumpingcube"))); + + diff --git a/Use-KCrash.patch b/Use-KCrash.patch new file mode 100644 index 0000000..d73edeb --- /dev/null +++ b/Use-KCrash.patch @@ -0,0 +1,127 @@ +From: Frederik Schwarzer +Date: Wed, 27 Jan 2016 10:16:59 +0000 +Subject: Use KCrash. +X-Git-Tag: v16.03.80 +X-Git-Url: http://quickgit.kde.org/?p=kjumpingcube.git&a=commitdiff&h=482b9cf76083e8e41dad9e4561bacc6f507cc352 +--- +Use KCrash. +--- + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,14 +2,16 @@ + + cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) + set (QT_MIN_VERSION "5.3.0") ++set (KF5_MIN_VERSION "5.15.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 ++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + CoreAddons + Config ++ Crash + ItemModels + WidgetsAddons + WindowSystem +@@ -22,7 +24,8 @@ + KIO + NotifyConfig + NewStuff +- KDELibs4Support) ++ KDELibs4Support ++) + + find_package(KF5KDEGames 4.9.0 REQUIRED) + find_package(Phonon4Qt5 CONFIG REQUIRED) +@@ -36,8 +39,8 @@ + + add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) + +-add_subdirectory( pics ) +-add_subdirectory( doc ) ++add_subdirectory(pics) ++add_subdirectory(doc) + + ########### next target ############### + +@@ -50,30 +53,42 @@ + ai_main.cpp + ai_kepler.cpp + ai_newton.cpp +- ai_box.cpp ) ++ ai_box.cpp ++) + +-ki18n_wrap_ui(kjumpingcube_SRCS settings.ui ) ++ki18n_wrap_ui(kjumpingcube_SRCS settings.ui) + +-kconfig_add_kcfg_files(kjumpingcube_SRCS prefs.kcfgc ) ++kconfig_add_kcfg_files(kjumpingcube_SRCS prefs.kcfgc) + + 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 ++ KF5::KIOCore ++ KF5KDEGames ++ KF5::XmlGui ++ KF5::KDELibs4Support ++ Qt5::Svg ++) + +-install(TARGETS kjumpingcube ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) ++install(TARGETS kjumpingcube ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + + + ########### install files ############### + +-install( PROGRAMS org.kde.kjumpingcube.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) +-install( FILES kjumpingcube.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} ) +-install( FILES kjumpingcubeui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kjumpingcube ) ++install(PROGRAMS org.kde.kjumpingcube.desktop DESTINATION ${KDE_INSTALL_APPDIR}) ++install(FILES kjumpingcube.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) ++install(FILES kjumpingcubeui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kjumpingcube) + +-ecm_install_icons( ICONS 128-apps-kjumpingcube.png 16-apps-kjumpingcube.png 22-apps-kjumpingcube.png 32-apps-kjumpingcube.png 48-apps-kjumpingcube.png 64-apps-kjumpingcube.png DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor ) +- +- +- ++ecm_install_icons(ICONS ++ 128-apps-kjumpingcube.png ++ 16-apps-kjumpingcube.png ++ 22-apps-kjumpingcube.png ++ 32-apps-kjumpingcube.png ++ 48-apps-kjumpingcube.png ++ 64-apps-kjumpingcube.png ++ DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor ++) + + feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) + + +--- a/main.cpp ++++ b/main.cpp +@@ -24,6 +24,7 @@ + + + #include ++#include + #include + #include + #include +@@ -59,6 +60,7 @@ + + QCommandLineParser parser; + KAboutData::setApplicationData(aboutData); ++ KCrash::initialize(); + parser.addVersionOption(); + parser.addHelpOption(); + aboutData.setupCommandLine(&parser); + diff --git a/kjumpingcube.changes b/kjumpingcube.changes index 9a798fe..562b3cb 100644 --- a/kjumpingcube.changes +++ b/kjumpingcube.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 30 09:40:55 UTC 2016 - wbauer@tmo.at + +- Add Use-KCrash.patch: initialize KDE's Crash dialog (boo#958086) +- Add Unbreak-startup.patch: fixes desktop freezing while + kjumpingcube is running and showing an error when it is closed + (kde#357408) + ------------------------------------------------------------------- Sun Mar 13 15:45:57 UTC 2016 - tittiatcoke@gmail.com diff --git a/kjumpingcube.spec b/kjumpingcube.spec index c7506a8..9a08d3f 100644 --- a/kjumpingcube.spec +++ b/kjumpingcube.spec @@ -45,6 +45,10 @@ Url: http://www.kde.org Version: 15.12.3 Release: 0 Source0: kjumpingcube-%{version}.tar.xz +# PATCH-FIX-UPSTREAM Use-KCrash.patch boo#958086 -- initialize KDE's Crash dialog +Patch0: Use-KCrash.patch +# PATCH-FIX-UPSTREAM Unbreak-startup.patch kde#357409 -- fixes desktop freezing while kjumpingcube is running and showing an error when it is closed +Patch1: Unbreak-startup.patch Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,6 +61,8 @@ this you can gain more fields and finally win the board over. %prep %setup -q -n kjumpingcube-%{version} +%patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build