From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] epiphany: update to 44.0.
Date: Wed, 22 Mar 2023 23:47:52 +0100 [thread overview]
Message-ID: <20230322224752.YeCtHlyvl3-N86Qk4YvleegSHZizzWIpoPWADfLYIec@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42935@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages epiphany
https://github.com/void-linux/void-packages/pull/42935
epiphany: update to 44.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
Depends on: https://github.com/void-linux/void-packages/pull/41698
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/42935.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-epiphany-42935.patch --]
[-- Type: text/x-diff, Size: 14922 bytes --]
From ebd1371ffceb3c342965e4373d847147ec6e4ac7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 1/2] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index f972eebc4d3a..7639470721de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1
libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1
libwebkit2gtk-4.1.so.0 libwebkit2gtk41-2.38.0_1
libjavascriptcoregtk-4.1.so.0 libwebkit2gtk41-2.38.0_1
-libwebkit2gtk-5.0.so.0 libwebkit2gtk50-2.38.0_1
-libjavascriptcoregtk-5.0.so.0 libwebkit2gtk50-2.38.0_1
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.0_1
libgimp-2.0.so.0 libgimp-2.10.0_1
libgimpwidgets-2.0.so.0 libgimp-2.10.0_1
libgimpui-2.0.so.0 libgimp-2.10.0_1
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
+libgsttranscoder-1.0.so.0 gst-plugins-bad1-1.18.4_2
libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
libgnome-desktop-3.so.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..670c63bf5808
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #fi
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
# Don't remove which from hostmakedepends
# Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
hostmakedepends="perl python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc 'gi-docgen')
$(vopt_if wayland 'wayland-devel libxml2-devel')"
makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
libsoup-devel libsoup3-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
dbus-glib-devel libwebp-devel gtk+3-devel gtk4-devel libgudev-devel
libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
- woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-devel
qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
$(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
depends="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
libwebkit2gtk41-devel_package() {
depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From 82d11784891e741164e4c704f27f27d3a24e5285 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 2/2] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
next prev parent reply other threads:[~2023-03-22 22:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-22 21:05 [PR PATCH] " oreo639
2023-03-22 22:46 ` [PR PATCH] [Updated] " oreo639
2023-03-22 22:47 ` oreo639 [this message]
2023-03-22 23:24 ` paper42
2023-04-07 20:43 ` [PR PATCH] [Updated] " oreo639
2023-04-07 21:17 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230322224752.YeCtHlyvl3-N86Qk4YvleegSHZizzWIpoPWADfLYIec@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).