cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to webkitgtk40-2.38.1.

Browse Source
This commit is contained in:
ajacoutot 2022-10-21 09:19:54 +00:00
parent 8115873355
commit ee78eff7fb
6 changed files with 16 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/webkitgtk4/Makefile
View File

@ -11,7 +11,7 @@ PORTROACH = limitw:1,even
COMMENT = GTK+ port of the WebKit (${API}) rendering engine
V = 2.38.0
V = 2.38.1
DISTNAME = webkitgtk-${V}
PKGNAME = webkitgtk${API:S/.//}-${V}
FULLPKGNAME = ${PKGNAME}
@ -33,7 +33,7 @@ MAINTAINER = Antoine Jacoutot <ajacoutot@openbsd.org>
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} EGL GL X11 Xcomposite Xdamage Xrender
WANTLIB += Xt atk-1.0 c cairo cairo-gobject enchant-2 fontconfig
WANTLIB += Xt c cairo cairo-gobject enchant-2 fontconfig
WANTLIB += freetype gcrypt gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gpg-error gstallocators-1.0 gstapp-1.0
WANTLIB += gstaudio-1.0 gstbase-1.0 gstfft-1.0 gstgl-1.0 gstpbutils-1.0
@ -143,7 +143,7 @@ FLAVOR ?=
.if ${FLAVOR:Mwebkitgtk41}
API = 4.1
WANTLIB += gdk-3 gtk-3 soup-3.0
WANTLIB += atk-1.0 gdk-3 gtk-3 soup-3.0
LIB_DEPENDS += devel/libsoup3 \
x11/gtk+3
CONFIGURE_ARGS += -DUSE_SOUP2=OFF
@ -156,7 +156,7 @@ CONFIGURE_ARGS += -DUSE_SOUP2=OFF \
-DUSE_GTK4=ON
.else
API = 4.0
WANTLIB += gdk-3 gtk-3 soup-2.4
WANTLIB += atk-1.0 gdk-3 gtk-3 soup-2.4
LIB_DEPENDS += devel/libsoup \
x11/gtk+3
CONFIGURE_ARGS += -DUSE_SOUP2=ON

4
www/webkitgtk4/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (webkitgtk-2.38.0.tar.xz) = +c5jdaO24TKbC2CfRpIeJifcetYiSze5Z6supkO8D70=
SIZE (webkitgtk-2.38.0.tar.xz) = 32997240
SHA256 (webkitgtk-2.38.1.tar.xz) = AuGVs/ueBXdDszZO5/HuwT9xYUImhJVEwHwypzuPGEg=
SIZE (webkitgtk-2.38.1.tar.xz) = 33006384

8
www/webkitgtk4/patches/patch-Source_WTF_wtf_PlatformCPU_h
View File

@ -3,7 +3,7 @@ https://bugs.webkit.org/show_bug.cgi?id=129963
Index: Source/WTF/wtf/PlatformCPU.h
--- Source/WTF/wtf/PlatformCPU.h.orig
+++ Source/WTF/wtf/PlatformCPU.h
@@ -89,6 +89,13 @@
@@ -95,6 +95,13 @@
#define WTF_CPU_KNOWN 1
#endif
@ -17,12 +17,12 @@ Index: Source/WTF/wtf/PlatformCPU.h
/* CPU(X86) - i386 / x86 32-bit */
#if defined(__i386__) \
|| defined(i386) \
@@ -289,7 +296,7 @@
@@ -295,7 +302,7 @@
#define WTF_CPU_UNKNOWN 1
#endif
-#if CPU(ARM) || CPU(MIPS) || CPU(UNKNOWN)
+#if CPU(ARM) || CPU(MIPS) || CPU(SPARC64) || CPU(UNKNOWN)
-#if CPU(ARM) || CPU(MIPS) || CPU(RISCV64) || CPU(UNKNOWN)
+#if CPU(ARM) || CPU(MIPS) || CPU(RISCV64) || CPU(SPARC64) || CPU(UNKNOWN)
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif

2
www/webkitgtk4/patches/patch-Source_WTF_wtf_dtoa_utils_h
View File

@ -1,7 +1,7 @@
Index: Source/WTF/wtf/dtoa/utils.h
--- Source/WTF/wtf/dtoa/utils.h.orig
+++ Source/WTF/wtf/dtoa/utils.h
@@ -86,7 +86,7 @@ int main(int argc, char** argv) {
@@ -87,7 +87,7 @@ int main(int argc, char** argv) {
defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
defined(__sparc__) || defined(__sparc) || defined(__s390__) || \

115
www/webkitgtk4/patches/patch-Source_WebKit_Platform_IPC_ArgumentCoders_h
View File

@ -1,115 +0,0 @@
https://bugs.webkit.org/show_bug.cgi?id=245044
REVERT:
From: "zan@falconsigh.net" <zan@falconsigh.net@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue, 12 Apr 2022 06:30:51 +0000
Subject: [PATCH] [WK2] Simplify IPC encoding, decoding of tuples https://bugs.webkit.org/show_bug.cgi?id=239062
Index: Source/WebKit/Platform/IPC/ArgumentCoders.h
--- Source/WebKit/Platform/IPC/ArgumentCoders.h.orig
+++ Source/WebKit/Platform/IPC/ArgumentCoders.h
@@ -495,26 +495,38 @@ template<typename T> struct ArgumentCoder<Ref<T>> {
}
};
-template<typename... Elements>
+template<size_t index, typename... Elements>
struct TupleEncoder {
template<typename Encoder>
static void encode(Encoder& encoder, const std::tuple<Elements...>& tuple)
{
- encode(encoder, tuple, std::index_sequence_for<Elements...> { });
+ encoder << std::get<sizeof...(Elements) - index>(tuple);
+ TupleEncoder<index - 1, Elements...>::encode(encoder, tuple);
}
+};
- template<typename Encoder, size_t... Indices>
- static void encode(Encoder& encoder, const std::tuple<Elements...>& tuple, std::index_sequence<Indices...>)
+template<typename... Elements>
+struct TupleEncoder<0, Elements...> {
+ template<typename Encoder>
+ static void encode(Encoder&, const std::tuple<Elements...>&)
{
- if constexpr (sizeof...(Indices) > 0)
- (encoder << ... << std::get<Indices>(tuple));
}
};
-template<typename... Elements> struct TupleDecoder;
+template <typename T, typename... Elements, size_t... Indices>
+auto tupleFromTupleAndObject(T&& object, std::tuple<Elements...>&& tuple, std::index_sequence<Indices...>)
+{
+ return std::make_tuple(WTFMove(object), WTFMove(std::get<Indices>(tuple))...);
+}
+template <typename T, typename... Elements>
+auto tupleFromTupleAndObject(T&& object, std::tuple<Elements...>&& tuple)
+{
+ return tupleFromTupleAndObject(WTFMove(object), WTFMove(tuple), std::index_sequence_for<Elements...>());
+}
+
template<typename Type, typename... Types>
-struct TupleDecoder<Type, Types...> {
+struct TupleDecoderImpl {
template<typename Decoder>
static std::optional<std::tuple<Type, Types...>> decode(Decoder& decoder)
{
@@ -523,16 +535,38 @@ struct TupleDecoder<Type, Types...> {
if (!optional)
return std::nullopt;
- std::optional<std::tuple<Types...>> remainder = TupleDecoder<Types...>::decode(decoder);
- if (!remainder)
+ std::optional<std::tuple<Types...>> subTuple = TupleDecoderImpl<Types...>::decode(decoder);
+ if (!subTuple)
return std::nullopt;
- return std::tuple_cat(std::make_tuple(WTFMove(*optional)), WTFMove(*remainder));
+ return tupleFromTupleAndObject(WTFMove(*optional), WTFMove(*subTuple));
}
};
+template<typename Type>
+struct TupleDecoderImpl<Type> {
+ template<typename Decoder>
+ static std::optional<std::tuple<Type>> decode(Decoder& decoder)
+ {
+ std::optional<Type> optional;
+ decoder >> optional;
+ if (!optional)
+ return std::nullopt;
+ return std::make_tuple(WTFMove(*optional));
+ }
+};
+
+template<size_t size, typename... Elements>
+struct TupleDecoder {
+ template<typename Decoder>
+ static std::optional<std::tuple<Elements...>> decode(Decoder& decoder)
+ {
+ return TupleDecoderImpl<Elements...>::decode(decoder);
+ }
+};
+
template<>
-struct TupleDecoder<> {
+struct TupleDecoder<0> {
template<typename Decoder>
static std::optional<std::tuple<>> decode(Decoder&)
{
@@ -544,13 +578,13 @@ template<typename... Elements> struct ArgumentCoder<st
template<typename Encoder>
static void encode(Encoder& encoder, const std::tuple<Elements...>& tuple)
{
- TupleEncoder<Elements...>::encode(encoder, tuple);
+ TupleEncoder<sizeof...(Elements), Elements...>::encode(encoder, tuple);
}
template<typename Decoder>
static std::optional<std::tuple<Elements...>> decode(Decoder& decoder)
{
- return TupleDecoder<Elements...>::decode(decoder);
+ return TupleDecoder<sizeof...(Elements), Elements...>::decode(decoder);
}
};

10
www/webkitgtk4/patches/patch-Source_cmake_WebKitCommon_cmake
View File

@ -10,16 +10,16 @@ Index: Source/cmake/WebKitCommon.cmake
set(WTF_CPU_PPC 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
set(WTF_CPU_PPC64 1)
@@ -119,6 +119,8 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
set(WTF_CPU_PPC64LE 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64")
@@ -121,6 +121,8 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
set(WTF_CPU_RISCV64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64")
set(WTF_CPU_LOONGARCH64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64")
+ set(WTF_CPU_SPARC64 1)
else ()
set(WTF_CPU_UNKNOWN 1)
endif ()
@@ -190,9 +192,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
@@ -192,9 +194,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
# We cannot check for RUBY_FOUND because it is set only when the full package is installed and
# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
# for finding only the Ruby interpreter.
@ -32,7 +32,7 @@ Index: Source/cmake/WebKitCommon.cmake
endif ()
# -----------------------------------------------------------------------------
@@ -204,7 +206,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
@@ -206,7 +208,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
include(CheckCXXCompilerFlag)
include(CheckCXXSourceCompiles)
include(CheckFunctionExists)