[vlc/f27: 12/22] Fix build against Qt 5.11

commit b46eb65ee255a5903ea7297cf93642b94fc0be69 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sat Jun 2 14:18:16 2018 +0100 Fix build against Qt 5.11 buildfix_qt511.patch | 28 ++++++++++++++++++++++++++++ vlc.spec | 11 +++++++---- 2 files changed, 35 insertions(+), 4 deletions(-) --- diff --git a/buildfix_qt511.patch b/buildfix_qt511.patch new file mode 100644 index 0000000..ee84452 --- /dev/null +++ b/buildfix_qt511.patch @@ -0,0 +1,28 @@ +From 39b0590165501cdeb85595a19bf076d06bcc594c Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger <dimstar(a)opensuse.org&gt; +Date: Thu, 17 May 2018 17:40:37 +0200 +Subject: [PATCH] qt: fix build against Qt 5.11 + +Qt 5.11 is in RC phase now, and some headers need to be explicitly +included in order to build successfully. + +Signed-off-by: Jean-Baptiste Kempf <jb(a)videolan.org&gt; +--- + modules/gui/qt/components/simple_preferences.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp +index b48ea7b67f..7a9c2dbf28 100644 +--- a/modules/gui/qt/components/simple_preferences.cpp ++++ b/modules/gui/qt/components/simple_preferences.cpp +@@ -36,6 +36,7 @@ + #include <QString> + #include <QFont> + #include <QToolButton> ++#include <QButtonGroup> + #include <QSignalMapper> + #include <QVBoxLayout> + #include <QScrollArea> +-- +2.11.0 + diff --git a/vlc.spec b/vlc.spec index f11bdc8..a6ae4d7 100644 --- a/vlc.spec +++ b/vlc.spec @@ -42,13 +42,14 @@ Summary: The cross-platform open-source multimedia framework, player and server Name: vlc Version: 3.0.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz # https://git.videolan.org/?p=vlc.git;a=commit;h=26e2d3906658c30f2f88f4b1bc... Patch0: modules_text_renderer_freetype_text_layout.c.patch - +# https://git.videolan.org/?p=vlc.git;a=commit;h=39b0590165501cdeb85595a19b... +Patch1: buildfix_qt511.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: fontpackages-devel @@ -270,8 +271,7 @@ VLC media player extras modules. %prep -%setup -q -n %{name}-%{version}%{?vlc_rc:-%{vlc_rc}} -%patch0 -p1 +%autosetup -p1 -n %{name}-%{version}%{?vlc_rc:-%{vlc_rc}} %if 0%{?rhel} == 7 . /opt/rh/devtoolset-7/enable @@ -565,6 +565,9 @@ fi || : %changelog +* Sat Jun 02 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3.0.3-3 +- Fix build against Qt 5.11 + * Fri Jun 01 2018 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.0.3-2 - Add missing libjpeg