Hello community, here is the log from the commit of package picmi for openSUSE:Factory checked in at 2016-05-29 03:07:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/picmi (Old) and /work/SRC/openSUSE:Factory/.picmi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "picmi" Changes: -------- --- /work/SRC/openSUSE:Factory/picmi/picmi.changes 2016-03-29 10:38:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.picmi.new/picmi.changes 2016-05-29 03:07:31.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:45:09 UTC 2016 - tittiatc...@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 06:21:09 UTC 2016 - tittiatc...@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:56:02 UTC 2016 - tittiatc...@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 + + +------------------------------------------------------------------- Old: ---- picmi-15.12.3.tar.xz New: ---- picmi-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ picmi.spec ++++++ --- /var/tmp/diff_new_pack.w86LxY/_old 2016-05-29 03:07:32.000000000 +0200 +++ /var/tmp/diff_new_pack.w86LxY/_new 2016-05-29 03:07:32.000000000 +0200 @@ -36,7 +36,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Logic Url: http://www.kde.org -Version: 15.12.3 +Version: 16.04.1 Release: 0 Source0: picmi-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ picmi-15.12.3.tar.xz -> picmi-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-15.12.3/CMakeLists.txt new/picmi-16.04.1/CMakeLists.txt --- old/picmi-15.12.3/CMakeLists.txt 2016-02-08 16:02:10.000000000 +0100 +++ new/picmi-16.04.1/CMakeLists.txt 2016-04-12 14:33:30.000000000 +0200 @@ -1,6 +1,9 @@ -cmake_minimum_required (VERSION 2.8.12) project (picmi) +cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) +set (QT_MIN_VERSION "5.2.0") +set (KF5_MIN_VERSION "5.15.0") + if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif () @@ -9,10 +12,10 @@ 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 5.2.0 CONFIG REQUIRED Core Widgets Svg Quick QuickWidgets Test) -find_package(KF5 REQUIRED COMPONENTS - DocTools +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Svg Quick QuickWidgets Test) +find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons + Crash DBusAddons Declarative DocTools @@ -41,8 +44,9 @@ add_subdirectory(test) install(FILES ${CMAKE_SOURCE_DIR}/org.kde.picmi.desktop DESTINATION ${KDE_INSTALL_APPDIR}) -install(FILES ${CMAKE_SOURCE_DIR}/org.kde.picmi.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} ) +install(FILES ${CMAKE_SOURCE_DIR}/org.kde.picmi.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) install(FILES ${CMAKE_SOURCE_DIR}/picmiui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/picmi) -# vim:set ts=4 sw=4 et: feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) + +# vim:set ts=4 sw=4 et: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-15.12.3/org.kde.picmi.appdata.xml new/picmi-16.04.1/org.kde.picmi.appdata.xml --- old/picmi-15.12.3/org.kde.picmi.appdata.xml 2016-02-08 16:02:10.000000000 +0100 +++ new/picmi-16.04.1/org.kde.picmi.appdata.xml 2016-04-12 14:33:30.000000000 +0200 @@ -8,13 +8,13 @@ <id>org.kde.picmi.desktop</id> <metadata_license>CC0-1.0</metadata_license> <summary>Puzzle game based on number logic</summary> + <summary xml:lang="ast">Xuegu de puzzles basáu na llóxica numbérica</summary> <summary xml:lang="ca">Joc de puzle basat en lògica de nombres</summary> <summary xml:lang="ca-valencia">Joc de puzle basat en lògica de nombres</summary> <summary xml:lang="cs">Hra puzzle založená na číselné logice</summary> <summary xml:lang="de">Rätselspiel auf der Grundlage von Zahlenlogik</summary> <summary xml:lang="en-GB">Puzzle game based on number logic</summary> <summary xml:lang="es">Juego de rompecabezas basado en lógica numérica</summary> - <summary xml:lang="et">Arvuloogikal põhinev mõistatusmäng</summary> <summary xml:lang="fi">Lukulogiikkaan perustuva arvoituspeli</summary> <summary xml:lang="gl">Quebracabezas baseado en lóxica numérica</summary> <summary xml:lang="nl">Een logisch spel met nummers</summary> @@ -39,12 +39,12 @@ of the grid. This is a single player game. </p> + <p xml:lang="ast">La meta ye revelar el patrón anubríu nel tableru coloriando o dexando blanques les caxelles nun rexáu acordies colos númberos daos al llau del rexáu. Esti ye un xuegu d'un xugador.</p> <p xml:lang="ca">L'objectiu és descobrir el patró ocult en el taulell acolorint o deixant en blanc les cel·les en una quadrícula d'acord amb els nombres indicats en el lateral de la quadrícula. És un joc d'un jugador.</p> <p xml:lang="ca-valencia">L'objectiu és descobrir el patró ocult en el taulell acolorint o deixant en blanc les cel·les en una quadrícula d'acord amb els nombres indicats en el lateral de la quadrícula. És un joc d'un jugador.</p> <p xml:lang="de">Das Ziel ist, das verborgene Muster zu enthüllen, indem Sie Zellen einfärben oder leer lassen. Hinweise geben die Zahlen am Rand des Rasters. Dieses Spiel ist für einen Spieler.</p> <p xml:lang="en-GB">The goal is to reveal the hidden pattern in the board by coloring or leaving blank the cells in a grid according to numbers given at the side of the grid. This is a single player game.</p> <p xml:lang="es">El objetivo consiste en revelar el patrón oculto en el tablero coloreando o dejando en blanco las casillas de una rejilla según los números que se muestran al lado de la rejilla. Este juego es para un único jugador.</p> - <p xml:lang="et">Mängu eesmärk on paljastada mängulauale peidetud muster, andes ruudustiku lahtritele värvi või jättes nad tühjaks vastavalt ruudustiku serval näidatavatele arvudele. See on ühele mängijale mõeldud mäng.</p> <p xml:lang="fi">Tavoitteena on paljastaa laudan salainen hahmo värittämällä tai jättämällä tyhjiksi ruudukon soluja sen sivulla annettujen lukujen mukaan. Tämä on yksinpeli.</p> <p xml:lang="gl">O obxectivo consiste en descubrir o padrón oculto no taboleiro. Para facelo, ten que colorar ou deixar en branco celas nunha grade segundo os números que aparecen nas celas contiguas. Trátase dun xogo para un único xogador.</p> <p xml:lang="nl">Het doel is het onthullen van het verborgen patroon in het bord door kleuren of leeg laten van de cellen in een raster volgens cijfers gegeven aan de rand van het raster. Dit is een spel voor een enkele speler.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-15.12.3/src/CMakeLists.txt new/picmi-16.04.1/src/CMakeLists.txt --- old/picmi-15.12.3/src/CMakeLists.txt 2016-02-08 16:02:10.000000000 +0100 +++ new/picmi-16.04.1/src/CMakeLists.txt 2016-04-12 14:33:30.000000000 +0200 @@ -11,7 +11,7 @@ kde_enable_exceptions() if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - add_definitions("-Wextra -pedantic") + add_compile_options(-Wextra -pedantic) endif () include(CheckIncludeFileCXX) @@ -42,15 +42,16 @@ add_executable(picmi ${picmi_SRCS}) target_link_libraries(picmi - picmi_gui - picmi_logic + Qt5::Svg KF5::CoreAddons - KF5::XmlGui + KF5::Crash + KF5::DBusAddons KF5::I18n KF5::KIOWidgets - Qt5::Svg + KF5::XmlGui KF5KDEGames - KF5::DBusAddons + picmi_gui + picmi_logic ) install(TARGETS picmi DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-15.12.3/src/gui/mainwindow.cpp new/picmi-16.04.1/src/gui/mainwindow.cpp --- old/picmi-15.12.3/src/gui/mainwindow.cpp 2016-02-08 16:02:10.000000000 +0100 +++ new/picmi-16.04.1/src/gui/mainwindow.cpp 2016-04-12 14:33:30.000000000 +0200 @@ -277,9 +277,9 @@ void MainWindow::gameWon() { KScoreDialog::FieldInfo score = m_game->endGame(); - bool notified = false; m_status_position->setVisible(false); if (m_mode == Random) { + bool notified = false; m_new_game->setVisible(true); if (Kg::difficultyLevel() != KgDifficultyLevel::Custom) { QSharedPointer<KScoreDialog> scoreDialog = createScoreDialog(); @@ -288,15 +288,18 @@ notified = true; } } + + /* Ensure that the user gets some kind of feedback about solving the board. */ + if (!notified) { + KMessageBox::information(this, i18n("Congratulations, you have solved this board!"), + i18n("Board Solved!")); + } } else if (m_mode == Preset) { m_load_game->setVisible(true); m_current_level->setSolved(m_game->elapsedSecs()); - } - - /* Ensure that the user gets some kind of feedback about solving the board. */ - if (!notified) { - KMessageBox::information(this, i18n("Board Solved!"), - i18n("Congratulations, you've solved this board!")); + KMessageBox::information(this, i18n("Congratulations, you have solved board '%1'!", + m_current_level->name()), + i18n("Board Solved!")); } m_view.setFocus(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-15.12.3/src/gui/settingswindow.cpp new/picmi-16.04.1/src/gui/settingswindow.cpp --- old/picmi-15.12.3/src/gui/settingswindow.cpp 2016-02-08 16:02:10.000000000 +0100 +++ new/picmi-16.04.1/src/gui/settingswindow.cpp 2016-04-12 14:33:30.000000000 +0200 @@ -52,7 +52,7 @@ { QColor color(m_font_color_solved); color = QColorDialog::getColor(color, this); - if ( color.isValid() ) { + if (!color.isValid()) { return; } m_font_color_solved = color.name(); @@ -63,7 +63,7 @@ { QColor color(m_font_color_unsolved); color = QColorDialog::getColor(color, this); - if ( color.isValid() ) { + if (!color.isValid()) { return; } m_font_color_unsolved = color.name(); @@ -73,7 +73,7 @@ void SettingsWindow::bgToolButtonClicked() { QString fileName = QFileDialog::getOpenFileName(this, i18n("Select Background"), QString(), - i18n("*.png *.jpg|Image Files (*.png *.jpg)") ); + i18n("Image Files (*.png *.jpg)")); if (fileName.isNull()) { return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-15.12.3/src/logic/elapsedtime.h new/picmi-16.04.1/src/logic/elapsedtime.h --- old/picmi-15.12.3/src/logic/elapsedtime.h 2016-02-08 16:02:10.000000000 +0100 +++ new/picmi-16.04.1/src/logic/elapsedtime.h 2016-04-12 14:33:30.000000000 +0200 @@ -47,7 +47,7 @@ /* adds penalty time and increases the next penalty amount */ void addPenaltyTime(); - /* return elapsed seconds the the datetime when start() was called */ + /* return elapsed seconds since the datetime when start() was called */ int elapsedSecs() const; QDateTime startDate() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-15.12.3/src/logic/picmi.cpp new/picmi-16.04.1/src/logic/picmi.cpp --- old/picmi-15.12.3/src/logic/picmi.cpp 2016-02-08 16:02:10.000000000 +0100 +++ new/picmi-16.04.1/src/logic/picmi.cpp 2016-04-12 14:33:30.000000000 +0200 @@ -186,7 +186,7 @@ return QPoint(0, 0); } - const int idx = rand() % incorrect_cells.size(); + const int idx = qrand() % incorrect_cells.size(); const QPoint cell(incorrect_cells.at(idx)); Board::State state = m_map->get(cell.x(), cell.y()); if (state == Board::Nothing) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-15.12.3/src/main.cpp new/picmi-16.04.1/src/main.cpp --- old/picmi-15.12.3/src/main.cpp 2016-02-08 16:02:10.000000000 +0100 +++ new/picmi-16.04.1/src/main.cpp 2016-04-12 14:33:30.000000000 +0200 @@ -19,6 +19,7 @@ #include "config.h" #include <KAboutData> +#include <KCrash> #include <KDBusService> #include <KLocalizedString> #include <QApplication> @@ -46,12 +47,13 @@ i18n("Picmi - a nonogram puzzle game"), KAboutLicense::GPL_V2, i18n("(c) 2012 - 2015 The Picmi Authors")); - about.setHomepage("https://projects.kde.org/projects/kde/kdegames/picmi";); + about.setHomepage("https://games.kde.org/picmi";); about.addAuthor(i18n("Jakob Gruber"), i18n("Picmi Author"), "jakob.gru...@gmail.com"); QCommandLineParser parser; KAboutData::setApplicationData(about); + KCrash::initialize(); parser.addVersionOption(); parser.addHelpOption(); about.setupCommandLine(&parser);
