commit: 98d3f06f815b5052315fe17c9a1a84fd1ab442bd Author: Haochen Tong <i <AT> hexchain <DOT> org> AuthorDate: Mon Jul 22 08:45:18 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Jul 25 06:09:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d3f06f
dev-qt/qtbase: add logging backends selection Signed-off-by: Haochen Tong <i <AT> hexchain.org> Closes: https://github.com/gentoo/gentoo/pull/37668 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtbase/metadata.xml | 2 ++ dev-qt/qtbase/qtbase-6.7.2-r1.ebuild | 6 +++++- dev-qt/qtbase/qtbase-6.7.9999.ebuild | 6 +++++- dev-qt/qtbase/qtbase-6.8.9999.ebuild | 6 +++++- dev-qt/qtbase/qtbase-6.9999.ebuild | 6 +++++- profiles/features/musl/package.use.mask | 1 + 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml index 61564794deab..3c04495eff72 100644 --- a/dev-qt/qtbase/metadata.xml +++ b/dev-qt/qtbase/metadata.xml @@ -21,6 +21,8 @@ <flag name="sql">Build Qt6Sql module</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="journald">Enable logging to journald</flag> + <flag name="syslog">Enable logging to syslog</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild index 54a41ae62c97..f33fdc4a6d2b 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]=" @@ -34,6 +34,7 @@ REQUIRED_USE=" printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/} printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/} ) + ?? ( journald syslog ) accessibility? ( dbus ) eglfs? ( opengl ) gles2-only? ( opengl ) @@ -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? ( @@ -187,6 +189,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild index 21ce4da21682..1745b5822a2f 100644 --- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.9999.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]=" @@ -34,6 +34,7 @@ REQUIRED_USE=" printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/} printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/} ) + ?? ( journald syslog ) accessibility? ( dbus ) eglfs? ( opengl ) gles2-only? ( opengl ) @@ -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? ( @@ -186,6 +188,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild index a07ea4a4d232..89be67c5f6ec 100644 --- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.8.9999.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]=" @@ -34,6 +34,7 @@ REQUIRED_USE=" printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/} printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/} ) + ?? ( journald syslog ) accessibility? ( dbus ) eglfs? ( opengl ) gles2-only? ( opengl ) @@ -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? ( @@ -186,6 +188,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index a07ea4a4d232..89be67c5f6ec 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.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]=" @@ -34,6 +34,7 @@ REQUIRED_USE=" printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/} printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/} ) + ?? ( journald syslog ) accessibility? ( dbus ) eglfs? ( opengl ) gles2-only? ( opengl ) @@ -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? ( @@ -186,6 +188,8 @@ src_configure() { # qtcore $(qt_feature icu) + $(qt_feature journald) + $(qt_feature syslog) # tools -DQT_FEATURE_androiddeployqt=OFF diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask index 9cb4b9e5ab7b..b6ade27e214e 100644 --- a/profiles/features/musl/package.use.mask +++ b/profiles/features/musl/package.use.mask @@ -138,6 +138,7 @@ www-client/qutebrowser widevine net-analyzer/wireshark sdjournal sys-apps/ipmitool openbmc sys-auth/pambase homed +dev-qt/qtbase journald # Petr Vaněk <[email protected]> (2022-03-15) # musl package does not currently provide gencat binary, which is needed for
