[vlc/f27: 18/22] Add patch from vlc mailing list to fix wayland freeze (rfbz#4596)

commit a3ace90d021446f34f788c552d04dc797176a5af Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sat Aug 4 14:14:49 2018 +0100 Add patch from vlc mailing list to fix wayland freeze (rfbz#4596) fix_wayland_freeze.patch | 21 +++++++++++++++++++++ vlc.spec | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) --- diff --git a/fix_wayland_freeze.patch b/fix_wayland_freeze.patch new file mode 100644 index 0000000..7addcf8 --- /dev/null +++ b/fix_wayland_freeze.patch @@ -0,0 +1,21 @@ +Closes: https://gitlab.gnome.org/GNOME/mutter/issues/244 +Signed-off-by: Olivier Fourdan <ofourdan at redhat.com> +--- + modules/gui/qt/util/timetooltip.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/gui/qt/util/timetooltip.cpp b/modules/gui/qt/util/timetooltip.cpp +index 1314b520ea..7a63a9d7d9 100644 +--- a/modules/gui/qt/util/timetooltip.cpp ++++ b/modules/gui/qt/util/timetooltip.cpp +@@ -73,7 +73,7 @@ void TimeTooltip::adjustPosition() + #if defined( Q_OS_WIN ) + mTarget.y() - 2 * size.height() - TIP_HEIGHT / 2 ); + #else +- mTarget.y() - size.height() + TIP_HEIGHT / 2 ); ++ mTarget.y() - size.height() - TIP_HEIGHT / 2 ); + #endif + + // Keep the tooltip on the same screen if possible +-- +2.17.1 diff --git a/vlc.spec b/vlc.spec index 0989bff..4053548 100644 --- a/vlc.spec +++ b/vlc.spec @@ -42,7 +42,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Name: vlc Version: 3.0.3 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz @@ -50,6 +50,9 @@ Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz Patch0: modules_text_renderer_freetype_text_layout.c.patch # https://git.videolan.org/?p=vlc.git;a=commit;h=39b0590165501cdeb85595a19b... Patch1: buildfix_qt511.patch +# https://mailman.videolan.org/pipermail/vlc-devel/2018-July/120638.html +# https://bugzilla.rpmfusion.org/show_bug.cgi?id=4596 +Patch2: fix_wayland_freeze.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: fontpackages-devel @@ -562,6 +565,9 @@ fi || : %changelog +* Sat Aug 04 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3.0.3-7 +- Add patch from vlc mailing list to fix wayland freeze (rfbz#4596) + * Tue Jul 24 2018 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.0.3-6 - Rebuilt for libplacebo