Compare commits

..

No commits in common. "ccbf6ef9a797a0983ac8ef46e260d546bb35a356" and "cf87981eaeb1543b83a3a63ff7c8be526d3a98fb" have entirely different histories.

3 changed files with 2 additions and 41 deletions

View File

@ -1,26 +0,0 @@
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

View File

@ -1,8 +1,6 @@
%define __cmake3 %{nil}
Name: phonon
Version: 4.10.1
Release: 5
Release: 4
License: LGPLv2+
Summary: Multimedia library
URL: http://phonon.kde.org/
@ -17,7 +15,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
@ -103,8 +101,6 @@ end
%{_libdir}/pkgconfig/phonon.pc
%{_libdir}/*.so
%{_qt4_datadir}/mkspecs/modules/qt_phonon.pri
%exclude %{_libdir}/libphonon4qt5.so
%exclude %{_libdir}/libphonon4qt5experimental.so
%files qt5
%doc COPYING.LIB
@ -121,12 +117,7 @@ end
%{_libdir}/*.so
%{_libdir}/pkgconfig/phonon4qt5.pc
%{_qt5_archdatadir}/mkspecs/modules/qt_phonon4qt5.pri
%exclude %{_libdir}/libphonon.so
%exclude %{_libdir}/libphononexperimental.so
%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
- Package init

View File

@ -1,4 +0,0 @@
version_control: github
src_repo: KDE/phonon
tag_prefix: ^v
seperator: .