phonon: update 4.9.0 -> 4.10.0

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-03-12 17:45:27 +01:00
parent 544b930b13
commit 74861365ec
2 changed files with 2 additions and 50 deletions

View File

@@ -1,47 +0,0 @@
From 3f10bfe169b6ad2dcde4a1e71ddec69cd0abdecd Mon Sep 17 00:00:00 2001
From: Takahiro Hashimoto <kenya888@gmail.com>
Date: Tue, 25 Oct 2016 09:22:35 +0900
Subject: use cmake variables to check if QtDbus is enabled
BUG: 368948
REVIEW: 129256
---
phonon/CMakeLists.txt | 2 +-
phonon/phononconfig_p.h.in | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt
index e6dfcb7..f9ae09e 100644
--- a/phonon/CMakeLists.txt
+++ b/phonon/CMakeLists.txt
@@ -12,7 +12,7 @@ endif (PHONON_BUILD_EXPERIMENTAL)
# ------------------------ Configure File QMake Style ------------------------ #
-if (PHONON_NO_DBUS)
+if (PHONON_NO_DBUS OR NOT QT_QTDBUS_FOUND)
set(PHONON_NO_DBUS_DEFINE "#define PHONON_NO_DBUS")
else()
set(PHONON_NO_DBUS_DEFINE "/* #undef PHONON_NO_DBUS */")
diff --git a/phonon/phononconfig_p.h.in b/phonon/phononconfig_p.h.in
index 63f2305..b397626 100644
--- a/phonon/phononconfig_p.h.in
+++ b/phonon/phononconfig_p.h.in
@@ -3,14 +3,7 @@
#ifndef PHONONCONFIG_H_P
#define PHONONCONFIG_H_P
-#include <QtCore/qfeatures.h>
-
/** Whether to build with D-Bus support */
$${PHONON_NO_DBUS_DEFINE}
-/** If QT_NO_DBUS is defined, always set PHONON_NO_DBUS */
-#if !defined(PHONON_NO_DBUS) && defined(QT_NO_DBUS)
-#define PHONON_NO_DBUS 1
-#endif
-
#endif // PHONONCONFIG_H_P
--
cgit v0.11.2

View File

@@ -11,10 +11,9 @@ DEPENDS += "alsa-lib"
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}.tar.xz"
SRC_URI += " \
file://0001-fix-PHONON_LIBRARY_PATH-was-usr-usr-lib-qt5-plugins.patch \
file://fix-qt-5.8-build.patch \
"
SRC_URI[md5sum] = "8abeb7b1eaf4935668c7fb441fc2491a"
SRC_URI[sha256sum] = "bb74b40f18ade1d9ab89ffcd7aeb7555be797ca395f1224c488b394da6deb0e0"
SRC_URI[md5sum] = "4c7f311a44babbf3270aec992daaa4b1"
SRC_URI[sha256sum] = "e2c10ecc7d2f3d3a0f80a63def789a875420b3d90062c26718dcfdaab8a5d03f"
EXTRA_OECMAKE += "-DPHONON_BUILD_DEMOS=ON -DPHONON_BUILD_PHONON4QT5=ON -D__KDE_HAVE_GCC_VISIBILITY=NO"