!7 [sync] PR-6: modify kf5-knotifyconfig compile error
Merge pull request !7 from openeuler-sync-bot/sync-pr6-master-to-openEuler-22.03-LTS-Next
This commit is contained in:
commit
ccbf6ef9a7
26
0001-modify-kf5-knotifyconfig-compile-error.patch
Normal file
26
0001-modify-kf5-knotifyconfig-compile-error.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From a3d1f07f230dde6c03cdd1f8835b91ca3879eeb8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: pei-jiankang <peijiankang@kylinos.cn>
|
||||||
|
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<T> &d)
|
||||||
|
{
|
||||||
|
dbg.nospace() << "\n{\n";
|
||||||
|
dbg.nospace() << " index: " << d.index() << "\n";
|
||||||
|
- Q_FOREACH (const QByteArray &propertyName, d.propertyNames()) {
|
||||||
|
+ const QList<QByteArray> propertyNames = d.propertyNames();
|
||||||
|
+ for (const QByteArray &propertyName : propertyNames) {
|
||||||
|
dbg.nospace() << " " << propertyName << ": " <<
|
||||||
|
d.property(propertyName).toString() << "\n";
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: phonon
|
Name: phonon
|
||||||
Version: 4.10.1
|
Version: 4.10.1
|
||||||
Release: 4
|
Release: 5
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Summary: Multimedia library
|
Summary: Multimedia library
|
||||||
URL: http://phonon.kde.org/
|
URL: http://phonon.kde.org/
|
||||||
@ -17,7 +17,7 @@ Provides: phonon-experimental = %{version}-%{release}
|
|||||||
|
|
||||||
Patch0001: phonon-rpath_use_link_path.patch
|
Patch0001: phonon-rpath_use_link_path.patch
|
||||||
Patch0002: phonon-DEFAULT_SOURCE.patch
|
Patch0002: phonon-DEFAULT_SOURCE.patch
|
||||||
|
Patch0003: 0001-modify-kf5-knotifyconfig-compile-error.patch
|
||||||
%description
|
%description
|
||||||
Phonon provides a Qt-style interface for audio and video.It is aimed at
|
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
|
the average desktop application, whether that is a game that needs sound
|
||||||
@ -125,5 +125,8 @@ end
|
|||||||
%exclude %{_libdir}/libphononexperimental.so
|
%exclude %{_libdir}/libphononexperimental.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 25 2022 pei-jiankang<peijiankang@kylinos.com> - 4.10.1-5
|
||||||
|
- modify kf5-knotifyconfig compile error
|
||||||
|
|
||||||
* Mon Dec 2 2019 Ling Yang <lingyang2@huawei.com> - 4.10.1-4
|
* Mon Dec 2 2019 Ling Yang <lingyang2@huawei.com> - 4.10.1-4
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user