haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtwebkit: apply upstream patches.

Browse Source
This commit is contained in:
Jerome Duval
2017-11-06 19:21:27 +01:00
parent 822f798d9b
commit 0032262fa3
2 changed files with 83 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
dev-qt/qtwebkit/patches/qtwebkit-5.212.0~alpha2.patchset
View File

@@ -1,4 +1,4 @@
From 435ea3f817603c044601a41caa56e2d4dd6cddb2 Mon Sep 17 00:00:00 2001
From 10f4b1a5be0b7782968729745f4ccd57615fcf9e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 16 Jun 2017 21:38:08 +1000
Subject: Fix build
@@ -874,10 +874,10 @@ index 1930027..9c827a3 100644
set(USE_GSTREAMER_DEFAULT OFF)
set(USE_QT_MULTIMEDIA_DEFAULT ON)
--
2.13.1
2.14.2
From 636802d8047fb72f71246eaac679bb9ff907f760 Mon Sep 17 00:00:00 2001
From 2cbbfc2033c112f39f3e63b58bc68323a9edb92a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 17 Jun 2017 12:22:33 +1000
Subject: Add libnetwork
@@ -901,10 +901,10 @@ index e5d08ed..deb9f68 100644
find_library(LIBRT_LIBRARIES NAMES rt)
mark_as_advanced(LIBRT_LIBRARIES)
--
2.13.1
2.14.2
From ed7f9e20322840163f8ffced1840104da478da0b Mon Sep 17 00:00:00 2001
From d18bada409cfe1f80738e03c4692fe73efd5bf5b Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 17 Jun 2017 12:23:20 +1000
Subject: Add Haiku detection to useragent string
@@ -924,10 +924,10 @@ index 4b88762..fa564f9 100644
"GNU Hurd"
#elif OS(LINUX)
--
2.13.1
2.14.2
From 59f0e94423239a4f3beec68758a13be7c427bebe Mon Sep 17 00:00:00 2001
From 5fed395ae0d28745f456b52c932b407e976542b9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 17 Jul 2017 19:43:24 +1000
Subject: Use gstreamer instead qtmulimadia
@@ -947,10 +947,10 @@ index 9c827a3..1930027 100644
set(USE_GSTREAMER_DEFAULT OFF)
set(USE_QT_MULTIMEDIA_DEFAULT ON)
--
2.13.1
2.14.2
From 6916eb2650d78bf98e2a299e46d4d3661a6480b6 Mon Sep 17 00:00:00 2001
From 99782e7c1f095d643db8770c5a56fd012a012e3c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 17 Jul 2017 19:44:23 +1000
Subject: UserAgent improvements
@@ -983,17 +983,17 @@ index fa564f9..71920ff 100644
"GNU Hurd"
#elif OS(LINUX)
--
2.13.1
2.14.2
From e992f421bf46a1689b72b8ca3af5b1d142f6c3a4 Mon Sep 17 00:00:00 2001
From 158e71f95d08011d38e569eb83c75fd9b57eb613 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 21 Jul 2017 21:58:31 +1000
Subject: Add support for notification icon
diff --git a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
index ccd1afb..5e1c22d 100644
index ccd1afb..c096f14 100644
--- a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
@@ -51,6 +51,82 @@ namespace WebCore {
@@ -1133,5 +1133,74 @@ index f53fe51..9f69a31 100644
};
--
2.13.1
2.14.2
From c6e1cd79073670e08329c323ef41faa66a87a886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@digia.com>
Date: Wed, 13 Nov 2013 18:13:36 +0100
Subject: Trigger layout after resizing the FrameView.
There are problems with QGLWidget based web plugins due to the fact
that WebKit forces us to relayout during paint events, which in turn
might resize widgets, causing the shared backing store's QImages to
be corrupted and hence causing crashed.
This patch triggers a layout upon resizing the FrameView, which reduces
the likely hood of resizing plugins during a subsequent paintEvent.
Task-number: QTBUG-34277
Change-Id: Id35c72a3cc68ac6633a74fba0669c2d8fbfabc88
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
index e6145b6..941d8df 100644
--- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
@@ -962,6 +962,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& size)
ASSERT(view);
view->resize(size);
view->adjustViewSize();
+
+ if (view->needsLayout())
+ view->layout();
}
--
2.14.2
From a8f8a41fc66dbd1bb4cf8365062f0d0171bfbf59 Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Thu, 12 Oct 2017 20:15:15 +0300
Subject: Fix for 451c5a10: run adjustViewSize() after relayout
Additional note for 451c5a10 + this:
Since r162515 resize of FrameView that does not have scrollbars (or use
overlay scrollbars) does not lead to automatic re-layout. In Trojita
contentsSize() is called immediately after QWebPage::setViewportSize(),
returning wrong result.
Change-Id: I543b22d7bbe1514333007e5f99b97a7c12c19c1a
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
index 941d8df..df28e9f 100644
--- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
@@ -961,10 +961,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& size)
FrameView* view = frame->view();
ASSERT(view);
view->resize(size);
- view->adjustViewSize();
-
if (view->needsLayout())
view->layout();
+ view->adjustViewSize();
}
--
2.14.2

2
dev-qt/qtwebkit/qtwebkit-5.212.0~alpha2.recipe
View File

@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/annulen/webkit"
COPYRIGHT="2015-2017 The Qt Company Ltd."
LICENSE="GNU LGPL v2.1
GNU LGPL v3"
REVISION="6"
REVISION="7"
SOURCE_URI="https://github.com/annulen/webkit/releases/download/qtwebkit-${portVersion/\~/-}/qtwebkit-${portVersion/\~/-}.tar.xz"
CHECKSUM_SHA256="f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a"
SOURCE_DIR="qtwebkit-${portVersion/\~/-}"