From 3269d31bd3bf4961c249bde8399a4e8a650f5dbf Mon Sep 17 00:00:00 2001 From: heftig Date: Sat, 6 May 2023 16:44:18 +0000 Subject: [PATCH] db-move: moved webkit2gtk from [testing] to [extra] (x86_64) git-svn-id: file:///srv/repos/svn-packages/svn@476864 eb2447ed-0c53-47e4-bac8-5bc4a241df78 --- .../0001-Fix-build-of-SourceBrush.cpp.patch | 0 webkit2gtk/repos/extra-x86_64/PKGBUILD | 16 +- webkit2gtk/repos/testing-x86_64/PKGBUILD | 162 --------------------- .../5AA3BC334FD7E3369E7C77B291C559DBE4C9123B.asc | 21 --- .../D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.asc | 23 --- 5 files changed, 11 insertions(+), 211 deletions(-) rename webkit2gtk/repos/{testing-x86_64 => extra-x86_64}/0001-Fix-build-of-SourceBrush.cpp.patch (100%) delete mode 100644 webkit2gtk/repos/testing-x86_64/PKGBUILD delete mode 100644 webkit2gtk/repos/testing-x86_64/keys/pgp/5AA3BC334FD7E3369E7C77B291C559DBE4C9123B.asc delete mode 100644 webkit2gtk/repos/testing-x86_64/keys/pgp/D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.asc diff --git a/webkit2gtk/repos/testing-x86_64/0001-Fix-build-of-SourceBrush.cpp.patch b/webkit2gtk/repos/extra-x86_64/0001-Fix-build-of-SourceBrush.cpp.patch similarity index 100% rename from webkit2gtk/repos/testing-x86_64/0001-Fix-build-of-SourceBrush.cpp.patch rename to webkit2gtk/repos/extra-x86_64/0001-Fix-build-of-SourceBrush.cpp.patch diff --git a/webkit2gtk/repos/extra-x86_64/PKGBUILD b/webkit2gtk/repos/extra-x86_64/PKGBUILD index 3f3ebc35698..fe33f73002a 100644 --- a/webkit2gtk/repos/extra-x86_64/PKGBUILD +++ b/webkit2gtk/repos/extra-x86_64/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( webkit2gtk-docs ) pkgver=2.40.1 -pkgrel=1 +pkgrel=2 pkgdesc="Web content engine for GTK" url="https://webkitgtk.org" arch=(x86_64) @@ -36,10 +36,8 @@ depends=( libgcrypt libgl libgles - libice libjpeg libmanette - libnotify libpng libseccomp libsecret @@ -50,7 +48,6 @@ depends=( libwpe libx11 libxcomposite - libxext libxml2 libxslt libxt @@ -78,9 +75,14 @@ makedepends=( ) source=( $url/releases/webkitgtk-$pkgver.tar.xz{,.asc} + 0001-Fix-build-of-SourceBrush.cpp.patch ) sha256sums=('64e526984f8cd2161ef03ae949af99c002ff333d615e6386b460164a3c1b7ef6' - 'SKIP') + 'SKIP' + 'ad3191d494647a33f48fa2b0eb2f0ed9035571a01909d009764960029cac4092') +b2sums=('b50c983eafdb215e62e1509873691bc3f932c8b5daf0ceeaefc041d3bc6c5ff804f25af5f761837a3f37df07c1c598f5984e40b116e70a3523d508d13594dc4d' + 'SKIP' + 'aa01aacc2f58f0634370472a001ddf01f84ce2d603ed5352138e63b786ec4e6a99429eb0d00d7fd893ac9c46b90fd5f0ed49c916cd124cc7d78e6dbb6a1a9386') validpgpkeys=( 'D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3' # Carlos Garcia Campos '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B' # Adrián Pérez de Castro @@ -88,6 +90,10 @@ validpgpkeys=( 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() { diff --git a/webkit2gtk/repos/testing-x86_64/PKGBUILD b/webkit2gtk/repos/testing-x86_64/PKGBUILD deleted file mode 100644 index fe33f73002a..00000000000 --- a/webkit2gtk/repos/testing-x86_64/PKGBUILD +++ /dev/null @@ -1,162 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Eric Bélanger - -pkgbase=webkit2gtk -pkgname=( - webkit2gtk - webkit2gtk-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 - libsoup - 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 - '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B' # Adrián Pérez de Castro -) - -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=ON - -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() { - depends+=( - libWPEBackend-fdo-1.0.so - libwpe-1.0.so - ) - provides+=( - libjavascriptcoregtk-4.0.so - libwebkit2gtk-4.0.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-docs() { - pkgdesc+=" (documentation)" - depends=() - - mv doc/* "$pkgdir" -} - -# vim:set sw=2 sts=-1 et: diff --git a/webkit2gtk/repos/testing-x86_64/keys/pgp/5AA3BC334FD7E3369E7C77B291C559DBE4C9123B.asc b/webkit2gtk/repos/testing-x86_64/keys/pgp/5AA3BC334FD7E3369E7C77B291C559DBE4C9123B.asc deleted file mode 100644 index 9f844169fd1..00000000000 --- a/webkit2gtk/repos/testing-x86_64/keys/pgp/5AA3BC334FD7E3369E7C77B291C559DBE4C9123B.asc +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGiBEhD/gURBADY9/zG24BcSOkrarNtDlMqTM1Mc22gBlpVs3IyGwiYFy1f+NYL -0CwgO6JsJPF0BsrLtZ0jO7SCUOnq1lQ/XA3Ecttp9Fc7p7qRoDX4okC72PFGOtth -fnnkAaFe4d2LYIXs6ZPbuH4x7sDnEDcK2ceJvNXFIRjF8XnOglpN3pmI+wCggRxa -VFsAYh/xbm5/UYSDyJDqCH0EALjkCl4l5kGVA+5ZQgtuvLNrHyOIAX35pwE4fKby -krpM7DP0YooNnXzENOPvOB4WlhW8dAAt2EuQspvmJieeevE//DcgAhYVZBlzNnQq -Z3yPbJY4ucQy9KU5hyP6GLul+80KThhJZRAiCnjSQf8H3Ij7sEwLkSAmg1MIyPF7 -OShABAC42FzEpsyW6+SX7c6FNYB5ZgsgEESq6nTiCJ77Tqe5CrOqNplpNqrw/knI -GgSEsxmXNEhBvXCjCH4CDDGPXVuqXpHB/E38JW75irXVVSr47iTx0XaBRzGLcHyM -gT1b/yYCl10FV/47u8XaOP0BP9cQ2A9PY/vRTKRDNbe4plJSRbQsQWRyacOhbiBQ -w6lyZXogZGUgQ2FzdHJvIDxhcGVyZXpAaWdhbGlhLmNvbT6IgQQTEQoAQQIbIwIe -AQIXgAIZAQULCQgHAwUVCgkICwUWAgMBABYhBFqjvDNP1+M2nnx3spHFWdvkyRI7 -BQJeuoBnBQkaOOliAAoJEJHFWdvkyRI7lAsAn0EYqK753vXGH0fQGi30hnLUTbo7 -AJ4gi/3tS5RXrokUBWt//IhPrkUSBrQ+QWRyacOhbiBQw6lyZXogZGUgQ2FzdHJv -IChwZXJzb25hbCkgPGFkcmlhbkBwZXJlemRlY2FzdHJvLm9yZz6IfgQTEQoAPgIb -IwIeAQIXgAULCQgHAwUVCgkICwUWAgMBABYhBFqjvDNP1+M2nnx3spHFWdvkyRI7 -BQJeuoBuBQkaOOliAAoJEJHFWdvkyRI7PlsAn0kzehBht+bqJ9IVW08hfq3dNirm -AJsHuPgQnz2Zm43XDUf6Re8vaoxlxQ== -=tAiD ------END PGP PUBLIC KEY BLOCK----- diff --git a/webkit2gtk/repos/testing-x86_64/keys/pgp/D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.asc b/webkit2gtk/repos/testing-x86_64/keys/pgp/D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.asc deleted file mode 100644 index e5d71dd52f6..00000000000 --- a/webkit2gtk/repos/testing-x86_64/keys/pgp/D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.asc +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGiBEy4Qy4RBACevATwAKdArGO2UjVGsP3nb3BWLfB9KR5hbpuL5yejUoR6xeN4 -vsw1/fy9fiGlsLGqlmnd6bDZ6c7mNyc0ERXXGk2QOQEMeDyL6VsoZEbo5t8bZa6B -Pxc23C9L4d0bdNF7y0CoO7xsg1zClq23MXWAgi4Wm+ZDonw+b2UBcCt/uwCg9AST -/g8XgNKZ4WxpRI4bM/1BvxUD/2xeJkUjgmdwV14dOdHmsW7BYJHUKxAt9KBSJ5Yo -ZDCmh6HTtUjd9dKwkuRTxtc3G4s+J5D5WCeNKQ/kNAYAoclzXYc2crTrXZ+RqWap -G+ngUZxgnyNAaveyUjV19qDRJKVuzBXeQWH/UU5eEpuRfx7ReyFX7sAhDOmnVrvg -IoegA/0SNS+wsGjYxpWOO1QMsqGidgIp5yLanfA7qsfxz8t+gGtXOSqomUJsYyYX -a0c2kXl3ZPe/cyK6j9o+l4YrczkNAxeXVJd4uA4sSrqmKI1F7cICV3EqJ5uyKWll -eW/sfhKNcPiadBZr9LNS1775jWM3pNxszZrjCnTfspn0gyGTbLQpQ2FybG9zIEdh -cmNpYSBDYW1wb3MgPGNnYXJjaWFAaWdhbGlhLmNvbT6IYgQTEQIAIgUCTLhDLgIb -AwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ89Mi0OxFgsO7aQCgyouexI5L -4PxyZlCgucZj2UGUI1kAn2Lh4CPgaCa7kno1aArSFzzdVRnhuQENBEy4Qy4QBADZ -F1vw6zV7ZKGg8Ipfi0ASbDRVzHdr4wdoiNbFGKXykwi3PRuolrSTd+970u0MNX30 -ZmfOTk/cidymaBd0RyVnwmPgnoRxZpKhMnFrlxRYtukUHyYDeFwM376ux1TXNWwG -sxZ3RmENWyoAs8GK3vIYhaqC22qxS1SfjMn1eueonwADBQQAnLZte7R5TK0j5L1K -/JJc82JOkdjlF6ORS+hxHqlITmRevmo5zcvBMfCjH98y5yGVHciQ/Pp+AC+hI7n0 -r2B+HO7/M+fzub4mJpgsrdGLebwFOOMuJQCzU/vm2O+ni9RfhKGxj6j5ibVzW/Xg -dxDF7ffwmiqAWJrzUGtIBKRw372ISQQYEQIACQUCTLhDLgIbDAAKCRDz0yLQ7EWC -w/ohAJ9TForRmpOoZQn8nC82lvjLnl8yJwCfePN1wgFlZu2kkHP4d0fJ2LN6whM= -=HKDK ------END PGP PUBLIC KEY BLOCK----- -- 2.11.4.GIT