Fix build against Qt 5.11

el8
leigh123linux 7 years ago
parent 2abed9d689
commit 177501b2ef

@ -0,0 +1,28 @@
From 39b0590165501cdeb85595a19bf076d06bcc594c Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
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@videolan.org>
---
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

@ -42,13 +42,14 @@
Summary: The cross-platform open-source multimedia framework, player and server Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc Name: vlc
Version: 3.0.3 Version: 3.0.3
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
URL: https://www.videolan.org URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
# https://git.videolan.org/?p=vlc.git;a=commit;h=26e2d3906658c30f2f88f4b1bc9630ec43bf5525 # https://git.videolan.org/?p=vlc.git;a=commit;h=26e2d3906658c30f2f88f4b1bc9630ec43bf5525
Patch0: modules_text_renderer_freetype_text_layout.c.patch Patch0: modules_text_renderer_freetype_text_layout.c.patch
# https://git.videolan.org/?p=vlc.git;a=commit;h=39b0590165501cdeb85595a19bf076d06bcc594c
Patch1: buildfix_qt511.patch
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib BuildRequires: libappstream-glib
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
@ -270,8 +271,7 @@ VLC media player extras modules.
%prep %prep
%setup -q -n %{name}-%{version}%{?vlc_rc:-%{vlc_rc}} %autosetup -p1 -n %{name}-%{version}%{?vlc_rc:-%{vlc_rc}}
%patch0 -p1
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable . /opt/rh/devtoolset-7/enable
@ -565,6 +565,9 @@ fi || :
%changelog %changelog
* Sat Jun 02 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.0.3-3
- Fix build against Qt 5.11
* Fri Jun 01 2018 Nicolas Chauvet <kwizart@gmail.com> - 3.0.3-2 * Fri Jun 01 2018 Nicolas Chauvet <kwizart@gmail.com> - 3.0.3-2
- Add missing libjpeg - Add missing libjpeg

Loading…
Cancel
Save