summaryrefslogtreecommitdiff
path: root/dev-qt/qtbase
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-08-07 12:37:21 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-08-07 12:37:21 +0100
commitb8c7370a682e4e29cda623222d17a790c01c3642 (patch)
treef6caa14689bd00a5760eadaa381ff41e50ef3c1b /dev-qt/qtbase
parent8a4997a7e2d1e36c089d4d76935b5a902d98d3d0 (diff)
gentoo auto-resync : 07:08:2024 - 12:37:20
Diffstat (limited to 'dev-qt/qtbase')
-rw-r--r--dev-qt/qtbase/Manifest10
-rw-r--r--dev-qt/qtbase/metadata.xml2
-rw-r--r--dev-qt/qtbase/qtbase-6.7.2-r1.ebuild19
-rw-r--r--dev-qt/qtbase/qtbase-6.7.9999.ebuild19
-rw-r--r--dev-qt/qtbase/qtbase-6.8.9999.ebuild19
-rw-r--r--dev-qt/qtbase/qtbase-6.9999.ebuild19
6 files changed, 59 insertions, 29 deletions
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 65ad56bd180a..817b2d85bf01 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -4,8 +4,8 @@ AUX qtbase-6.6.1-forkfd-childstack-size.patch 1003 BLAKE2B abc1bc5633032fc55fca9
AUX qtbase-6.6.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f7524e0df00e13912e2e28d5c204d1a3e2bc351b9cdc212b9169e4d84e2884df76d9722a73f29734c18fe50cc8e6583e41a5cc2 SHA512 1effa903d5d3c65ffc6af5fb2f9896346b4b90cd1f8a54f0a697f23f1c118dd1803b5f4fa9b4959cf4ba1c433d36ca21a6abe6cb3bfae84a811297566388e907
AUX qtbase-6.7.2-CVE-2024-39936.patch 7171 BLAKE2B d1b6e9a35e35f1e6b3e7a7c975fb6719b8594ee5f3212bc18bfe4a1990d70424a682071551c5971d62d6351a38e36b6f4c4acb9241af1ad2e64ec604ca440394 SHA512 cd6b48ebe7c1dc1224a54f0d32845e598223a3c40c6da11b4639646fb073c6b5a2e54d9625ba0413afb876a83c2d50bdf616f4876154fb33fa941d6cbf053291
DIST qtbase-everywhere-src-6.7.2.tar.xz 49364504 BLAKE2B b48b8a8decafe3262d459b9446c25561851fef88b3316107c2909f5964e8122a558b5501a3e59667bdf4776d36ea5ba0d9f227538c45c1f8e94fbc8fff4244a6 SHA512 eb4b2f1fb02ab0ed5508d32449e140778278ff1a619cfcae14920b276b5c46e01a566d73fb8f84cf2cfc81e19cb11e53ab500df6b27d12ab875aa8c07bd15d6b
-EBUILD qtbase-6.7.2-r1.ebuild 9601 BLAKE2B bb3b5fd887874ff289da3660b64823d8fbfc1bb523189c1f3d94c26d74825bb219ffe6836b42ceb8589015ad61feb1b820816830b0fcb02aeb237ecc38f70737 SHA512 4cdf5627cf82e1c9d1f8442efe9257cef3b20dfdf160ee707cce8d1e8c6db22f8ee1a863ed0d743bb6b8e4b011472ea6b16e4829c47240b96366ab6ff3a03668
-EBUILD qtbase-6.7.9999.ebuild 9559 BLAKE2B 5963ad805fab54ad09255d5fa42ee6f7abdba38aa2caf211138b3df78abb4f714d54122aaf66b7455a0740e40002ee77b0bb67a5bdba307ec02ae69a92607362 SHA512 4924e009671bfc94d8c2da05ea884ce8043d77adcbd2cc403c3badbf5034e1ea511bfb4df6d343a531471d472cb865e49bcc7f7028b195647f50bab4aa6f164f
-EBUILD qtbase-6.8.9999.ebuild 9998 BLAKE2B 71b9fc07d2b968a92d9a421439488690a5e24a7da5b500592a7beba14aff4d6ec0eac4d78a4671c2697edb4d03d65995c708b34bc0db4b4be0f650fad3c5cb50 SHA512 c787767932b16b336f170dcfc9fa6529c941e92a7a160281aa7d40ae4e9d5eef86dc5f05a7955ba70b85eec4fff093f82bddb17ba63ac208758344e4df7cd57a
-EBUILD qtbase-6.9999.ebuild 9998 BLAKE2B 71b9fc07d2b968a92d9a421439488690a5e24a7da5b500592a7beba14aff4d6ec0eac4d78a4671c2697edb4d03d65995c708b34bc0db4b4be0f650fad3c5cb50 SHA512 c787767932b16b336f170dcfc9fa6529c941e92a7a160281aa7d40ae4e9d5eef86dc5f05a7955ba70b85eec4fff093f82bddb17ba63ac208758344e4df7cd57a
-MISC metadata.xml 1655 BLAKE2B 1f3bdbe5f14716d1825ff0ce6d3a9439a87c0c18abd0bb6a2286c9709e815205f2f6911ef5d053b57598aa54471d4316f87c9a4d36004be15f499447785f14bd SHA512 d1479bae177f75991241eacaa1300f43d644730fa3d6d7e6e039b8a212f1289b920b6e1aad7c56576857049f133492f5cf648c7931228c6c4ee272d93437e351
+EBUILD qtbase-6.7.2-r1.ebuild 9791 BLAKE2B f65954646f705dc3263d711a447c9803e7b967c3c8b35cb4148726aedcfd14edeb2c6b0a408b226c9e58ea26e0304d69a2908fe1b95c9c0e92a11da6736b5165 SHA512 e9cb9a522776e4904d0e715b17385f93f37fa41c309083593d0a0e005fad0f449eebd7a444cabb0c7d0dc82dd59f4d4af2e029090b5de546b2147b81e89cbd81
+EBUILD qtbase-6.7.9999.ebuild 9749 BLAKE2B c9416e34473869963c79ad6b79316d82c7a69256e7f3eb37c6c16ef9388880dbaa1541b2cf333db9d050d3c8067d5469adab7c786c8332d98648c7b151c1a147 SHA512 3a8ba5819a4d0dab097b13726cbd63b82f4ac15a112f6ce07a79d46005ecb09414a48a6763bc95253ac38280cd78179c7f1478e818e34eb99edd10b4d2042489
+EBUILD qtbase-6.8.9999.ebuild 10188 BLAKE2B e11f0819a5fd5b4669cbc20ff54db471709b5ff2cdede20169f2068dae57790e1346bddeb3615ea693417abe0f945860053aa56db5d06d00f441456937c7fe7f SHA512 382447cfd0f81f2de3543cc0bfa62f80de9a124b59d96707e538d44e9db1be6244888fb3d4ef683fc99f09669eb253449ec1036fae2cba563053c3f207d2a301
+EBUILD qtbase-6.9999.ebuild 10188 BLAKE2B e11f0819a5fd5b4669cbc20ff54db471709b5ff2cdede20169f2068dae57790e1346bddeb3615ea693417abe0f945860053aa56db5d06d00f441456937c7fe7f SHA512 382447cfd0f81f2de3543cc0bfa62f80de9a124b59d96707e538d44e9db1be6244888fb3d4ef683fc99f09669eb253449ec1036fae2cba563053c3f207d2a301
+MISC metadata.xml 1965 BLAKE2B e91aa3bc2379fa587766cfc7c4053b382a8894c0092d075543b2a5d466dfa001105bb0f564008fab8e71d4517954e527618896de41069c6bafb4258f6201cdbe SHA512 a71f6fe0fb01e60716aa6632605a423f765983f41da2c8ca761afca548cd061bd52bc328f7441fa831e890d75bcfc2820112c946802588dab1de706fbb7ac531
diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
index 61564794deab..ceb3786524f7 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 428654198862..37e0b5c51a97 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 )
@@ -187,6 +193,8 @@ src_configure() {
# qtcore
$(qt_feature icu)
+ $(qt_feature journald)
+ $(qt_feature syslog)
# tools
-DQT_FEATURE_androiddeployqt=OFF
@@ -275,6 +283,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
@@ -309,7 +318,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 '
@@ -319,7 +327,6 @@ src_test() {
# bug #914033
$(usev sparc '
tst_qbuffer
- tst_qprocess
tst_qtconcurrentiteratekernel
')
# note: for linux, upstream only really runs+maintains tests for amd64
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 435584eeecbe..66720e44d615 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]="
@@ -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 )
@@ -186,6 +192,8 @@ src_configure() {
# qtcore
$(qt_feature icu)
+ $(qt_feature journald)
+ $(qt_feature syslog)
# tools
-DQT_FEATURE_androiddeployqt=OFF
@@ -274,6 +282,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
@@ -308,7 +317,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 '
@@ -318,7 +326,6 @@ src_test() {
# bug #914033
$(usev sparc '
tst_qbuffer
- tst_qprocess
tst_qtconcurrentiteratekernel
')
# note: for linux, upstream only really runs+maintains tests for amd64
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 04fb1a0aaefe..0f0f5cc3cd3a 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]="
@@ -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 )
@@ -186,6 +192,8 @@ src_configure() {
# qtcore
$(qt_feature icu)
+ $(qt_feature journald)
+ $(qt_feature syslog)
# tools
-DQT_FEATURE_androiddeployqt=OFF
@@ -286,6 +294,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
@@ -320,7 +329,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 '
@@ -330,7 +338,6 @@ src_test() {
# bug #914033
$(usev sparc '
tst_qbuffer
- tst_qprocess
tst_qtconcurrentiteratekernel
')
# note: for linux, upstream only really runs+maintains tests for amd64
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 04fb1a0aaefe..0f0f5cc3cd3a 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]="
@@ -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 )
@@ -186,6 +192,8 @@ src_configure() {
# qtcore
$(qt_feature icu)
+ $(qt_feature journald)
+ $(qt_feature syslog)
# tools
-DQT_FEATURE_androiddeployqt=OFF
@@ -286,6 +294,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
@@ -320,7 +329,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 '
@@ -330,7 +338,6 @@ src_test() {
# bug #914033
$(usev sparc '
tst_qbuffer
- tst_qprocess
tst_qtconcurrentiteratekernel
')
# note: for linux, upstream only really runs+maintains tests for amd64