Skip to content

Commit

Permalink
[wpewebkit] Upgrade to wpewebkit 2.46.3
Browse files Browse the repository at this point in the history
With this many of the wpewebkit patches can be dropped
because they are already included in 2.46.3
  • Loading branch information
zhani committed Nov 16, 2024
1 parent 0179d92 commit eec7213
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 942 deletions.
2 changes: 1 addition & 1 deletion packages/wpewebkit-core.package
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

class Package(package.Package):
name = 'wpewebkit-core'
version = '2.44.1'
version = '2.46.3'
shortdesc = 'Web Platform for Embedded'
longdesc = 'WPE WebKit allows embedders to create simple and performant \
systems based on Web platform technologies. It is a WebKit port designed \
Expand Down
2 changes: 1 addition & 1 deletion packages/wpewebkit.package
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

class SDKPackage(package.SDKPackage):
name = 'wpewebkit'
version = '2.46.0'
version = '2.46.3'
shortdesc = 'Web Platform for Embedded'
longdesc = 'WPE WebKit allows embedders to create simple and performant \
systems based on Web platform technologies. It is a WebKit port designed \
Expand Down
18 changes: 5 additions & 13 deletions recipes/wpewebkit.recipe
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

class Recipe(recipe.Recipe):
name = 'wpewebkit'
version = '2.46.0'
version = '2.46.3'
stype = SourceType.TARBALL
btype = BuildType.CMAKE
url = 'https://wpewebkit.org/releases/wpewebkit-{0}.tar.xz'.format(version)
tarball_checksum = '301550fbd8703f3ba4c4a65fe596686960569f8a3b0f6668243179cbc77bbc50'
tarball_checksum = '56709f8cf113650d8cc30dc22f2b69cb6f74e651731f12e1db52ecce12ab86f2'
deps = [
'icu',
'cairo',
Expand Down Expand Up @@ -194,17 +194,9 @@ class Recipe(recipe.Recipe):
'wpewebkit/0001-Android-logging-macro.patch',
'wpewebkit/0002-Implement-Android-WebProcess-and-NetworkProcess-entr.patch',
'wpewebkit/0003-Allow-setting-injected-bundle-and-inspector-lib-path.patch',
'wpewebkit/0004-Workaround-for-Android-emulator-samplerExternalOES-p.patch',
'wpewebkit/0005-Use-ASharedMemory-instead-of-shm.patch',
'wpewebkit/0006-Enable-Android-on-ANGLE-for-WebGL-support.patch',
'wpewebkit/0007-Compile-WebDriver-as-a-library.patch',
'wpewebkit/0008-WebDriver-WPE-Mouse-interaction-simulation-needs-to-.patch',
'wpewebkit/0009-CMake-WPE-ENABLE_WPE_PLATFORM-cannot-be-toggled.patch',
'wpewebkit/0010-GTK-WPE-IPC-Connection-fails-to-unset-FD_CLOEXEC.patch',
'wpewebkit/0011-WPE-Auxiliary-processes-fail-to-launch-if-ProcessPro.patch',
'wpewebkit/0012-Add-Android-support-to-Skia-integration.patch',
'wpewebkit/0013-Remove-Float16Array-from-WebInspectorUI.patch',
'wpewebkit/0014-TextureMapper-Preserve-3d-layers-don-t-get-flattened.patch'
'wpewebkit/0004-Use-ASharedMemory-instead-of-shm.patch',
'wpewebkit/0005-Compile-WebDriver-as-a-library.patch',
'wpewebkit/0006-Remove-Float16Array-from-WebInspectorUI.patch'
]
else:
self.append_env('LDFLAGS', '-lrt')
Expand Down
4 changes: 2 additions & 2 deletions recipes/wpewebkit/0001-Android-logging-macro.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 4d9121d87aab4d0866f4c570e26ed5a011b32d09 Mon Sep 17 00:00:00 2001
From c1d61fe8b469b444f057f61a3880ace168b02ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= <[email protected]>
Date: Tue, 25 May 2021 15:32:57 +0200
Subject: [PATCH 01/14] Android logging macro
Subject: [PATCH 1/6] Android logging macro

---
Source/WebKit/config.h | 3 +++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,46 +1,20 @@
From ae486ebcc2ca2f5c40723af5c8e2f7a4f96909c4 Mon Sep 17 00:00:00 2001
From 290b3245adbe0ac63d8e4377c84d9c8bc437f627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= <[email protected]>
Date: Tue, 25 May 2021 13:51:14 +0200
Subject: [PATCH 02/14] Implement Android WebProcess and NetworkProcess entry
Subject: [PATCH 2/6] Implement Android WebProcess and NetworkProcess entry
points

---
.../soup/NetworkProcessMainSoup.cpp | 34 ++++++++-----------
.../WebProcess/wpe/WebProcessMainWPE.cpp | 13 +++++++
Source/WebKit/webkitglib-symbols.map | 1 +
3 files changed, 28 insertions(+), 20 deletions(-)
.../NetworkProcess/soup/NetworkProcessMainSoup.cpp | 13 +++++++++++++
Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp | 13 +++++++++++++
Source/WebKit/webkitglib-symbols.map | 1 +
3 files changed, 27 insertions(+)

diff --git a/Source/WebKit/NetworkProcess/soup/NetworkProcessMainSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkProcessMainSoup.cpp
index f98cd65a0ea1..3dae162d5cfa 100644
index dc26ae7acb81..bb5898e947b2 100644
--- a/Source/WebKit/NetworkProcess/soup/NetworkProcessMainSoup.cpp
+++ b/Source/WebKit/NetworkProcess/soup/NetworkProcessMainSoup.cpp
@@ -37,28 +37,22 @@

namespace WebKit {

-class NetworkProcessMainSoup final: public AuxiliaryProcessMainBaseNoSingleton<NetworkProcess> {
-public:
- bool platformInitialize() override
- {
-#if USE(GCRYPT)
- PAL::GCrypt::initialize();
-#endif
- return true;
- }
-
- void platformFinalize() override
- {
- // FIXME: Is this still needed? We should probably destroy all existing sessions at this point instead.
- // Needed to destroy the SoupSession and SoupCookieJar, e.g. to avoid
- // leaking SQLite temporary journaling files.
- process().destroySession(PAL::SessionID::defaultSessionID());
- }
-};
-
int NetworkProcessMain(int argc, char** argv)
{
- return AuxiliaryProcessMain<NetworkProcessMainSoup>(argc, argv);
+ return AuxiliaryProcessMain<AuxiliaryProcessMainBaseNoSingleton<NetworkProcess>>(argc, argv);
@@ -67,3 +67,16 @@ int NetworkProcessMain(int argc, char** argv)
}

} // namespace WebKit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
From e20f3344536da81cb533e03865fba97e59f3927f Mon Sep 17 00:00:00 2001
From 9fae07d96c8c9e68bc9a68ec7893fd32e3f88513 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Thu, 24 Mar 2022 09:41:17 +0200
Subject: [PATCH 03/14] Allow setting injected bundle and inspector lib paths
in non dev mode
Subject: [PATCH 3/6] Allow setting injected bundle and inspector lib paths in
non dev mode

---
.../inspector/remote/glib/RemoteInspectorUtils.cpp | 4 ++--
Expand Down Expand Up @@ -30,7 +30,7 @@ index 04a49a2af4b5..c394cb86554a 100644
GModule* resourcesModule = g_module_open(bundleFilename.get(), G_MODULE_BIND_LAZY);
if (!resourcesModule) {
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
index 5ebc00dd4b58..1fe752e7e7b1 100644
index 65cf0eb2b99a..f34220b0e762 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
@@ -337,11 +337,9 @@ void webkitWebContextWillCloseAutomationSession(WebKitWebContext* webContext)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 890959f49930b51a84b7af799825b3222f99b0e8 Mon Sep 17 00:00:00 2001
From a02e5e2ec5d4cf0eb763cf450348e28d90435335 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Wed, 28 Sep 2022 15:13:08 +0300
Subject: [PATCH 05/14] Use ASharedMemory instead of shm
Subject: [PATCH 4/6] Use ASharedMemory instead of shm

---
.../platform/unix/SharedMemoryUnix.cpp | 63 +++++++++----------
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b78029f2b2c57eedbbb379b2a2a3b3e297c406b0 Mon Sep 17 00:00:00 2001
From 258a35ec3035f55aade3031b9d19921220096c69 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Mon, 23 Sep 2024 13:51:10 +0300
Subject: [PATCH 07/14] Compile WebDriver as a library.
Subject: [PATCH 5/6] Compile WebDriver as a library.

---
Source/WebDriver/CMakeLists.txt | 4 ++--
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 9a3139885a047037519bbfc4f3cc1d37f2105a1e Mon Sep 17 00:00:00 2001
From aea652ec0cc796b51791ed1b00af6b16d2f53113 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <[email protected]>
Date: Wed, 16 Oct 2024 16:44:03 +0300
Subject: [PATCH 13/14] Remove Float16Array from WebInspectorUI
Subject: [PATCH 6/6] Remove Float16Array from WebInspectorUI

* Source/WebInspectorUI/UserInterface/Base/Utilities.js:
---
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit eec7213

Please sign in to comment.