Skip to content

Commit 74f78c4

Browse files
committed
Bump WPEWebKit to ToT
After upstreaming some of the remaining patches, only a revert is needed to build.
1 parent 64bd4a4 commit 74f78c4

6 files changed

+3960
-296
lines changed

recipes/wpewebkit.recipe

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
class Recipe(recipe.Recipe):
44
name = 'wpewebkit'
5-
version = '2.46.7'
6-
stype = SourceType.TARBALL
5+
version = '9.99.9'
6+
stype = SourceType.GIT
77
btype = BuildType.CMAKE
8-
url = 'https://wpewebkit.org/releases/wpewebkit-{0}.tar.xz'.format(version)
9-
tarball_checksum = 'cf3e47638595d86de96abdb94db69a836c8aa509fc063be714f52c5a24bb5cd5'
8+
remotes = {'origin': 'https://github.com/WebKit/WebKit.git'}
9+
commit = 'cfb61f6b86d78e016439c69f4f0a058de25c41b2'
1010
deps = [
1111
'icu',
1212
'cairo',
@@ -52,6 +52,7 @@ class Recipe(recipe.Recipe):
5252
-DENABLE_WEBDRIVER=ON \
5353
-DENABLE_WPE_PLATFORM=OFF \
5454
-DCMAKE_BUILD_TYPE=Release \
55+
-DENABLE_SPEECH_SYNTHESIS=OFF \
5556
'
5657
cmake_generator = 'ninja'
5758

@@ -180,7 +181,7 @@ class Recipe(recipe.Recipe):
180181
if self.config.target_arch == Architecture.ARMv7:
181182
arch_src_name = 'arm'
182183
self.configure_options += ' -DCMAKE_SYSTEM_PROCESSOR=' + arch_src_name
183-
self.configure_options += ' -DANDROID=1'
184+
self.configure_options += ' -DANDROID=TRUE'
184185
self.append_env('LDFLAGS', '-landroid -llog -lm -lintl -lc++_shared -O2')
185186
# Android libc does not have bcmp()
186187
self.append_env('CXXFLAGS', ' -Dbcmp=memcmp ')
@@ -191,10 +192,7 @@ class Recipe(recipe.Recipe):
191192
# Placeholder to allow enabling debug externally
192193
self.append_env('WEBKIT_DEBUG', '')
193194
self.patches += [
194-
'wpewebkit/0001-Android-logging-macro.patch',
195-
'wpewebkit/0002-Allow-setting-injected-bundle-and-inspector-lib-path.patch',
196-
'wpewebkit/0003-Use-ASharedMemory-instead-of-shm.patch',
197-
'wpewebkit/0004-Compile-WebDriver-as-a-library.patch',
195+
'wpewebkit/0001-Revert-Remove-unneeded-includes-from-generated-Messa.patch',
198196
]
199197
else:
200198
self.append_env('LDFLAGS', '-lrt')

recipes/wpewebkit/0001-Android-logging-macro.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)