Hello community, here is the log from the commit of package kjumpingcube for openSUSE:Factory checked in at 2016-05-29 03:11:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjumpingcube (Old) and /work/SRC/openSUSE:Factory/.kjumpingcube.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjumpingcube" Changes: -------- --- /work/SRC/openSUSE:Factory/kjumpingcube/kjumpingcube.changes 2016-04-05 10:42:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kjumpingcube.new/kjumpingcube.changes 2016-05-29 03:11:06.000000000 +0200 @@ -1,0 +2,30 @@ +Wed May 18 05:17:48 UTC 2016 - [email protected] + +- Ensure the .desktop file isn't executable + +------------------------------------------------------------------- +Sat May 7 10:31:17 UTC 2016 - [email protected] + +- 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:06:42 UTC 2016 - [email protected] + +- 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:43:01 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * 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 + +------------------------------------------------------------------- Old: ---- Unbreak-startup.patch Use-KCrash.patch kjumpingcube-15.12.3.tar.xz New: ---- kjumpingcube-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjumpingcube.spec ++++++ --- /var/tmp/diff_new_pack.CK3JnX/_old 2016-05-29 03:11:07.000000000 +0200 +++ /var/tmp/diff_new_pack.CK3JnX/_new 2016-05-29 03:11:07.000000000 +0200 @@ -42,13 +42,9 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 15.12.3 +Version: 16.04.1 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 @@ -61,8 +57,6 @@ %prep %setup -q -n kjumpingcube-%{version} -%patch0 -p1 -%patch1 -p1 %build %cmake_kf5 -d build @@ -70,6 +64,8 @@ %install %kf5_makeinstall -C build +# .desktop files shouldn't be executable + chmod -x %{buildroot}/usr/share/applications/org.kde.kjumpingcube.desktop %files %defattr(-,root,root) ++++++ kjumpingcube-15.12.3.tar.xz -> kjumpingcube-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-15.12.3/CMakeLists.txt new/kjumpingcube-16.04.1/CMakeLists.txt --- old/kjumpingcube-15.12.3/CMakeLists.txt 2015-11-11 11:14:38.000000000 +0100 +++ new/kjumpingcube-16.04.1/CMakeLists.txt 2016-04-07 17:14:47.000000000 +0200 @@ -2,30 +2,25 @@ 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(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg) +find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Config - ItemModels + Crash WidgetsAddons - WindowSystem - Config DBusAddons I18n ConfigWidgets - TextWidgets XmlGui - KIO - NotifyConfig - NewStuff - KDELibs4Support) + KDELibs4Support +) find_package(KF5KDEGames 4.9.0 REQUIRED) -find_package(Phonon4Qt5 CONFIG REQUIRED) include(FeatureSummary) include(ECMAddAppIcon) @@ -36,8 +31,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 +45,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 + KF5KDEGames + KF5::XmlGui + KF5::DBusAddons + 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 ) - -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 ) - - - +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 +) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-15.12.3/ai_box.h new/kjumpingcube-16.04.1/ai_box.h --- old/kjumpingcube-15.12.3/ai_box.h 2015-11-11 11:14:38.000000000 +0100 +++ new/kjumpingcube-16.04.1/ai_box.h 2016-04-07 17:14:47.000000000 +0200 @@ -40,7 +40,7 @@ /** * The KJumpingCube AI_Box constructor. */ - AI_Box (QObject * parent = 0, int side = 5); + explicit AI_Box (QObject * parent = 0, int side = 5); virtual ~AI_Box(); int side() const { return m_side; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-15.12.3/ai_main.cpp new/kjumpingcube-16.04.1/ai_main.cpp --- old/kjumpingcube-15.12.3/ai_main.cpp 2015-11-11 11:14:38.000000000 +0100 +++ new/kjumpingcube-16.04.1/ai_main.cpp 2016-04-07 17:14:47.000000000 +0200 @@ -443,7 +443,7 @@ int counter = 0; // Find all moves with minimum assessment - for (n = 0; n < moves; n++) { + for (n = 0; n < moves; ++n) { if (c2m[n].val == min) { c2m[counter].index = c2m[n].index; c2m[counter].val = c2m[n].val; @@ -462,7 +462,7 @@ // if ((counter <= 2) || (m_skill == Prefs::EnumSkill1::Average)) // if ((m_skill == Prefs::EnumSkill1::Average) && if (m_currentMoveNo > (m_nCubes / 3)) { // If board > 1/3 full. - for (n = 0; n < moves; n++) { + for (n = 0; n < moves; ++n) { if (c2m[n].val == secondMin) { c2m[counter].index = c2m[n].index; c2m[counter].val = c2m[n].val; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-15.12.3/ai_newton.cpp new/kjumpingcube-16.04.1/ai_newton.cpp --- old/kjumpingcube-15.12.3/ai_newton.cpp 2015-11-11 11:14:38.000000000 +0100 +++ new/kjumpingcube-16.04.1/ai_newton.cpp 2016-04-07 17:14:47.000000000 +0200 @@ -46,7 +46,6 @@ int oCount = 0; int oRank = 4; int cRank = maxValues[index] - values[index]; - int nCount = 0; int pos = 0; // Get statistics for neighbors: count and best rank for player and other. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-15.12.3/game.cpp new/kjumpingcube-16.04.1/game.cpp --- old/kjumpingcube-15.12.3/game.cpp 2015-11-11 11:14:38.000000000 +0100 +++ new/kjumpingcube-16.04.1/game.cpp 2016-04-07 17:14:47.000000000 +0200 @@ -573,8 +573,7 @@ // check filename QRegExp pattern ("*.kjc", Qt::CaseSensitive, QRegExp::Wildcard); if (! pattern.exactMatch (url.fileName())) { - url = url.adjusted(QUrl::RemoveFilename); - url.setPath(url.path() + url.fileName()+".kjc"); + url.setPath(url.path() +".kjc"); } if (KIO::NetAccess::exists (url, KIO::NetAccess::DestinationSide, @@ -829,8 +828,8 @@ int cubeDim = config.readEntry ("CubeDim", minSide); if ((cubeDim < minSide) || (cubeDim > maxSide)) { KMessageBox::sorry (m_view, i18n("The file's cube box size is outside " - "the range %1 to %2. It will be set to %1.") - .arg(minSide).arg(maxSide)); + "the range %1 to %2. It will be set to %1.", + minSide, maxSide)); cubeDim = 3; } @@ -844,8 +843,7 @@ list = config.readEntry (key, QStringList()); // List length must be 2, owner must be 0-2, value >= 1 and <= max(). if (list.count() < 2) { - KMessageBox::sorry (m_view, i18n("Missing input line for cube %1.") - .arg(key)); + KMessageBox::sorry (m_view, i18n("Missing input line for cube %1.", key)); owner = 0; value = 1; } @@ -855,15 +853,14 @@ } if ((owner < 0) || (owner > 2)) { KMessageBox::sorry (m_view, i18n("Owner of cube %1 is outside the " - "range 0 to 2.").arg(key)); + "range 0 to 2.", key)); owner = 0; } int index = x * m_side + y; maxValue = (owner == 0) ? 1 : m_box->maxValue (index); if ((value < 1) || (value > maxValue)) { KMessageBox::sorry (m_view, i18n("Value of cube %1 is outside the " - "range 1 to %2.") - .arg(key).arg(maxValue)); + "range 1 to %2.", key, maxValue)); value = maxValue; } m_view->displayCube (index, (Player) owner, value); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-15.12.3/kjumpingcube.kcfg new/kjumpingcube-16.04.1/kjumpingcube.kcfg --- old/kjumpingcube-15.12.3/kjumpingcube.kcfg 2015-11-11 11:14:38.000000000 +0100 +++ new/kjumpingcube-16.04.1/kjumpingcube.kcfg 2016-04-07 17:14:47.000000000 +0200 @@ -2,10 +2,12 @@ <kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > + http://www.kde.org/standards/kcfg/1.0/kcfg.xsd";> <kcfgfile name="kjumpingcuberc"/> <group name="Game"> - <entry name="AnimationSpeed" type="Int" min="1" max="10"> + <entry name="AnimationSpeed" type="Int"> + <min>1</min> + <max>10</max> <label>Animation speed of overflowing dice</label> <default>4</default> </entry> @@ -37,7 +39,9 @@ <label>Color of player 2.</label> <default>#6193cf</default> </entry> - <entry name="CubeDim" type="Int" min="3" max="15"> + <entry name="CubeDim" type="Int"> + <min>3</min> + <max>15</max> <label>Size of the playing field.</label> <default>6</default> </entry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-15.12.3/kjumpingcubeui.rc new/kjumpingcube-16.04.1/kjumpingcubeui.rc --- old/kjumpingcube-15.12.3/kjumpingcubeui.rc 2015-11-11 11:14:38.000000000 +0100 +++ new/kjumpingcube-16.04.1/kjumpingcubeui.rc 2016-04-07 17:14:47.000000000 +0200 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<gui name="kjumpingcube" - version="7" - xmlns="http://www.kde.org/standards/kxmlgui/1.0"; +<gui xmlns="http://www.kde.org/standards/kxmlgui/1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + name="kjumpingcube" + version="7" xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0 http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd";> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-15.12.3/main.cpp new/kjumpingcube-16.04.1/main.cpp --- old/kjumpingcube-15.12.3/main.cpp 2015-11-11 11:14:38.000000000 +0100 +++ new/kjumpingcube-16.04.1/main.cpp 2016-04-07 17:14:47.000000000 +0200 @@ -24,8 +24,10 @@ #include <KAboutData> +#include <KCrash> #include <QApplication> #include <KLocalizedString> +#include <KDBusService> #include <QCommandLineParser> #include <kdelibs4configmigrator.h> @@ -47,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(), "[email protected]"); aboutData.addAuthor(i18n("Benjamin Meyer"),i18n("Various improvements"), "[email protected]"); aboutData.addCredit(i18n("Ian Wadham"), @@ -59,11 +62,13 @@ QCommandLineParser parser; KAboutData::setApplicationData(aboutData); + KCrash::initialize(); parser.addVersionOption(); parser.addHelpOption(); aboutData.setupCommandLine(&parser); parser.process(app); aboutData.processCommandLine(&parser); + KDBusService service; app.setWindowIcon(QIcon::fromTheme(QLatin1String("kjumpingcube"))); @@ -72,8 +77,8 @@ RESTORE(KJumpingCube) } else { - KJumpingCube *kjumpingcube = new KJumpingCube; - kjumpingcube->show(); - } - return app.exec(); + KJumpingCube *kjumpingcube = new KJumpingCube; + kjumpingcube->show(); + } + return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-15.12.3/settingswidget.h new/kjumpingcube-16.04.1/settingswidget.h --- old/kjumpingcube-15.12.3/settingswidget.h 2015-11-11 11:14:38.000000000 +0100 +++ new/kjumpingcube-16.04.1/settingswidget.h 2016-04-07 17:14:47.000000000 +0200 @@ -15,15 +15,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ********************************************************************** */ +#ifndef SETTINGSWIDGET_H +#define SETTINGSWIDGET_H + // Settings widget. #include "ui_settings.h" class SettingsWidget : public QWidget, public Ui::Settings { public: - SettingsWidget(QWidget *parent) + explicit SettingsWidget(QWidget *parent) : QWidget(parent) { setupUi(this); } }; + +#endif +
