Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
ccbf6ef9a7
!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
2022-01-25 07:50:18 +00:00
pei-jiankang
6c28ffe5f4 modify kf5-knotifyconfig compile error
(cherry picked from commit 30c4cd9dcd5f1623096287310fc38808e8b53d9c)
2022-01-25 14:42:02 +08:00
openeuler-ci-bot
16a791d37e !5 Modify yaml file
Merge pull request !5 from jeff200902/master
2020-07-18 10:48:55 +08:00
jeff200902
097298f17c modify yaml 2020-07-18 10:32:29 +08:00
openeuler-ci-bot
01dac5ebeb !3 Add yaml file
Merge pull request !3 from jeff200902/master
2020-05-09 19:27:31 +08:00
jeff200902
092e00f6f2 Add yaml file 2020-05-09 12:04:41 +08:00
openeuler-ci-bot
5604c83374 !2 phonon: remove several extra .so files
Merge pull request !2 from gnaygnil/master
2019-12-04 14:20:50 +08:00
gnaygnil
6ad98e824a phonon: remove several extra .so files 2019-12-04 11:53:55 +08:00
openeuler-ci-bot
1ea42e5afa !1 phonon: add macro define __cmake3
Merge pull request !1 from gnaygnil/master
2019-12-03 20:14:56 +08:00
gnaygnil
87dc1d5872 phonon: add macro define __cmake3 2019-12-03 19:53:36 +08:00
3 changed files with 41 additions and 2 deletions

View 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

View File

@ -1,6 +1,8 @@
%define __cmake3 %{nil}
Name: phonon
Version: 4.10.1
Release: 4
Release: 5
License: LGPLv2+
Summary: Multimedia library
URL: http://phonon.kde.org/
@ -15,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
@ -101,6 +103,8 @@ 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
@ -117,7 +121,12 @@ 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

4
phonon.yaml Normal file
View File

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