From 2d3002d2035f310e76befe4b225cd2d2dace1723 Mon Sep 17 00:00:00 2001 From: Levon 'noptrix' Kayan Date: Thu, 10 Oct 2024 23:45:46 +0200 Subject: [PATCH] qt5-webkit: style fixes. --- packages/qt5-webkit/PKGBUILD | 61 +++++++++++++++++------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/packages/qt5-webkit/PKGBUILD b/packages/qt5-webkit/PKGBUILD index 204b7ecb920..2147cfe14fc 100644 --- a/packages/qt5-webkit/PKGBUILD +++ b/packages/qt5-webkit/PKGBUILD @@ -12,44 +12,41 @@ pkgname=qt5-webkit _pkgver=5.212.0-alpha4 _basever=5.15.3 pkgver=${_pkgver/-/} -pkgrel=26 -arch=(x86_64 aarch64) -url="https://github.com/qtwebkit/qtwebkit" -license=(LGPL2.1) -pkgdesc="Classes for a WebKit2 based implementation and a new QML API" -source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-${_pkgver}.tar.xz" +pkgrel=20 +pkgdesc='Classes for a WebKit2 based implementation and a new QML API.' +arch=('x86_64' 'aarch64') +url='https://github.com/qtwebkit/qtwebkit' +license=('LGPL2.1') +source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz" "https://src.fedoraproject.org/rpms/qt5-qtwebkit/raw/rawhide/f/qtwebkit-cstdint.patch" "https://src.fedoraproject.org/rpms/qt5-qtwebkit/raw/rawhide/f/qtwebkit-fix-build-gcc14.patch" https://src.fedoraproject.org/rpms/qt5-qtwebkit/raw/rawhide/f/webkit-offlineasm-warnings-ruby27.patch "qt5-webkit-icu75.patch::https://github.com/qtwebkit/qtwebkit/commit/756e1c8f23dc2720471298281c421c0076d02df8.patch" - icu68.patch - glib-2.68.patch - qt5-webkit-python-3.9.patch - qt5-webkit-bison-3.7.patch - -) -depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxcomposite gst-plugins-base hyphen woff2 - - # namcap implicit depends - glibc gcc-libs glib2 zlib libx11 sqlite gst-plugins-base-libs libjpeg-turbo icu libpng gstreamer libxml2 - qt5-base qt5-declarative) - # libxslt -depends+=(libicuuc.so libicui18n.so) -makedepends=(cmake ruby ruby-erb gperf python qt5-doc qt5-tools) + 'icu68.patch' + 'glib-2.68.patch' + 'qt5-webkit-python-3.9.patch' + 'qt5-webkit-bison-3.7.patch') +depends=('qt5-location' 'qt5-sensors' 'qt5-webchannel' 'libwebp' 'glibc' 'glib2' + 'libxcomposite' 'gst-plugins-base' 'hyphen' 'woff2' 'gcc-libs' 'zlib' + 'libx11' 'sqlite' 'gst-plugins-base-libs' 'libjpeg-turbo' 'icu' + 'libpng' 'gstreamer' 'libxml2' 'qt5-base' 'qt5-declarative' + 'libicuuc.so' 'libicui18n.so') +makedepends=('cmake' 'ruby' 'ruby-erb' 'gperf' 'python' 'qt5-doc' 'qt5-tools') optdepends=('gst-plugins-good: Webm codec support') options=(!lto) -sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6' - '4c71c958eae45cae65c9f002024eb1369d06029b668e595158138ff7971e64f1' - 'eea38db22078700887bf22b6a49bb628fd8444cdb2e506770c993df883d0e8fb' - '8768433ff3f641b506962ed22cc596eaf57bf21b6d3402e0e73ad8c2afeaa502' - 'b4d1ba1e99e28fd8cb1ec82252373c870ede683869a9cd43c8e465fe09531bcb' - '0b40ed924f03ff6081af610bb0ee01560b7bd1fb68f8af02053304a01d4ccdf0' - '4969dd03e482155e2490b50307dada81dda7bbc9e5398e3a53c20bc474f7c04e' - '6e0cee08e4fa57b04752e80817f33562f48aa42608a3a620930b6040259b4932' - '34f37b53ee0bc31c63ce85ebd1ae95543a8ba28483e387b20efd50574bd813be') +sha512sums=('33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6' + '82388c5b95dea56e508780eb4386f685e086a476c4176a90773ccc4c87aae644455cc9e636c75e68d7552f80f4c83a094db7291bd76969029e8c35646506ff94' + '1d2ff7e5e0bab4670d24741237d5d4f4a9c3c072245e7437e62e3534c192107f32b321d60ef688d6456f7d4af98a7f7722f75fd1f5cdf0213491cb0bbba9c954' + '1431c6329fb9ef86dbe929a4002881f6a511aa8a2be684a7c96ea7ea48af53b4f0d96bd8e8367289080bed674ba35cab002747cf3820a6831e60f7ab7a53d3cc' + '8b2a23a51a1463893ab97904f385da6744f2619d46cb011795394030de5a6647b0a39b5837ee198fd3d2804530bb98ba346abbc2a67f31bbec2092930f527a90' + 'c4714b40d9b516698490cc3f587f7fefe8097545a2310e144be1dfa39549ad056bf7bd67f5f89334e54c3a9bb95136876a62d0a392991a872030c4dff0d7c820' + 'f8a49e24023431ac37cff2b5bdf6f88d632021eb777668404956a4c6e4f8744f256205093dc5077325a33ec2a050b6e159dcf5d8cf3c1dda7d26ec0b37db95c3' + 'e4d4d4abfb8f2e9913c2f5cb7b3a73d5c613a8e8ced66ae1a7789faaa83a2bdf89ff29955d7e9b7bd7a0935ca2ddcad796cf371882e2bb38b4e69c1d528cfe75' + 'd90e3bd03090d468f6d73bcee949593a9266de8c5d29f2879c53efa757e7be449db16eb7a563c6279ed2554e549f2dc6321a40cf855d6290e5bdded8f18a90e4') prepare() { - cd "qtwebkit-${_pkgver}" + cd "qtwebkit-$_pkgver" + patch -p0 -i ../icu68.patch # Fix build with ICU 68.x patch -p1 -i ../glib-2.68.patch # https://github.com/qtwebkit/qtwebkit/issues/1057 patch -p1 -i ../qt5-webkit-python-3.9.patch # Fix build with python 3.9 @@ -66,7 +63,7 @@ prepare() { } build() { - cmake -B build -S "qtwebkit-${_pkgver}" -Wno-dev \ + cmake -B build -S "qtwebkit-$_pkgver" -Wno-dev \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \ @@ -80,6 +77,6 @@ build() { } package() { - DESTDIR="${pkgdir}" cmake --install build + DESTDIR="$pkgdir" cmake --install build }