Date: Monday, May 1, 2023 @ 20:17:44
Author: heftig
Revision: 476214
archrelease: copy trunk to gnome-unstable-x86_64
Added:
webkit2gtk-4.1/repos/gnome-unstable-x86_64/
webkit2gtk-4.1/repos/gnome-unstable-x86_64/0001-Fix-build-of-SourceBrush.cpp.patch
(from rev 476212,
webkit2gtk-4.1/trunk/0001-Fix-build-of-SourceBrush.cpp.patch)
webkit2gtk-4.1/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 476212, webkit2gtk-4.1/trunk/PKGBUILD)
webkit2gtk-4.1/repos/gnome-unstable-x86_64/keys/
-----------------------------------------+
0001-Fix-build-of-SourceBrush.cpp.patch | 36 ++++++
PKGBUILD | 162 ++++++++++++++++++++++++++++++
2 files changed, 198 insertions(+)
Copied:
webkit2gtk-4.1/repos/gnome-unstable-x86_64/0001-Fix-build-of-SourceBrush.cpp.patch
(from rev 476212, webkit2gtk-4.1/trunk/0001-Fix-build-of-SourceBrush.cpp.patch)
===================================================================
--- gnome-unstable-x86_64/0001-Fix-build-of-SourceBrush.cpp.patch
(rev 0)
+++ gnome-unstable-x86_64/0001-Fix-build-of-SourceBrush.cpp.patch
2023-05-01 20:17:44 UTC (rev 476214)
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <[email protected]>
+Date: Fri, 31 Mar 2023 12:24:09 -0700
+Subject: [PATCH] Fix build of SourceBrush.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=254821
+
+Unreviewed build fix.
+
+* Source/WebCore/platform/graphics/SourceBrush.cpp:
+(WebCore::SourceBrush::setGradient):
+(WebCore::SourceBrush::setPattern):
+
+Canonical link: https://commits.webkit.org/262434@main
+---
+ Source/WebCore/platform/graphics/SourceBrush.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/WebCore/platform/graphics/SourceBrush.cpp
b/Source/WebCore/platform/graphics/SourceBrush.cpp
+index f4d299be82f1..4bf4d6842aea 100644
+--- a/Source/WebCore/platform/graphics/SourceBrush.cpp
++++ b/Source/WebCore/platform/graphics/SourceBrush.cpp
+@@ -65,12 +65,12 @@ Pattern* SourceBrush::pattern() const
+
+ void SourceBrush::setGradient(Ref<Gradient>&& gradient, const
AffineTransform& spaceTransform)
+ {
+- m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform }
};
++ m_brush = Brush { Brush::LogicalGradient { WTFMove(gradient),
spaceTransform } };
+ }
+
+ void SourceBrush::setPattern(Ref<Pattern>&& pattern)
+ {
+- m_brush = { Brush::Variant { std::in_place_type<Ref<Pattern>>,
WTFMove(pattern) } };
++ m_brush = Brush { Brush::Variant { std::in_place_type<Ref<Pattern>>,
WTFMove(pattern) } };
+ }
+
+ WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush)
Copied: webkit2gtk-4.1/repos/gnome-unstable-x86_64/PKGBUILD (from rev 476212,
webkit2gtk-4.1/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2023-05-01 20:17:44 UTC (rev 476214)
@@ -0,0 +1,162 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Eric Bélanger <[email protected]>
+
+pkgbase=webkit2gtk-4.1
+pkgname=(
+ webkit2gtk-4.1
+ webkit2gtk-4.1-docs
+)
+pkgver=2.40.1
+pkgrel=2
+pkgdesc="Web content engine for GTK"
+url="https://webkitgtk.org";
+arch=(x86_64)
+license=(custom)
+depends=(
+ at-spi2-core
+ atk
+ bubblewrap
+ cairo
+ enchant
+ fontconfig
+ freetype2
+ glib2
+ gst-plugins-bad-libs
+ gst-plugins-base-libs
+ gstreamer
+ gtk3
+ harfbuzz
+ harfbuzz-icu
+ hyphen
+ icu
+ libavif
+ libdrm
+ libegl
+ libepoxy
+ libgcrypt
+ libgl
+ libgles
+ libjpeg
+ libmanette
+ libpng
+ libseccomp
+ libsecret
+ libsoup3
+ libsystemd
+ libtasn1
+ libwebp
+ libwpe
+ libx11
+ libxcomposite
+ libxml2
+ libxslt
+ libxt
+ mesa
+ openjpeg2
+ sqlite
+ wayland
+ woff2
+ wpebackend-fdo
+ xdg-dbus-proxy
+ zlib
+)
+makedepends=(
+ cmake
+ gi-docgen
+ gobject-introspection
+ gperf
+ gst-plugins-bad
+ ninja
+ python
+ ruby
+ systemd
+ unifdef
+ wayland-protocols
+)
+source=(
+ $url/releases/webkitgtk-$pkgver.tar.xz{,.asc}
+ 0001-Fix-build-of-SourceBrush.cpp.patch
+)
+sha256sums=('64e526984f8cd2161ef03ae949af99c002ff333d615e6386b460164a3c1b7ef6'
+ 'SKIP'
+ 'ad3191d494647a33f48fa2b0eb2f0ed9035571a01909d009764960029cac4092')
+b2sums=('b50c983eafdb215e62e1509873691bc3f932c8b5daf0ceeaefc041d3bc6c5ff804f25af5f761837a3f37df07c1c598f5984e40b116e70a3523d508d13594dc4d'
+ 'SKIP'
+
'aa01aacc2f58f0634370472a001ddf01f84ce2d603ed5352138e63b786ec4e6a99429eb0d00d7fd893ac9c46b90fd5f0ed49c916cd124cc7d78e6dbb6a1a9386')
+validpgpkeys=(
+ 'D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3' # Carlos Garcia Campos
<[email protected]>
+ '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B' # Adrián Pérez de Castro
<[email protected]>
+)
+
+prepare() {
+ cd webkitgtk-$pkgver
+
+ # Fix build with GCC 13
+ # Backport of
https://github.com/WebKit/WebKit/commit/93920b55f52ff8b883296f4845269e2ed746acb3
+ patch -Np1 -i ../0001-Fix-build-of-SourceBrush.cpp.patch
+}
+
+build() {
+ local cmake_options=(
+ -DPORT=GTK
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_LIBDIR=lib
+ -DCMAKE_INSTALL_LIBEXECDIR=lib
+ -DCMAKE_SKIP_RPATH=ON
+ -DUSE_AVIF=ON
+ -DUSE_SOUP2=OFF
+ -DENABLE_DOCUMENTATION=ON
+ -DENABLE_MINIBROWSER=ON
+ )
+
+ # Produce minimal debug info: 4.3 GB of debug data makes the
+ # build too slow and is too much to package for debuginfod
+ CFLAGS+=' -g1'
+ CXXFLAGS+=' -g1'
+
+ cmake -S webkitgtk-$pkgver -B build -G Ninja "${cmake_options[@]}"
+ cmake --build build
+}
+
+package_webkit2gtk-4.1() {
+ depends+=(
+ libWPEBackend-fdo-1.0.so
+ libwpe-1.0.so
+ )
+ provides+=(
+ libjavascriptcoregtk-4.1.so
+ libwebkit2gtk-4.1.so
+ )
+ optdepends=(
+ 'geoclue: Geolocation support'
+ 'gst-libav: nonfree media decoding'
+ 'gst-plugins-bad: media decoding'
+ 'gst-plugins-good: media decoding'
+ )
+
+ DESTDIR="$pkgdir" cmake --install build
+
+ rm -r "$pkgdir/usr/bin"
+
+ mkdir -p doc/usr/share
+ mv {"$pkgdir",doc}/usr/share/gtk-doc
+
+ cd webkitgtk-$pkgver
+ find Source -name 'COPYING*' -or -name 'LICENSE*' -print0 | sort -z |
+ while IFS= read -d $'\0' -r _f; do
+ echo "### $_f ###"
+ cat "$_f"
+ echo
+ done |
+ install -Dm644 /dev/stdin "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_webkit2gtk-4.1-docs() {
+ pkgdesc+=" (documentation)"
+ depends=()
+
+ mv doc/* "$pkgdir"
+}
+
+# vim:set sw=2 sts=-1 et:
