Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions recipes/build-tools/icu-tools.recipe
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

class Recipe(recipe.Recipe):
name = 'icu-tools'
version = '68.2'
url = 'https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz'
tarball_checksum = 'c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625'
version = '70.1'
url = 'https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz'
tarball_checksum = '8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5'
stype = SourceType.TARBALL
tarball_dirname = 'icu'
srcdir = 'source'
Expand Down
7 changes: 4 additions & 3 deletions recipes/icu.recipe
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ from pathlib import Path

class Recipe(recipe.Recipe):
name = 'icu'
version = '68.2'
version = '70.1'
(major_ver, minor_ver) = version.split('.')
url = 'https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz'
tarball_checksum = 'c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625'
url = 'https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz'
tarball_checksum = '8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5'
stype = SourceType.TARBALL
autoreconf = True
tarball_dirname = 'icu'
Expand Down Expand Up @@ -67,6 +67,7 @@ class Recipe(recipe.Recipe):
self.append_env('CXXFLAGS', '-frtti')
if self.config.target_platform == Platform.ANDROID:
self.append_env('LDFLAGS', '-lc++_shared')
self.patches += ['icu/0001-Include-AX_CHECK_COMPILE_FLAG-AC-macro.patch']

@modify_environment
async def configure(self):
Expand Down
82 changes: 82 additions & 0 deletions recipes/icu/0001-Include-AX_CHECK_COMPILE_FLAG-AC-macro.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
From 8a1895d01eaabf176215546afd3e668e2ac77d62 Mon Sep 17 00:00:00 2001
From: Simon Pena <[email protected]>
Date: Mon, 14 Apr 2025 12:34:11 +0100
Subject: [PATCH] Include AX_CHECK_COMPILE_FLAG AC macro

---
source/config/m4/ax_check_compile_flag.m4 | 63 +++++++++++++++++++++++
1 file changed, 63 insertions(+)
create mode 100644 source/config/m4/ax_check_compile_flag.m4

diff --git a/source/config/m4/ax_check_compile_flag.m4 b/source/config/m4/ax_check_compile_flag.m4
new file mode 100644
index 0000000..54191c5
--- /dev/null
+++ b/source/config/m4/ax_check_compile_flag.m4
@@ -0,0 +1,63 @@
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+# Check whether the given FLAG works with the current language's compiler
+# or gives an error. (Warnings, however, are ignored)
+#
+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+# success/failure.
+#
+# If EXTRA-FLAGS is defined, it is added to the current language's default
+# flags (e.g. CFLAGS) when the check is done. The check is thus made with
+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
+# force the compiler to issue an error when a bad flag is given.
+#
+# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Guido U. Draheim <[email protected]>
+# Copyright (c) 2011 Maarten Bosmans <[email protected]>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 11
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether the _AC_LANG compiler accepts $1], CACHEVAR, [
+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+ if test x"m4_case(_AC_LANG,
+ [C], [$GCC],
+ [C++], [$GXX],
+ [Fortran], [$GFC],
+ [Fortran 77], [$G77],
+ [Objective C], [$GOBJC],
+ [Objective C++], [$GOBJCXX],
+ [no])" = xyes ; then
+ add_gnu_werror="-Werror"
+ fi
+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1 $add_gnu_werror"
+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+ [AS_VAR_SET(CACHEVAR,[yes])],
+ [AS_VAR_SET(CACHEVAR,[no])])
+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+ [m4_default([$2], :)],
+ [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
--
2.43.0

6 changes: 3 additions & 3 deletions recipes/libxml2.recipe
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

class Recipe(recipe.Recipe):
name = 'libxml2'
version = '2.9.9'
version = '2.9.13'
stype = SourceType.TARBALL
# Upstream still has a broken SSL certificate, use our mirror
#url = 'https://xmlsoft.org/sources/libxml2-%(version)s.tar.gz'
url = 'https://gstreamer.freedesktop.org/src/mirror/libxml2-%(version)s.tar.gz'
tarball_checksum = '94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871'
url = 'https://download.gnome.org/sources/libxml2/2.9/libxml2-%(version)s.tar.xz'
tarball_checksum = '276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e'
licenses = [{License.MIT: ['COPYING']}]
configure_options = '--with-python=no'

Expand Down
16 changes: 7 additions & 9 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.7'
stype = SourceType.TARBALL
version = '9.99.9'
stype = SourceType.GIT
btype = BuildType.CMAKE
url = 'https://wpewebkit.org/releases/wpewebkit-{0}.tar.xz'.format(version)
tarball_checksum = 'cf3e47638595d86de96abdb94db69a836c8aa509fc063be714f52c5a24bb5cd5'
remotes = {'origin': 'https://github.com/WebKit/WebKit.git'}
commit = 'cfb61f6b86d78e016439c69f4f0a058de25c41b2'
deps = [
'icu',
'cairo',
Expand Down Expand Up @@ -52,6 +52,7 @@ class Recipe(recipe.Recipe):
-DENABLE_WEBDRIVER=ON \
-DENABLE_WPE_PLATFORM=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_SPEECH_SYNTHESIS=OFF \
'
cmake_generator = 'ninja'

Expand Down Expand Up @@ -180,7 +181,7 @@ class Recipe(recipe.Recipe):
if self.config.target_arch == Architecture.ARMv7:
arch_src_name = 'arm'
self.configure_options += ' -DCMAKE_SYSTEM_PROCESSOR=' + arch_src_name
self.configure_options += ' -DANDROID=1'
self.configure_options += ' -DANDROID=TRUE'
self.append_env('LDFLAGS', '-landroid -llog -lm -lintl -lc++_shared -O2')
# Android libc does not have bcmp()
self.append_env('CXXFLAGS', ' -Dbcmp=memcmp ')
Expand All @@ -191,10 +192,7 @@ class Recipe(recipe.Recipe):
# Placeholder to allow enabling debug externally
self.append_env('WEBKIT_DEBUG', '')
self.patches += [
'wpewebkit/0001-Android-logging-macro.patch',
'wpewebkit/0002-Allow-setting-injected-bundle-and-inspector-lib-path.patch',
'wpewebkit/0003-Use-ASharedMemory-instead-of-shm.patch',
'wpewebkit/0004-Compile-WebDriver-as-a-library.patch',
'wpewebkit/0001-Revert-Remove-unneeded-includes-from-generated-Messa.patch',
]
else:
self.append_env('LDFLAGS', '-lrt')
Expand Down
23 changes: 0 additions & 23 deletions recipes/wpewebkit/0001-Android-logging-macro.patch

This file was deleted.

Loading
Loading