From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- dev-qt/Manifest.gz | Bin 10187 -> 10181 bytes dev-qt/qt-creator/Manifest | 8 +- dev-qt/qt-creator/metadata.xml | 14 +- dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 3 +- dev-qt/qt-creator/qt-creator-6.0.0.ebuild | 231 ++++++++++++++++++++ dev-qt/qt-creator/qt-creator-9999.ebuild | 55 +++-- dev-qt/qtnetwork/Manifest | 1 + dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild | 74 +++++++ dev-qt/qtwebengine/Manifest | 7 - .../qtwebengine-5.15.2_p20210406-glibc-2.33.patch | 141 ------------ ...qtwebengine-5.15.2_p20210521-clang-libc++.patch | 10 - .../files/qtwebengine-5.15.2_p20210521-gcc11.patch | 74 ------- ...webengine-5.15.2_p20210824-harfbuzz-3.0.0.patch | 32 --- .../qtwebengine-5.15.2_p20210824-r1.ebuild | 237 --------------------- 14 files changed, 350 insertions(+), 537 deletions(-) create mode 100644 dev-qt/qt-creator/qt-creator-6.0.0.ebuild create mode 100644 dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch delete mode 100644 dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index a4d6881e637a..6f414895ecde 100644 Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 176e4a6846ee..271dfe086082 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,4 +1,6 @@ DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a SHA512 a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3 -EBUILD qt-creator-4.15.1.ebuild 7181 BLAKE2B 1d374ac5b14917b315654aa2d3d24d54b1d1855ee895e6f3ab666395d6b09661f21e2af602ecb43748e388cb7010286e125929e0e972aa1757f689a60b304e1e SHA512 72ea5019db3cb5e74d7058e8eeb3ccb4024a7e6a85b12c624db25ee3cb9aea906f0e903a6bbe9a1fa794e086ff0b94cc53b39e362cf720cf44e11399e408c419 -EBUILD qt-creator-9999.ebuild 7181 BLAKE2B 1d374ac5b14917b315654aa2d3d24d54b1d1855ee895e6f3ab666395d6b09661f21e2af602ecb43748e388cb7010286e125929e0e972aa1757f689a60b304e1e SHA512 72ea5019db3cb5e74d7058e8eeb3ccb4024a7e6a85b12c624db25ee3cb9aea906f0e903a6bbe9a1fa794e086ff0b94cc53b39e362cf720cf44e11399e408c419 -MISC metadata.xml 3399 BLAKE2B 0cfa5258ef99dabbe09cb8df0e3186c98d49cbf8e3f3330cba4d16385f5f01877cd1c95bc00586f03c1706e603a1901058da093e924f537428baddf33f4378cc SHA512 8b5dd9ce27b582b06729ea479530176e10cc55a36bfd07c870a677f5375435acb3a42abf81cbd03fde18d91df7f94a58eee89e9ebe6d6e285f69a667563f9343 +DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348 SHA512 4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb +EBUILD qt-creator-4.15.1.ebuild 7209 BLAKE2B f4fc67fa5ff3548a1751478d17d292c883e463d083f1fd59b7785c3c8f6a818746df4eb4cca1ebf38751e24bcc15e08d87cd2e710002496472eaccedbd77589c SHA512 64c89d041808b92d31077c8e24d9727902b653c20fc3f268c337461a97e111259cfb76dbb62329945036f56f09d542048e303122ff286335b215f45f47cd4c02 +EBUILD qt-creator-6.0.0.ebuild 7282 BLAKE2B 2935b4c5ca4e9d107a4f47aa67c1188a23ac634c50fa3a04e859a66513d532b1073fe5583738461212ef4472056477e816d5d04bf83c6877f1d47719bae14800 SHA512 023c98bba47ec6fa272873651601e010aee2682941a5597c6a24dbe37a1405f571e20c1f4369c8f8a061d4010e6a833dde03a101fa35b2556fbeb8fe85c1a038 +EBUILD qt-creator-9999.ebuild 7282 BLAKE2B 2935b4c5ca4e9d107a4f47aa67c1188a23ac634c50fa3a04e859a66513d532b1073fe5583738461212ef4472056477e816d5d04bf83c6877f1d47719bae14800 SHA512 023c98bba47ec6fa272873651601e010aee2682941a5597c6a24dbe37a1405f571e20c1f4369c8f8a061d4010e6a833dde03a101fa35b2556fbeb8fe85c1a038 +MISC metadata.xml 3881 BLAKE2B e70f7f66fd52b5e9a0526d4cc902289d7a1a94933f741d3a941d53aa3a2534dfb24942a952931b221750755a5793f458803f6f86dd958052f5a1982d69d6025b SHA512 0f06152dc28ce8b8a15dd80a46aff37088b4383dd50f609e5da075a88d3c14a3304c9b3e40c7315fd448d08138148d68dcac3dafd294a7c266d9f0ba879d1b5f diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml index 45e6f90bbd93..d2e6af3e1338 100644 --- a/dev-qt/qt-creator/metadata.xml +++ b/dev-qt/qt-creator/metadata.xml @@ -11,34 +11,40 @@ Build plugin for Android devices - Enable integration with popular unit testing frameworks (QtTest, Google Test, Boost.Test) + Enable integration with popular unit testing frameworks (QtTest, GoogleTest, Boost.Test, Catch2) Build plugin for autotools-based projects Build plugin for bare metal devices Add support for GNU Bazaar version control system (requires manual installation of Bazaar client) Build the beautifier plugin (supports astyle, clang-format, and uncrustify) Build plugin for Boot2Qt devices - Build clang-based plugins (code model, formatting, static analysis) + Build clang-based plugins for C/C++ development (code model, formatting, static analysis) Add support for IBM ClearCase version control system (requires manual installation of ClearCase client) Build plugin for CMake-based projects + Build plugin to integrate with the Conan package manager Enable integration with dev-util/cppcheck Build the Chrome Trace Format visualizer plugin Enable designer for QtWidgets-based UIs + Build plugin for Docker support Build the GLSL editor plugin Enable the integrated documentation viewer + Enable integration with Incredibuild Add support for the Language Server Protocol (LSP) Build plugin for MCU devices Add support for dev-vcs/mercurial version control system + Build plugin for Meson-based projects Build the graphical model editor plugin Build plugin for Nim language support Add support for Perforce version control system (requires manual installation of Perforce client) Build the Linux Perf-based profiler plugin Build plugin for Python language support - Build plugin for QBS-based projects + Build plugin for Qbs-based projects + Build plugin for qmake-based projects + Build plugins for QML-based development (designer, editor, project manager) Enable designer for QML/QtQuick-based UIs Build the QML/JavaScript editor plugin Build the QML profiler plugin Build plugin for QNX devices - Add support for deployment and execution on a remote Linux host + Build plugin for deployment and execution on a remote Linux host Build the graphical SCXML editor plugin Build the serial terminal plugin Enable integration with sys-apps/the_silver_searcher diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild index bfc4e05275dc..18260cba5420 100644 --- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild @@ -33,9 +33,10 @@ QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaa IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}" RESTRICT="!test? ( test )" REQUIRED_USE=" + android? ( lsp ) boot2qt? ( remotelinux ) clang? ( test? ( qbs ) ) - mcu? ( cmake ) + mcu? ( baremetal cmake ) python? ( lsp ) qmldesigner? ( qmljs ) qnx? ( remotelinux ) diff --git a/dev-qt/qt-creator/qt-creator-6.0.0.ebuild b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild new file mode 100644 index 000000000000..f8eca8f995f6 --- /dev/null +++ b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +LLVM_MAX_SLOT=13 +PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW" + +inherit llvm qmake-utils virtualx xdg + +DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" +HOMEPAGE="https://doc.qt.io/qtcreator/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git" +else + MY_PV=${PV/_/-} + MY_P=${PN}-opensource-src-${MY_PV} + [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development + SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz" + S=${WORKDIR}/${MY_P} + KEYWORDS="~amd64 ~arm ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools' + clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker +git glsl:glsleditor +help incredibuild + +lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python + qbs:qbsprojectmanager +qmake:qmakeprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome' + qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly) +IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + android? ( lsp ) + boot2qt? ( remotelinux ) + clang? ( lsp ) + mcu? ( baremetal cmake ) + python? ( lsp ) + qml? ( qmake ) + qnx? ( remotelinux ) +" + +# minimum Qt version required +QT_PV="5.15:5" + +BDEPEND=" + >=dev-qt/linguist-tools-${QT_PV} + virtual/pkgconfig + doc? ( >=dev-qt/qdoc-${QT_PV} ) +" +CDEPEND=" + >=dev-qt/qtconcurrent-${QT_PV} + >=dev-qt/qtcore-${QT_PV} + >=dev-qt/qtdeclarative-${QT_PV}[widgets] + >=dev-qt/qtgui-${QT_PV} + >=dev-qt/qtnetwork-${QT_PV}[ssl] + >=dev-qt/qtprintsupport-${QT_PV} + >=dev-qt/qtquickcontrols-${QT_PV} + >=dev-qt/qtscript-${QT_PV} + >=dev-qt/qtsql-${QT_PV}[sqlite] + >=dev-qt/qtsvg-${QT_PV} + >=dev-qt/qtwidgets-${QT_PV} + >=dev-qt/qtx11extras-${QT_PV} + >=dev-qt/qtxml-${QT_PV} + >=kde-frameworks/syntax-highlighting-5.87:5 + clang? ( + >=dev-cpp/yaml-cpp-0.6.2:= + || ( + sys-devel/clang:13 + sys-devel/clang:12 + sys-devel/clang:11 + ) + =dev-qt/designer-${QT_PV} ) + help? ( + >=dev-qt/qthelp-${QT_PV} + webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] ) + ) + perfprofiler? ( dev-libs/elfutils ) + serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) + systemd? ( sys-apps/systemd:= ) +" +DEPEND="${CDEPEND} + test? ( + >=dev-qt/qtdeclarative-${QT_PV}[localstorage] + >=dev-qt/qtquickcontrols2-${QT_PV} + >=dev-qt/qttest-${QT_PV} + >=dev-qt/qtxmlpatterns-${QT_PV}[qml] + ) +" +RDEPEND="${CDEPEND} + sys-devel/gdb[python] + cppcheck? ( dev-util/cppcheck ) + cvs? ( dev-vcs/cvs ) + git? ( dev-vcs/git ) + mercurial? ( dev-vcs/mercurial ) + qml? ( >=dev-qt/qtquicktimeline-${QT_PV} ) + silversearcher? ( sys-apps/the_silver_searcher ) + subversion? ( dev-vcs/subversion ) + valgrind? ( dev-util/valgrind ) +" +# qt translations must also be installed or qt-creator translations won't be loaded +for x in ${PLOCALES}; do + IUSE+=" l10n_${x}" + RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )" +done +unset x + +llvm_check_deps() { + has_version -d "sys-devel/clang:${LLVM_SLOT}" +} + +pkg_setup() { + use clang && llvm_pkg_setup +} + +src_prepare() { + default + + # disable unwanted plugins + for plugin in "${QTC_PLUGINS[@]#[+-]}"; do + if ! use ${plugin%:*}; then + sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \ + src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin" + fi + done + sed -i -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die + + # avoid building unused support libraries and tools + if ! use clang; then + sed -i -e '/yaml-cpp/d' src/libs/libs.pro || die + sed -i -e '/clangbackend/d' src/tools/tools.pro || die + fi + if ! use glsl; then + sed -i -e '/glsl/d' src/libs/libs.pro || die + fi + if ! use lsp; then + sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die + fi + if ! use modeling; then + sed -i -e '/modelinglib/d' src/libs/libs.pro || die + fi + if ! use perfprofiler; then + rm -r src/tools/perfparser || die + if ! use ctfvisualizer && ! use qmlprofiler; then + sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die + fi + fi + if ! use qmake; then + sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die + fi + if ! use qml; then + sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die + sed -i -e '/qml2puppet/d' src/tools/tools.pro || die + sed -i -e '/qmldesigner\|qmlprojectmanager/d' tests/auto/qml/qml.pro || die + fi + if ! use valgrind; then + sed -i -e '/valgrindfake/d' src/tools/tools.pro || die + sed -i -e '/valgrind/d' tests/auto/auto.pro || die + fi + + # automagic dep on qtwebengine + if ! use webengine; then + sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die + fi + + # disable broken or unreliable tests + sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die + sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die + sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die + sed -i -e '/reformatter/d' tests/auto/qml/qml.pro || die + sed -i -e 's/\<\(imports\|\)check\>//' tests/auto/qml/codemodel/codemodel.pro || die + sed -i -e '/timelineitemsrenderpass/d' tests/auto/tracing/tracing.pro || die + sed -i -e '/qtcprocess/d' tests/auto/utils/utils.pro || die + + # do not install test binaries + sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die + + # fix path to some clang headers + sed -i -e "/^CLANG_INCLUDE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die + + # fix translations + local lang languages= + for lang in ${PLOCALES}; do + use l10n_${lang} && languages+=" ${lang/-/_}" + done + sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die + + # remove bundled syntax-highlighting + rm -r src/libs/3rdparty/syntax-highlighting || die + + # remove bundled yaml-cpp + rm -r src/libs/3rdparty/yaml-cpp || die + + # remove bundled qbs + rm -r src/shared/qbs || die + + # TODO: unbundle sqlite +} + +src_configure() { + eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ + IDE_PACKAGE_MODE=1 \ + KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ + KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \ + $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ + $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ + $(use systemd && echo CONFIG+=journald) \ + $(use test && echo BUILD_TESTS=1) +} + +src_test() { + cd tests/auto && virtx default +} + +src_install() { + emake INSTALL_ROOT="${ED}/usr" install + + dodoc dist/{changes-*,known-issues} + + # install documentation + if use doc; then + emake docs + # don't use ${PF} or the doc will not be found + insinto /usr/share/doc/qtcreator + doins share/doc/qtcreator/qtcreator{,-dev}.qch + docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch + fi +} diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index bfc4e05275dc..f8eca8f995f6 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LLVM_MAX_SLOT=12 +LLVM_MAX_SLOT=13 PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW" inherit llvm qmake-utils virtualx xdg @@ -24,25 +24,25 @@ fi LICENSE="GPL-3" SLOT="0" -QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt - '+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck - ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial - modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner - +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher - subversion valgrind webassembly) +QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools' + clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker +git glsl:glsleditor +help incredibuild + +lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python + qbs:qbsprojectmanager +qmake:qmakeprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome' + qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly) IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}" RESTRICT="!test? ( test )" REQUIRED_USE=" + android? ( lsp ) boot2qt? ( remotelinux ) - clang? ( test? ( qbs ) ) - mcu? ( cmake ) + clang? ( lsp ) + mcu? ( baremetal cmake ) python? ( lsp ) - qmldesigner? ( qmljs ) + qml? ( qmake ) qnx? ( remotelinux ) " # minimum Qt version required -QT_PV="5.14:5" +QT_PV="5.15:5" BDEPEND=" >=dev-qt/linguist-tools-${QT_PV} @@ -63,10 +63,11 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - kde-frameworks/syntax-highlighting:5 + >=kde-frameworks/syntax-highlighting-5.87:5 clang? ( >=dev-cpp/yaml-cpp-0.6.2:= || ( + sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 ) @@ -91,14 +92,11 @@ DEPEND="${CDEPEND} " RDEPEND="${CDEPEND} sys-devel/gdb[python] - autotools? ( sys-devel/autoconf ) - cmake? ( >=dev-util/cmake-3.14 ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) - qbs? ( >=dev-util/qbs-1.18 ) - qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) + qml? ( >=dev-qt/qtquicktimeline-${QT_PV} ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) @@ -124,17 +122,15 @@ src_prepare() { # disable unwanted plugins for plugin in "${QTC_PLUGINS[@]#[+-]}"; do if ! use ${plugin%:*}; then - einfo "Disabling ${plugin%:*} plugin" sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \ src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin" fi done - sed -i -re '/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die - sed -i -re '/clang(pchmanager|refactoring)backend/d' src/tools/tools.pro || die + sed -i -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die # avoid building unused support libraries and tools if ! use clang; then - sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die + sed -i -e '/yaml-cpp/d' src/libs/libs.pro || die sed -i -e '/clangbackend/d' src/tools/tools.pro || die fi if ! use glsl; then @@ -152,13 +148,13 @@ src_prepare() { sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die fi fi - if ! use qmldesigner; then - sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die - sed -i -e '/qml2puppet/d' src/tools/tools.pro || die - sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die + if ! use qmake; then + sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die fi - if ! use qmljs; then - sed -i -e '/qmleditorwidgets/d' src/libs/libs.pro || die + if ! use qml; then + sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die + sed -i -e '/qml2puppet/d' src/tools/tools.pro || die + sed -i -e '/qmldesigner\|qmlprojectmanager/d' tests/auto/qml/qml.pro || die fi if ! use valgrind; then sed -i -e '/valgrindfake/d' src/tools/tools.pro || die @@ -172,9 +168,12 @@ src_prepare() { # disable broken or unreliable tests sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die - sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die + sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die - sed -i -e 's/\//' tests/auto/qml/codemodel/codemodel.pro || die + sed -i -e '/reformatter/d' tests/auto/qml/qml.pro || die + sed -i -e 's/\<\(imports\|\)check\>//' tests/auto/qml/codemodel/codemodel.pro || die + sed -i -e '/timelineitemsrenderpass/d' tests/auto/tracing/tracing.pro || die + sed -i -e '/qtcprocess/d' tests/auto/utils/utils.pro || die # do not install test binaries sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index fdaa803da8a8..ed2a51fa937b 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -2,4 +2,5 @@ DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238 DIST qtbase-5.15.2-c9fde86b.tar.gz 67960262 BLAKE2B d1a6a7dac78abce189a753c0a00185fbe03f9de97b226790535af73a9bc009b353fe1edeb754d2098a7beeb7cd1c6e7efb949797658269ef0d0f200f11909820 SHA512 99026537dd4da678bcb04214ebb717907422e373b44fd3b3716798565c330f8d492ec1fc67d936c5125292b30e44f23abe4bf6434b58b9fa76bada3680dfc9f8 EBUILD qtnetwork-5.15.2-r11.ebuild 1661 BLAKE2B 72d1089771b6546c2425872e547420e7c4326af64b21f92b7008633fa36e7cbd0f064a339f486ad7ebcfefac76e136242273b9b902aacac92cd2fc1933a1af15 SHA512 e08756281594e069079dcb3fa2688c93a42a30f3efec0f7cfa1662edfc2bd5b444db75be2f47ac341192d44fef3610692eb76f2cbe048c2a2cb48756c52daa25 EBUILD qtnetwork-5.15.2-r12.ebuild 1667 BLAKE2B 824979c0d3509136b54b7e82d380c86d5e66a94527afe50085181d7be467fd8a9305731de30b3f9b326987822d3b5c1fcae499ceb942aa283f4cf7453a3f0928 SHA512 285a3d978e9feb254477c68aa73fe7cc21c648a5df4ead9f867ffaf9a192d27ad36d17fe0bed7f2e141b161ee4c8ac875f580b4a602b245ba5957d54c1977dfd +EBUILD qtnetwork-5.15.2-r13.ebuild 1646 BLAKE2B 05cacaf4bd01da468a5ccd5c6c11302e4653c8c73756abdced024eab6b72e4676adc2b9ebf9af52e20b92373ec9133235238218f31308323b2e84cf88c647003 SHA512 a592157d596e9b6d2608a66ba28907ca8bbbe0172631cef520132b80277ab34a060656fbfdc3be5baa2c245cb228db2b8abd0e438f5eb7186284420c006bb249 MISC metadata.xml 958 BLAKE2B 7d9b64c45710ec4b80132463178d63563b09fdb7c79f527a84017faa524f6f45f5ff566abea92f8cee5f9c62c7d6bb505d3789520559fd3864f402c18c35f771 SHA512 11948c91b244c607f2cd84c8165db6794be18d0f465ae27ed02086fcc1f8b3755e451b8203f447a05f53437cb04c8e4859de8e077f85360fe87ce846939408c1 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild new file mode 100644 index 000000000000..6ca6eb826334 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="connman gssapi libproxy networkmanager sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + connman? ( =dev-qt/qtdbus-${QT5_PV}* ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND} + connman? ( net-misc/connman ) + networkmanager? ( net-misc/networkmanager ) +" + +QT5_TARGET_SUBDIRS=( + src/network + src/plugins/bearer/generic +) + +QT5_GENTOO_CONFIG=( + libproxy:libproxy: + ssl::SSL + ssl::OPENSSL + ssl:openssl-linked:LINKED_OPENSSL +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :network +) + +pkg_setup() { + use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) + use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) +} + +src_configure() { + local myconf=( + $(usev connman -dbus-linked) + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(usev networkmanager -dbus-linked) + $(qt_use sctp) + $(usev ssl -openssl-linked) + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +} diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 6ad1769efc9b..73257ab2eeae 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -3,18 +3,11 @@ AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d4 AUX qtwebengine-5.15.2-extra_gn.patch 503 BLAKE2B 7949b35e725d920605ee7337de7aa29c22dee43ffaa383b4351e1e4170b06755e8b16eed28faf004486831fb020cd4fca1d5e54f61e99b7c8f084cad0d5d847c SHA512 2d916d918a1b12d91387da8b1161b15d33a55a9445de9725927fb88bb91666506a91df0df9224ec4a273b0c3f2fd3dbb2bb10857164a4204023f277707c099d0 AUX qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch 7361 BLAKE2B 0a5ab9077982df3afea7d156e0dbaf11384d7b9ab6ea70ef4dc0b82f1690e455144318734cb50b7bf2349a95b99325e67bbfcbdf5c88f55f3ecc65c7e593c468 SHA512 585dab11bf6cf811b657831292d5b6b90dd01d9e4c1fa4b6a446d0eb66f436c46a6fcd4851e9c6b6b0bda8a41cbea57fe74ca5ecca4e40cb35f85d7c2f5265e7 AUX qtwebengine-5.15.2_p20210224-disable-git.patch 501 BLAKE2B a295e5061830da6bfaf0c0ae6db832c86f797fa2426ec29e244133e862c0998a03373c11a2a31944bc09e0a20bf30c0a0a91eb06b1f8a9fdcdd9762f5ba7c542 SHA512 b795328058be945e7a323ea50f01cd5c11b130bc1204c8274fec920e04cce1643d8f9313e975f451dbb7dfecd6214f9ff9ea0aec87ad29237b6e9bb1b4114c5f -AUX qtwebengine-5.15.2_p20210406-glibc-2.33.patch 5361 BLAKE2B 92ead1bfe2be883e7438813441091e23466d060f278bb150f1d8f24e65cd847202142ed6a70a2d2bc683d2af90966ce25555f0d62bde1f3125fdf8a5343ed56f SHA512 827866ea1363273a8efc20793205ec20762ab4bd951fb837510d1cdd0a5df499958a1fb89566e4028f7781b48e439ed41dcfb127882475fc5fde4f82dcf78891 -AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da -AUX qtwebengine-5.15.2_p20210521-gcc11.patch 3642 BLAKE2B 9b5085dbb201b12c3476bb9fb340a65021718802da545bb34a3bc03a02d11e95cf677497588711ff7f3f297ea4a6b4a882c865f87158e69582f8875bba0b0931 SHA512 fdd8da9d4353ce78f6b2c789422a3deee80e74feed5fcce4c8929b0814a9f21734e31fdbb0388a3f152d380b2eb14508be6f4f9ffeaee5913d299873a94135c2 AUX qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch 7642 BLAKE2B 3650865736f4fdaa3fcb6146da8607710612a7652053f314ddf21e6a1f9c9acfd48bc26e048091ecb3096705c91529b264198812ceca774754c19911ccbef23e SHA512 f2168d125f5c4e3cb7e1c33924cbef687291e0f172b0f079fb8f8ecf8790247437bdedbb58c3f916ef93e8b991485cc3a14611500212b7b7f5d56c7b55e83941 AUX qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch 8346 BLAKE2B d305461d127bd95b7bd3be58cb1488212f9af8d934f2519b82416f8a4237238b02f4ed2a7cb9cba7145ae44e48725a28f6f41f9250d052e2a58670724050e825 SHA512 1e99d95459509c58fe185d3b39f9b46b19d5052ea5927254f283de1dacb02cd94a208a72f4bd85517254c933c9990b570fe40e23b4e6ed2067f16be3bc30996c -AUX qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch 1862 BLAKE2B 023f267ce14a8bbf06faeabd3a1a0b3381a4c5ef823f149d8d4c66e042c5505866f2a22a53e52bea9ccc95b61bbc5080a4743bd6c1c46122d03dda89eedb7088 SHA512 e2f8a516b1db982e7e6b26d52fed94d04b16ab4ce8a3f9dd924790a51ca282cb8d3487c08e47ac3af940581444fe37798420a6c2f8ac65a9ab252d9186a4e7d1 AUX qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch 2182 BLAKE2B cc19cc0c1242f7193f62a550ceb6358e43fcbdf6f95ddee373a3a775448908d6d0a661c6406e6c7578013a32ae280198263a94804e76c87e99db064dc972db7c SHA512 8890ab95300c148e21315a201ac56d04aca1ccc402e464b6ec1b90a69127a4fa02398893007f98eb40ea78d0abe56d459c34eba3c5cdd1521d4ab567225bced1 -DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e -DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89 DIST qtwebengine-5.15.2_p20211019.tar.xz 320325744 BLAKE2B fac2f2a44e0f443a2642c0a0b3888ff15d047ce5b2de6673213db308e60f3e26b12adf98ad1dcf305630f0bc55abff078942711fbd10d05dc5a4095faadead25 SHA512 4abd2ca416228bbafa31aad9deae1466748930c02bcc08b559bbbb21fda598f720137e2af0cfa176dd534c8da97934d76e59b72c124b73564378fda0deaddaee -EBUILD qtwebengine-5.15.2_p20210824-r1.ebuild 7827 BLAKE2B e82b51e2131ad87f86588450185d3bb5e6f5c194fa8daa1b218eccfaa42b3cb2f93ad75c26abc48775aee9a93013a67d651dc4806d6f05d436f1b4d208ee2a14 SHA512 b52761731cdfaed6747871dd16fa7a03f3a44bfb715488890d2c17f6ac7ca7197b55bec7540dc04cde7bb52f57e02899f5b3826cacf225e6eae5c100d4c57a1a EBUILD qtwebengine-5.15.2_p20211019.ebuild 7554 BLAKE2B d7efbce1c07c1825e9f93fa5d7fe188c08a1fb568c37186c1bb52c6ae4cf97521b11c27c7c6aa87e0bd4fc516fb515ba1446b780c0d3643d42e3a96765d15162 SHA512 d9ce3ab681121c662ba31fbfe42c6b888957fb0e497ac18c48fd1aac1ab0306e6b521ce67deb3bd76df8ce8b9ed91b8fc29f55270d487a0ef261d34d37551895 MISC metadata.xml 1270 BLAKE2B 6ac8693b4a994904a8d7dd5728a0f47679b2b7553750a17fa64a7b8fd8cd74abd54ffbcb7da00d5b43622a67dedb3e3bcc93029bef2872e921e333a24892ca47 SHA512 4675ec29c3d6ac329b177f10b920dcf75ea5ed18a21aee1c500ee28430d85fcaaeac6df28a942c4bdcdf8692196017b1ea456e9f66d129afd1254d7931083eda diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch deleted file mode 100644 index cb90428e8d49..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc ---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de - return RestrictKillTarget(current_pid, sysno); - } - -+#if defined(__NR_newfstatat) -+ if (sysno == __NR_newfstatat) { -+ return RewriteFstatatSIGSYS(); -+ } -+#endif -+ -+#if defined(__NR_fstatat64) -+ if (sysno == __NR_fstatat64) { -+ return RewriteFstatatSIGSYS(); -+ } -+#endif -+ - if (SyscallSets::IsFileSystem(sysno) || - SyscallSets::IsCurrentDirectory(sysno)) { - return Error(fs_denied_errno); -diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc ---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc -+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc -@@ -6,6 +6,8 @@ - - #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h" - -+#include -+#include - #include - #include - #include -@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct - return -ENOSYS; - } - -+intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args, -+ void* aux) { -+ switch (args.nr) { -+#if defined(__NR_newfstatat) -+ case __NR_newfstatat: -+#endif -+#if defined(__NR_fstatat64) -+ case __NR_fstatat64: -+#endif -+#if defined(__NR_newfstatat) || defined(__NR_fstatat64) -+ if (*reinterpret_cast(args.args[1]) == '\0' -+ && args.args[3] == static_cast(AT_EMPTY_PATH)) { -+ return sandbox::sys_fstat64(static_cast(args.args[0]), -+ reinterpret_cast(args.args[2])); -+ } else { -+ errno = EACCES; -+ return -1; -+ } -+ break; -+#endif -+ } -+ -+ CrashSIGSYS_Handler(args, aux); -+ -+ // Should never be reached. -+ RAW_CHECK(false); -+ return -ENOSYS; -+} -+ - bpf_dsl::ResultExpr CrashSIGSYS() { - return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL); - } -@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS() - return bpf_dsl::Trap(SIGSYSSchedHandler, NULL); - } - -+bpf_dsl::ResultExpr RewriteFstatatSIGSYS() { -+ return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL); -+} -+ - void AllocateCrashKeys() { - #if !defined(OS_NACL_NONSFI) - if (seccomp_crash_key) -diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h ---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h -+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h -@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail - // sched_setparam(), sched_setscheduler() - SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args, - void* aux); -+// If the fstatat syscall is actually a disguised fstat, calls the regular fstat -+// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler. -+SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args, -+ void* aux); - - // Variants of the above functions for use with bpf_dsl. - SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS(); -@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash - SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex(); - SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace(); - SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS(); -+SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS(); - - // Allocates a crash key so that Seccomp information can be recorded. - void AllocateCrashKeys(); -diff -up b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc ---- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc -+++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc -@@ -261,4 +261,13 @@ int sys_sigaction(int signum, - - #endif // defined(MEMORY_SANITIZER) - -+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf) -+{ -+#if defined(__NR_fstat64) -+ return syscall(__NR_fstat64, fd, buf); -+#else -+ return syscall(__NR_fstat, fd, buf); -+#endif -+} -+ - } // namespace sandbox -diff -up b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h ---- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h -+++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h -@@ -17,6 +17,7 @@ struct sock_fprog; - struct rlimit64; - struct cap_hdr; - struct cap_data; -+struct stat64; - - namespace sandbox { - -@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig - const struct sigaction* act, - struct sigaction* oldact); - -+// Recent glibc rewrites fstat to fstatat. -+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf); -+ - } // namespace sandbox - - #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_ diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch deleted file mode 100644 index fdcc787971ca..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/buildtools/gn.pro -+++ b/src/buildtools/gn.pro -@@ -25,6 +25,7 @@ - msvc:!clang_cl: gn_gen_args += --use-lto - - gn_configure = $$system_quote($$gn_bootstrap) $$gn_gen_args -+ gn_configure += --no-static-libstdc++ - macos { - gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\" - } diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch deleted file mode 100644 index 0014ec135441..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp -index 013f1dfb2..3ce63c192 100644 ---- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp -+++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp -@@ -9,6 +9,7 @@ - - #include "libANGLE/HandleAllocator.h" - -+#include - #include - #include - -diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc -index be91def6b..73f202356 100644 ---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc -+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc -@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) { - } - - GType ax_platform_atk_hyperlink_get_type() { -- static volatile gsize type_volatile = 0; -+ static gsize type_volatile = 0; - - AXPlatformNodeAuraLinux::EnsureGTypeInit(); - -diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc -index 04125c6fd..6c64e5d8e 100644 ---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc -+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc -@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* class_data */) { - GType GetType() { - AXPlatformNodeAuraLinux::EnsureGTypeInit(); - -- static volatile gsize type_volatile = 0; -+ static gsize type_volatile = 0; - if (g_once_init_enter(&type_volatile)) { - static const GTypeInfo type_info = { - sizeof(AXPlatformNodeAuraLinuxClass), // class_size -diff --git a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc -index c663a2074..38a342484 100644 ---- a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc -+++ b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc -@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) { - } - - GType GtkKeyBindingsHandler::HandlerGetType() { -- static volatile gsize type_id_volatile = 0; -+ static gsize type_id_volatile = 0; - if (g_once_init_enter(&type_id_volatile)) { - GType type_id = g_type_register_static_simple( - GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"), ---- a/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc -+++ b/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc -@@ -2,6 +2,7 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include - #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" - - #include -diff --git a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc -index 657a3c96b..ad641a082 100644 ---- a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc -+++ b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "components/bookmarks/browser/base_bookmark_model_observer.h" - - namespace bookmarks { diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch deleted file mode 100644 index 61e56d5ae4f5..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/rawhide/f/qtwebengine-harfbuzz.patch ---- a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc -+++ b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc -@@ -71,9 +71,9 @@ sk_sp SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) { - hb_set_t* glyphs = - hb_subset_input_glyph_set(input.get()); // Owned by |input|. - usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs))); -- hb_subset_input_set_retain_gids(input.get(), true); -+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS); - -- HbScoped subset_face(hb_subset(face.get(), input.get())); -+ HbScoped subset_face(hb_subset_or_fail(face.get(), input.get())); - HbScoped subset_blob(hb_face_reference_blob(subset_face.get())); - if (!subset_blob) - return nullptr; ---- a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp -+++ b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp -@@ -71,11 +71,10 @@ static sk_sp subset_harfbuzz(sk_sp fontData, - hb_set_t* glyphs = hb_subset_input_glyph_set(input.get()); - glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);}); - -- hb_subset_input_set_retain_gids(input.get(), true); - // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. - // If it isn't known if a font is 'tricky', retain the hints. -- hb_subset_input_set_drop_hints(input.get(), false); -- HBFace subset(hb_subset(face.get(), input.get())); -+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS | HB_SUBSET_FLAGS_NO_HINTING); -+ HBFace subset(hb_subset_or_fail(face.get(), input.get())); - HBBlob result(hb_face_reference_blob(subset.get())); - return to_data(std::move(result)); - } - diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild deleted file mode 100644 index e920abe31ae8..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python2_7 ) -inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build - -DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" -HOMEPAGE="https://www.qt.io/" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" - if [[ ${PV} == ${QT5_PV}_p* ]]; then - SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" - S="${WORKDIR}/${P}" - QT5_BUILD_DIR="${S}_build" - fi -else - EGIT_BRANCH="5.15" - EGIT_REPO_URI=( - "https://code.qt.io/qt/${QT5_MODULE}.git" - "https://github.com/qt/${QT5_MODULE}.git" - ) - inherit git-r3 -fi - -# patchset based on https://github.com/chromium-ppc64le releases -SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )" - -IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets" -REQUIRED_USE="designer? ( widgets )" - -RDEPEND=" - app-arch/snappy:= - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - dev-libs/expat - dev-libs/libevent:= - dev-libs/libxml2[icu] - dev-libs/libxslt - dev-libs/re2:= - =dev-qt/qtcore-${QT5_PV}* - =dev-qt/qtdeclarative-${QT5_PV}* - =dev-qt/qtgui-${QT5_PV}* - =dev-qt/qtnetwork-${QT5_PV}* - =dev-qt/qtprintsupport-${QT5_PV}* - =dev-qt/qtwebchannel-${QT5_PV}*[qml] - media-libs/fontconfig - media-libs/freetype - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/libvpx-1.5:=[svc(+)] - media-libs/libwebp:= - media-libs/mesa[egl,X(+)] - media-libs/opus - sys-apps/dbus - sys-apps/pciutils - sys-libs/zlib[minizip] - virtual/libudev - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - alsa? ( media-libs/alsa-lib ) - designer? ( =dev-qt/designer-${QT5_PV}* ) - geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* ) - kerberos? ( virtual/krb5 ) - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( media-video/ffmpeg:0= ) - system-icu? ( >=dev-libs/icu-69.1:= ) - widgets? ( - =dev-qt/qtdeclarative-${QT5_PV}*[widgets] - =dev-qt/qtwidgets-${QT5_PV}* - ) -" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - dev-util/gperf - dev-util/ninja - dev-util/re2c - net-libs/nodejs[ssl] - sys-devel/bison - sys-devel/flex - ppc64? ( >=dev-util/gn-0.1807 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446 - "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186 - "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606 - "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix - "${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989 - "${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261 - "${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312 - "${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312 -) - -pkg_preinst() { - elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with" - elog "additional security fixes from newer versions. Extensive as it is, the" - elog "list of backports is impossible to evaluate, but always bound to be behind" - elog "Chromium's release schedule." - elog "In addition, various online services may deny service based on an outdated" - elog "user agent version (and/or other checks). Google is already known to do so." - elog - elog "tldr: Your web browsing experience will be compromised." -} - -src_unpack() { - # bug 307861 - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - ewarn - ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." - ewarn "You may experience really long compilation times and/or increased memory usage." - ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." - ewarn - fi - eshopts_pop - - case ${QT5_BUILD_TYPE} in - live) git-r3_src_unpack ;& - release) default ;; - esac -} - -src_prepare() { - if [[ ${PV} == ${QT5_PV}_p* ]]; then - # This is made from git, and for some reason will fail w/o .git directories. - mkdir -p .git src/3rdparty/chromium/.git || die - fi - # We need to make sure this integrates well into Qt 5.15.2 installation. - # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. - sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die - - # QTBUG-88657 - jumbo-build could still make trouble - if ! use jumbo-build; then - sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ - src/buildtools/config/common.pri || die - fi - - # bug 620444 - ensure local headers are used - find "${S}" -type f -name "*.pr[fio]" | \ - xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die - - if use system-icu; then - # Sanity check to ensure that bundled copy of ICU is not used. - # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because - # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system. - # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in - # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in - # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated. - local file - while read file; do - echo "#error This file should not be used!" > "${file}" || die - done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) - fi - - if has_version ">=media-libs/harfbuzz-3.0.0-r1"; then - # We can get away with conditionally applying this with has_version - # because we have a := dep on harfbuzz and the subslot changed - # at 3.0.0. - eapply "${FILESDIR}/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch" - fi - - # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++` - if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then - eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch" - fi - - qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri - qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri - - qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro - - qt_use_disable_mod widgets widgets src/src.pro - - qt5-build_src_prepare - - # we need to generate ppc64 stuff because upstream does not ship it yet - if use ppc64; then - einfo "Patching for ppc64le and generating build files" - eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" - pushd src/3rdparty/chromium > /dev/null || die - eapply -p0 "${WORKDIR}/${PN}-ppc64le" - popd > /dev/null || die - pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die - mkdir -vp source/config/linux/ppc64 || die - mkdir -p source/libvpx/test || die - touch source/libvpx/test/test.mk || die - ./generate_gni.sh || die - popd >/dev/null || die - fi -} - -src_configure() { - export NINJA_PATH=/usr/bin/ninja - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" - - local myqmakeargs=( - -- - -no-build-qtpdf - -printing-and-pdf - -system-opus - -system-webp - $(qt_use alsa) - $(qt_use !bindist proprietary-codecs) - $(qt_use geolocation webengine-geolocation) - $(qt_use kerberos webengine-kerberos) - $(qt_use pulseaudio) - $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg) - $(qt_use system-icu webengine-icu) - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - # bug 601472 - if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then - die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" - fi -} -- cgit v1.2.3