- Update for 5.7.1 tentative final packages

This commit is contained in:
Helio Chissini de Castro 2016-12-01 11:40:54 +01:00
parent ef1aec5029
commit 81f2a2b715
4 changed files with 7 additions and 36 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/qtwebkit-opensource-src-5.6.0.tar.xz
/qtwebkit-opensource-src-5.6.1-b889f46.tar.xz
/qtwebkit-opensource-src-5.7.0.tar.xz
/qtwebkit-opensource-src-5.7.1.tar.xz

View File

@ -1,26 +0,0 @@
From 9d69c357ca97785eee385b14942a27ec2a680ede Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Fri, 20 May 2016 13:59:05 +0300
Subject: [PATCH 5/9] Added missing break statement.
Change-Id: I90bc4a7c65dd70206fd250dcfa81dfac02f8ba74
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
index d1a7f6c..554ab89 100644
--- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
@@ -1179,6 +1179,7 @@ void QWebPageAdapter::triggerAction(QWebPageAdapter::MenuAction action, QWebHitT
case ToggleMediaPlayPause:
if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode))
mediaElt->togglePlayState();
+ break;
case ToggleMediaMute:
if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode))
mediaElt->setMuted(!mediaElt->muted());
--
2.7.4

View File

@ -5,8 +5,8 @@
Summary: Qt5 - QtWebKit components
Name: qt5-qtwebkit
Version: 5.7.0
Release: 2%{?dist}
Version: 5.7.1
Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@ -29,10 +29,6 @@ Patch7: 0001-Add-ARM-64-support.patch
# truly madly deeply no rpath please, kthxbye
Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch
## upstream patches
Patch105: 0005-Added-missing-break-statement.patch
Patch109: 0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch
BuildRequires: cmake
BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: pkgconfig(Qt5Qml) >= %{version}
@ -102,9 +98,6 @@ BuildArch: noarch
%prep
%setup -q -n %{qt_module}-opensource-src-%{version}
%patch105 -p1 -b .0005
%patch109 -p1 -b .0009
%patch1 -p1 -b .pluginpath
%patch3 -p1 -b .debuginfo
%patch4 -p1 -b .save_memory
@ -188,6 +181,9 @@ popd
%changelog
* Wed Nov 09 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.1-1
- New upstream version
* Mon Jul 04 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-2
- Compiled with gcc

View File

@ -1 +1 @@
9379b8829639645c184fa63532035098 qtwebkit-opensource-src-5.7.0.tar.xz
93fb6f059904921bf8768b89513fcbd9 qtwebkit-opensource-src-5.7.1.tar.xz