Hello community, here is the log from the commit of package kbreakout for openSUSE:Factory checked in at 2016-08-31 00:06:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbreakout (Old) and /work/SRC/openSUSE:Factory/.kbreakout.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbreakout" Changes: -------- --- /work/SRC/openSUSE:Factory/kbreakout/kbreakout.changes 2016-07-24 19:53:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kbreakout.new/kbreakout.changes 2016-08-31 00:06:58.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:11:07 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:48:58 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kbreakout-16.04.3.tar.xz New: ---- kbreakout-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbreakout.spec ++++++ --- /var/tmp/diff_new_pack.Ra4IFE/_old 2016-08-31 00:06:59.000000000 +0200 +++ /var/tmp/diff_new_pack.Ra4IFE/_new 2016-08-31 00:06:59.000000000 +0200 @@ -37,7 +37,7 @@ License: GPL-2.0+ Group: Amusements/Games/Action/Breakout Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: kbreakout-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kbreakout-16.04.3.tar.xz -> kbreakout-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/.gitignore new/kbreakout-16.08.0/.gitignore --- old/kbreakout-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kbreakout-16.08.0/.gitignore 2016-07-23 20:45:38.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/CMakeLists.txt new/kbreakout-16.08.0/CMakeLists.txt --- old/kbreakout-16.04.3/CMakeLists.txt 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/CMakeLists.txt 2016-07-23 20:45:38.000000000 +0200 @@ -26,7 +26,7 @@ include(FeatureSummary) include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddAppIcon) Files old/kbreakout-16.04.3/doc/gameboard.png and new/kbreakout-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/doc/index.docbook new/kbreakout-16.08.0/doc/index.docbook --- old/kbreakout-16.04.3/doc/index.docbook 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/doc/index.docbook 2016-07-23 20:45:38.000000000 +0200 @@ -1,8 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ -<!ENTITY kbreakout "<application>KBreakout</application>"> -<!ENTITY kappname "&kbreakout;"> -<!ENTITY package "kdegames"> <!ENTITY % English "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> @@ -35,12 +32,12 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-05-03</date> -<releaseinfo>1.0.0 (&kde; 4.11)</releaseinfo> +<date>2016-05-09</date> +<releaseinfo>1.2.0 (Applications 16.04)</releaseinfo> <abstract> <para> -&kappname;, a Breakout-like game.</para> +&kbreakout;, a Breakout-like game.</para> </abstract> <keywordset> @@ -59,9 +56,20 @@ <title>Introduction</title> <para> -&kappname; is a Breakout-like game. +&kbreakout; is a Breakout-like game. </para> +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&kbreakout; gameboard</phrase> +</textobject> +</mediaobject> +</screenshot> + <para> The object of the game is to destroy as many bricks as possible without losing the ball. </para> @@ -82,6 +90,11 @@ To fire the ball press the spacebar, to move the bar use the mouse or the arrow keys. The ball will bounce in the direction of the side of the bar it bounced on hit, the more it bounces near the left end of the bar the more it will bounce toward the left, the same applies for the right side; if it bounces in the middle of the bar it will bounce straight toward the top. </para> +<para> +If you enable the option <guilabel>Fire on mouse click</guilabel> in the settings dialog, you can click with the &LMB; to fire. +Enabling the option will make the game steal the mouse cursor, pause the game to get the cursor back. +</para> + </chapter> <chapter id="rules-strategies-tips"> @@ -599,7 +612,7 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycap>&Esc;</keycap> +<keycap>P</keycap> </shortcut> <guimenu>Game</guimenu> <guimenuitem>Pause</guimenuitem> @@ -682,7 +695,7 @@ <row> <entry>Pause/Resume</entry> <entry> -<keycap>&Esc;</keycap> +<keycap>P</keycap> </entry> </row> <row> @@ -729,7 +742,7 @@ <title>Credits and License</title> <para> -&kappname; +&kbreakout; </para> <para> Program copyright 2008 by Fela Winkelmolen <email>fela....@gmail.com</email> @@ -745,25 +758,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-kbreakout"> -<title>How to obtain &kappname;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> -</appendix> - - &documentation.index; </book> <!-- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/CMakeLists.txt new/kbreakout-16.08.0/src/CMakeLists.txt --- old/kbreakout-16.04.3/src/CMakeLists.txt 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/src/CMakeLists.txt 2016-07-23 20:45:38.000000000 +0200 @@ -5,6 +5,7 @@ mainwindow.cpp canvaswidget.cpp gameengine.cpp + kbreakout_debug.cpp levelloader.cpp #generalsettings.cpp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/canvaswidget.cpp new/kbreakout-16.08.0/src/canvaswidget.cpp --- old/kbreakout-16.04.3/src/canvaswidget.cpp 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/src/canvaswidget.cpp 2016-07-23 20:45:38.000000000 +0200 @@ -17,6 +17,7 @@ #include "canvaswidget.h" #include "globals.h" +#include "kbreakout_debug.h" #include "settings.h" #include <QGraphicsObject> @@ -33,7 +34,10 @@ { m_provider->discoverThemes("appdata", QStringLiteral("themes")); m_provider->setDeclarativeEngine(QStringLiteral("themeProvider"), engine()); - QString path = QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("qml/main.qml")); + QString path = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("qml/main.qml")); + + qCDebug(KBREAKOUT_General) << "QtQuick QML file: " << path; + setSource(QUrl::fromLocalFile(path)); // forward signals from QML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/gameengine.cpp new/kbreakout-16.08.0/src/gameengine.cpp --- old/kbreakout-16.04.3/src/gameengine.cpp 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/src/gameengine.cpp 2016-07-23 20:45:38.000000000 +0200 @@ -17,11 +17,11 @@ #include "gameengine.h" +#include "kbreakout_debug.h" #include "levelloader.h" #include <QTimer> #include <QTime> -#include <QDebug> GameEngine::GameEngine(QObject *parent) : QObject(parent) @@ -64,7 +64,7 @@ inline void GameEngine::deleteAllObjects() { - /*qDebug() << "all object deleted"; + /*qCDebug(KBREAKOUT_General) << "all object deleted"; deleteMovingObjects(); qDeleteAll(m_bricks); m_bricks.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/kbreakout_debug.cpp new/kbreakout-16.08.0/src/kbreakout_debug.cpp --- old/kbreakout-16.04.3/src/kbreakout_debug.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kbreakout-16.08.0/src/kbreakout_debug.cpp 2016-07-23 20:45:38.000000000 +0200 @@ -0,0 +1,20 @@ +/* + Copyright 2016 Julian Helfferich <julian.helffer...@gmail.com> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "kbreakout_debug.h" + +Q_LOGGING_CATEGORY(KBREAKOUT_General, "KBreakout") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/kbreakout_debug.h new/kbreakout-16.08.0/src/kbreakout_debug.h --- old/kbreakout-16.04.3/src/kbreakout_debug.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kbreakout-16.08.0/src/kbreakout_debug.h 2016-07-23 20:45:38.000000000 +0200 @@ -0,0 +1,25 @@ +/* + Copyright 2016 Julian Helfferich <julian.helffer...@gmail.com> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef KBREAKOUT_DEBUG_H +#define KBREAKOUT_DEBUG_H + +// Define logging category +#include <QLoggingCategory> +Q_DECLARE_LOGGING_CATEGORY(KBREAKOUT_General) + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/levelloader.cpp new/kbreakout-16.08.0/src/levelloader.cpp --- old/kbreakout-16.04.3/src/levelloader.cpp 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/src/levelloader.cpp 2016-07-23 20:45:38.000000000 +0200 @@ -17,6 +17,7 @@ #include "levelloader.h" #include "globals.h" +#include "kbreakout_debug.h" #include <QDomDocument> #include <QFile> @@ -26,8 +27,6 @@ #include <KConfig> #include <KConfigGroup> -#include <QDebug> - LevelLoader::LevelLoader(QObject *parent) : QObject(parent) { @@ -65,8 +64,8 @@ // Loading document model // Locating the path in the filesystem - QString path = QLatin1String("levelsets/") + m_levelname + QLatin1String(".levelset"); - path = QStandardPaths::locate(QStandardPaths::DataLocation, path); + QString path = QStringLiteral("levelsets/%1.levelset").arg(m_levelname); + path = QStandardPaths::locate(QStandardPaths::AppDataLocation, path); // -- delete m_levelset; @@ -257,8 +256,8 @@ m_level++; // Loading the levelset - QString path = QLatin1String("levelsets/") + m_levelname + QLatin1String(".levelset"); - path = QStandardPaths::locate(QStandardPaths::DataLocation, path); + QString path = QStringLiteral("levelsets/%1.levelset").arg(m_levelname); + path = QStandardPaths::locate(QStandardPaths::AppDataLocation, path); KConfig file(path, KConfig::SimpleConfig); QString levelName(QLatin1String("level") + QString::number(m_level)); @@ -284,7 +283,7 @@ return; } - qDebug() << line << endl; + qCDebug(KBREAKOUT_General) << line << endl; if (line.size() > WIDTH) { qCritical() << "Invalid file: too many bricks\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbreakout-16.04.3/src/qml/logic.js new/kbreakout-16.08.0/src/qml/logic.js --- old/kbreakout-16.04.3/src/qml/logic.js 2016-04-22 14:50:26.000000000 +0200 +++ new/kbreakout-16.08.0/src/qml/logic.js 2016-07-23 20:45:38.000000000 +0200 @@ -601,12 +601,12 @@ var r1 = createRect(bricks[0]); var r2 = createRect(bricks[1]); - var area1 = intersectArea(ball, r1); - var area2 = intersectArea(ball, r2); + var area1 = intersectArea(ballRect, r1); + var area2 = intersectArea(ballRect, r2); if (area1 > area2) { // the area of intersection with the first brick is bigger - collideWithBrick(ball, bricsk[0]); + collideWithBrick(ball, bricks[0]); } else { collideWithBrick(ball, bricks[1]); }
