Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kolourpaint for openSUSE:Factory checked in at 2025-08-21 16:57:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kolourpaint (Old) and /work/SRC/openSUSE:Factory/.kolourpaint.new.29662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kolourpaint" Thu Aug 21 16:57:16 2025 rev:177 rq:1300689 version:25.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kolourpaint/kolourpaint.changes 2025-07-06 17:15:12.229064229 +0200 +++ /work/SRC/openSUSE:Factory/.kolourpaint.new.29662/kolourpaint.changes 2025-08-21 16:57:24.141130420 +0200 @@ -1,0 +2,30 @@ +Thu Aug 21 06:45:41 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Add upstream change: + * 0001-Install-colors-file-into-app-specific-directory.patch + +------------------------------------------------------------------- +Fri Aug 8 07:47:45 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 25.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/25.08.0/ +- No code change since 25.07.80 + +------------------------------------------------------------------- +Mon Jul 14 14:25:31 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 25.07.80 + * New feature release +- Changes since 25.04.3: + * install color files which previously were in kdelibs4support (kde#501341) + * Port away from Qt6 deprecated methods + * kpTransformResizeScaleDialog simplify condition + * Improve spinbox localization + * Grammar touch-up in application description + * CI: Flatpak - Delete whitespace + * CI: Flatpak - Disable testing for all KDE projects + * CI: Flatpak - Update to 6.8 runtime + +------------------------------------------------------------------- Old: ---- kolourpaint-25.04.3.tar.xz kolourpaint-25.04.3.tar.xz.sig New: ---- 0001-Install-colors-file-into-app-specific-directory.patch kolourpaint-25.08.0.tar.xz kolourpaint-25.08.0.tar.xz.sig ----------(New B)---------- New:- Add upstream change: * 0001-Install-colors-file-into-app-specific-directory.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kolourpaint.spec ++++++ --- /var/tmp/diff_new_pack.T7PzcP/_old 2025-08-21 16:57:26.225217608 +0200 +++ /var/tmp/diff_new_pack.T7PzcP/_new 2025-08-21 16:57:26.237218110 +0200 @@ -1,7 +1,7 @@ # # spec file for package kolourpaint # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,12 +16,12 @@ # -%define kf6_version 6.6.0 -%define qt6_version 6.6.0 +%define kf6_version 6.14.0 +%define qt6_version 6.8.0 %bcond_without released Name: kolourpaint -Version: 25.04.3 +Version: 25.08.0 Release: 0 Summary: Paint Program # See boo#717722 for license details @@ -33,6 +33,8 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM +Patch0: 0001-Install-colors-file-into-app-specific-directory.patch BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: fdupes BuildRequires: cmake(KF6Crash) >= %{kf6_version} @@ -52,7 +54,7 @@ Obsoletes: kolourpaint5 < %{version} %description -Paint program by KDE +Paint program by KDE. %lang_package @@ -60,7 +62,7 @@ %autosetup -p1 %build -%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE +%cmake_kf6 %kf6_build ++++++ 0001-Install-colors-file-into-app-specific-directory.patch ++++++ >From d35991d3d9b94c829c0d27835f8a49b85a810b91 Mon Sep 17 00:00:00 2001 From: Nicolas Fella <nicolas.fe...@gmx.de> Date: Mon, 14 Jul 2025 00:22:06 +0200 Subject: [PATCH] Install colors file into app-specific directory Kolourpain-specific data should not go into a generically named global config dir BUG: 507007 --- CMakeLists.txt | 2 +- lgpl/generic/kpColorCollection.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bc5f6917..89c5a920 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -368,7 +368,7 @@ endif() install(PROGRAMS org.kde.kolourpaint.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.kde.kolourpaint.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) -install(DIRECTORY colors DESTINATION ${KDE_INSTALL_CONFDIR}) +install(DIRECTORY colors DESTINATION ${KDE_INSTALL_DATADIR}/kolourpaint) if(BUILD_DOC) add_subdirectory(doc) diff --git a/lgpl/generic/kpColorCollection.cpp b/lgpl/generic/kpColorCollection.cpp index aac45e75..70f25cb5 100644 --- a/lgpl/generic/kpColorCollection.cpp +++ b/lgpl/generic/kpColorCollection.cpp @@ -80,7 +80,7 @@ QStringList kpColorCollection::installedCollections() { QStringList paletteList; - QStringList paths = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("colors"), QStandardPaths::LocateDirectory); + QStringList paths = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("colors"), QStandardPaths::LocateDirectory); for (const auto &path : paths) { paletteList.append(QDir(path).entryList(QStringList(), QDir::Files)); } @@ -206,7 +206,7 @@ bool kpColorCollection::openKDE(const QString &name, QWidget *parent) return false; } - QString filename = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("colors/") + name); + QString filename = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("colors/") + name); if (filename.isEmpty()) { #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogColorCollection) << "could not find file"; -- 2.50.1 ++++++ kolourpaint-25.04.3.tar.xz -> kolourpaint-25.08.0.tar.xz ++++++ ++++ 37021 lines of diff (skipped)