* [PR PATCH] webkit2gtk: update to 2.32.2
@ 2021-07-23 18:19 ericonr
2021-07-23 20:40 ` [PR PATCH] [Updated] " ericonr
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: ericonr @ 2021-07-23 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages webkit
https://github.com/void-linux/void-packages/pull/32160
webkit2gtk: update to 2.32.2
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/32160.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit-32160.patch --]
[-- Type: text/x-diff, Size: 10176 bytes --]
From a55fc2d19a52bd8ed9c10e5f8293ea67dfc42a6f Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Sun, 18 Jul 2021 13:10:28 +0200
Subject: [PATCH] webkit2gtk: update to 2.32.2
---
.../webkit2gtk/patches/be-typedarray.patch | 213 ------------------
srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch | 13 --
srcpkgs/webkit2gtk/template | 6 +-
3 files changed, 3 insertions(+), 229 deletions(-)
delete mode 100644 srcpkgs/webkit2gtk/patches/be-typedarray.patch
delete mode 100644 srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
deleted file mode 100644
index 12011525f3ed..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
-
-https://tenfourfox.tenderapp.com/discussions/problems/7505-problems-uploading-to-facebook
-
-Updated by @q66.
-
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-index dbe211d..4da5fbd 100644
---- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-@@ -28,6 +28,7 @@
- #include "JSArrayBufferView.h"
- #include "ThrowScope.h"
- #include "ToNativeFromValue.h"
-+#include <wtf/FlipBytes.h>
-
- namespace JSC {
-
-@@ -146,7 +147,18 @@ public:
-
- JSValue getIndexQuickly(unsigned i) const
- {
-+#if CPU(BIG_ENDIAN)
-+ switch (Adaptor::typeValue) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ return Adaptor::toJSValue(nullptr, getIndexQuicklyAsNativeValue(i));
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ return Adaptor::toJSValue(nullptr, flipBytes(getIndexQuicklyAsNativeValue(i)));
-+ }
-+#else
- return Adaptor::toJSValue(nullptr, getIndexQuicklyAsNativeValue(i));
-+#endif
- }
-
- void setIndexQuicklyToNativeValue(unsigned i, typename Adaptor::Type value)
-@@ -158,7 +170,20 @@ public:
- void setIndexQuickly(unsigned i, JSValue value)
- {
- ASSERT(!value.isObject());
-+#if CPU(BIG_ENDIAN)
-+ switch (Adaptor::typeValue) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+ break;
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ setIndexQuicklyToNativeValue(i, flipBytes(toNativeFromValue<Adaptor>(value)));
-+ break;
-+ }
-+#else
- setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+#endif
- }
-
- bool setIndex(JSGlobalObject* globalObject, unsigned i, JSValue jsValue)
-@@ -172,13 +197,54 @@ public:
- if (isDetached() || i >= m_length)
- return false;
-
-+#if CPU(BIG_ENDIAN)
-+ switch (Adaptor::typeValue) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ setIndexQuicklyToNativeValue(i, value);
-+ break;
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ setIndexQuicklyToNativeValue(i, flipBytes(value));
-+ break;
-+ }
-+#else
- setIndexQuicklyToNativeValue(i, value);
-+#endif
- return true;
- }
-
-- static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue) { return toNativeFromValue<Adaptor>(globalObject, jsValue); }
-+ static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue)
-+ {
-+#if CPU(BIG_ENDIAN)
-+ switch (Adaptor::typeValue) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ return flipBytes(toNativeFromValue<Adaptor>(globalObject, jsValue));
-+ }
-+#else
-+ return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+#endif
-+ }
-
-- static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue) { return toNativeFromValueWithoutCoercion<Adaptor>(jsValue); }
-+ static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue)
-+ {
-+#if CPU(BIG_ENDIAN)
-+ switch (Adaptor::typeValue) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ return flipBytes(toNativeFromValueWithoutCoercion<Adaptor>(jsValue));
-+ }
-+#else
-+ return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+#endif
-+ }
-
- void sort()
- {
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-index 126f33c..0913af5 100644
---- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -208,9 +208,36 @@ ALWAYS_INLINE EncodedJSValue genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
- scope.assertNoException();
- RELEASE_ASSERT(!thisObject->isDetached());
-
-- if (std::isnan(static_cast<double>(*targetOption))) {
-+ double targetOptionLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+ }
-+#else
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+#endif
-+
-+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
-- if (std::isnan(static_cast<double>(array[index])))
-+ double arrayElementLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+ }
-+#else
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+#endif
-+ if (std::isnan(arrayElementLittleEndianAsDouble))
- return JSValue::encode(jsBoolean(true));
- }
- } else {
-diff --git Source/WTF/wtf/FlipBytes.h Source/WTF/wtf/FlipBytes.h
-index 6cd7126..24708f7 100644
---- a/Source/WTF/wtf/FlipBytes.h
-+++ b/Source/WTF/wtf/FlipBytes.h
-@@ -24,6 +24,7 @@
- */
-
- #pragma once
-+#include "Optional.h"
-
- namespace WTF {
-
-@@ -98,6 +99,42 @@ inline T flipBytes(T value)
- return T();
- }
-
-+template<typename T>
-+inline T flipBytes(WTF::Optional<T> value)
-+{
-+ if (sizeof(*value) == 1)
-+ return *value;
-+ if (sizeof(*value) == 2) {
-+ union {
-+ T original;
-+ uint16_t word;
-+ } u;
-+ u.original = *value;
-+ u.word = flipBytes(u.word);
-+ return u.original;
-+ }
-+ if (sizeof(*value) == 4) {
-+ union {
-+ T original;
-+ uint32_t word;
-+ } u;
-+ u.original = *value;
-+ u.word = flipBytes(u.word);
-+ return u.original;
-+ }
-+ if (sizeof(*value) == 8) {
-+ union {
-+ T original;
-+ uint64_t word;
-+ } u;
-+ u.original = *value;
-+ u.word = flipBytes(u.word);
-+ return u.original;
-+ }
-+ RELEASE_ASSERT_NOT_REACHED();
-+ return T();
-+}
-+
- template<typename T>
- inline T flipBytesIfLittleEndian(T value, bool littleEndian)
- {
diff --git a/srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch b/srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch
deleted file mode 100644
index e35ed38c3287..000000000000
--- a/srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This should fix a recent regression in JSC CLoop on BE/32bit.
-
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -425,7 +425,7 @@ end)
- op(llint_get_host_call_return_value, macro ()
- functionPrologue()
- pushCalleeSaves()
-- loadp Callee[cfr], t0
-+ loadp Callee + PayloadOffset[cfr], t0
- convertCalleeToVM(t0)
- loadi VM::encodedHostCallReturnValue + TagOffset[t0], t1
- loadi VM::encodedHostCallReturnValue + PayloadOffset[t0], t0
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index ae7e80744d0b..97d9e843b5d2 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,8 +1,8 @@
# Template file for 'webkit2gtk'
# ping q66 before touching this
pkgname=webkit2gtk
-version=2.32.1
-revision=2
+version=2.32.2
+revision=1
wrksrc="webkitgtk-${version}"
build_style=cmake
build_helper="gir"
@@ -36,7 +36,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917
+checksum=1790f86975bdef957ba9a12fc09202de8f55c885ee38467afc50d2bdb7a6c5cd
make_check=no
build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.32.2
2021-07-23 18:19 [PR PATCH] webkit2gtk: update to 2.32.2 ericonr
@ 2021-07-23 20:40 ` ericonr
2021-07-24 20:29 ` ericonr
2021-07-28 3:32 ` [PR PATCH] [Merged]: webkit2gtk: update to 2.32.3 ericonr
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-07-23 20:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages webkit
https://github.com/void-linux/void-packages/pull/32160
webkit2gtk: update to 2.32.2
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/32160.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit-32160.patch --]
[-- Type: text/x-diff, Size: 10177 bytes --]
From c24c3d3b278d1f5d2225f6798734b9d622d27c72 Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Sun, 18 Jul 2021 13:10:28 +0200
Subject: [PATCH] webkit2gtk: update to 2.32.3.
---
.../webkit2gtk/patches/be-typedarray.patch | 213 ------------------
srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch | 13 --
srcpkgs/webkit2gtk/template | 6 +-
3 files changed, 3 insertions(+), 229 deletions(-)
delete mode 100644 srcpkgs/webkit2gtk/patches/be-typedarray.patch
delete mode 100644 srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
deleted file mode 100644
index 12011525f3ed..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
-
-https://tenfourfox.tenderapp.com/discussions/problems/7505-problems-uploading-to-facebook
-
-Updated by @q66.
-
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-index dbe211d..4da5fbd 100644
---- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-@@ -28,6 +28,7 @@
- #include "JSArrayBufferView.h"
- #include "ThrowScope.h"
- #include "ToNativeFromValue.h"
-+#include <wtf/FlipBytes.h>
-
- namespace JSC {
-
-@@ -146,7 +147,18 @@ public:
-
- JSValue getIndexQuickly(unsigned i) const
- {
-+#if CPU(BIG_ENDIAN)
-+ switch (Adaptor::typeValue) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ return Adaptor::toJSValue(nullptr, getIndexQuicklyAsNativeValue(i));
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ return Adaptor::toJSValue(nullptr, flipBytes(getIndexQuicklyAsNativeValue(i)));
-+ }
-+#else
- return Adaptor::toJSValue(nullptr, getIndexQuicklyAsNativeValue(i));
-+#endif
- }
-
- void setIndexQuicklyToNativeValue(unsigned i, typename Adaptor::Type value)
-@@ -158,7 +170,20 @@ public:
- void setIndexQuickly(unsigned i, JSValue value)
- {
- ASSERT(!value.isObject());
-+#if CPU(BIG_ENDIAN)
-+ switch (Adaptor::typeValue) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+ break;
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ setIndexQuicklyToNativeValue(i, flipBytes(toNativeFromValue<Adaptor>(value)));
-+ break;
-+ }
-+#else
- setIndexQuicklyToNativeValue(i, toNativeFromValue<Adaptor>(value));
-+#endif
- }
-
- bool setIndex(JSGlobalObject* globalObject, unsigned i, JSValue jsValue)
-@@ -172,13 +197,54 @@ public:
- if (isDetached() || i >= m_length)
- return false;
-
-+#if CPU(BIG_ENDIAN)
-+ switch (Adaptor::typeValue) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ setIndexQuicklyToNativeValue(i, value);
-+ break;
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ setIndexQuicklyToNativeValue(i, flipBytes(value));
-+ break;
-+ }
-+#else
- setIndexQuicklyToNativeValue(i, value);
-+#endif
- return true;
- }
-
-- static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue) { return toNativeFromValue<Adaptor>(globalObject, jsValue); }
-+ static ElementType toAdaptorNativeFromValue(JSGlobalObject* globalObject, JSValue jsValue)
-+ {
-+#if CPU(BIG_ENDIAN)
-+ switch (Adaptor::typeValue) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ return flipBytes(toNativeFromValue<Adaptor>(globalObject, jsValue));
-+ }
-+#else
-+ return toNativeFromValue<Adaptor>(globalObject, jsValue);
-+#endif
-+ }
-
-- static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue) { return toNativeFromValueWithoutCoercion<Adaptor>(jsValue); }
-+ static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue)
-+ {
-+#if CPU(BIG_ENDIAN)
-+ switch (Adaptor::typeValue) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ return flipBytes(toNativeFromValueWithoutCoercion<Adaptor>(jsValue));
-+ }
-+#else
-+ return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
-+#endif
-+ }
-
- void sort()
- {
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-index 126f33c..0913af5 100644
---- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -208,9 +208,36 @@ ALWAYS_INLINE EncodedJSValue genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
- scope.assertNoException();
- RELEASE_ASSERT(!thisObject->isDetached());
-
-- if (std::isnan(static_cast<double>(*targetOption))) {
-+ double targetOptionLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+ }
-+#else
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+#endif
-+
-+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
-- if (std::isnan(static_cast<double>(array[index])))
-+ double arrayElementLittleEndianAsDouble;
-+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+ }
-+#else
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+#endif
-+ if (std::isnan(arrayElementLittleEndianAsDouble))
- return JSValue::encode(jsBoolean(true));
- }
- } else {
-diff --git Source/WTF/wtf/FlipBytes.h Source/WTF/wtf/FlipBytes.h
-index 6cd7126..24708f7 100644
---- a/Source/WTF/wtf/FlipBytes.h
-+++ b/Source/WTF/wtf/FlipBytes.h
-@@ -24,6 +24,7 @@
- */
-
- #pragma once
-+#include "Optional.h"
-
- namespace WTF {
-
-@@ -98,6 +99,42 @@ inline T flipBytes(T value)
- return T();
- }
-
-+template<typename T>
-+inline T flipBytes(WTF::Optional<T> value)
-+{
-+ if (sizeof(*value) == 1)
-+ return *value;
-+ if (sizeof(*value) == 2) {
-+ union {
-+ T original;
-+ uint16_t word;
-+ } u;
-+ u.original = *value;
-+ u.word = flipBytes(u.word);
-+ return u.original;
-+ }
-+ if (sizeof(*value) == 4) {
-+ union {
-+ T original;
-+ uint32_t word;
-+ } u;
-+ u.original = *value;
-+ u.word = flipBytes(u.word);
-+ return u.original;
-+ }
-+ if (sizeof(*value) == 8) {
-+ union {
-+ T original;
-+ uint64_t word;
-+ } u;
-+ u.original = *value;
-+ u.word = flipBytes(u.word);
-+ return u.original;
-+ }
-+ RELEASE_ASSERT_NOT_REACHED();
-+ return T();
-+}
-+
- template<typename T>
- inline T flipBytesIfLittleEndian(T value, bool littleEndian)
- {
diff --git a/srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch b/srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch
deleted file mode 100644
index e35ed38c3287..000000000000
--- a/srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This should fix a recent regression in JSC CLoop on BE/32bit.
-
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -425,7 +425,7 @@ end)
- op(llint_get_host_call_return_value, macro ()
- functionPrologue()
- pushCalleeSaves()
-- loadp Callee[cfr], t0
-+ loadp Callee + PayloadOffset[cfr], t0
- convertCalleeToVM(t0)
- loadi VM::encodedHostCallReturnValue + TagOffset[t0], t1
- loadi VM::encodedHostCallReturnValue + PayloadOffset[t0], t0
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index ae7e80744d0b..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,8 +1,8 @@
# Template file for 'webkit2gtk'
# ping q66 before touching this
pkgname=webkit2gtk
-version=2.32.1
-revision=2
+version=2.32.3
+revision=1
wrksrc="webkitgtk-${version}"
build_style=cmake
build_helper="gir"
@@ -36,7 +36,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917
+checksum=c1f496f5ac654efe4cef62fbd4f2fbeeef265a07c5e7419e5d2900bfeea52cbc
make_check=no
build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.32.2
2021-07-23 18:19 [PR PATCH] webkit2gtk: update to 2.32.2 ericonr
2021-07-23 20:40 ` [PR PATCH] [Updated] " ericonr
@ 2021-07-24 20:29 ` ericonr
2021-07-28 3:32 ` [PR PATCH] [Merged]: webkit2gtk: update to 2.32.3 ericonr
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-07-24 20:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages webkit
https://github.com/void-linux/void-packages/pull/32160
webkit2gtk: update to 2.32.2
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/32160.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit-32160.patch --]
[-- Type: text/x-diff, Size: 2089 bytes --]
From cc5dad19a4b56403344f17d537f9c269ecdc2b29 Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Sun, 18 Jul 2021 13:10:28 +0200
Subject: [PATCH] webkit2gtk: update to 2.32.3.
---
srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch | 13 -------------
srcpkgs/webkit2gtk/template | 6 +++---
2 files changed, 3 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch
diff --git a/srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch b/srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch
deleted file mode 100644
index e35ed38c3287..000000000000
--- a/srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This should fix a recent regression in JSC CLoop on BE/32bit.
-
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -425,7 +425,7 @@ end)
- op(llint_get_host_call_return_value, macro ()
- functionPrologue()
- pushCalleeSaves()
-- loadp Callee[cfr], t0
-+ loadp Callee + PayloadOffset[cfr], t0
- convertCalleeToVM(t0)
- loadi VM::encodedHostCallReturnValue + TagOffset[t0], t1
- loadi VM::encodedHostCallReturnValue + PayloadOffset[t0], t0
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index ae7e80744d0b..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,8 +1,8 @@
# Template file for 'webkit2gtk'
# ping q66 before touching this
pkgname=webkit2gtk
-version=2.32.1
-revision=2
+version=2.32.3
+revision=1
wrksrc="webkitgtk-${version}"
build_style=cmake
build_helper="gir"
@@ -36,7 +36,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917
+checksum=c1f496f5ac654efe4cef62fbd4f2fbeeef265a07c5e7419e5d2900bfeea52cbc
make_check=no
build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: webkit2gtk: update to 2.32.3
2021-07-23 18:19 [PR PATCH] webkit2gtk: update to 2.32.2 ericonr
2021-07-23 20:40 ` [PR PATCH] [Updated] " ericonr
2021-07-24 20:29 ` ericonr
@ 2021-07-28 3:32 ` ericonr
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-07-28 3:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]
There's a merged pull request on the void-packages repository
webkit2gtk: update to 2.32.3
https://github.com/void-linux/void-packages/pull/32160
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-28 3:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-23 18:19 [PR PATCH] webkit2gtk: update to 2.32.2 ericonr
2021-07-23 20:40 ` [PR PATCH] [Updated] " ericonr
2021-07-24 20:29 ` ericonr
2021-07-28 3:32 ` [PR PATCH] [Merged]: webkit2gtk: update to 2.32.3 ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).