From f0dd98107411f07690e19f10ee3b3b68979ce481 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 29 Aug 2024 23:10:34 +1000 Subject: [PATCH] qtwebengine_bin: bump version --- dev-qt/qtwebengine/qtwebengine-5.15.2.recipe | 21 ++++++++-- ....recipe => qtwebengine_bin-5.15.17.recipe} | 42 +++++++++---------- 2 files changed, 36 insertions(+), 27 deletions(-) rename dev-qt/qtwebengine/{qtwebengine_bin-5.15.16.recipe => qtwebengine_bin-5.15.17.recipe} (74%) diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.recipe b/dev-qt/qtwebengine/qtwebengine-5.15.2.recipe index 75aaea962..427f319f7 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2.recipe +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.recipe @@ -6,7 +6,8 @@ COPYRIGHT="2015-2020 The Qt Company Ltd." LICENSE="BSD (3-clause) GNU LGPL v2.1" REVISION="2" -SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtwebengine-everywhere-src-$portVersion.tar.xz" +#SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtwebengine-everywhere-src-$portVersion.tar.xz" +SOURCE_URI="https://ftp.osuosl.org/pub/blfs/conglomeration/qtwebengine/qtwebengine-everywhere-src-5.15.2.tar.xz" CHECKSUM_SHA256="c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0" SOURCE_DIR="qtwebengine-everywhere-src-$portVersion" PATCHES="qtwebengine-$portVersion.patchset" @@ -38,6 +39,9 @@ REQUIRES=" lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libgl$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicudata$secondaryArchSuffix lib:libharfbuzz$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:liblcms2$secondaryArchSuffix @@ -57,6 +61,7 @@ REQUIRES=" lib:libQt5QmlModels$secondaryArchSuffix lib:libQt5Quick$secondaryArchSuffix lib:libQt5WebChannel$secondaryArchSuffix + lib:libre2$secondaryArchSuffix lib:libsmime3$secondaryArchSuffix lib:libsnappy$secondaryArchSuffix lib:libvpx$secondaryArchSuffix @@ -89,6 +94,7 @@ BUILD_REQUIRES=" devel:libfreetype$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix devel:libharfbuzz$secondaryArchSuffix + devel:libicuuc$secondaryArchSuffix >= 66 devel:libjpeg$secondaryArchSuffix devel:libjsoncpp$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix @@ -106,11 +112,13 @@ BUILD_REQUIRES=" devel:libQt5Quick$secondaryArchSuffix devel:libQt5UiTools$secondaryArchSuffix devel:libQt5WebChannel$secondaryArchSuffix + devel:libre2$secondaryArchSuffix devel:libsnappy$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libvpx$secondaryArchSuffix devel:libwebp$secondaryArchSuffix >= 7 devel:libxslt$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:awk @@ -121,8 +129,10 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:gperf cmd:ld$secondaryArchSuffix + cmd:lld >= 16 cmd:make cmd:ninja + cmd:node >= 16 cmd:perl pkgconfig$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix @@ -138,11 +148,14 @@ BUILD() { mkdir -p build && cd build - qmake .. -- \ + qmake QMAKE_LFLAGS+="-fuse-ld=lld -Wl,--no-keep-memory -Wl,--undefined-version" \ + .. -- \ -proprietary-codecs \ -system-ffmpeg \ - -webp - NINJAJOBS=-j1 make + -system-webp \ + -webengine-icu + + NINJAJOBS=$jobArgs make } INSTALL() diff --git a/dev-qt/qtwebengine/qtwebengine_bin-5.15.16.recipe b/dev-qt/qtwebengine/qtwebengine_bin-5.15.17.recipe similarity index 74% rename from dev-qt/qtwebengine/qtwebengine_bin-5.15.16.recipe rename to dev-qt/qtwebengine/qtwebengine_bin-5.15.17.recipe index 89640c0ba..d31adcf74 100644 --- a/dev-qt/qtwebengine/qtwebengine_bin-5.15.16.recipe +++ b/dev-qt/qtwebengine/qtwebengine_bin-5.15.17.recipe @@ -2,19 +2,19 @@ SUMMARY="Chromium-based rendering library for the Qt5 framework" DESCRIPTION="QtWebEngine provides a Web browser engine that integrates \ Chromium's fast moving web capabilities into Qt. " HOMEPAGE="https://www.qt.io" -COPYRIGHT="2015-2023 The Qt Company Ltd." +COPYRIGHT="2015-2024 The Qt Company Ltd." LICENSE="BSD (3-clause) GNU LGPL v2.1" -REVISION="5" +REVISION="1" hpkgHOME="https://github.com/threedeyes/qtwebengine-haiku" -SOURCE_URI="$hpkgHOME/releases/download/v${portVersion}-4/qtwebengine-${portVersion}-4-x86_64.hpkg#noarchive" -CHECKSUM_SHA256="b6fcff8eb5a4f83b0694ff873a86ddc0553c63691209266ec68fa88326f4cf3e" -SOURCE_URI_2="$hpkgHOME/releases/download/v${portVersion}-4/qtwebengine_devel-${portVersion}-4-x86_64.hpkg#noarchive" -CHECKSUM_SHA256_2="a3899a279422593aa29c7aaf1b0b570375b06f7492389fe0398681eab73da295" -SOURCE_URI_3="$hpkgHOME/releases/download/v${portVersion}-4/qtwebengine_x86-${portVersion}-4-x86_gcc2.hpkg#noarchive" -CHECKSUM_SHA256_3="e1d155c8ecf4416e86b356ea57dffd1b081cdd4b4feb58881e460c96a8586e6c" -SOURCE_URI_4="$hpkgHOME/releases/download/v${portVersion}-4/qtwebengine_x86_devel-${portVersion}-4-x86_gcc2.hpkg#noarchive" -CHECKSUM_SHA256_4="5871b652ceefdc1c83945a0b8f3a654971dcffe166660aefe9e5d2ecc9b68d65" +SOURCE_URI="$hpkgHOME/releases/download/v${portVersion}-1/qtwebengine-${portVersion}-1-x86_64.hpkg#noarchive" +CHECKSUM_SHA256="2d42a9c21d0aa5ab70123058875e21cb39094df3bddf05dc9b50079096e8eb42" +SOURCE_URI_2="$hpkgHOME/releases/download/v${portVersion}-1/qtwebengine_devel-${portVersion}-1-x86_64.hpkg#noarchive" +CHECKSUM_SHA256_2="968f92e8fc20fdab28ac0ac21dc4b4c668ee95daa6025e1b019eb457fa8439b6" +SOURCE_URI_3="$hpkgHOME/releases/download/v${portVersion}-1/qtwebengine_x86-${portVersion}-1-x86_gcc2.hpkg#noarchive" +CHECKSUM_SHA256_3="2b07054d2b44b1bc136869769bf0e0090911af3533d89915ea2fdf879805446a" +SOURCE_URI_4="$hpkgHOME/releases/download/v${portVersion}-1/qtwebengine_x86_devel-${portVersion}-1-x86_gcc2.hpkg#noarchive" +CHECKSUM_SHA256_4="5cb3b8b8a77ab549d565ce79cb5a04b3a4be235b038ce69c31afa34a55cac164" DISABLE_SOURCE_PACKAGE="yes" ARCHITECTURES="x86_64" @@ -22,7 +22,7 @@ SECONDARY_ARCHITECTURES="x86" libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" -Qt5Version="5.15.11" +Qt5Version="5.15.14" WebEngineApiVersion="5.15.17" PROVIDES=" @@ -36,17 +36,16 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libavcodec$secondaryArchSuffix >= 58 - lib:libavformat$secondaryArchSuffix >= 58 - lib:libavutil$secondaryArchSuffix >= 56 lib:libexecinfo$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libgl$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix >= 66 - lib:libicui18n$secondaryArchSuffix >= 66 - lib:libicudata$secondaryArchSuffix >= 66 + lib:libharfbuzz$secondaryArchSuffix + lib:libharfbuzz_subset$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix >= 74 + lib:libicui18n$secondaryArchSuffix >= 74 + lib:libicudata$secondaryArchSuffix >= 74 lib:libjpeg$secondaryArchSuffix lib:liblcms2$secondaryArchSuffix lib:libminizip$secondaryArchSuffix @@ -101,12 +100,9 @@ CONFLICTS_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - lib:libavcodec$secondaryArchSuffix >= 58 - lib:libavformat$secondaryArchSuffix >= 58 - lib:libavutil$secondaryArchSuffix >= 56 - lib:libicuuc$secondaryArchSuffix >= 66 - lib:libicui18n$secondaryArchSuffix >= 66 - lib:libicudata$secondaryArchSuffix >= 66 + lib:libicuuc$secondaryArchSuffix >= 74 + lib:libicui18n$secondaryArchSuffix >= 74 + lib:libicudata$secondaryArchSuffix >= 74 lib:libvpx$secondaryArchSuffix >= 7 lib:libwebp$secondaryArchSuffix >= 7 lib:libwebpdemux$secondaryArchSuffix >= 2