From bc4dbf971122463cda948ecf80d65e82997fff4784744cb7f98d4642060b2f16 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 11 Apr 2016 06:34:42 +0000 Subject: [PATCH 1/8] update to (16.03.90) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kblocks?expand=0&rev=26 --- kblocks-15.12.3.tar.xz | 3 --- kblocks-16.03.90.tar.xz | 3 +++ kblocks.changes | 8 ++++++++ kblocks.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 kblocks-15.12.3.tar.xz create mode 100644 kblocks-16.03.90.tar.xz diff --git a/kblocks-15.12.3.tar.xz b/kblocks-15.12.3.tar.xz deleted file mode 100644 index 29c1bfa..0000000 --- a/kblocks-15.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ca1165de78c76a609691d792012d95b7115d5997dd4180698c96aef1fa9f541 -size 1212116 diff --git a/kblocks-16.03.90.tar.xz b/kblocks-16.03.90.tar.xz new file mode 100644 index 0000000..19c0ea2 --- /dev/null +++ b/kblocks-16.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e618fd7763b7de5d4ccb5c91832c2f04fce079d4304baf26d6c35c0700eb948 +size 1211944 diff --git a/kblocks.changes b/kblocks.changes index df30d65..d0c6764 100644 --- a/kblocks.changes +++ b/kblocks.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 11 06:34:37 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + ------------------------------------------------------------------- Tue Mar 29 16:32:24 UTC 2016 - wbauer@tmo.at diff --git a/kblocks.spec b/kblocks.spec index e3e97fb..a13895d 100644 --- a/kblocks.spec +++ b/kblocks.spec @@ -42,7 +42,7 @@ Summary: KBlocks - classic falling blocks game License: LGPL-2.1+ Group: Amusements/Games/Strategy/Real Time Url: http://www.kde.org -Version: 15.12.3 +Version: 16.03.90 Release: 0 Source0: kblocks-%{version}.tar.xz # PATCH-FIX-UPSTREAM Use-KCrash.patch boo#958086 -- initialize KDE's Crash dialog From aeb9b3a2bff2c9fd7d35551acab43b0d108ea4f01a333b376391763c67190d21 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 12 Apr 2016 14:47:54 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kblocks?expand=0&rev=27 --- kblocks.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/kblocks.spec b/kblocks.spec index a13895d..92aeda6 100644 --- a/kblocks.spec +++ b/kblocks.spec @@ -45,10 +45,6 @@ Url: http://www.kde.org Version: 16.03.90 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 @@ -58,8 +54,6 @@ 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 From 9f1cff0261086bbd9ef229ee8295f72f50de677ca101b7661475168733a970f4 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 12 Apr 2016 14:48:21 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kblocks?expand=0&rev=28 --- kblocks.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/kblocks.changes b/kblocks.changes index d0c6764..eeea0b0 100644 --- a/kblocks.changes +++ b/kblocks.changes @@ -5,6 +5,7 @@ Mon Apr 11 06:34:37 UTC 2016 - tittiatcoke@gmail.com * KDE Applications 16.04.0 RC * https://www.kde.org/announcements/announce-applications-16.04-rc.php +- Drop upstreamed patches Unbreak-startup.patch and Use-KCrash.patch ------------------------------------------------------------------- Tue Mar 29 16:32:24 UTC 2016 - wbauer@tmo.at From 69738fc1da6494198aa4e619cdf5f079e94589ca4b59a7301ecb13edf05fd337 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 12 Apr 2016 15:13:32 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kblocks?expand=0&rev=29 --- kblocks.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kblocks.spec b/kblocks.spec index 92aeda6..2090b57 100644 --- a/kblocks.spec +++ b/kblocks.spec @@ -78,7 +78,7 @@ KBlocks is the KDE version of the classic falling blocks game. %{_kf5_configkcfgdir}/kblocks.kcfg %{_kf5_configdir}/kblocks.knsrc %dir %_datadir/appdata -%_datadir/appdata/kblocks.appdata.xml +%_datadir/appdata/org.kde.kblocks.appdata.xml %_datadir/kxmlgui5/kblocks/ %changelog From 3b192bb146deef3eee9f4042d0d6e01cd1a07649a201447e7e55dd1620a814f8 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 12 Apr 2016 15:13:39 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kblocks?expand=0&rev=30 --- Unbreak-startup.patch | 58 ------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 Unbreak-startup.patch diff --git a/Unbreak-startup.patch b/Unbreak-startup.patch deleted file mode 100644 index 499e9f8..0000000 --- a/Unbreak-startup.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Andreas Sturmlechner -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 - #include -+#include - #include - - #include -@@ -334,6 +335,7 @@ - aboutData.setupCommandLine(&parser); - parser.process(app); - aboutData.processCommandLine(&parser); -+ KDBusService service; - - app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kblocks"))); - - From 1b23736e37d5ad42bb2ecbbe84011e54c028bda5431d47bd3d86330cf9cfe701 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 12 Apr 2016 15:13:44 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kblocks?expand=0&rev=31 --- Use-KCrash.patch | 111 ----------------------------------------------- 1 file changed, 111 deletions(-) delete mode 100644 Use-KCrash.patch diff --git a/Use-KCrash.patch b/Use-KCrash.patch deleted file mode 100644 index 1c8e329..0000000 --- a/Use-KCrash.patch +++ /dev/null @@ -1,111 +0,0 @@ -From: Frederik Schwarzer -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 - - #include -+#include - #include - - #include -@@ -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"))); - From e268a9a8a55333242dd69b0e8c9df32f9512cfd8eb5b126a4cc2bad9c4f11307 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 17 Apr 2016 05:57:13 +0000 Subject: [PATCH 7/8] update to (16.04.0) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kblocks?expand=0&rev=32 --- kblocks-16.03.90.tar.xz | 3 --- kblocks-16.04.0.tar.xz | 3 +++ kblocks.changes | 8 ++++++++ kblocks.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 kblocks-16.03.90.tar.xz create mode 100644 kblocks-16.04.0.tar.xz diff --git a/kblocks-16.03.90.tar.xz b/kblocks-16.03.90.tar.xz deleted file mode 100644 index 19c0ea2..0000000 --- a/kblocks-16.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e618fd7763b7de5d4ccb5c91832c2f04fce079d4304baf26d6c35c0700eb948 -size 1211944 diff --git a/kblocks-16.04.0.tar.xz b/kblocks-16.04.0.tar.xz new file mode 100644 index 0000000..855d593 --- /dev/null +++ b/kblocks-16.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:791568976663a61e318f3071ffe45f8aa1a79a62c5e19d11eed14882e9d126b0 +size 1212108 diff --git a/kblocks.changes b/kblocks.changes index eeea0b0..2d0232c 100644 --- a/kblocks.changes +++ b/kblocks.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Apr 17 05:57:08 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + ------------------------------------------------------------------- Mon Apr 11 06:34:37 UTC 2016 - tittiatcoke@gmail.com diff --git a/kblocks.spec b/kblocks.spec index 2090b57..46ccc32 100644 --- a/kblocks.spec +++ b/kblocks.spec @@ -42,7 +42,7 @@ Summary: KBlocks - classic falling blocks game License: LGPL-2.1+ Group: Amusements/Games/Strategy/Real Time Url: http://www.kde.org -Version: 16.03.90 +Version: 16.04.0 Release: 0 Source0: kblocks-%{version}.tar.xz Obsoletes: %{name}5 < %{version} From 1c1fdfc1eb44d3140d14e624185f9c44d0237519ca8a110bf071d366b0f06759 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 7 May 2016 10:18:27 +0000 Subject: [PATCH 8/8] update to (16.04.1) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kblocks?expand=0&rev=33 --- kblocks-16.04.0.tar.xz | 3 --- kblocks-16.04.1.tar.xz | 3 +++ kblocks.changes | 8 ++++++++ kblocks.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 kblocks-16.04.0.tar.xz create mode 100644 kblocks-16.04.1.tar.xz diff --git a/kblocks-16.04.0.tar.xz b/kblocks-16.04.0.tar.xz deleted file mode 100644 index 855d593..0000000 --- a/kblocks-16.04.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:791568976663a61e318f3071ffe45f8aa1a79a62c5e19d11eed14882e9d126b0 -size 1212108 diff --git a/kblocks-16.04.1.tar.xz b/kblocks-16.04.1.tar.xz new file mode 100644 index 0000000..57de54f --- /dev/null +++ b/kblocks-16.04.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fa93fd5889b61b1c8d25ffba8372322ac7f53f43b4661e8b068bc4294040703 +size 1212072 diff --git a/kblocks.changes b/kblocks.changes index 2d0232c..a99b641 100644 --- a/kblocks.changes +++ b/kblocks.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat May 7 10:18:02 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + ------------------------------------------------------------------- Sun Apr 17 05:57:08 UTC 2016 - tittiatcoke@gmail.com diff --git a/kblocks.spec b/kblocks.spec index 46ccc32..d3e1624 100644 --- a/kblocks.spec +++ b/kblocks.spec @@ -42,7 +42,7 @@ Summary: KBlocks - classic falling blocks game License: LGPL-2.1+ Group: Amusements/Games/Strategy/Real Time Url: http://www.kde.org -Version: 16.04.0 +Version: 16.04.1 Release: 0 Source0: kblocks-%{version}.tar.xz Obsoletes: %{name}5 < %{version}