commit: cc456776c6b7a6fa659c2d7d4b7d56878ade99ef
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Sep 17 16:15:39 2023 +0000
Commit: orbea <orbea <AT> riseup <DOT> 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 <orbea <AT> 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 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
+ <flag name="X">Build the XCB platform plugin and enable X11
integration</flag>
<flag name="brotli">Enable support for Brotli
decompression</flag>
<flag name="concurrent">Build Qt6Concurrent module</flag>
<flag name="dbus">Build Qt6DBus module</flag>
@@ -17,11 +18,10 @@
<flag name="libinput">Enable support for input devices via
<pkg>dev-libs/libinput</pkg></flag>
<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for
automatic HTTP/SOCKS proxy configuration</flag>
<flag name="network">Build Qt6Network module</flag>
+ <flag name="renderdoc">Enable support for capturing graphic's
API calls using <pkg>media-gfx/renderdoc</pkg></flag>
<flag name="sql">Build Qt6Sql module</flag>
- <flag name="systemd">Enable native journald logging
support</flag>
<flag name="tslib">Enable support for touchscreen devices via
<pkg>x11-libs/tslib</pkg></flag>
<flag name="widgets">Build Qt6Widgets module</flag>
- <flag name="X">Build the XCB platform plugin and enable X11
integration</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
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
