forked from pool/kblocks
Accepting request 382527 from KDE:Applications
1 OBS-URL: https://build.opensuse.org/request/show/382527 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kblocks?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
a845be369e
58
Unbreak-startup.patch
Normal file
58
Unbreak-startup.patch
Normal file
@ -0,0 +1,58 @@
|
||||
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
|
||||
Date: Sun, 20 Mar 2016 11:48:01 +0000
|
||||
Subject: Unbreak startup, add dependencies, drop Phonon
|
||||
X-Git-Tag: v16.03.80
|
||||
X-Git-Url: http://quickgit.kde.org/?p=kblocks.git&a=commitdiff&h=52f42548becb9396a45a795984b3f238326dd1bd
|
||||
---
|
||||
Unbreak startup, add dependencies, drop Phonon
|
||||
|
||||
BUG: 357408
|
||||
REVIEW: 127433
|
||||
---
|
||||
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -9,9 +9,14 @@
|
||||
|
||||
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg Network)
|
||||
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
|
||||
+ Config
|
||||
+ ConfigWidgets
|
||||
+ CoreAddons
|
||||
Crash
|
||||
DocTools
|
||||
+ DBusAddons
|
||||
I18n
|
||||
+ WidgetsAddons
|
||||
XmlGui
|
||||
)
|
||||
|
||||
@@ -93,6 +93,7 @@
|
||||
Phonon::phonon4qt5
|
||||
Qt5::Network
|
||||
KF5::Crash
|
||||
+ KF5::DBusAddons
|
||||
KF5::XmlGui
|
||||
KF5::I18n
|
||||
Qt5::Svg
|
||||
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
#include <KAboutData>
|
||||
#include <KCrash>
|
||||
+#include <KDBusService>
|
||||
#include <KLocalizedString>
|
||||
|
||||
#include <QString>
|
||||
@@ -334,6 +335,7 @@
|
||||
aboutData.setupCommandLine(&parser);
|
||||
parser.process(app);
|
||||
aboutData.processCommandLine(&parser);
|
||||
+ KDBusService service;
|
||||
|
||||
app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kblocks")));
|
||||
|
||||
|
||||
111
Use-KCrash.patch
Normal file
111
Use-KCrash.patch
Normal file
@ -0,0 +1,111 @@
|
||||
From: Frederik Schwarzer <schwarzerf@gmail.com>
|
||||
Date: Wed, 27 Jan 2016 09:35:17 +0000
|
||||
Subject: Use KCrash.
|
||||
X-Git-Tag: v16.03.80
|
||||
X-Git-Url: http://quickgit.kde.org/?p=kblocks.git&a=commitdiff&h=3906da92d977e2a7f11c39fb2275d1c02a562a7b
|
||||
---
|
||||
Use KCrash.
|
||||
---
|
||||
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -2,16 +2,18 @@
|
||||
|
||||
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 Svg Network )
|
||||
-find_package(KF5 REQUIRED COMPONENTS
|
||||
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg Network)
|
||||
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
|
||||
+ Crash
|
||||
DocTools
|
||||
I18n
|
||||
XmlGui
|
||||
- )
|
||||
+)
|
||||
|
||||
find_package(KF5KDEGames 4.9.0 REQUIRED)
|
||||
find_package(Phonon4Qt5 CONFIG REQUIRED)
|
||||
@@ -28,8 +30,8 @@
|
||||
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
|
||||
|
||||
|
||||
-add_subdirectory( themes )
|
||||
-add_subdirectory( doc )
|
||||
+add_subdirectory(themes)
|
||||
+add_subdirectory(doc)
|
||||
|
||||
|
||||
########### next target ###############
|
||||
@@ -74,7 +76,8 @@
|
||||
AI/KBlocksAIPlannerExtend.cpp
|
||||
AI/KBlocksAIEvaluation.cpp
|
||||
AI/KBlocksAIFeature.cpp
|
||||
- AI/KBlocksAILog.cpp )
|
||||
+ AI/KBlocksAILog.cpp
|
||||
+)
|
||||
|
||||
kconfig_add_kcfg_files(kblocks_SRCS settings.kcfgc )
|
||||
|
||||
@@ -83,19 +86,28 @@
|
||||
|
||||
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::Crash
|
||||
+ KF5::XmlGui
|
||||
+ KF5::I18n
|
||||
+ Qt5::Svg
|
||||
+)
|
||||
|
||||
install(TARGETS kblocks ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
########### install files ###############
|
||||
|
||||
-install( PROGRAMS org.kde.kblocks.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
|
||||
-install( FILES kblocks.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
|
||||
-install( FILES kblocks.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
|
||||
-install( FILES kblocksui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kblocks )
|
||||
-install( FILES kblocks.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
|
||||
+install(PROGRAMS org.kde.kblocks.desktop DESTINATION ${KDE_INSTALL_APPDIR})
|
||||
+install(FILES kblocks.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
|
||||
+install(FILES kblocks.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
|
||||
+install(FILES kblocksui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kblocks)
|
||||
+install(FILES kblocks.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
|
||||
|
||||
-ecm_install_icons( ICONS 128-apps-kblocks.png 16-apps-kblocks.png 22-apps-kblocks.png 32-apps-kblocks.png 48-apps-kblocks.png 64-apps-kblocks.png DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor )
|
||||
+ecm_install_icons(ICONS 128-apps-kblocks.png 16-apps-kblocks.png 22-apps-kblocks.png 32-apps-kblocks.png 48-apps-kblocks.png 64-apps-kblocks.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
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include <KAboutData>
|
||||
+#include <KCrash>
|
||||
#include <KLocalizedString>
|
||||
|
||||
#include <QString>
|
||||
@@ -324,6 +325,7 @@
|
||||
// Command line argument options
|
||||
QCommandLineParser parser;
|
||||
KAboutData::setApplicationData(aboutData);
|
||||
+ KCrash::initialize();
|
||||
parser.addVersionOption();
|
||||
parser.addHelpOption();
|
||||
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("mode"), i18n("Setup kblocks game running mode.\n\t0 = Desktop Mode\t1 = Game Engine Mode\n\t2 = Gui Mode\t3 = Player Mode"), QStringLiteral("game mode"), QStringLiteral("0")));
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 29 16:32:24 UTC 2016 - wbauer@tmo.at
|
||||
|
||||
- Add Use-KCrash.patch: initialize KDE's Crash dialog (boo#958086)
|
||||
- Add Unbreak-startup.patch: fixes desktop freezing while kblocks
|
||||
is running and showing an error when it is closed (kde#357408)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 13 15:37:28 UTC 2016 - tittiatcoke@gmail.com
|
||||
|
||||
|
||||
@ -45,6 +45,10 @@ Url: http://www.kde.org
|
||||
Version: 15.12.3
|
||||
Release: 0
|
||||
Source0: kblocks-%{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#357408 -- fixes desktop freezing while kblocks 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
|
||||
@ -54,6 +58,8 @@ KBlocks is the KDE version of the classic falling blocks game.
|
||||
|
||||
%prep
|
||||
%setup -q -n kblocks-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user