From 6c28ffe5f409ceb0bde65f6157e3321ce9f54cb5 Mon Sep 17 00:00:00 2001 From: pei-jiankang Date: Sun, 23 Jan 2022 08:07:46 +0800 Subject: [PATCH] modify kf5-knotifyconfig compile error (cherry picked from commit 30c4cd9dcd5f1623096287310fc38808e8b53d9c) --- ...dify-kf5-knotifyconfig-compile-error.patch | 26 +++++++++++++++++++ phonon.spec | 7 +++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 0001-modify-kf5-knotifyconfig-compile-error.patch diff --git a/0001-modify-kf5-knotifyconfig-compile-error.patch b/0001-modify-kf5-knotifyconfig-compile-error.patch new file mode 100644 index 0000000..6bda5cd --- /dev/null +++ b/0001-modify-kf5-knotifyconfig-compile-error.patch @@ -0,0 +1,26 @@ +From a3d1f07f230dde6c03cdd1f8835b91ca3879eeb8 Mon Sep 17 00:00:00 2001 +From: pei-jiankang +Date: Sun, 23 Jan 2022 08:05:19 +0800 +Subject: [PATCH] modify kf5-knotifyconfig compile error + +--- + phonon/objectdescription.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h +index dafcca0..cb000c3 100644 +--- a/phonon/objectdescription.h ++++ b/phonon/objectdescription.h +@@ -267,7 +267,8 @@ QDebug operator<<(QDebug dbg, const ObjectDescription &d) + { + dbg.nospace() << "\n{\n"; + dbg.nospace() << " index: " << d.index() << "\n"; +- Q_FOREACH (const QByteArray &propertyName, d.propertyNames()) { ++ const QList propertyNames = d.propertyNames(); ++ for (const QByteArray &propertyName : propertyNames) { + dbg.nospace() << " " << propertyName << ": " << + d.property(propertyName).toString() << "\n"; + } +-- +2.27.0 + diff --git a/phonon.spec b/phonon.spec index eb04024..ac00eea 100644 --- a/phonon.spec +++ b/phonon.spec @@ -2,7 +2,7 @@ Name: phonon Version: 4.10.1 -Release: 4 +Release: 5 License: LGPLv2+ Summary: Multimedia library URL: http://phonon.kde.org/ @@ -17,7 +17,7 @@ Provides: phonon-experimental = %{version}-%{release} Patch0001: phonon-rpath_use_link_path.patch Patch0002: phonon-DEFAULT_SOURCE.patch - +Patch0003: 0001-modify-kf5-knotifyconfig-compile-error.patch %description Phonon provides a Qt-style interface for audio and video.It is aimed at the average desktop application, whether that is a game that needs sound @@ -125,5 +125,8 @@ end %exclude %{_libdir}/libphononexperimental.so %changelog +* Tue Jan 25 2022 pei-jiankang - 4.10.1-5 +- modify kf5-knotifyconfig compile error + * Mon Dec 2 2019 Ling Yang - 4.10.1-4 - Package init