sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (d0e5abe875eeb153da51df098074e0a3f67939b7)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (d0e5abe875eeb153da51df098074e0a3f67939b7)
- Date: Mon, 20 Jan 2025 02:03:46 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
http/webkitgtk3/BUILD | 3 +
http/webkitgtk3/DEPENDS | 11 ++--
http/webkitgtk3/DETAILS | 4 -
http/webkitgtk3/HISTORY | 5 ++
http/webkitgtk3/PRE_BUILD | 3 +
http/webkitgtk3/patches/0001-Support-ICU-76.1-build.patch | 33
++++++++++++++
6 files changed, 51 insertions(+), 8 deletions(-)
New commits:
commit d0e5abe875eeb153da51df098074e0a3f67939b7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
webkitgtk3 2.47.1
diff --git a/http/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index 1d59b05..5c35587 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,4 +1,7 @@
# remove options not supported by ld.gold
LDFLAGS="${LDFLAGS//-Wl,-znoseparate-code}" &&
OPTS="$WEBKIT_OPTS $OPTS -DENABLE_GAMEPAD=false -DENABLE_WEBKIT_LEGACY=off
-DCMAKE_SKIP_RPATH=on -DUSE_SYSTEM_MALLOC=on -DPORT=GTK" &&
+# Libraries we don't have
+OPTS+=' -DUSE_LIBBACKTRACE=NO -DUSE_SYSTEM_SYSPROF_CAPTURE=NO' &&
+CXXFLAGS+=' -std=c++17' &&
default_build
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index 1df8aa0..a33b3bc 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -31,7 +31,7 @@ depends JPEG &&
depends libwebp &&
depends sqlite &&
depends perl &&
-depends PYTHON &&
+depends python3 &&
depends RUBY &&
depends unifdef &&
depends gi-docgen &&
@@ -66,11 +66,10 @@ optional_depends openjpeg
\
'-DUSE_OPENJPEG=OFF' \
'Use openjpeg?' &&
-# To be enabled when jpegxl spell is added
-#optional_depends jpegxl \
-# '-DUSE_JPEGXL=ON' \
-# '-DUSE_JPEGXL=OFF' \
-# 'Use JPEGXL?' &&
+optional_depends libjxl \
+ '-DUSE_JPEGXL=ON' \
+ '-DUSE_JPEGXL=OFF' \
+ 'Use JPEGXL?' &&
optional_depends woff2 \
'-DUSE_WOFF2=ON' \
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index 9473316..b1814ad 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,10 +1,10 @@
# Watch: https://www.webkitgtk.org/releases/ webkitgtk-([0-9.]*)[.]tar
. "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=webkitgtk3
- VERSION=2.42.1
+ VERSION=2.46.5
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:c7ff45e748a2a3d381db05c7f05b7515d8e4e771e703dab6d153cb32392ff64f63f7d4039701676180abb6fd718153e762ce8ca9aede2ecbe0dc4efde5ed660c
+
SOURCE_HASH=sha512:9a0eb018361d407f13b303f66babcdc9960075bf69b83cf2ee8f708e5396cfa9e0a720f77695aea216072392e0603c2dc8ad50e6d56f962d4a52e9cdadf38275
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkitgtk-$VERSION"
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=13
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 32422c2..0cc788a 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,8 @@
+2025-01-19 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS: updated spell to 2.46.5
+ * PRE_BUILD, patches/0001-Support-ICU-76.1-build.patch:
+ fixed build against icu 76.1
+
2024-01-17 Conner Clere <xenanthropy AT sourcemage.org>
* DETAILS: version 2.42.1, SECURITY_PATCH++
* DEPENDS: add unifdef, gi-docgen dependencies
diff --git a/http/webkitgtk3/PRE_BUILD b/http/webkitgtk3/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/http/webkitgtk3/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/http/webkitgtk3/patches/0001-Support-ICU-76.1-build.patch
b/http/webkitgtk3/patches/0001-Support-ICU-76.1-build.patch
new file mode 100644
index 0000000..2ac2cc3
--- /dev/null
+++ b/http/webkitgtk3/patches/0001-Support-ICU-76.1-build.patch
@@ -0,0 +1,33 @@
+From 63f7badbada070ebaadd318b2801818ecf7e7ea0 Mon Sep 17 00:00:00 2001
+From: Don Olmstead <don.olmstead AT sony.com>
+Date: Sat, 26 Oct 2024 08:27:01 -0700
+Subject: [PATCH] Support ICU 76.1 build
+ https://bugs.webkit.org/show_bug.cgi?id=282120
+
+Reviewed by Yusuke Suzuki.
+
+In ICU 76.1 an additional macro `U_SHOW_CPLUSPLUS_HEADER_API` was added to
+control visibility of the C++ API within ICU. Set this value to `0` since
WebKit
+wants to only use the C API.
+
+* Source/WTF/wtf/Platform.h:
+
+Canonical link: https://commits.webkit.org/285727@main
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ Source/WTF/wtf/Platform.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 23070df2937ba..51a8dce97755e 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -115,6 +115,7 @@
+ /* ICU configuration. Some of these match ICU defaults on some platforms,
but we would like them consistently set everywhere we build WebKit. */
+ #define U_HIDE_DEPRECATED_API 1
+ #define U_SHOW_CPLUSPLUS_API 0
++#define U_SHOW_CPLUSPLUS_HEADER_API 0
+ #ifdef __cplusplus
+ #define UCHAR_TYPE char16_t
+ #endif
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (d0e5abe875eeb153da51df098074e0a3f67939b7), Ismael Luceno, 01/19/2025
Archive powered by MHonArc 2.6.24.