From 83d7e439a02aefa4d9a57aeb94880399bf5947af Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 14 Aug 2024 17:44:47 +0000 Subject: [PATCH] extra/wpewebkit to 2.44.3-2 --- extra/wpewebkit/.SRCINFO | 36 +++++++++++++++++++++++++---- extra/wpewebkit/PKGBUILD | 49 +++++++++++++++++++++++++++++----------- 2 files changed, 68 insertions(+), 17 deletions(-) diff --git a/extra/wpewebkit/.SRCINFO b/extra/wpewebkit/.SRCINFO index 921c96f75..d5ed22b56 100644 --- a/extra/wpewebkit/.SRCINFO +++ b/extra/wpewebkit/.SRCINFO @@ -1,18 +1,39 @@ pkgbase = wpewebkit pkgdesc = Embeddable web content engine pkgver = 2.44.3 - pkgrel = 1 + pkgrel = 2 url = https://wpewebkit.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 @@ -26,13 +47,16 @@ pkgbase = wpewebkit depends = cairo depends = fontconfig depends = freetype2 + depends = gcc-libs depends = glib2 + depends = glibc depends = gst-plugins-bad-libs depends = gst-plugins-base-libs depends = gstreamer depends = harfbuzz depends = harfbuzz-icu depends = icu + depends = lcms2 depends = libavif depends = libdrm depends = libepoxy @@ -57,6 +81,7 @@ pkgbase = wpewebkit depends = wpebackend-fdo depends = xdg-dbus-proxy depends = zlib + options = !lto source = https://wpewebkit.org/releases/wpewebkit-2.44.3.tar.xz source = https://wpewebkit.org/releases/wpewebkit-2.44.3.tar.xz.asc validpgpkeys = 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B @@ -73,13 +98,16 @@ pkgname = wpewebkit depends = cairo depends = fontconfig depends = freetype2 + depends = gcc-libs depends = glib2 + depends = glibc depends = gst-plugins-bad-libs depends = gst-plugins-base-libs depends = gstreamer depends = harfbuzz depends = harfbuzz-icu depends = icu + depends = lcms2 depends = libavif depends = libdrm depends = libepoxy diff --git a/extra/wpewebkit/PKGBUILD b/extra/wpewebkit/PKGBUILD index aedf782b4..c87d4d612 100644 --- a/extra/wpewebkit/PKGBUILD +++ b/extra/wpewebkit/PKGBUILD @@ -9,11 +9,37 @@ pkgname=( wpewebkit-docs ) pkgver=2.44.3 -pkgrel=1 +pkgrel=2 pkgdesc="Embeddable web content engine" url="https://wpewebkit.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 @@ -21,13 +47,16 @@ depends=( cairo fontconfig freetype2 + gcc-libs glib2 + glibc gst-plugins-bad-libs gst-plugins-base-libs gstreamer harfbuzz harfbuzz-icu icu + lcms2 libavif libdrm libepoxy @@ -54,14 +83,12 @@ depends=( zlib ) makedepends=( - clang cmake gi-docgen glib2-devel gobject-introspection gperf gst-plugins-bad - lld ninja python ruby @@ -70,6 +97,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/wpewebkit-$pkgver.tar.xz{,.asc} ) @@ -100,15 +132,6 @@ build() { -DENABLE_MINIBROWSER=ON ) - # GCC with LTO fails to link jsc - # /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'