From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2A33E158089 for ; Sun, 17 Sep 2023 16:22:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E26D2BC04D; Sun, 17 Sep 2023 16:22:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 420D92BC04D for ; Sun, 17 Sep 2023 16:22:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47A86335D16 for ; Sun, 17 Sep 2023 16:22:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 825AD11D0 for ; Sun, 17 Sep 2023 16:22:16 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1694967413.cc456776c6b7a6fa659c2d7d4b7d56878ade99ef.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtbase/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-qt/qtbase/metadata.xml dev-qt/qtbase/qtbase-6.5.2-r1.ebuild dev-qt/qtbase/qtbase-6.5.2-r2.ebuild X-VCS-Directories: dev-qt/qtbase/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: cc456776c6b7a6fa659c2d7d4b7d56878ade99ef X-VCS-Branch: master Date: Sun, 17 Sep 2023 16:22:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 98007962-43d6-4291-bfa9-7006cffeba30 X-Archives-Hash: 4510e51d1cbb547ccb23549555908927 commit: cc456776c6b7a6fa659c2d7d4b7d56878ade99ef Author: orbea riseup net> AuthorDate: Sun Sep 17 16:15:39 2023 +0000 Commit: orbea riseup net> CommitDate: Sun Sep 17 16:16:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=cc456776 dev-qt/qtbase: add 6.5.2-r2, drop 6.5.2-r1 Signed-off-by: orbea riseup.net> dev-qt/qtbase/metadata.xml | 4 ++-- ...base-6.5.2-r1.ebuild => qtbase-6.5.2-r2.ebuild} | 26 +++++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml index 573775d..852224a 100644 --- a/dev-qt/qtbase/metadata.xml +++ b/dev-qt/qtbase/metadata.xml @@ -6,6 +6,7 @@ Gentoo Qt Project + Build the XCB platform plugin and enable X11 integration Enable support for Brotli decompression Build Qt6Concurrent module Build Qt6DBus module @@ -17,11 +18,10 @@ Enable support for input devices via dev-libs/libinput Use net-libs/libproxy for automatic HTTP/SOCKS proxy configuration Build Qt6Network module + Enable support for capturing graphic's API calls using media-gfx/renderdoc Build Qt6Sql module - Enable native journald logging support Enable support for touchscreen devices via x11-libs/tslib Build Qt6Widgets module - Build the XCB platform plugin and enable X11 integration https://bugreports.qt.io/ diff --git a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild similarity index 95% rename from dev-qt/qtbase/qtbase-6.5.2-r1.ebuild rename to dev-qt/qtbase/qtbase-6.5.2-r2.ebuild index e0bb6d1..34dd3d1 100644 --- a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild +++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild @@ -8,12 +8,12 @@ inherit flag-o-matic qt6-build toolchain-funcs DESCRIPTION="Cross-platform application development framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="amd64 ~arm ~arm64 ~x86" fi declare -A QT6_IUSE=( [global]="+ssl +udev zstd" - [core]="icu systemd" + [core]="icu" [modules]="+concurrent +dbus +gui +network +sql +xml" [gui]=" @@ -24,7 +24,7 @@ declare -A QT6_IUSE=( [sql]="mysql oci8 odbc postgres +sqlite" [widgets]="cups gtk" - [optfeature]="wayland" #864509 + [optfeature]="nls wayland" #810802,864509 ) IUSE="${QT6_IUSE[*]}" REQUIRED_USE=" @@ -36,6 +36,7 @@ REQUIRED_USE=" ) accessibility? ( X dbus ) eglfs? ( opengl ) + gles2-only? ( opengl ) gui? ( || ( X eglfs wayland ) ) libinput? ( udev ) sql? ( || ( ${QT6_IUSE[sql]//+/} ) ) @@ -60,7 +61,6 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) - systemd? ( sys-apps/systemd:= ) dbus? ( sys-apps/dbus ) gui? ( @@ -124,10 +124,14 @@ DEPEND=" ) " BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392 -PDEPEND="wayland? ( ~dev-qt/qtwayland-${PV}:6 )" +PDEPEND=" + nls? ( ~dev-qt/qttranslations-${PV}:6 ) + wayland? ( ~dev-qt/qtwayland-${PV}:6 ) +" PATCHES=( "${FILESDIR}/${PN}-6.5.0-libressl.patch" + "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${P}-CVE-2023-38197.patch "${FILESDIR}"/${P}-tests-gcc13.patch ) @@ -144,6 +148,8 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DBUILD_WITH_PCH=OFF + -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" -DINSTALL_BINDIR="${QT6_BINDIR}" -DINSTALL_DATADIR="${QT6_DATADIR}" @@ -158,7 +164,6 @@ src_configure() { -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" - -DQT_FEATURE_precompile_header=OFF $(qt_feature ssl openssl) $(qt_feature ssl openssl_linked) $(qt_feature udev libudev) @@ -166,7 +171,6 @@ src_configure() { # qtcore $(qt_feature icu) - $(qt_feature systemd journald) # tools -DQT_FEATURE_androiddeployqt=OFF @@ -190,13 +194,11 @@ src_configure() { $(qt_feature eglfs) $(qt_feature evdev) $(qt_feature evdev mtdev) - $(qt_feature gles2-only opengles2) $(qt_feature libinput) - $(qt_feature opengl) - $(usev !opengl -DINPUT_opengl=no) #913691 $(qt_feature tslib) $(qt_feature vulkan) $(qt_feature widgets) + -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c ) && use widgets && mycmakeargs+=( $(qt_feature cups) # qtprintsupport is enabled w/ gui+widgets @@ -298,13 +300,15 @@ src_test() { tst_qglyphrun tst_qvectornd tst_rcc + # similarly, but on armv7 (bug #914028) + tst_qlineedit + tst_qpainter # partially broken on llvm-musl, needs looking into but skip to have # a baseline for regressions (like above, rest of dev-qt is fine) $(usev elibc_musl ' tst_qfiledialog2 tst_qicoimageformat tst_qimagereader - tst_qpainter tst_qimage ') # note: for linux, upstream only really runs+maintains tests for amd64