rev 20884 - in kde-extras/kmplayer/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2017-10-11 20:27:01 +0000 (Wed, 11 Oct 2017)
New Revision: 20884

Added:
   kde-extras/kmplayer/trunk/debian/patches/upstream_Fix-build-with-Qt-5.9.patch
Modified:
   kde-extras/kmplayer/trunk/debian/changelog
   kde-extras/kmplayer/trunk/debian/patches/series
Log:
fix build with Qt 5.9 (#877499)

backport upstream commit 3def65075c09af4961cd399e8e78ed78cca72e65


Modified: kde-extras/kmplayer/trunk/debian/changelog
===================================================================
--- kde-extras/kmplayer/trunk/debian/changelog	2017-10-11 20:23:05 UTC (rev 20883)
+++ kde-extras/kmplayer/trunk/debian/changelog	2017-10-11 20:27:01 UTC (rev 20884)
@@ -1,5 +1,9 @@
 kmplayer (1:0.12.0b-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit 3def65075c09af4961cd399e8e78ed78cca72e65 to fix
+    build with Qt 5.9; patch upstream_Fix-build-with-Qt-5.9.patch.
+    (Closes: #877499)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 11 Oct 2017 22:22:48 +0200
 

Modified: kde-extras/kmplayer/trunk/debian/patches/series
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/series	2017-10-11 20:23:05 UTC (rev 20883)
+++ kde-extras/kmplayer/trunk/debian/patches/series	2017-10-11 20:27:01 UTC (rev 20884)
@@ -1 +1,2 @@
 aarch64.diff
+upstream_Fix-build-with-Qt-5.9.patch

Added: kde-extras/kmplayer/trunk/debian/patches/upstream_Fix-build-with-Qt-5.9.patch
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/upstream_Fix-build-with-Qt-5.9.patch	                        (rev 0)
+++ kde-extras/kmplayer/trunk/debian/patches/upstream_Fix-build-with-Qt-5.9.patch	2017-10-11 20:27:01 UTC (rev 20884)
@@ -0,0 +1,42 @@
+From 3def65075c09af4961cd399e8e78ed78cca72e65 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer <wbauer at tmo.at>
+Date: Wed, 11 Oct 2017 22:16:02 +0200
+Subject: [PATCH] Fix build with Qt 5.9
+
+Summary:
+moc 5.9 errors out when building:
+Error: Plugin Metadata file "" could not be opened: file to open is a directory
+
+Same issue and fix as https://phabricator.kde.org/D5392 for khtml.
+
+CCBUG: 377490
+
+Test Plan: builds fine now with Qt 5.9.0rc and also earlier versions.
+
+Reviewers: vriezen, pino
+
+Reviewed By: pino
+
+Subscribers: pino
+
+Differential Revision: https://phabricator.kde.org/D5985
+---
+ src/kmplayer_part.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h
+index f90f85d..0fddbaa 100644
+--- a/src/kmplayer_part.h
++++ b/src/kmplayer_part.h
+@@ -36,7 +36,7 @@ namespace KMPlayer {
+ 
+ class KMPlayerFactory : public KPluginFactory {
+     Q_OBJECT
+-    Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "")
++    Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory")
+     Q_INTERFACES(KPluginFactory)
+ public:
+     KMPlayerFactory();
+-- 
+2.14.2
+