Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2019-01-15 13:14:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon4qt5" Tue Jan 15 13:14:41 2019 rev:18 rq:663605 version:4.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes 2018-05-06 14:54:37.360098400 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new.28833/phonon4qt5.changes 2019-01-15 13:14:42.868436021 +0100 @@ -1,0 +2,8 @@ +Mon Jan 7 09:25:01 UTC 2019 - Luca Beltrame <lbeltr...@kde.org> + +- Add upstream patch 0001-Fix-PulseAudio-support-with-Qt-5.12.patch + to fix PulseAudio detection with Qt 5.12 +- Run spec-cleaner +- Add %license + +------------------------------------------------------------------- New: ---- 0001-Fix-PulseAudio-support-with-Qt-5.12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon4qt5.spec ++++++ --- /var/tmp/diff_new_pack.M2SJgU/_old 2019-01-15 13:14:43.464435554 +0100 +++ /var/tmp/diff_new_pack.M2SJgU/_new 2019-01-15 13:14:43.468435551 +0100 @@ -1,7 +1,7 @@ # # spec file for package phonon4qt5 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,26 +12,28 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define rname phonon - Name: phonon4qt5 Version: 4.10.1 Release: 0 Summary: Multimedia Platform Abstraction -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: System/GUI/KDE -Url: http://phonon.kde.org/ +URL: http://phonon.kde.org/ Source: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-PulseAudio-support-with-Qt-5.12.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libpulse-devel +BuildRequires: pkgconfig BuildRequires: xz BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -41,7 +43,6 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Phonon is a cross-platform portable multimedia support abstraction, @@ -52,8 +53,8 @@ %package devel Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE -Requires: libphonon4qt5 = %{version} Requires: extra-cmake-modules >= 1.7.0 +Requires: libphonon4qt5 = %{version} %description devel Phonon is a cross-platform portable Multimedia Support Abstraction, @@ -74,6 +75,7 @@ %prep %setup -q -n %{rname}-%{version} +%autopatch -p1 %build %cmake_kf5 -d build -- -DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true -DDBUS_INTERFACES_INSTALL_DIR=%{_kf5_sharedir}/dbus-1/interfaces/ @@ -84,16 +86,15 @@ %fdupes -s %{buildroot}%{_includedir}/%{name} %post -n libphonon4qt5 -p /sbin/ldconfig - %postun -n libphonon4qt5 -p /sbin/ldconfig %files -n libphonon4qt5 -%defattr(-,root,root) +%license COPYING.LIB %{_kf5_libdir}/lib%{name}.so.* %{_kf5_libdir}/lib%{name}experimental.so.* %files devel -%defattr(-,root,root) +%license COPYING.LIB %{_includedir}/%{name} %{_kf5_libdir}/cmake/%{name} %{_kf5_sharedir}/%{name} ++++++ 0001-Fix-PulseAudio-support-with-Qt-5.12.patch ++++++ >From eef6dae58a19da4c6af90a0b7cce6378e527683d Mon Sep 17 00:00:00 2001 From: Antonio Rojas <aro...@archlinux.org> Date: Mon, 10 Dec 2018 21:10:13 +0100 Subject: [PATCH] Fix PulseAudio support with Qt 5.12 QAbstractEventDispatcher::instance()->metaObject()->className() now returns "QXcbGlibEventDispatcher", so the glib event loop test fails Differential Revision: https://phabricator.kde.org/D17486 --- phonon/pulsesupport.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp index b7009b11..d3240840 100644 --- a/phonon/pulsesupport.cpp +++ b/phonon/pulsesupport.cpp @@ -840,7 +840,8 @@ PulseSupport::PulseSupport() } // We require a glib event loop - if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) { + if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib") && + !QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("GlibEventDispatcher")) { qWarning("WARNING: Disabling PulseAudio integration for lack of GLib event loop."); return; } -- 2.19.2
