diff options
author | 2024-08-01 10:57:55 -0700 | |
---|---|---|
committer | 2024-08-01 10:57:55 -0700 | |
commit | 95381baca99c4b569d95df0faa916edf2d598c06 (patch) | |
tree | 92f097b76dcc2a34c9714ff9e9378bd9c679a08a /dev-qt | |
parent | dev-python/PyQt6: add 6.7.1-r1 (diff) | |
download | libressl-95381baca99c4b569d95df0faa916edf2d598c06.tar.gz libressl-95381baca99c4b569d95df0faa916edf2d598c06.tar.bz2 libressl-95381baca99c4b569d95df0faa916edf2d598c06.zip |
dev-qt/qtbase: sync ::gentoo
Signed-off-by: orbea <orbea@riseup.net>
Diffstat (limited to 'dev-qt')
-rw-r--r-- | dev-qt/qtbase/metadata.xml | 2 | ||||
-rw-r--r-- | dev-qt/qtbase/qtbase-6.7.2-r1.ebuild | 19 |
2 files changed, 15 insertions, 6 deletions
diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml index 6156479..ceb3786 100644 --- a/dev-qt/qtbase/metadata.xml +++ b/dev-qt/qtbase/metadata.xml @@ -14,11 +14,13 @@ <flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag> <flag name="gtk">Build the GTK platform theme plugin</flag> <flag name="gui">Build Qt6Gui module</flag> + <flag name="journald">Log messages using <pkg>sys-apps/systemd</pkg>'s journald rather than output to stderr (override with the QT_FORCE_STDERR_LOGGING=1 env var)</flag> <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="syslog">Log messages using syslog rather than output to stderr (override with the QT_FORCE_STDERR_LOGGING=1 env var)</flag> <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> <flag name="widgets">Build Qt6Widgets module</flag> </use> diff --git a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild index f56a653..2fe9c04 100644 --- a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild @@ -13,7 +13,7 @@ fi declare -A QT6_IUSE=( [global]="+ssl +udev zstd" - [core]="icu" + [core]="icu journald syslog" [modules]="+concurrent +dbus +gui +network +sql +xml" [gui]=" @@ -28,6 +28,7 @@ declare -A QT6_IUSE=( ) IUSE="${QT6_IUSE[*]}" REQUIRED_USE=" + ?? ( journald syslog ) $( printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} @@ -50,8 +51,8 @@ REQUIRED_USE=" # - qtnetwork (src/network/configure.cmake) # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] # - qtsql (src/plugins/sqldrivers/configure.cmake) -# dlopen: renderdoc -RDEPEND=" +# nolink: renderdoc, systemd +COMMON_DEPEND=" sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) @@ -62,6 +63,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) + journald? ( sys-apps/systemd ) dbus? ( sys-apps/dbus ) gui? ( @@ -115,8 +117,12 @@ RDEPEND=" sqlite? ( dev-db/sqlite:3 ) ) " +RDEPEND=" + ${COMMON_DEPEND} + syslog? ( virtual/logger ) +" DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) @@ -188,6 +194,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF @@ -277,6 +285,7 @@ src_test() { # randomly fails without -j1, and not worth it over this (bug #916181) tst_qfiledialog{,2} # may randomly hang+timeout, perhaps related to -j as well + tst_qprocess #936484 tst_qtimer # these can be flaky depending on the environment/toolchain tst_qlogging # backtrace log test can easily vary @@ -311,7 +320,6 @@ src_test() { tst_qicoimageformat tst_qimagereader tst_qimage - tst_qprocess ') # fails due to hppa's NaN handling, needs looking into (bug #914371) $(usev hppa ' @@ -321,7 +329,6 @@ src_test() { # bug #914033 $(usev sparc ' tst_qbuffer - tst_qprocess tst_qtconcurrentiteratekernel ') # note: for linux, upstream only really runs+maintains tests for amd64 |