Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package palapeli for openSUSE:Factory checked in at 2021-08-16 10:11:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/palapeli (Old) and /work/SRC/openSUSE:Factory/.palapeli.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "palapeli" Mon Aug 16 10:11:00 2021 rev:111 rq:911794 version:21.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/palapeli/palapeli.changes 2021-07-10 00:02:39.466976170 +0200 +++ /work/SRC/openSUSE:Factory/.palapeli.new.1899/palapeli.changes 2021-08-16 10:16:52.618710227 +0200 @@ -1,0 +2,25 @@ +Fri Aug 6 09:42:45 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.08.0 +- No code change since 21.07.90 + +------------------------------------------------------------------- +Fri Jul 30 10:05:55 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.07.90 + * New feature release +- No code change since 21.07.80 + +------------------------------------------------------------------- +Sat Jul 17 20:07:05 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.07.80 + * New feature release +- Changes since 21.04.3: + * Clean up ServiceType property usage for JSON based plugins +- Only install the license files once + +------------------------------------------------------------------- Old: ---- palapeli-21.04.3.tar.xz palapeli-21.04.3.tar.xz.sig New: ---- palapeli-21.08.0.tar.xz palapeli-21.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ palapeli.spec ++++++ --- /var/tmp/diff_new_pack.GDRlu5/_old 2021-08-16 10:16:53.106709640 +0200 +++ /var/tmp/diff_new_pack.GDRlu5/_new 2021-08-16 10:16:53.110709636 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: palapeli -Version: 21.04.3 +Version: 21.08.0 Release: 0 Summary: Jigsaw puzzle game License: GPL-2.0-or-later @@ -53,7 +53,6 @@ BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Widgets) Requires: palapeli-data = %{version} -Recommends: %{name}-lang %description Palapeli is a jigsaw puzzle game. Unlike other games in that genre, you are not @@ -133,19 +132,16 @@ %{_kf5_sharedir}/mime/packages/palapeli-mimetypes.xml %files data -%license LICENSES/* %{_kf5_appsdir}/palapeli/ %config %{_kf5_configdir}/palapeli-collectionrc %files devel -%license LICENSES/* %{_includedir}/Pala %{_kf5_libdir}/libpala.so %{_kf5_cmakedir}/Pala/ %if %{with lang} %files lang -f %{name}.lang -%license LICENSES/* %endif %changelog ++++++ palapeli-21.04.3.tar.xz -> palapeli-21.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/.gitignore new/palapeli-21.08.0/.gitignore --- old/palapeli-21.04.3/.gitignore 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/.gitignore 2021-08-05 00:04:18.000000000 +0200 @@ -3,3 +3,9 @@ *.kdev4 CMakeLists.txt.user* .cmake/ +/.clang-format +/compile_commands.json +.clangd +.cache +.idea +/cmake-build* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/CMakeLists.txt new/palapeli-21.08.0/CMakeLists.txt --- old/palapeli-21.04.3/CMakeLists.txt 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/CMakeLists.txt 2021-08-05 00:04:18.000000000 +0200 @@ -1,15 +1,15 @@ -cmake_minimum_required (VERSION 3.5 FATAL_ERROR) +cmake_minimum_required(VERSION 3.16 FATAL_ERROR) set (RELEASE_SERVICE_VERSION_MAJOR "21") -set (RELEASE_SERVICE_VERSION_MINOR "04") -set (RELEASE_SERVICE_VERSION_MICRO "3") +set (RELEASE_SERVICE_VERSION_MINOR "08") +set (RELEASE_SERVICE_VERSION_MICRO "0") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") set (RELEASE_SERVICE_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}") project(palapeli VERSION "2.1.${RELEASE_SERVICE_COMPACT_VERSION}") -set (QT_MIN_VERSION "5.12.0") -set (KF5_MIN_VERSION "5.68.0") +set (QT_MIN_VERSION "5.15.0") +set (KF5_MIN_VERSION "5.83.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/CMakePresets.json new/palapeli-21.08.0/CMakePresets.json --- old/palapeli-21.04.3/CMakePresets.json 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/CMakePresets.json 2021-08-05 00:04:18.000000000 +0200 @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "configurePresets": [ { "name": "dev", @@ -23,6 +23,17 @@ } }, { + "name": "unity", + "displayName": "Build with CMake unity support.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-unity", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_UNITY_BUILD": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + } + }, + { "name": "release", "displayName": "Build as release mode.", "generator": "Ninja", @@ -40,6 +51,33 @@ "CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" } + }, + { + "name": "clazy", + "displayName": "clazy", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-clazy", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + }, + "environment": { + "CXX": "clazy", + "CCACHE_DISABLE": "ON" + } + } + ], + "buildPresets": [ + { + "name": "dev", + "configurePreset": "dev" + }, + { + "name": "clazy", + "configurePreset": "clazy", + "environment": { + "CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo", + "CCACHE_DISABLE" : "ON" + } } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/libpala/CMakeLists.txt new/palapeli-21.08.0/libpala/CMakeLists.txt --- old/palapeli-21.04.3/libpala/CMakeLists.txt 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/libpala/CMakeLists.txt 2021-08-05 00:04:18.000000000 +0200 @@ -9,15 +9,23 @@ # Pala/ is include visibility protection layer set(libpala_INSTALL_INCLUDEDIR ${KDE_INSTALL_INCLUDEDIR}/Pala) -set(libpala_SRCS - slicer.cpp - slicerjob.cpp - slicermode.cpp - slicerproperty.cpp - slicerpropertyset.cpp +add_library(pala SHARED) + +target_sources(pala PRIVATE + slicer.cpp + slicerjob.cpp + slicermode.cpp + slicerproperty.cpp + slicerpropertyset.cpp ) -ecm_qt_declare_logging_category(libpala_SRCS HEADER libpala_debug.h IDENTIFIER PALAPELI_LIBPALA_LOG CATEGORY_NAME org.kde.palapeli.libpala DESCRIPTION "palapeli (libpala)" EXPORT PALAPELI) +ecm_qt_declare_logging_category(pala + HEADER libpala_debug.h + IDENTIFIER PALAPELI_LIBPALA_LOG + CATEGORY_NAME org.kde.palapeli.libpala + DESCRIPTION "palapeli (libpala)" + EXPORT PALAPELI +) set(libpala_HDRS ${CMAKE_CURRENT_BINARY_DIR}/libpala_export.h @@ -33,7 +41,6 @@ PREFIX Pala ) -add_library(pala SHARED ${libpala_SRCS}) generate_export_header(pala BASE_NAME libpala) target_link_libraries(pala KF5::I18n Qt5::Gui) target_include_directories(pala @@ -41,8 +48,8 @@ "$<INSTALL_INTERFACE:${libpala_INSTALL_INCLUDEDIR}>" ) set_target_properties(pala PROPERTIES - VERSION ${libpala_VERSION} - SOVERSION ${libpala_SOVERSION} + VERSION ${libpala_VERSION} + SOVERSION ${libpala_SOVERSION} EXPORT_NAME Pala ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/po/pl/palapeli.po new/palapeli-21.08.0/po/pl/palapeli.po --- old/palapeli-21.04.3/po/pl/palapeli.po 2021-07-06 07:23:49.000000000 +0200 +++ new/palapeli-21.08.0/po/pl/palapeli.po 2021-08-06 02:19:42.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: palipeli\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-26 02:34+0100\n" -"PO-Revision-Date: 2021-04-04 08:10+0200\n" +"PO-Revision-Date: 2021-04-04 07:57+0200\n" "Last-Translator: ??ukasz Wojni??owicz <lukasz.wojnilow...@gmail.com>\n" "Language-Team: Polish <kde-i18n-...@kde.org>\n" "Language: pl\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/po/zh_CN/palapeli.po new/palapeli-21.08.0/po/zh_CN/palapeli.po --- old/palapeli-21.04.3/po/zh_CN/palapeli.po 2021-07-06 07:23:49.000000000 +0200 +++ new/palapeli-21.08.0/po/zh_CN/palapeli.po 2021-08-06 02:19:42.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-26 02:34+0100\n" -"PO-Revision-Date: 2021-06-20 07:37\n" +"PO-Revision-Date: 2021-07-26 13:49\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/slicers/CMakeLists.txt new/palapeli-21.08.0/slicers/CMakeLists.txt --- old/palapeli-21.04.3/slicers/CMakeLists.txt 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/slicers/CMakeLists.txt 2021-08-05 00:04:18.000000000 +0200 @@ -25,22 +25,20 @@ add_library(palapeli_jigsawslicer MODULE slicer-jigsaw.cpp) target_link_libraries(palapeli_jigsawslicer ${SLICER_LINK_LIBS}) -set(palapeli_goldbergslicer_SRCS - goldberg/slicer-goldberg.cpp - goldberg/goldberg-engine.cpp - goldberg/grid-preset.cpp - goldberg/grid-cairo.cpp - goldberg/grid-hex.cpp - goldberg/grid-rect.cpp - goldberg/grid-rotrex.cpp - goldberg/grid-voronoi.cpp - goldberg/pointfinder.cpp - goldberg/utilities.cpp -) - -add_library(palapeli_goldbergslicer MODULE ${palapeli_goldbergslicer_SRCS}) +add_library(palapeli_goldbergslicer MODULE) target_link_libraries(palapeli_goldbergslicer ${SLICER_LINK_LIBS}) - +target_sources(palapeli_goldbergslicer PRIVATE + goldberg/slicer-goldberg.cpp + goldberg/goldberg-engine.cpp + goldberg/grid-preset.cpp + goldberg/grid-cairo.cpp + goldberg/grid-hex.cpp + goldberg/grid-rect.cpp + goldberg/grid-rotrex.cpp + goldberg/grid-voronoi.cpp + goldberg/pointfinder.cpp + goldberg/utilities.cpp +) install(TARGETS palapeli_goldbergslicer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/slicers/goldberg/grid-voronoi.cpp new/palapeli-21.08.0/slicers/goldberg/grid-voronoi.cpp --- old/palapeli-21.04.3/slicers/goldberg/grid-voronoi.cpp 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/slicers/goldberg/grid-voronoi.cpp 2021-08-05 00:04:18.000000000 +0200 @@ -31,11 +31,7 @@ QList<int> result; if (input.size() == 0) return result; -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) const QStringList parts = QString::fromUtf8(input.takeFirst()).split(QLatin1Char(' '), Qt::SkipEmptyParts); -#else - QStringList parts = QString::fromUtf8(input.takeFirst()).split(QLatin1Char(' '), QString::SkipEmptyParts); -#endif bool ok; for (int i=0; i<parts.size(); ++i) { @@ -55,11 +51,7 @@ QList<qreal> result; if (input.size() == 0) return result; -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) const QStringList parts = QString::fromUtf8(input.takeFirst()).split(QLatin1Char(' '), Qt::SkipEmptyParts); -#else - QStringList parts = QString::fromUtf8(input.takeFirst()).split(QLatin1Char(' '), QString::SkipEmptyParts); -#endif bool ok; for (int i=0; i<parts.size(); ++i) { @@ -101,11 +93,7 @@ case 3: border = QLineF(0, height, width, height); break; } if (new_points_found == 0) { -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - if (QLineF::BoundedIntersection == border.intersect(ridge, &new_p1)) { -#else if (QLineF::BoundedIntersection == border.intersects(ridge, &new_p1)) { -#endif // if one point is inside, there will be only 1 intersection point. // But, if one point is on the frame, we might have found it. check that. new_points_found = 1; @@ -121,11 +109,7 @@ } } else { -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - if (QLineF::BoundedIntersection == border.intersect(ridge, &new_p2)) { -#else if (QLineF::BoundedIntersection == border.intersects(ridge, &new_p2)) { -#endif // We have to set new_points_found > 1, in order to get // endpoints cropped correctly in the case where both points are // outside the frame, but the ridge passes through the frame. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/slicers/palapeli_goldbergslicer.json new/palapeli-21.08.0/slicers/palapeli_goldbergslicer.json --- old/palapeli-21.04.3/slicers/palapeli_goldbergslicer.json 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/slicers/palapeli_goldbergslicer.json 2021-08-05 00:04:18.000000000 +0200 @@ -9,6 +9,7 @@ "Name[de]": "Johannes Loehnert", "Name[en_GB]": "Johannes Loehnert", "Name[es]": "Johannes Loehnert", + "Name[eu]": "Johannes Loehnert", "Name[fi]": "Johannes Loehnert", "Name[fr]": "Johannes Loehnert", "Name[it]": "Johannes Loehnert", @@ -30,6 +31,7 @@ "Description[de]": "Vormals als ???Goldberg???-Schneidewerkzeug bekannt", "Description[en_GB]": "Formerly known as Goldberg Slicer", "Description[es]": "Anteriormente conocido como Goldberg Slicer", + "Description[eu]": "Behinola Goldberg zatitzaile gisa ezaguna", "Description[fi]": "Aiemmin tunnettu Goldberg-paloittetapana", "Description[fr]": "Anciennement connu comme le d??coupage de Goldberg", "Description[it]": "Precedentemente noto come Suddivisore di Goldberg", @@ -86,9 +88,6 @@ "Name[x-test]": "xxPalapeli Slicer Collectionxx", "Name[zh_CN]": "Palapeli ???????????????", "Name[zh_TW]": "Palapeli ???????????????", - "ServiceTypes": [ - "Libpala/SlicerPlugin" - ], "Version": "0.3" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/slicers/palapeli_jigsawslicer.json new/palapeli-21.08.0/slicers/palapeli_jigsawslicer.json --- old/palapeli-21.04.3/slicers/palapeli_jigsawslicer.json 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/slicers/palapeli_jigsawslicer.json 2021-08-05 00:04:18.000000000 +0200 @@ -9,6 +9,7 @@ "Name[de]": "Stefan Majewsky", "Name[en_GB]": "Stefan Majewsky", "Name[es]": "Stefan Majewsky", + "Name[eu]": "Stefan Majewsky", "Name[fi]": "Stefan Majewsky", "Name[fr]": "Stefan Majewsky", "Name[it]": "Stefan Majewsky", @@ -68,9 +69,6 @@ "Name[x-test]": "xxClassic jigsaw piecesxx", "Name[zh_CN]": "????????????", "Name[zh_TW]": "??????????????????", - "ServiceTypes": [ - "Libpala/SlicerPlugin" - ], "Version": "0.3" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/slicers/palapeli_rectslicer.json new/palapeli-21.08.0/slicers/palapeli_rectslicer.json --- old/palapeli-21.04.3/slicers/palapeli_rectslicer.json 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/slicers/palapeli_rectslicer.json 2021-08-05 00:04:18.000000000 +0200 @@ -9,6 +9,7 @@ "Name[de]": "Stefan Majewsky", "Name[en_GB]": "Stefan Majewsky", "Name[es]": "Stefan Majewsky", + "Name[eu]": "Stefan Majewsky", "Name[fi]": "Stefan Majewsky", "Name[fr]": "Stefan Majewsky", "Name[it]": "Stefan Majewsky", @@ -70,9 +71,6 @@ "Name[x-test]": "xxRectangular piecesxx", "Name[zh_CN]": "????????????", "Name[zh_TW]": "???????????????", - "ServiceTypes": [ - "Libpala/SlicerPlugin" - ], "Version": "0.3" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/src/CMakeLists.txt new/palapeli-21.08.0/src/CMakeLists.txt --- old/palapeli-21.04.3/src/CMakeLists.txt 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/src/CMakeLists.txt 2021-08-05 00:04:18.000000000 +0200 @@ -1,59 +1,74 @@ -set(palapeli_SRCS - config/configdialog.cpp - config/elidinglabel.cpp - config/mouseinputbutton.cpp - config/triggerconfigwidget.cpp - config/triggerlistview.cpp - creator/propertywidget.cpp - creator/puzzlecreator.cpp - creator/slicerconfwidget.cpp - creator/slicerselector.cpp - engine/gameplay.cpp - engine/constraintinteractor.cpp - engine/constraintvisualizer.cpp - engine/interactor.cpp - engine/interactors.cpp - engine/interactormanager.cpp - engine/mergegroup.cpp - engine/piece.cpp - engine/piecevisuals.cpp - engine/puzzlepreview.cpp - engine/scene.cpp - engine/texturehelper.cpp - engine/trigger.cpp - engine/triggermapper.cpp - engine/view.cpp - engine/zoomwidget.cpp - file-io/collection.cpp - file-io/collection-delegate.cpp - file-io/collection-view.cpp - file-io/components-archivestorage.cpp - file-io/components-collectionstorage.cpp - file-io/components-copy.cpp - file-io/components-creationcontext.cpp - file-io/components-directorystorage.cpp - file-io/components-retailstorage.cpp - file-io/puzzle.cpp - importhelper.cpp - main.cpp - window/loadingwidget.cpp - window/mainwindow.cpp - window/puzzletablewidget.cpp - window/pieceholder.cpp - palapeli.qrc +ecm_setup_version(${PROJECT_VERSION} + VARIABLE_PREFIX PALAPELI + VERSION_HEADER palapeli_version.h ) -ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX PALAPELI VERSION_HEADER palapeli_version.h) -ecm_qt_declare_logging_category(palapeli_SRCS HEADER palapeli_debug.h IDENTIFIER PALAPELI_LOG CATEGORY_NAME org.kde.palapeli DESCRIPTION "palapeli" EXPORT PALAPELI) +add_executable(palapeli) + +target_sources(palapeli PRIVATE + config/configdialog.cpp + config/elidinglabel.cpp + config/mouseinputbutton.cpp + config/triggerconfigwidget.cpp + config/triggerlistview.cpp + creator/propertywidget.cpp + creator/puzzlecreator.cpp + creator/slicerconfwidget.cpp + creator/slicerselector.cpp + engine/gameplay.cpp + engine/constraintinteractor.cpp + engine/constraintvisualizer.cpp + engine/interactor.cpp + engine/interactors.cpp + engine/interactormanager.cpp + engine/mergegroup.cpp + engine/piece.cpp + engine/piecevisuals.cpp + engine/puzzlepreview.cpp + engine/scene.cpp + engine/texturehelper.cpp + engine/trigger.cpp + engine/triggermapper.cpp + engine/view.cpp + engine/zoomwidget.cpp + file-io/collection.cpp + file-io/collection-delegate.cpp + file-io/collection-view.cpp + file-io/components-archivestorage.cpp + file-io/components-collectionstorage.cpp + file-io/components-copy.cpp + file-io/components-creationcontext.cpp + file-io/components-directorystorage.cpp + file-io/components-retailstorage.cpp + file-io/puzzle.cpp + importhelper.cpp + main.cpp + window/loadingwidget.cpp + window/mainwindow.cpp + window/puzzletablewidget.cpp + window/pieceholder.cpp + + palapeli.qrc +) + +ecm_qt_declare_logging_category(palapeli + HEADER palapeli_debug.h + IDENTIFIER PALAPELI_LOG + CATEGORY_NAME org.kde.palapeli + DESCRIPTION "palapeli" + EXPORT PALAPELI +) + +kconfig_add_kcfg_files(palapeli settings.kcfgc) + +ki18n_wrap_ui(palapeli settings.ui) -kconfig_add_kcfg_files(palapeli_SRCS settings.kcfgc) -ki18n_wrap_ui(palapeli_SRCS settings.ui) file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/*-apps-palapeli.png") -ecm_add_app_icon(palapeli_SRCS ICONS ${ICONS_SRCS}) +ecm_add_app_icon(palapeli ICONS ${ICONS_SRCS}) -add_executable(palapeli ${palapeli_SRCS}) target_link_libraries(palapeli pala + KF5KDEGames KF5::Archive KF5::ConfigWidgets KF5::Crash @@ -62,7 +77,6 @@ KF5::KIOWidgets KF5::WidgetsAddons KF5::XmlGui - KF5KDEGames Qt5::Svg ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/src/engine/interactormanager.cpp new/palapeli-21.08.0/src/engine/interactormanager.cpp --- old/palapeli-21.04.3/src/engine/interactormanager.cpp 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/src/engine/interactormanager.cpp 2021-08-05 00:04:18.000000000 +0200 @@ -44,13 +44,9 @@ void Palapeli::InteractorManager::handleEvent(QWheelEvent* event) { //convert event -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) const QPoint angleDelta = event->angleDelta(); const int delta = (qAbs(angleDelta.x()) > qAbs(angleDelta.y())) ? angleDelta.x() : angleDelta.y(); Palapeli::WheelEvent pEvent(m_view, event->position().toPoint(), delta); -#else - Palapeli::WheelEvent pEvent(m_view, event->pos(), event->delta()); -#endif //check which interactors are triggered by this event Palapeli::Interactor* bestMatchInteractor = nullptr; int bestMatchPriority = -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-21.04.3/src/org.kde.palapeli.appdata.xml new/palapeli-21.08.0/src/org.kde.palapeli.appdata.xml --- old/palapeli-21.04.3/src/org.kde.palapeli.appdata.xml 2021-07-05 21:18:42.000000000 +0200 +++ new/palapeli-21.08.0/src/org.kde.palapeli.appdata.xml 2021-08-05 00:04:18.000000000 +0200 @@ -204,9 +204,9 @@ </provides> <content_rating type="oars-1.1"/> <releases> + <release version="2.1.21080" date="2021-08-12"/> <release version="2.1.21043" date="2021-07-08"/> <release version="2.1.21042" date="2021-06-10"/> <release version="2.1.21041" date="2021-05-13"/> - <release version="2.1.21040" date="2021-04-22"/> </releases> </component>
