From 5e2fa69c2226de7ae585ec59e1cd5f7e9985b2ae13326319392a77290a2fd2f4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 19 May 2018 13:41:41 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/vlc revision 85.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=ec59e8f75d2b2464094ae7d973c7ab1d --- vlc-qt-5.11.patch | 12 ++++++++++++ vlc.changes | 5 +++++ vlc.spec | 3 +++ 3 files changed, 20 insertions(+) create mode 100644 vlc-qt-5.11.patch diff --git a/vlc-qt-5.11.patch b/vlc-qt-5.11.patch new file mode 100644 index 0000000..90c2343 --- /dev/null +++ b/vlc-qt-5.11.patch @@ -0,0 +1,12 @@ +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 + #include + #include ++#include + #include + #include + #include diff --git a/vlc.changes b/vlc.changes index 2599733..ff42056 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 17 15:19:59 UTC 2018 - dimstar@opensuse.org + +- Add vlc-qt-5.11.patch: Fix build against Qt 5.11 (boo#1093732). + ------------------------------------------------------------------- Wed May 9 11:17:48 UTC 2018 - tchvatal@suse.com diff --git a/vlc.spec b/vlc.spec index 1a023dc..d1ca4a8 100644 --- a/vlc.spec +++ b/vlc.spec @@ -49,6 +49,8 @@ Patch1: vlc-allow-deprecated-fribidi.patch Patch2: vlc-lua-5.3.patch # PATCH-FIX-UPSTREAM 0001-Update-czech-translation.patch tchvatal@suse.com -- update the czech translation, was merged upstream, drop with next bump Patch3: 0001-Update-czech-translation.patch +# PATCH-FIX-UPSTREAM vlc-qt-5.11.patch boo#1093732 dimstar@opensuse.org -- Fix build against Qt 5.11 +Patch4: vlc-qt-5.11.patch # PATCH-FEATURE-OPENSUSE vlc-projectM-qt5.patch -- Build against projectM-qt5; openSUSE provides projectM as -qt and -qt5 variant Patch100: vlc-projectM-qt5.patch BuildRequires: Mesa-devel @@ -362,6 +364,7 @@ default when `vlc` is invoked from an X session. %patch0 -p1 %patch1 -p1 %patch3 -p1 +%patch4 -p1 %if 0%{?suse_version} > 1320 %patch100 -p1 %endif