From 565fe9f19c55f6c2ffe0dc9f7aff418bec069297 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 14 Aug 2024 17:42:19 +0000 Subject: [PATCH] extra/webkit2gtk to 2.44.3-2 --- extra/webkit2gtk/.SRCINFO | 88 ++++++++++++++------------------------- extra/webkit2gtk/PKGBUILD | 59 ++++++++++++++++---------- 2 files changed, 69 insertions(+), 78 deletions(-) diff --git a/extra/webkit2gtk/.SRCINFO b/extra/webkit2gtk/.SRCINFO index 25f537cd6..2baf5198b 100644 --- a/extra/webkit2gtk/.SRCINFO +++ b/extra/webkit2gtk/.SRCINFO @@ -1,18 +1,39 @@ pkgbase = webkit2gtk pkgdesc = Web content engine for GTK pkgver = 2.44.3 - pkgrel = 1 + pkgrel = 2 url = https://webkitgtk.org arch = x86_64 - license = custom - makedepends = clang + license = AFL-2.0 OR GPL-2.0-or-later + license = Apache-2.0 + license = Apache-2.0 WITH LLVM-exception + license = BSD-2-Clause + license = BSD-2-Clause-Views + license = BSD-3-Clause + license = BSD-Source-Code + license = BSL-1.0 + license = bzip2-1.0.6 + license = GPL-2.0-only + license = GPL-3.0-only WITH Autoconf-exception-3.0 + license = GPL-3.0-or-later WITH Bison-exception-2.2 + license = ICU + license = ISC + license = LGPL-2.1-only + license = LGPL-2.1-or-later + license = MIT + license = MPL-1.1 + license = MPL-2.0 + license = NCSA + license = NCSA OR MIT + license = OFL-1.1 + license = SunPro + license = Unicode-TOU makedepends = cmake makedepends = gi-docgen makedepends = glib2-devel makedepends = gobject-introspection makedepends = gperf makedepends = gst-plugins-bad - makedepends = lld makedepends = ninja makedepends = python makedepends = ruby @@ -27,7 +48,10 @@ pkgbase = webkit2gtk depends = enchant depends = fontconfig depends = freetype2 + depends = gcc-libs + depends = gdk-pixbuf2 depends = glib2 + depends = glibc depends = gst-plugins-bad-libs depends = gst-plugins-base-libs depends = gstreamer @@ -36,6 +60,7 @@ pkgbase = webkit2gtk depends = harfbuzz-icu depends = hyphen depends = icu + depends = lcms2 depends = libavif depends = libdrm depends = libegl @@ -53,20 +78,18 @@ pkgbase = webkit2gtk depends = libsystemd depends = libtasn1 depends = libwebp - depends = libwpe depends = libx11 - depends = libxcomposite depends = libxml2 depends = libxslt - depends = libxt depends = mesa depends = openjpeg2 + depends = pango depends = sqlite depends = wayland depends = woff2 - depends = wpebackend-fdo depends = xdg-dbus-proxy depends = zlib + options = !lto source = https://webkitgtk.org/releases/webkitgtk-2.44.3.tar.xz source = https://webkitgtk.org/releases/webkitgtk-2.44.3.tar.xz.asc validpgpkeys = 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B @@ -77,55 +100,6 @@ pkgbase = webkit2gtk b2sums = SKIP pkgname = webkit2gtk - depends = at-spi2-core - depends = atk - depends = bubblewrap - depends = cairo - depends = enchant - depends = fontconfig - depends = freetype2 - depends = glib2 - depends = gst-plugins-bad-libs - depends = gst-plugins-base-libs - depends = gstreamer - depends = gtk3 - depends = harfbuzz - depends = harfbuzz-icu - depends = hyphen - depends = icu - depends = libavif - depends = libdrm - depends = libegl - depends = libepoxy - depends = libgcrypt - depends = libgl - depends = libgles - depends = libjpeg - depends = libjxl - depends = libmanette - depends = libpng - depends = libseccomp - depends = libsecret - depends = libsoup - depends = libsystemd - depends = libtasn1 - depends = libwebp - depends = libwpe - depends = libx11 - depends = libxcomposite - depends = libxml2 - depends = libxslt - depends = libxt - depends = mesa - depends = openjpeg2 - depends = sqlite - depends = wayland - depends = woff2 - depends = wpebackend-fdo - depends = xdg-dbus-proxy - depends = zlib - depends = libWPEBackend-fdo-1.0.so - depends = libwpe-1.0.so optdepends = geoclue: Geolocation support optdepends = gst-libav: nonfree media decoding optdepends = gst-plugins-bad: media decoding diff --git a/extra/webkit2gtk/PKGBUILD b/extra/webkit2gtk/PKGBUILD index 66b7f701f..c3c740bf0 100644 --- a/extra/webkit2gtk/PKGBUILD +++ b/extra/webkit2gtk/PKGBUILD @@ -12,11 +12,37 @@ pkgname=( webkit2gtk-docs ) pkgver=2.44.3 -pkgrel=1 +pkgrel=2 pkgdesc="Web content engine for GTK" url="https://webkitgtk.org" arch=(x86_64) -license=(custom) +license=( + # :sort ui /\v^\s*['"]?/ + 'AFL-2.0 OR GPL-2.0-or-later' + Apache-2.0 + 'Apache-2.0 WITH LLVM-exception' + BSD-2-Clause + BSD-2-Clause-Views + BSD-3-Clause + BSD-Source-Code + BSL-1.0 + bzip2-1.0.6 + GPL-2.0-only + 'GPL-3.0-only WITH Autoconf-exception-3.0' + 'GPL-3.0-or-later WITH Bison-exception-2.2' + ICU + ISC + LGPL-2.1-only + LGPL-2.1-or-later + MIT + MPL-1.1 + MPL-2.0 + NCSA + 'NCSA OR MIT' + OFL-1.1 + SunPro + Unicode-TOU +) depends=( at-spi2-core atk @@ -25,7 +51,10 @@ depends=( enchant fontconfig freetype2 + gcc-libs + gdk-pixbuf2 glib2 + glibc gst-plugins-bad-libs gst-plugins-base-libs gstreamer @@ -34,6 +63,7 @@ depends=( harfbuzz-icu hyphen icu + lcms2 libavif libdrm libegl @@ -51,30 +81,25 @@ depends=( libsystemd libtasn1 libwebp - libwpe libx11 - libxcomposite libxml2 libxslt - libxt mesa openjpeg2 + pango sqlite wayland woff2 - wpebackend-fdo xdg-dbus-proxy zlib ) makedepends=( - clang cmake gi-docgen glib2-devel gobject-introspection gperf gst-plugins-bad - lld ninja python ruby @@ -83,6 +108,11 @@ makedepends=( unifdef wayland-protocols ) +options=( + # https://gitlab.archlinux.org/archlinux/packaging/packages/webkit2gtk-4.1/-/issues/1 + # https://bugs.webkit.org/show_bug.cgi?id=278090 + !lto +) source=( $url/releases/webkitgtk-$pkgver.tar.xz{,.asc} ) @@ -115,15 +145,6 @@ build() { -DENABLE_MINIBROWSER=ON ) - # GCC with LTO fails to link libjavascriptcoregtk - # /usr/bin/ld: /tmp/ccXxyWZV.ltrans0.ltrans.o: in function `ipint_table_size_validate': - # :(.text+0x49f0f): undefined reference to `ipint_extern_table_size' - # /usr/bin/ld: /tmp/ccXxyWZV.ltrans0.ltrans.o: in function `ipint_table_fill_validate': - # :(.text+0x4a019): undefined reference to `ipint_extern_table_fill' - # collect2: error: ld returned 1 exit status - #export CC=clang CXX=clang++ - #LDFLAGS+=" -fuse-ld=lld" - # JITted code crashes when CET is used #CFLAGS+=' -fcf-protection=none' #CXXFLAGS+=' -fcf-protection=none' @@ -140,10 +161,6 @@ build() { } package_webkit2gtk() { - depends+=( - libWPEBackend-fdo-1.0.so - libwpe-1.0.so - ) provides+=( libjavascriptcoregtk-4.0.so libwebkit2gtk-4.0.so