extra/webkitgtk-6.0 to 2.44.3-2

extra/webkitgtk-6.0/.SRCINFO

@@ -1,18 +1,39 @@
 pkgbase = webkitgtk-6.0
 	pkgdesc = Web content engine for GTK
 	pkgver = 2.44.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://webkitgtk.org
 	arch = x86_64
-	license = custom
+	license = AFL-2.0 OR GPL-2.0-or-later
-	makedepends = clang
+	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 = webkitgtk-6.0
 	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 = webkitgtk-6.0
 	depends = harfbuzz-icu
 	depends = hyphen
 	depends = icu
+	depends = lcms2
 	depends = libavif
 	depends = libdrm
 	depends = libegl
@@ -53,20 +78,18 @@ pkgbase = webkitgtk-6.0
 	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 = webkitgtk-6.0
 	b2sums = SKIP
 
 pkgname = webkitgtk-6.0
-	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 = gtk4
-	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 = libsoup3
-	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

extra/webkitgtk-6.0/PKGBUILD

@@ -11,11 +11,37 @@ pkgname=(
   webkitgtk-6.0-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
@@ -24,7 +50,10 @@ depends=(
   enchant
   fontconfig
   freetype2
+  gcc-libs
+  gdk-pixbuf2
   glib2
+  glibc
   gst-plugins-bad-libs
   gst-plugins-base-libs
   gstreamer
@@ -33,6 +62,7 @@ depends=(
   harfbuzz-icu
   hyphen
   icu
+  lcms2
   libavif
   libdrm
   libegl
@@ -50,18 +80,15 @@ depends=(
   libsystemd
   libtasn1
   libwebp
-  libwpe
   libx11
-  libxcomposite
   libxml2
   libxslt
-  libxt
   mesa
   openjpeg2
+  pango
   sqlite
   wayland
   woff2
-  wpebackend-fdo
   xdg-dbus-proxy
   zlib
 )
@@ -80,6 +107,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}
 )
@@ -116,15 +148,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':
-  #     <artificial>:(.text+0x49f0f): undefined reference to `ipint_extern_table_size'
-  #     /usr/bin/ld: /tmp/ccXxyWZV.ltrans0.ltrans.o: in function `ipint_table_fill_validate':
-  #     <artificial>:(.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'
@@ -141,10 +164,6 @@ build() {
 }
 
 package_webkitgtk-6.0() {
-  depends+=(
-    libWPEBackend-fdo-1.0.so
-    libwpe-1.0.so
-  )
   provides+=(
     libjavascriptcoregtk-6.0.so
     libwebkitgtk-6.0.so