* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2022-08-02 22:00 Sam James
0 siblings, 0 replies; 80+ messages in thread
From: Sam James @ 2022-08-02 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 34cf3fb20c519d428c10f47155caa98739b8c1b1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 22:00:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 22:00:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34cf3fb2
dev-qt/qtbase: [QA] fix DTD HTTP->HTTPS
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtbase/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
index 809758b7ae0e..ba54edfe722e 100644
--- a/dev-qt/qtbase/metadata.xml
+++ b/dev-qt/qtbase/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>qt@gentoo.org</email>
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2022-09-24 14:32 Andreas Sturmlechner
0 siblings, 0 replies; 80+ messages in thread
From: Andreas Sturmlechner @ 2022-09-24 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 40945d00d4267b0fc9f73343c6c495f52674132a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 14:07:01 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 14:32:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40945d00
dev-qt/qtbase: drop 6.3.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtbase/Manifest | 1 -
dev-qt/qtbase/qtbase-6.3.1.ebuild | 178 --------------------------------------
2 files changed, 179 deletions(-)
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 3594826e844c..469b7132fb46 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-6.3.1.tar.xz 47118260 BLAKE2B b8b819330011033275d9532219bf09cce3ef1e7d8e50945b1cdeceddf3742c1ee4a1bba9d4340f1f6b48fd59659920c3652abf21bbd8b4bbed0c635a3caafb0c SHA512 5c4304dc1f5fa80201b61c9c8dbf4c3449506a243ea1f87e336dc3641a37b9d40c2aa4a93190cc69ddde0f349c74e327c35de5f46de888ddfd49616903e8a7b5
DIST qtbase-everywhere-src-6.3.2.tar.xz 47507396 BLAKE2B 9f5a1af7abb914af58c32bfdd2f54fdd2d496972606bfa68425e5997be74249d0314a4978fc8359c5a6ccad3f6ef6920bf3e7c9450b256f39d830abf7e778051 SHA512 e164ed6511cf6d5aa39f91cfb624c89b4dd3fc7d3c6c14b60d0c211e5b40ba1ad379ecca653db33dfa944ecfbd9c7044a8d7a968c660e8a76c4897c869584822
diff --git a/dev-qt/qtbase/qtbase-6.3.1.ebuild b/dev-qt/qtbase/qtbase-6.3.1.ebuild
deleted file mode 100644
index 36931e0ea933..000000000000
--- a/dev-qt/qtbase/qtbase-6.3.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-# TODO: Restore/patch xml flag support (seems fixed in 6.9999).
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets zstd"
-REQUIRED_USE="
- opengl? ( gui )
- widgets? ( gui )
- X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
- $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
- $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
- $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
- accessibility? ( dbus X )
- cups? ( gui widgets )
- eglfs? ( egl )
- gtk? ( widgets )
- gui? ( || ( eglfs X ) || ( libinput X ) )
- libinput? ( udev )
- sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
- vnc? ( gui )
- X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode]
- dev-util/gtk-update-icon-cache
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.6.0:=
- media-libs/tiff:0
- >=sys-apps/dbus-1.4.20
- sys-libs/zlib:=
- brotli? ( app-arch/brotli:= )
- evdev? ( sys-libs/mtdev )
- freetds? ( dev-db/freetds )
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X] )
- gssapi? ( virtual/krb5 )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
- gui? ( media-libs/libpng:0= )
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
- jpeg? ( media-libs/libjpeg-turbo:= )
- libinput? (
- dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
- )
- libproxy? ( net-libs/libproxy )
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd:= )
- tslib? ( >=x11-libs/tslib-1.21 )
- udev? ( virtual/libudev:= )
- vulkan? ( dev-util/vulkan-headers )
- X? (
- x11-libs/libdrm
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libxcb-1.12:=[xkb]
- >=x11-libs/libxkbcommon-0.5.0[X]
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_BINDIR=${QT6_BINDIR}
- -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
- -DINSTALL_LIBDIR=${QT6_LIBDIR}
- -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
- -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
- -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
- -DINSTALL_QMLDIR=${QT6_QMLDIR}
- -DINSTALL_DATADIR=${QT6_DATADIR}
- -DINSTALL_DOCDIR=${QT6_DOCDIR}
- -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
- -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
- -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
- -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
- -DQT_FEATURE_androiddeployqt=OFF
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature gui testlib)
- $(qt_feature icu)
- $(qt_feature network)
- $(qt_feature sql)
- $(qt_feature systemd journald)
- $(qt_feature udev libudev)
- $(qt_feature zstd)
- )
- use gui && mycmakeargs+=(
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature egl)
- $(qt_feature eglfs eglfs_egldevice)
- $(qt_feature eglfs eglfs_gbm)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- -DQT_FEATURE_gif=ON
- $(qt_feature jpeg)
- $(qt_feature opengl)
- $(qt_feature gles2-only opengles2)
- $(qt_feature libinput)
- $(qt_feature tslib)
- $(qt_feature tuio tuiotouch)
- $(qt_feature vulkan)
- $(qt_feature widgets)
- $(qt_feature X xcb)
- $(qt_feature X xcb_xlib)
- )
- use widgets && mycmakeargs+=(
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
- if use libinput || use X; then
- mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
- fi
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(qt_feature ssl openssl)
- $(qt_feature vnc)
- )
- use sql && mycmakeargs+=(
- $(qt_feature freetds sql_tds)
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- qt6-build_src_configure
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2022-12-01 19:19 Andreas Sturmlechner
0 siblings, 0 replies; 80+ messages in thread
From: Andreas Sturmlechner @ 2022-12-01 19:19 UTC (permalink / raw
To: gentoo-commits
commit: 0fe563d087f1ea9b58862a76dfeb18b2af37f246
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 18:44:25 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 19:19:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fe563d0
dev-qt/qtbase: drop 6.3.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtbase/Manifest | 1 -
dev-qt/qtbase/qtbase-6.3.2.ebuild | 178 --------------------------------------
2 files changed, 179 deletions(-)
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 2102f829b611..c57d973a6e07 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-6.3.2.tar.xz 47507396 BLAKE2B 9f5a1af7abb914af58c32bfdd2f54fdd2d496972606bfa68425e5997be74249d0314a4978fc8359c5a6ccad3f6ef6920bf3e7c9450b256f39d830abf7e778051 SHA512 e164ed6511cf6d5aa39f91cfb624c89b4dd3fc7d3c6c14b60d0c211e5b40ba1ad379ecca653db33dfa944ecfbd9c7044a8d7a968c660e8a76c4897c869584822
DIST qtbase-everywhere-src-6.4.0.tar.xz 47957680 BLAKE2B 488843aa5a7373a517aa993c4fd9ddf6b9926941ee1af2e337cea3dee035cf3bf237aa040705328d2b33e1c60d1cdbe72844621f8f2f79259e53a4a28f6c6267 SHA512 7c9430da115529fa5697d134bf53d185259de23529d6db17398d91d48a0b7a95acd1fbe55189a2d2b3a2ecdafb27065ea99f29f7022110c95a45d6c04ebf46a3
diff --git a/dev-qt/qtbase/qtbase-6.3.2.ebuild b/dev-qt/qtbase/qtbase-6.3.2.ebuild
deleted file mode 100644
index 36931e0ea933..000000000000
--- a/dev-qt/qtbase/qtbase-6.3.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-# TODO: Restore/patch xml flag support (seems fixed in 6.9999).
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets zstd"
-REQUIRED_USE="
- opengl? ( gui )
- widgets? ( gui )
- X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
- $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
- $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
- $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
- accessibility? ( dbus X )
- cups? ( gui widgets )
- eglfs? ( egl )
- gtk? ( widgets )
- gui? ( || ( eglfs X ) || ( libinput X ) )
- libinput? ( udev )
- sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
- vnc? ( gui )
- X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode]
- dev-util/gtk-update-icon-cache
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.6.0:=
- media-libs/tiff:0
- >=sys-apps/dbus-1.4.20
- sys-libs/zlib:=
- brotli? ( app-arch/brotli:= )
- evdev? ( sys-libs/mtdev )
- freetds? ( dev-db/freetds )
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X] )
- gssapi? ( virtual/krb5 )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
- gui? ( media-libs/libpng:0= )
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
- jpeg? ( media-libs/libjpeg-turbo:= )
- libinput? (
- dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
- )
- libproxy? ( net-libs/libproxy )
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd:= )
- tslib? ( >=x11-libs/tslib-1.21 )
- udev? ( virtual/libudev:= )
- vulkan? ( dev-util/vulkan-headers )
- X? (
- x11-libs/libdrm
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libxcb-1.12:=[xkb]
- >=x11-libs/libxkbcommon-0.5.0[X]
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_BINDIR=${QT6_BINDIR}
- -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
- -DINSTALL_LIBDIR=${QT6_LIBDIR}
- -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
- -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
- -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
- -DINSTALL_QMLDIR=${QT6_QMLDIR}
- -DINSTALL_DATADIR=${QT6_DATADIR}
- -DINSTALL_DOCDIR=${QT6_DOCDIR}
- -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
- -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
- -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
- -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
- -DQT_FEATURE_androiddeployqt=OFF
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature gui testlib)
- $(qt_feature icu)
- $(qt_feature network)
- $(qt_feature sql)
- $(qt_feature systemd journald)
- $(qt_feature udev libudev)
- $(qt_feature zstd)
- )
- use gui && mycmakeargs+=(
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature egl)
- $(qt_feature eglfs eglfs_egldevice)
- $(qt_feature eglfs eglfs_gbm)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- -DQT_FEATURE_gif=ON
- $(qt_feature jpeg)
- $(qt_feature opengl)
- $(qt_feature gles2-only opengles2)
- $(qt_feature libinput)
- $(qt_feature tslib)
- $(qt_feature tuio tuiotouch)
- $(qt_feature vulkan)
- $(qt_feature widgets)
- $(qt_feature X xcb)
- $(qt_feature X xcb_xlib)
- )
- use widgets && mycmakeargs+=(
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
- if use libinput || use X; then
- mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
- fi
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(qt_feature ssl openssl)
- $(qt_feature vnc)
- )
- use sql && mycmakeargs+=(
- $(qt_feature freetds sql_tds)
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- qt6-build_src_configure
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-01-05 22:39 Jimi Huotari
0 siblings, 0 replies; 80+ messages in thread
From: Jimi Huotari @ 2023-01-05 22:39 UTC (permalink / raw
To: gentoo-commits
commit: d594a5b454b2f9c6c359227dbf4525bde95764a0
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 5 14:40:29 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 22:38:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d594a5b4
dev-qt/qtbase: add 6.4.2
Bug: https://bugs.gentoo.org/838970
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/Manifest | 1 +
dev-qt/qtbase/qtbase-6.4.2.ebuild | 185 ++++++++++++++++++++++++++++++++++++++
2 files changed, 186 insertions(+)
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index c57d973a6e07..0e859a6a81fa 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1 +1,2 @@
DIST qtbase-everywhere-src-6.4.0.tar.xz 47957680 BLAKE2B 488843aa5a7373a517aa993c4fd9ddf6b9926941ee1af2e337cea3dee035cf3bf237aa040705328d2b33e1c60d1cdbe72844621f8f2f79259e53a4a28f6c6267 SHA512 7c9430da115529fa5697d134bf53d185259de23529d6db17398d91d48a0b7a95acd1fbe55189a2d2b3a2ecdafb27065ea99f29f7022110c95a45d6c04ebf46a3
+DIST qtbase-everywhere-src-6.4.2.tar.xz 47987188 BLAKE2B 5d25d8b912ba775faa5855ad4326cbd19580cc7f98b997a9bbdb4a2216550a60b2c8a7a2ef1741a5dfd66ebde0d1cf5d0394215474c39c7779648b03c3892812 SHA512 b00cce7bfc29d3a34c9a2f08db147c4bfd962e178916d60033e1845b25eaeaa4fbd42f5c1d7e39453ddb412a4e91c22c8eae52745eda8a47e35a691054d5496e
diff --git a/dev-qt/qtbase/qtbase-6.4.2.ebuild b/dev-qt/qtbase/qtbase-6.4.2.ebuild
new file mode 100644
index 000000000000..589a3d13aacf
--- /dev/null
+++ b/dev-qt/qtbase/qtbase-6.4.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+# Qt Modules
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
+REQUIRED_USE="
+ opengl? ( gui )
+ widgets? ( gui )
+ X? ( || ( evdev libinput ) )
+"
+
+QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
+QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
+QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
+IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
+# QtPrintSupport = QtGui + QtWidgets enabled.
+# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
+REQUIRED_USE+="
+ $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
+ $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
+ $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
+ accessibility? ( dbus X )
+ cups? ( gui widgets )
+ eglfs? ( egl )
+ gtk? ( widgets )
+ gui? ( || ( eglfs X ) || ( libinput X ) )
+ libinput? ( udev )
+ sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
+ vnc? ( gui )
+ X? ( gles2-only? ( egl ) )
+"
+
+# TODO:
+# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
+# qtnetwork: connman, networkmanager
+DEPEND="
+ app-crypt/libb2
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/libpcre2:=[pcre16,unicode]
+ dev-util/gtk-update-icon-cache
+ media-libs/fontconfig
+ >=media-libs/freetype-2.6.1:2
+ >=media-libs/harfbuzz-1.6.0:=
+ media-libs/tiff:=
+ >=sys-apps/dbus-1.4.20
+ sys-libs/zlib:=
+ brotli? ( app-arch/brotli:= )
+ evdev? ( sys-libs/mtdev )
+ freetds? ( dev-db/freetds )
+ gles2-only? ( media-libs/libglvnd )
+ !gles2-only? ( media-libs/libglvnd[X] )
+ gssapi? ( virtual/krb5 )
+ gtk? (
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ )
+ gui? ( media-libs/libpng:= )
+ icu? ( dev-libs/icu:= )
+ !icu? ( virtual/libiconv )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ libinput? (
+ dev-libs/libinput:=
+ >=x11-libs/libxkbcommon-0.5.0
+ )
+ libproxy? ( net-libs/libproxy )
+ mysql? ( dev-db/mysql-connector-c:= )
+ oci8? ( dev-db/oracle-instantclient:=[sdk] )
+ odbc? ( dev-db/unixODBC )
+ postgres? ( dev-db/postgresql:* )
+ sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:= )
+ systemd? ( sys-apps/systemd:= )
+ tslib? ( >=x11-libs/tslib-1.21 )
+ udev? ( virtual/libudev:= )
+ vulkan? ( dev-util/vulkan-headers )
+ X? (
+ x11-libs/libdrm
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=x11-libs/libxcb-1.12:=
+ >=x11-libs/libxkbcommon-0.5.0[X]
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-renderutil
+ x11-libs/xcb-util-wm
+ )
+ zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
+ -DINSTALL_BINDIR=${QT6_BINDIR}
+ -DINSTALL_DATADIR=${QT6_DATADIR}
+ -DINSTALL_DOCDIR=${QT6_DOCDIR}
+ -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+ -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
+ -DINSTALL_LIBDIR=${QT6_LIBDIR}
+ -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
+ -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
+ -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
+ -DINSTALL_QMLDIR=${QT6_QMLDIR}
+ -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
+ -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
+ -DQT_FEATURE_androiddeployqt=OFF
+ $(qt_feature concurrent)
+ $(qt_feature dbus)
+ $(qt_feature gui)
+ $(qt_feature gui testlib)
+ $(qt_feature icu)
+ $(qt_feature network)
+ $(qt_feature sql)
+ $(qt_feature systemd journald)
+ $(qt_feature udev libudev)
+ $(qt_feature xml)
+ $(qt_feature zstd)
+ )
+ use gui && mycmakeargs+=(
+ $(qt_feature accessibility accessibility_atspi_bridge)
+ $(qt_feature egl)
+ $(qt_feature eglfs eglfs_egldevice)
+ $(qt_feature eglfs eglfs_gbm)
+ $(qt_feature evdev)
+ $(qt_feature evdev mtdev)
+ -DQT_FEATURE_gif=ON
+ $(qt_feature jpeg)
+ $(qt_feature opengl)
+ $(qt_feature gles2-only opengles2)
+ $(qt_feature libinput)
+ $(qt_feature tslib)
+ $(qt_feature tuio tuiotouch)
+ $(qt_feature vulkan)
+ $(qt_feature widgets)
+ $(qt_feature X xcb)
+ $(qt_feature X xcb_xlib)
+ )
+ use widgets && mycmakeargs+=(
+ $(qt_feature cups)
+ $(qt_feature gtk gtk3)
+ )
+ if use libinput || use X; then
+ mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
+ fi
+ use network && mycmakeargs+=(
+ $(qt_feature brotli)
+ $(qt_feature gssapi)
+ $(qt_feature libproxy)
+ $(qt_feature sctp)
+ $(qt_feature ssl openssl)
+ $(qt_feature vnc)
+ )
+ use sql && mycmakeargs+=(
+ $(qt_feature freetds sql_tds)
+ $(qt_feature mysql sql_mysql)
+ $(qt_feature oci8 sql_oci)
+ $(qt_feature odbc sql_odbc)
+ $(qt_feature postgres sql_psql)
+ $(qt_feature sqlite sql_sqlite)
+ $(qt_feature sqlite system_sqlite)
+ )
+
+ qt6-build_src_configure
+}
+
+src_install() {
+ qt6-build_src_install
+
+ # https://bugs.gentoo.org/863395
+ dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
+}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-02-09 10:02 Andreas Sturmlechner
0 siblings, 0 replies; 80+ messages in thread
From: Andreas Sturmlechner @ 2023-02-09 10:02 UTC (permalink / raw
To: gentoo-commits
commit: d21ba9628fff5e4bbeb2074c57613d0803e00cd8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 8 22:18:45 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 09:48:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21ba962
dev-qt/qtbase: drop 6.4.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtbase/Manifest | 1 -
dev-qt/qtbase/qtbase-6.4.0-r1.ebuild | 185 -----------------------------------
2 files changed, 186 deletions(-)
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 0e859a6a81fa..e77cc5de7513 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-6.4.0.tar.xz 47957680 BLAKE2B 488843aa5a7373a517aa993c4fd9ddf6b9926941ee1af2e337cea3dee035cf3bf237aa040705328d2b33e1c60d1cdbe72844621f8f2f79259e53a4a28f6c6267 SHA512 7c9430da115529fa5697d134bf53d185259de23529d6db17398d91d48a0b7a95acd1fbe55189a2d2b3a2ecdafb27065ea99f29f7022110c95a45d6c04ebf46a3
DIST qtbase-everywhere-src-6.4.2.tar.xz 47987188 BLAKE2B 5d25d8b912ba775faa5855ad4326cbd19580cc7f98b997a9bbdb4a2216550a60b2c8a7a2ef1741a5dfd66ebde0d1cf5d0394215474c39c7779648b03c3892812 SHA512 b00cce7bfc29d3a34c9a2f08db147c4bfd962e178916d60033e1845b25eaeaa4fbd42f5c1d7e39453ddb412a4e91c22c8eae52745eda8a47e35a691054d5496e
diff --git a/dev-qt/qtbase/qtbase-6.4.0-r1.ebuild b/dev-qt/qtbase/qtbase-6.4.0-r1.ebuild
deleted file mode 100644
index 8398b9b52361..000000000000
--- a/dev-qt/qtbase/qtbase-6.4.0-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
-REQUIRED_USE="
- opengl? ( gui )
- widgets? ( gui )
- X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
- $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
- $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
- $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
- accessibility? ( dbus X )
- cups? ( gui widgets )
- eglfs? ( egl )
- gtk? ( widgets )
- gui? ( || ( eglfs X ) || ( libinput X ) )
- libinput? ( udev )
- sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
- vnc? ( gui )
- X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode]
- dev-util/gtk-update-icon-cache
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.6.0:=
- media-libs/tiff:=
- >=sys-apps/dbus-1.4.20
- sys-libs/zlib:=
- brotli? ( app-arch/brotli:= )
- evdev? ( sys-libs/mtdev )
- freetds? ( dev-db/freetds )
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X] )
- gssapi? ( virtual/krb5 )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
- gui? ( media-libs/libpng:= )
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
- jpeg? ( media-libs/libjpeg-turbo:= )
- libinput? (
- dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
- )
- libproxy? ( net-libs/libproxy )
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd:= )
- tslib? ( >=x11-libs/tslib-1.21 )
- udev? ( virtual/libudev:= )
- vulkan? ( dev-util/vulkan-headers )
- X? (
- x11-libs/libdrm
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libxcb-1.12:=
- >=x11-libs/libxkbcommon-0.5.0[X]
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
- -DINSTALL_BINDIR=${QT6_BINDIR}
- -DINSTALL_DATADIR=${QT6_DATADIR}
- -DINSTALL_DOCDIR=${QT6_DOCDIR}
- -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
- -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
- -DINSTALL_LIBDIR=${QT6_LIBDIR}
- -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
- -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
- -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
- -DINSTALL_QMLDIR=${QT6_QMLDIR}
- -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
- -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
- -DQT_FEATURE_androiddeployqt=OFF
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature gui testlib)
- $(qt_feature icu)
- $(qt_feature network)
- $(qt_feature sql)
- $(qt_feature systemd journald)
- $(qt_feature udev libudev)
- $(qt_feature xml)
- $(qt_feature zstd)
- )
- use gui && mycmakeargs+=(
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature egl)
- $(qt_feature eglfs eglfs_egldevice)
- $(qt_feature eglfs eglfs_gbm)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- -DQT_FEATURE_gif=ON
- $(qt_feature jpeg)
- $(qt_feature opengl)
- $(qt_feature gles2-only opengles2)
- $(qt_feature libinput)
- $(qt_feature tslib)
- $(qt_feature tuio tuiotouch)
- $(qt_feature vulkan)
- $(qt_feature widgets)
- $(qt_feature X xcb)
- $(qt_feature X xcb_xlib)
- )
- use widgets && mycmakeargs+=(
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
- if use libinput || use X; then
- mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
- fi
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(qt_feature ssl openssl)
- $(qt_feature vnc)
- )
- use sql && mycmakeargs+=(
- $(qt_feature freetds sql_tds)
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- qt6-build_src_configure
-}
-
-src_install() {
- qt6-build_src_install
-
- # https://bugs.gentoo.org/863395
- dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-03-19 13:09 Jimi Huotari
0 siblings, 0 replies; 80+ messages in thread
From: Jimi Huotari @ 2023-03-19 13:09 UTC (permalink / raw
To: gentoo-commits
commit: fc2f551c14e09f758eab8317e6ca803fc885f38e
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 11:22:18 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 13:06:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2f551c
dev-qt/qtbase: add 6.4.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/Manifest | 1 +
dev-qt/qtbase/qtbase-6.4.3.ebuild | 185 ++++++++++++++++++++++++++++++++++++++
2 files changed, 186 insertions(+)
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index e77cc5de7513..56fd88940d3e 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1 +1,2 @@
DIST qtbase-everywhere-src-6.4.2.tar.xz 47987188 BLAKE2B 5d25d8b912ba775faa5855ad4326cbd19580cc7f98b997a9bbdb4a2216550a60b2c8a7a2ef1741a5dfd66ebde0d1cf5d0394215474c39c7779648b03c3892812 SHA512 b00cce7bfc29d3a34c9a2f08db147c4bfd962e178916d60033e1845b25eaeaa4fbd42f5c1d7e39453ddb412a4e91c22c8eae52745eda8a47e35a691054d5496e
+DIST qtbase-everywhere-src-6.4.3.tar.xz 48078536 BLAKE2B 36d693535479677ca319485634c3eea9dc3c8e8870c8e3cab7693cab601f26c6f792ec056b66488db290defc771b65cdffdea16b420a24ea55e5c4f250119a70 SHA512 a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43
diff --git a/dev-qt/qtbase/qtbase-6.4.3.ebuild b/dev-qt/qtbase/qtbase-6.4.3.ebuild
new file mode 100644
index 000000000000..742bab1d9b5c
--- /dev/null
+++ b/dev-qt/qtbase/qtbase-6.4.3.ebuild
@@ -0,0 +1,185 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+# Qt Modules
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
+REQUIRED_USE="
+ opengl? ( gui )
+ widgets? ( gui )
+ X? ( || ( evdev libinput ) )
+"
+
+QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
+QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
+QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
+IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
+# QtPrintSupport = QtGui + QtWidgets enabled.
+# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
+REQUIRED_USE+="
+ $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
+ $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
+ $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
+ accessibility? ( dbus X )
+ cups? ( gui widgets )
+ eglfs? ( egl )
+ gtk? ( widgets )
+ gui? ( || ( eglfs X ) || ( libinput X ) )
+ libinput? ( udev )
+ sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
+ vnc? ( gui )
+ X? ( gles2-only? ( egl ) )
+"
+
+# TODO:
+# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
+# qtnetwork: connman, networkmanager
+DEPEND="
+ app-crypt/libb2
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/libpcre2:=[pcre16,unicode]
+ dev-util/gtk-update-icon-cache
+ media-libs/fontconfig
+ >=media-libs/freetype-2.6.1:2
+ >=media-libs/harfbuzz-1.6.0:=
+ media-libs/tiff:=
+ >=sys-apps/dbus-1.4.20
+ sys-libs/zlib:=
+ brotli? ( app-arch/brotli:= )
+ evdev? ( sys-libs/mtdev )
+ freetds? ( dev-db/freetds )
+ gles2-only? ( media-libs/libglvnd )
+ !gles2-only? ( media-libs/libglvnd[X] )
+ gssapi? ( virtual/krb5 )
+ gtk? (
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ )
+ gui? ( media-libs/libpng:= )
+ icu? ( dev-libs/icu:= )
+ !icu? ( virtual/libiconv )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ libinput? (
+ dev-libs/libinput:=
+ >=x11-libs/libxkbcommon-0.5.0
+ )
+ libproxy? ( net-libs/libproxy )
+ mysql? ( dev-db/mysql-connector-c:= )
+ oci8? ( dev-db/oracle-instantclient:=[sdk] )
+ odbc? ( dev-db/unixODBC )
+ postgres? ( dev-db/postgresql:* )
+ sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:= )
+ systemd? ( sys-apps/systemd:= )
+ tslib? ( >=x11-libs/tslib-1.21 )
+ udev? ( virtual/libudev:= )
+ vulkan? ( dev-util/vulkan-headers )
+ X? (
+ x11-libs/libdrm
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=x11-libs/libxcb-1.12:=
+ >=x11-libs/libxkbcommon-0.5.0[X]
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-renderutil
+ x11-libs/xcb-util-wm
+ )
+ zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
+ -DINSTALL_BINDIR=${QT6_BINDIR}
+ -DINSTALL_DATADIR=${QT6_DATADIR}
+ -DINSTALL_DOCDIR=${QT6_DOCDIR}
+ -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+ -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
+ -DINSTALL_LIBDIR=${QT6_LIBDIR}
+ -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
+ -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
+ -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
+ -DINSTALL_QMLDIR=${QT6_QMLDIR}
+ -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
+ -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
+ -DQT_FEATURE_androiddeployqt=OFF
+ $(qt_feature concurrent)
+ $(qt_feature dbus)
+ $(qt_feature gui)
+ $(qt_feature gui testlib)
+ $(qt_feature icu)
+ $(qt_feature network)
+ $(qt_feature sql)
+ $(qt_feature systemd journald)
+ $(qt_feature udev libudev)
+ $(qt_feature xml)
+ $(qt_feature zstd)
+ )
+ use gui && mycmakeargs+=(
+ $(qt_feature accessibility accessibility_atspi_bridge)
+ $(qt_feature egl)
+ $(qt_feature eglfs eglfs_egldevice)
+ $(qt_feature eglfs eglfs_gbm)
+ $(qt_feature evdev)
+ $(qt_feature evdev mtdev)
+ -DQT_FEATURE_gif=ON
+ $(qt_feature jpeg)
+ $(qt_feature opengl)
+ $(qt_feature gles2-only opengles2)
+ $(qt_feature libinput)
+ $(qt_feature tslib)
+ $(qt_feature tuio tuiotouch)
+ $(qt_feature vulkan)
+ $(qt_feature widgets)
+ $(qt_feature X xcb)
+ $(qt_feature X xcb_xlib)
+ )
+ use widgets && mycmakeargs+=(
+ $(qt_feature cups)
+ $(qt_feature gtk gtk3)
+ )
+ if use libinput || use X; then
+ mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
+ fi
+ use network && mycmakeargs+=(
+ $(qt_feature brotli)
+ $(qt_feature gssapi)
+ $(qt_feature libproxy)
+ $(qt_feature sctp)
+ $(qt_feature ssl openssl)
+ $(qt_feature vnc)
+ )
+ use sql && mycmakeargs+=(
+ $(qt_feature freetds sql_tds)
+ $(qt_feature mysql sql_mysql)
+ $(qt_feature oci8 sql_oci)
+ $(qt_feature odbc sql_odbc)
+ $(qt_feature postgres sql_psql)
+ $(qt_feature sqlite sql_sqlite)
+ $(qt_feature sqlite system_sqlite)
+ )
+
+ qt6-build_src_configure
+}
+
+src_install() {
+ qt6-build_src_install
+
+ # https://bugs.gentoo.org/863395
+ qt6_symlink_binary_to_path qmake 6
+}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-03-26 16:59 Jimi Huotari
0 siblings, 0 replies; 80+ messages in thread
From: Jimi Huotari @ 2023-03-26 16:59 UTC (permalink / raw
To: gentoo-commits
commit: 0e6b657fe9851f8e888e4c85bc009c2339ec827a
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 16:56:52 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 16:59:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e6b657f
dev-qt/qtbase: drop 6.4.2
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/Manifest | 1 -
dev-qt/qtbase/qtbase-6.4.2.ebuild | 189 --------------------------------------
2 files changed, 190 deletions(-)
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 56fd88940d3e..06d185fe31f1 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-6.4.2.tar.xz 47987188 BLAKE2B 5d25d8b912ba775faa5855ad4326cbd19580cc7f98b997a9bbdb4a2216550a60b2c8a7a2ef1741a5dfd66ebde0d1cf5d0394215474c39c7779648b03c3892812 SHA512 b00cce7bfc29d3a34c9a2f08db147c4bfd962e178916d60033e1845b25eaeaa4fbd42f5c1d7e39453ddb412a4e91c22c8eae52745eda8a47e35a691054d5496e
DIST qtbase-everywhere-src-6.4.3.tar.xz 48078536 BLAKE2B 36d693535479677ca319485634c3eea9dc3c8e8870c8e3cab7693cab601f26c6f792ec056b66488db290defc771b65cdffdea16b420a24ea55e5c4f250119a70 SHA512 a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43
diff --git a/dev-qt/qtbase/qtbase-6.4.2.ebuild b/dev-qt/qtbase/qtbase-6.4.2.ebuild
deleted file mode 100644
index c6545a5f1a0c..000000000000
--- a/dev-qt/qtbase/qtbase-6.4.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
-REQUIRED_USE="
- opengl? ( gui )
- widgets? ( gui )
- X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
- $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
- $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
- $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
- accessibility? ( dbus X )
- cups? ( gui widgets )
- eglfs? ( egl )
- gtk? ( widgets )
- gui? ( || ( eglfs X ) || ( libinput X ) )
- libinput? ( udev )
- sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
- vnc? ( gui )
- X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode]
- dev-util/gtk-update-icon-cache
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.6.0:=
- media-libs/tiff:=
- >=sys-apps/dbus-1.4.20
- sys-libs/zlib:=
- brotli? ( app-arch/brotli:= )
- evdev? ( sys-libs/mtdev )
- freetds? ( dev-db/freetds )
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X] )
- gssapi? ( virtual/krb5 )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
- gui? ( media-libs/libpng:= )
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
- jpeg? ( media-libs/libjpeg-turbo:= )
- libinput? (
- dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
- )
- libproxy? ( net-libs/libproxy )
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd:= )
- tslib? ( >=x11-libs/tslib-1.21 )
- udev? ( virtual/libudev:= )
- vulkan? ( dev-util/vulkan-headers )
- X? (
- x11-libs/libdrm
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libxcb-1.12:=
- >=x11-libs/libxkbcommon-0.5.0[X]
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/qtbase-6-march.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
- -DINSTALL_BINDIR=${QT6_BINDIR}
- -DINSTALL_DATADIR=${QT6_DATADIR}
- -DINSTALL_DOCDIR=${QT6_DOCDIR}
- -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
- -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
- -DINSTALL_LIBDIR=${QT6_LIBDIR}
- -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
- -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
- -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
- -DINSTALL_QMLDIR=${QT6_QMLDIR}
- -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
- -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
- -DQT_FEATURE_androiddeployqt=OFF
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature gui testlib)
- $(qt_feature icu)
- $(qt_feature network)
- $(qt_feature sql)
- $(qt_feature systemd journald)
- $(qt_feature udev libudev)
- $(qt_feature xml)
- $(qt_feature zstd)
- )
- use gui && mycmakeargs+=(
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature egl)
- $(qt_feature eglfs eglfs_egldevice)
- $(qt_feature eglfs eglfs_gbm)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- -DQT_FEATURE_gif=ON
- $(qt_feature jpeg)
- $(qt_feature opengl)
- $(qt_feature gles2-only opengles2)
- $(qt_feature libinput)
- $(qt_feature tslib)
- $(qt_feature tuio tuiotouch)
- $(qt_feature vulkan)
- $(qt_feature widgets)
- $(qt_feature X xcb)
- $(qt_feature X xcb_xlib)
- )
- use widgets && mycmakeargs+=(
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
- if use libinput || use X; then
- mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
- fi
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(qt_feature ssl openssl)
- $(qt_feature vnc)
- )
- use sql && mycmakeargs+=(
- $(qt_feature freetds sql_tds)
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- qt6-build_src_configure
-}
-
-src_install() {
- qt6-build_src_install
-
- # https://bugs.gentoo.org/863395
- dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-04-17 19:39 Jimi Huotari
0 siblings, 0 replies; 80+ messages in thread
From: Jimi Huotari @ 2023-04-17 19:39 UTC (permalink / raw
To: gentoo-commits
commit: bd864a3a4185cf3849150e1d4e5f3fd0d821a175
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 18:16:20 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 19:39:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd864a3a
dev-qt/qtbase: drop version 6.5.0 (r0)
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.0.ebuild | 188 --------------------------------------
1 file changed, 188 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.0.ebuild b/dev-qt/qtbase/qtbase-6.5.0.ebuild
deleted file mode 100644
index 38de403b3daf..000000000000
--- a/dev-qt/qtbase/qtbase-6.5.0.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
-REQUIRED_USE="
- opengl? ( gui )
- widgets? ( gui )
- X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
- $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
- $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
- $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
- accessibility? ( dbus X )
- cups? ( gui widgets )
- eglfs? ( egl )
- gtk? ( widgets )
- gui? ( || ( eglfs X ) || ( libinput X ) )
- libinput? ( udev )
- sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
- vnc? ( gui )
- X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode]
- dev-util/gtk-update-icon-cache
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.6.0:=
- media-libs/tiff:=
- >=sys-apps/dbus-1.4.20
- sys-libs/zlib:=
- brotli? ( app-arch/brotli:= )
- evdev? ( sys-libs/mtdev )
- freetds? ( dev-db/freetds )
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X] )
- gssapi? ( virtual/krb5 )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
- gui? ( media-libs/libpng:= )
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
- jpeg? ( media-libs/libjpeg-turbo:= )
- libinput? (
- dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
- )
- libproxy? ( net-libs/libproxy )
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd:= )
- tslib? ( >=x11-libs/tslib-1.21 )
- udev? ( virtual/libudev:= )
- vulkan? ( dev-util/vulkan-headers )
- X? (
- x11-libs/libdrm
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libxcb-1.12:=
- >=x11-libs/libxkbcommon-0.5.0[X]
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-6.5.0-setActiveWindow-deprecated-version.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
- -DINSTALL_BINDIR=${QT6_BINDIR}
- -DINSTALL_DATADIR=${QT6_DATADIR}
- -DINSTALL_DOCDIR=${QT6_DOCDIR}
- -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
- -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
- -DINSTALL_LIBDIR=${QT6_LIBDIR}
- -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
- -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
- -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
- -DINSTALL_QMLDIR=${QT6_QMLDIR}
- -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
- -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
- -DQT_FEATURE_androiddeployqt=OFF
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature gui testlib)
- $(qt_feature icu)
- $(qt_feature network)
- $(qt_feature sql)
- $(qt_feature systemd journald)
- $(qt_feature udev libudev)
- $(qt_feature xml)
- $(qt_feature zstd)
- )
- use gui && mycmakeargs+=(
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature egl)
- $(qt_feature egl xcb_egl_plugin)
- $(qt_feature eglfs eglfs_egldevice)
- $(qt_feature eglfs eglfs_gbm)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- -DQT_FEATURE_gif=ON
- $(qt_feature jpeg)
- $(qt_feature opengl)
- $(qt_feature gles2-only opengles2)
- $(qt_feature libinput)
- $(qt_feature tslib)
- $(qt_feature tuio tuiotouch)
- $(qt_feature vulkan)
- $(qt_feature widgets)
- $(qt_feature X xcb)
- $(qt_feature X xcb_xlib)
- )
- use widgets && mycmakeargs+=(
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
- if use libinput || use X; then
- mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
- fi
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(qt_feature ssl openssl)
- $(qt_feature vnc)
- )
- use sql && mycmakeargs+=(
- $(qt_feature freetds sql_tds)
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- qt6-build_src_configure
-}
-
-src_install() {
- qt6-build_src_install
-
- # https://bugs.gentoo.org/863395
- qt6_symlink_binary_to_path qmake 6
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-04-17 19:39 Jimi Huotari
0 siblings, 0 replies; 80+ messages in thread
From: Jimi Huotari @ 2023-04-17 19:39 UTC (permalink / raw
To: gentoo-commits
commit: 411c9a475d7c1d9a3a2b6032d161dc21729a5c86
Author: Miezhiko <Miezhiko <AT> gmail <DOT> com>
AuthorDate: Mon Apr 17 09:16:36 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 19:39:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411c9a47
dev-qt/qtbase: add missing dep xcb-util-cursor
Closes: https://bugs.gentoo.org/904397
Closes: https://github.com/gentoo/gentoo/pull/30626
Signed-off-by: Miezhiko <Miezhiko <AT> gmail.com>
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.0-r1.ebuild | 189 +++++++++++++++++++++++++++++++++++
1 file changed, 189 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.5.0-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..b99943b6b2db
--- /dev/null
+++ b/dev-qt/qtbase/qtbase-6.5.0-r1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+# Qt Modules
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
+REQUIRED_USE="
+ opengl? ( gui )
+ widgets? ( gui )
+ X? ( || ( evdev libinput ) )
+"
+
+QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
+QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
+QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
+IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
+# QtPrintSupport = QtGui + QtWidgets enabled.
+# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
+REQUIRED_USE+="
+ $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
+ $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
+ $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
+ accessibility? ( dbus X )
+ cups? ( gui widgets )
+ eglfs? ( egl )
+ gtk? ( widgets )
+ gui? ( || ( eglfs X ) || ( libinput X ) )
+ libinput? ( udev )
+ sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
+ vnc? ( gui )
+ X? ( gles2-only? ( egl ) )
+"
+
+# TODO:
+# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
+# qtnetwork: connman, networkmanager
+DEPEND="
+ app-crypt/libb2
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/libpcre2:=[pcre16,unicode]
+ dev-util/gtk-update-icon-cache
+ media-libs/fontconfig
+ >=media-libs/freetype-2.6.1:2
+ >=media-libs/harfbuzz-1.6.0:=
+ media-libs/tiff:=
+ >=sys-apps/dbus-1.4.20
+ sys-libs/zlib:=
+ brotli? ( app-arch/brotli:= )
+ evdev? ( sys-libs/mtdev )
+ freetds? ( dev-db/freetds )
+ gles2-only? ( media-libs/libglvnd )
+ !gles2-only? ( media-libs/libglvnd[X] )
+ gssapi? ( virtual/krb5 )
+ gtk? (
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ )
+ gui? ( media-libs/libpng:= )
+ icu? ( dev-libs/icu:= )
+ !icu? ( virtual/libiconv )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ libinput? (
+ dev-libs/libinput:=
+ >=x11-libs/libxkbcommon-0.5.0
+ )
+ libproxy? ( net-libs/libproxy )
+ mysql? ( dev-db/mysql-connector-c:= )
+ oci8? ( dev-db/oracle-instantclient:=[sdk] )
+ odbc? ( dev-db/unixODBC )
+ postgres? ( dev-db/postgresql:* )
+ sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:= )
+ systemd? ( sys-apps/systemd:= )
+ tslib? ( >=x11-libs/tslib-1.21 )
+ udev? ( virtual/libudev:= )
+ vulkan? ( dev-util/vulkan-headers )
+ X? (
+ x11-libs/libdrm
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=x11-libs/libxcb-1.12:=
+ >=x11-libs/libxkbcommon-0.5.0[X]
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-renderutil
+ x11-libs/xcb-util-wm
+ )
+ zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-6.5.0-setActiveWindow-deprecated-version.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
+ -DINSTALL_BINDIR=${QT6_BINDIR}
+ -DINSTALL_DATADIR=${QT6_DATADIR}
+ -DINSTALL_DOCDIR=${QT6_DOCDIR}
+ -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+ -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
+ -DINSTALL_LIBDIR=${QT6_LIBDIR}
+ -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
+ -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
+ -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
+ -DINSTALL_QMLDIR=${QT6_QMLDIR}
+ -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
+ -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
+ -DQT_FEATURE_androiddeployqt=OFF
+ $(qt_feature concurrent)
+ $(qt_feature dbus)
+ $(qt_feature gui)
+ $(qt_feature gui testlib)
+ $(qt_feature icu)
+ $(qt_feature network)
+ $(qt_feature sql)
+ $(qt_feature systemd journald)
+ $(qt_feature udev libudev)
+ $(qt_feature xml)
+ $(qt_feature zstd)
+ )
+ use gui && mycmakeargs+=(
+ $(qt_feature accessibility accessibility_atspi_bridge)
+ $(qt_feature egl)
+ $(qt_feature egl xcb_egl_plugin)
+ $(qt_feature eglfs eglfs_egldevice)
+ $(qt_feature eglfs eglfs_gbm)
+ $(qt_feature evdev)
+ $(qt_feature evdev mtdev)
+ -DQT_FEATURE_gif=ON
+ $(qt_feature jpeg)
+ $(qt_feature opengl)
+ $(qt_feature gles2-only opengles2)
+ $(qt_feature libinput)
+ $(qt_feature tslib)
+ $(qt_feature tuio tuiotouch)
+ $(qt_feature vulkan)
+ $(qt_feature widgets)
+ $(qt_feature X xcb)
+ $(qt_feature X xcb_xlib)
+ )
+ use widgets && mycmakeargs+=(
+ $(qt_feature cups)
+ $(qt_feature gtk gtk3)
+ )
+ if use libinput || use X; then
+ mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
+ fi
+ use network && mycmakeargs+=(
+ $(qt_feature brotli)
+ $(qt_feature gssapi)
+ $(qt_feature libproxy)
+ $(qt_feature sctp)
+ $(qt_feature ssl openssl)
+ $(qt_feature vnc)
+ )
+ use sql && mycmakeargs+=(
+ $(qt_feature freetds sql_tds)
+ $(qt_feature mysql sql_mysql)
+ $(qt_feature oci8 sql_oci)
+ $(qt_feature odbc sql_odbc)
+ $(qt_feature postgres sql_psql)
+ $(qt_feature sqlite sql_sqlite)
+ $(qt_feature sqlite system_sqlite)
+ )
+
+ qt6-build_src_configure
+}
+
+src_install() {
+ qt6-build_src_install
+
+ # https://bugs.gentoo.org/863395
+ qt6_symlink_binary_to_path qmake 6
+}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-05-06 11:26 Jimi Huotari
0 siblings, 0 replies; 80+ messages in thread
From: Jimi Huotari @ 2023-05-06 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 4275dda962ae8f777110f3ef6ea4fcd17fbd64cd
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 11:24:50 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat May 6 11:25:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4275dda9
dev-qt/qtbase: drop 6.4.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/Manifest | 1 -
dev-qt/qtbase/qtbase-6.4.3.ebuild | 185 --------------------------------------
2 files changed, 186 deletions(-)
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 6a809db4d6cb..6b955e5819f8 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-6.4.3.tar.xz 48078536 BLAKE2B 36d693535479677ca319485634c3eea9dc3c8e8870c8e3cab7693cab601f26c6f792ec056b66488db290defc771b65cdffdea16b420a24ea55e5c4f250119a70 SHA512 a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43
DIST qtbase-everywhere-src-6.5.0.tar.xz 48020636 BLAKE2B 234000eeb6e1b57a1c7561613bf437453fc2db0d23d5ddd61c38961311a7de5263c086864554aff7a0bc1e5a406af78ef8342eed3c8a5f48b9237912614f380b SHA512 29f70b9a9650afdd8e34703a7a8191feab4c3a25d0bc3a41010ea842389335b24e2685721fdb4a03653475ebd9bf8a8e4f4a77bf5d64b1289590b5ca0e4623f3
diff --git a/dev-qt/qtbase/qtbase-6.4.3.ebuild b/dev-qt/qtbase/qtbase-6.4.3.ebuild
deleted file mode 100644
index 742bab1d9b5c..000000000000
--- a/dev-qt/qtbase/qtbase-6.4.3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
-REQUIRED_USE="
- opengl? ( gui )
- widgets? ( gui )
- X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
- $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
- $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
- $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
- accessibility? ( dbus X )
- cups? ( gui widgets )
- eglfs? ( egl )
- gtk? ( widgets )
- gui? ( || ( eglfs X ) || ( libinput X ) )
- libinput? ( udev )
- sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
- vnc? ( gui )
- X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode]
- dev-util/gtk-update-icon-cache
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.6.0:=
- media-libs/tiff:=
- >=sys-apps/dbus-1.4.20
- sys-libs/zlib:=
- brotli? ( app-arch/brotli:= )
- evdev? ( sys-libs/mtdev )
- freetds? ( dev-db/freetds )
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X] )
- gssapi? ( virtual/krb5 )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
- gui? ( media-libs/libpng:= )
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
- jpeg? ( media-libs/libjpeg-turbo:= )
- libinput? (
- dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
- )
- libproxy? ( net-libs/libproxy )
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd:= )
- tslib? ( >=x11-libs/tslib-1.21 )
- udev? ( virtual/libudev:= )
- vulkan? ( dev-util/vulkan-headers )
- X? (
- x11-libs/libdrm
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libxcb-1.12:=
- >=x11-libs/libxkbcommon-0.5.0[X]
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
- -DINSTALL_BINDIR=${QT6_BINDIR}
- -DINSTALL_DATADIR=${QT6_DATADIR}
- -DINSTALL_DOCDIR=${QT6_DOCDIR}
- -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
- -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
- -DINSTALL_LIBDIR=${QT6_LIBDIR}
- -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
- -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
- -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
- -DINSTALL_QMLDIR=${QT6_QMLDIR}
- -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
- -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
- -DQT_FEATURE_androiddeployqt=OFF
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature gui testlib)
- $(qt_feature icu)
- $(qt_feature network)
- $(qt_feature sql)
- $(qt_feature systemd journald)
- $(qt_feature udev libudev)
- $(qt_feature xml)
- $(qt_feature zstd)
- )
- use gui && mycmakeargs+=(
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature egl)
- $(qt_feature eglfs eglfs_egldevice)
- $(qt_feature eglfs eglfs_gbm)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- -DQT_FEATURE_gif=ON
- $(qt_feature jpeg)
- $(qt_feature opengl)
- $(qt_feature gles2-only opengles2)
- $(qt_feature libinput)
- $(qt_feature tslib)
- $(qt_feature tuio tuiotouch)
- $(qt_feature vulkan)
- $(qt_feature widgets)
- $(qt_feature X xcb)
- $(qt_feature X xcb_xlib)
- )
- use widgets && mycmakeargs+=(
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
- if use libinput || use X; then
- mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
- fi
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(qt_feature ssl openssl)
- $(qt_feature vnc)
- )
- use sql && mycmakeargs+=(
- $(qt_feature freetds sql_tds)
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- qt6-build_src_configure
-}
-
-src_install() {
- qt6-build_src_install
-
- # https://bugs.gentoo.org/863395
- qt6_symlink_binary_to_path qmake 6
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-05-23 2:52 Sam James
0 siblings, 0 replies; 80+ messages in thread
From: Sam James @ 2023-05-23 2:52 UTC (permalink / raw
To: gentoo-commits
commit: 679cc37b1c688c8bbbc5aacc587be3ed62740d22
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 02:42:53 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 23 02:51:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=679cc37b
dev-qt/qtbase: defer to new global USE=vulkan description
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtbase/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
index ba54edfe722e..d828e06391c0 100644
--- a/dev-qt/qtbase/metadata.xml
+++ b/dev-qt/qtbase/metadata.xml
@@ -22,7 +22,6 @@
<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="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
- <flag name="vulkan">Enable support for Vulkan</flag>
<flag name="widgets">Build Qt6Widgets module</flag>
<flag name="X">Build the XCB platform plugin and enable X11 integration</flag>
</use>
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-05-24 6:52 Jimi Huotari
0 siblings, 0 replies; 80+ messages in thread
From: Jimi Huotari @ 2023-05-24 6:52 UTC (permalink / raw
To: gentoo-commits
commit: 9a6e2f7f5f03d24fd40a02147a921d11449a5553
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 06:46:09 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed May 24 06:52:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a6e2f7f
dev-qt/qtbase: drop 6.5.0 (r1)
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.0-r1.ebuild | 189 -----------------------------------
1 file changed, 189 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.0-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.0-r1.ebuild
deleted file mode 100644
index b99943b6b2db..000000000000
--- a/dev-qt/qtbase/qtbase-6.5.0-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
-REQUIRED_USE="
- opengl? ( gui )
- widgets? ( gui )
- X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
- $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
- $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
- $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
- accessibility? ( dbus X )
- cups? ( gui widgets )
- eglfs? ( egl )
- gtk? ( widgets )
- gui? ( || ( eglfs X ) || ( libinput X ) )
- libinput? ( udev )
- sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
- vnc? ( gui )
- X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode]
- dev-util/gtk-update-icon-cache
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.6.0:=
- media-libs/tiff:=
- >=sys-apps/dbus-1.4.20
- sys-libs/zlib:=
- brotli? ( app-arch/brotli:= )
- evdev? ( sys-libs/mtdev )
- freetds? ( dev-db/freetds )
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X] )
- gssapi? ( virtual/krb5 )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
- gui? ( media-libs/libpng:= )
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
- jpeg? ( media-libs/libjpeg-turbo:= )
- libinput? (
- dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
- )
- libproxy? ( net-libs/libproxy )
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd:= )
- tslib? ( >=x11-libs/tslib-1.21 )
- udev? ( virtual/libudev:= )
- vulkan? ( dev-util/vulkan-headers )
- X? (
- x11-libs/libdrm
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libxcb-1.12:=
- >=x11-libs/libxkbcommon-0.5.0[X]
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-6.5.0-setActiveWindow-deprecated-version.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
- -DINSTALL_BINDIR=${QT6_BINDIR}
- -DINSTALL_DATADIR=${QT6_DATADIR}
- -DINSTALL_DOCDIR=${QT6_DOCDIR}
- -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
- -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
- -DINSTALL_LIBDIR=${QT6_LIBDIR}
- -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
- -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
- -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
- -DINSTALL_QMLDIR=${QT6_QMLDIR}
- -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
- -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
- -DQT_FEATURE_androiddeployqt=OFF
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature gui testlib)
- $(qt_feature icu)
- $(qt_feature network)
- $(qt_feature sql)
- $(qt_feature systemd journald)
- $(qt_feature udev libudev)
- $(qt_feature xml)
- $(qt_feature zstd)
- )
- use gui && mycmakeargs+=(
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature egl)
- $(qt_feature egl xcb_egl_plugin)
- $(qt_feature eglfs eglfs_egldevice)
- $(qt_feature eglfs eglfs_gbm)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- -DQT_FEATURE_gif=ON
- $(qt_feature jpeg)
- $(qt_feature opengl)
- $(qt_feature gles2-only opengles2)
- $(qt_feature libinput)
- $(qt_feature tslib)
- $(qt_feature tuio tuiotouch)
- $(qt_feature vulkan)
- $(qt_feature widgets)
- $(qt_feature X xcb)
- $(qt_feature X xcb_xlib)
- )
- use widgets && mycmakeargs+=(
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
- if use libinput || use X; then
- mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
- fi
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(qt_feature ssl openssl)
- $(qt_feature vnc)
- )
- use sql && mycmakeargs+=(
- $(qt_feature freetds sql_tds)
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- qt6-build_src_configure
-}
-
-src_install() {
- qt6-build_src_install
-
- # https://bugs.gentoo.org/863395
- qt6_symlink_binary_to_path qmake 6
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-06-02 15:39 Jimi Huotari
0 siblings, 0 replies; 80+ messages in thread
From: Jimi Huotari @ 2023-06-02 15:39 UTC (permalink / raw
To: gentoo-commits
commit: d95e454986fe63a6f309c79ee706c202030cca97
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 2 14:57:24 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Jun 2 15:39:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d95e4549
dev-qt/qtbase: drop 6.5.0-r2
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.0-r2.ebuild | 192 -----------------------------------
1 file changed, 192 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.0-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.0-r2.ebuild
deleted file mode 100644
index afcd30dfe9f6..000000000000
--- a/dev-qt/qtbase/qtbase-6.5.0-r2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
-REQUIRED_USE="
- opengl? ( gui )
- widgets? ( gui )
- X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
- $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
- $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
- $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
- accessibility? ( dbus X )
- cups? ( gui widgets )
- eglfs? ( egl )
- gtk? ( widgets )
- gui? ( || ( eglfs X ) || ( libinput X ) )
- libinput? ( udev )
- sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
- vnc? ( gui )
- X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode]
- dev-util/gtk-update-icon-cache
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.6.0:=
- media-libs/tiff:=
- >=sys-apps/dbus-1.4.20
- sys-libs/zlib:=
- brotli? ( app-arch/brotli:= )
- evdev? ( sys-libs/mtdev )
- freetds? ( dev-db/freetds )
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X] )
- gssapi? ( virtual/krb5 )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
- gui? ( media-libs/libpng:= )
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
- jpeg? ( media-libs/libjpeg-turbo:= )
- libinput? (
- dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
- )
- libproxy? ( net-libs/libproxy )
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd:= )
- tslib? ( >=x11-libs/tslib-1.21 )
- udev? ( virtual/libudev:= )
- vulkan? ( dev-util/vulkan-headers )
- X? (
- x11-libs/libdrm
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libxcb-1.12:=
- >=x11-libs/libxkbcommon-0.5.0[X]
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.5.0-setActiveWindow-deprecated-version.patch"
- "${FILESDIR}/${PN}-6.5.0-CVE-2023-32762.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
- -DINSTALL_BINDIR=${QT6_BINDIR}
- -DINSTALL_DATADIR=${QT6_DATADIR}
- -DINSTALL_DOCDIR=${QT6_DOCDIR}
- -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
- -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
- -DINSTALL_LIBDIR=${QT6_LIBDIR}
- -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
- -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
- -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
- -DINSTALL_QMLDIR=${QT6_QMLDIR}
- -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
- -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
- -DQT_FEATURE_androiddeployqt=OFF
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature gui testlib)
- $(qt_feature icu)
- $(qt_feature network)
- $(qt_feature sql)
- $(qt_feature systemd journald)
- $(qt_feature udev libudev)
- $(qt_feature xml)
- $(qt_feature zstd)
- )
- use gui && mycmakeargs+=(
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature egl)
- $(qt_feature egl xcb_egl_plugin)
- $(qt_feature eglfs eglfs_egldevice)
- $(qt_feature eglfs eglfs_gbm)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- -DQT_FEATURE_gif=ON
- $(qt_feature jpeg)
- $(qt_feature opengl)
- $(qt_feature gles2-only opengles2)
- $(qt_feature libinput)
- $(qt_feature tslib)
- $(qt_feature tuio tuiotouch)
- $(qt_feature vulkan)
- $(qt_feature widgets)
- $(qt_feature X xcb)
- $(qt_feature X xcb_xlib)
- )
- use widgets && mycmakeargs+=(
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
- if use libinput || use X; then
- mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
- fi
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(qt_feature ssl openssl)
- $(qt_feature vnc)
- )
- use sql && mycmakeargs+=(
- $(qt_feature freetds sql_tds)
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- qt6-build_src_configure
-}
-
-src_install() {
- qt6-build_src_install
-
- # https://bugs.gentoo.org/863395
- qt6_symlink_binary_to_path qmake 6
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-06-10 14:33 Jimi Huotari
0 siblings, 0 replies; 80+ messages in thread
From: Jimi Huotari @ 2023-06-10 14:33 UTC (permalink / raw
To: gentoo-commits
commit: f2d462afc61f8c7593459ade1b86461d14f5a1b8
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 14:29:18 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 14:33:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d462af
dev-qt/qtbase: remove version 6.5.1 (r0)
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.1.ebuild | 189 --------------------------------------
1 file changed, 189 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.1.ebuild b/dev-qt/qtbase/qtbase-6.5.1.ebuild
deleted file mode 100644
index 770570eb3710..000000000000
--- a/dev-qt/qtbase/qtbase-6.5.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
-REQUIRED_USE="
- opengl? ( gui )
- widgets? ( gui )
- X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
- $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
- $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
- $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
- accessibility? ( dbus X )
- cups? ( gui widgets )
- eglfs? ( egl )
- gtk? ( widgets )
- gui? ( || ( eglfs X ) || ( libinput X ) )
- libinput? ( udev )
- sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
- vnc? ( gui )
- X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode]
- dev-util/gtk-update-icon-cache
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.6.0:=
- media-libs/tiff:=
- >=sys-apps/dbus-1.4.20
- sys-libs/zlib:=
- brotli? ( app-arch/brotli:= )
- evdev? ( sys-libs/mtdev )
- freetds? ( dev-db/freetds )
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X] )
- gssapi? ( virtual/krb5 )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
- gui? ( media-libs/libpng:= )
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
- jpeg? ( media-libs/libjpeg-turbo:= )
- libinput? (
- dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
- )
- libproxy? ( net-libs/libproxy )
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd:= )
- tslib? ( >=x11-libs/tslib-1.21 )
- udev? ( virtual/libudev:= )
- vulkan? ( dev-util/vulkan-headers )
- X? (
- x11-libs/libdrm
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libxcb-1.12:=
- >=x11-libs/libxkbcommon-0.5.0[X]
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-6.5.1-CVE-2023-34410.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
- -DINSTALL_BINDIR=${QT6_BINDIR}
- -DINSTALL_DATADIR=${QT6_DATADIR}
- -DINSTALL_DOCDIR=${QT6_DOCDIR}
- -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
- -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
- -DINSTALL_LIBDIR=${QT6_LIBDIR}
- -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
- -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
- -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
- -DINSTALL_QMLDIR=${QT6_QMLDIR}
- -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
- -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
- -DQT_FEATURE_androiddeployqt=OFF
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature gui testlib)
- $(qt_feature icu)
- $(qt_feature network)
- $(qt_feature sql)
- $(qt_feature systemd journald)
- $(qt_feature udev libudev)
- $(qt_feature xml)
- $(qt_feature zstd)
- )
- use gui && mycmakeargs+=(
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature egl)
- $(qt_feature egl xcb_egl_plugin)
- $(qt_feature eglfs eglfs_egldevice)
- $(qt_feature eglfs eglfs_gbm)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- -DQT_FEATURE_gif=ON
- $(qt_feature jpeg)
- $(qt_feature opengl)
- $(qt_feature gles2-only opengles2)
- $(qt_feature libinput)
- $(qt_feature tslib)
- $(qt_feature tuio tuiotouch)
- $(qt_feature vulkan)
- $(qt_feature widgets)
- $(qt_feature X xcb)
- $(qt_feature X xcb_xlib)
- )
- use widgets && mycmakeargs+=(
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
- if use libinput || use X; then
- mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
- fi
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(qt_feature ssl openssl)
- $(qt_feature vnc)
- )
- use sql && mycmakeargs+=(
- $(qt_feature freetds sql_tds)
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- qt6-build_src_configure
-}
-
-src_install() {
- qt6-build_src_install
-
- # https://bugs.gentoo.org/863395
- qt6_symlink_binary_to_path qmake 6
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-06-10 14:33 Jimi Huotari
0 siblings, 0 replies; 80+ messages in thread
From: Jimi Huotari @ 2023-06-10 14:33 UTC (permalink / raw
To: gentoo-commits
commit: 9212bba51719a1de8cff0cbe49df2bdca802d026
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 14:28:11 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 14:33:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9212bba5
dev-qt/qtbase: add USE="wayland" with PDEPEND
Closes: https://bugs.gentoo.org/864509
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.1-r1.ebuild | 190 +++++++++++++++++++++++++++++++++++
1 file changed, 190 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.5.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.1-r1.ebuild
new file mode 100644
index 000000000000..4bcdc55ce530
--- /dev/null
+++ b/dev-qt/qtbase/qtbase-6.5.1-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+# Qt Modules
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
+REQUIRED_USE="
+ opengl? ( gui )
+ widgets? ( gui )
+ X? ( || ( evdev libinput ) )
+"
+
+QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
+QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
+QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
+IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev wayland"
+# QtPrintSupport = QtGui + QtWidgets enabled.
+# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
+REQUIRED_USE+="
+ $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
+ $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
+ $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
+ accessibility? ( dbus X )
+ cups? ( gui widgets )
+ eglfs? ( egl )
+ gtk? ( widgets )
+ gui? ( || ( eglfs X ) || ( libinput X ) )
+ libinput? ( udev )
+ sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
+ vnc? ( gui )
+ X? ( gles2-only? ( egl ) )
+"
+
+# TODO:
+# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
+# qtnetwork: connman, networkmanager
+DEPEND="
+ app-crypt/libb2
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/libpcre2:=[pcre16,unicode]
+ dev-util/gtk-update-icon-cache
+ media-libs/fontconfig
+ >=media-libs/freetype-2.6.1:2
+ >=media-libs/harfbuzz-1.6.0:=
+ media-libs/tiff:=
+ >=sys-apps/dbus-1.4.20
+ sys-libs/zlib:=
+ brotli? ( app-arch/brotli:= )
+ evdev? ( sys-libs/mtdev )
+ freetds? ( dev-db/freetds )
+ gles2-only? ( media-libs/libglvnd )
+ !gles2-only? ( media-libs/libglvnd[X] )
+ gssapi? ( virtual/krb5 )
+ gtk? (
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ )
+ gui? ( media-libs/libpng:= )
+ icu? ( dev-libs/icu:= )
+ !icu? ( virtual/libiconv )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ libinput? (
+ dev-libs/libinput:=
+ >=x11-libs/libxkbcommon-0.5.0
+ )
+ libproxy? ( net-libs/libproxy )
+ mysql? ( dev-db/mysql-connector-c:= )
+ oci8? ( dev-db/oracle-instantclient:=[sdk] )
+ odbc? ( dev-db/unixODBC )
+ postgres? ( dev-db/postgresql:* )
+ sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:= )
+ systemd? ( sys-apps/systemd:= )
+ tslib? ( >=x11-libs/tslib-1.21 )
+ udev? ( virtual/libudev:= )
+ vulkan? ( dev-util/vulkan-headers )
+ X? (
+ x11-libs/libdrm
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=x11-libs/libxcb-1.12:=
+ >=x11-libs/libxkbcommon-0.5.0[X]
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-renderutil
+ x11-libs/xcb-util-wm
+ )
+ zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="wayland? ( =dev-qt/qtwayland-${PV}* )"
+
+PATCHES=( "${FILESDIR}/${PN}-6.5.1-CVE-2023-34410.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
+ -DINSTALL_BINDIR=${QT6_BINDIR}
+ -DINSTALL_DATADIR=${QT6_DATADIR}
+ -DINSTALL_DOCDIR=${QT6_DOCDIR}
+ -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+ -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
+ -DINSTALL_LIBDIR=${QT6_LIBDIR}
+ -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
+ -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
+ -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
+ -DINSTALL_QMLDIR=${QT6_QMLDIR}
+ -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
+ -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
+ -DQT_FEATURE_androiddeployqt=OFF
+ $(qt_feature concurrent)
+ $(qt_feature dbus)
+ $(qt_feature gui)
+ $(qt_feature gui testlib)
+ $(qt_feature icu)
+ $(qt_feature network)
+ $(qt_feature sql)
+ $(qt_feature systemd journald)
+ $(qt_feature udev libudev)
+ $(qt_feature xml)
+ $(qt_feature zstd)
+ )
+ use gui && mycmakeargs+=(
+ $(qt_feature accessibility accessibility_atspi_bridge)
+ $(qt_feature egl)
+ $(qt_feature egl xcb_egl_plugin)
+ $(qt_feature eglfs eglfs_egldevice)
+ $(qt_feature eglfs eglfs_gbm)
+ $(qt_feature evdev)
+ $(qt_feature evdev mtdev)
+ -DQT_FEATURE_gif=ON
+ $(qt_feature jpeg)
+ $(qt_feature opengl)
+ $(qt_feature gles2-only opengles2)
+ $(qt_feature libinput)
+ $(qt_feature tslib)
+ $(qt_feature tuio tuiotouch)
+ $(qt_feature vulkan)
+ $(qt_feature widgets)
+ $(qt_feature X xcb)
+ $(qt_feature X xcb_xlib)
+ )
+ use widgets && mycmakeargs+=(
+ $(qt_feature cups)
+ $(qt_feature gtk gtk3)
+ )
+ if use libinput || use X; then
+ mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
+ fi
+ use network && mycmakeargs+=(
+ $(qt_feature brotli)
+ $(qt_feature gssapi)
+ $(qt_feature libproxy)
+ $(qt_feature sctp)
+ $(qt_feature ssl openssl)
+ $(qt_feature vnc)
+ )
+ use sql && mycmakeargs+=(
+ $(qt_feature freetds sql_tds)
+ $(qt_feature mysql sql_mysql)
+ $(qt_feature oci8 sql_oci)
+ $(qt_feature odbc sql_odbc)
+ $(qt_feature postgres sql_psql)
+ $(qt_feature sqlite sql_sqlite)
+ $(qt_feature sqlite system_sqlite)
+ )
+
+ qt6-build_src_configure
+}
+
+src_install() {
+ qt6-build_src_install
+
+ # https://bugs.gentoo.org/863395
+ qt6_symlink_binary_to_path qmake 6
+}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-05 13:05 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-05 13:05 UTC (permalink / raw
To: gentoo-commits
commit: aa6feab907d063181e5bebeb052c3bd72843449b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 2 06:09:58 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 13:01:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa6feab9
dev-qt/qtbase: workaround x86intrin test and feature selection
qtbase does a single "big" test for all basic cpu features, and if
CXXFLAGS have any matching -mno-* then they will override Qt's
flags and the test fails. Surprised by this, Qt aborts unless
explicitly disable the feature.
Test can be bypassed, but then it does not perform per-flags
tests and will fail to build as-is.
Like bug #913400, debated a few options:
1. cpu_flags_x86_* to enable each feature, but given this is tied to
compiler flags we'd still need to test them to avoid failures and
not much better off, not to mention bug #913400 may have added its
own -mno-* that go against these.
2. Patching cmake files so it always pass its e.g. -mavx2 after the
user's flags (when needed), and does not rely on -march=haswell
given that does not override. But fwiw these files do get
installed and will alter expected behavior, and handling
-march is more annoying.
3. Patch out the bit that makes the x86intrin test prevent building
unless explicitly disabled, and let it auto-disable x86intrin
entirely if tests fail (subpar for performance if ignored).
4. Do self-tests and disable features that will fail, this has the
advantage that revdeps will not try to use these either.
5. One option to bug #913400 was to force simpler flags, which
would also solve this.
Picked #4 for now, not that particularly like it given it feels
like automagic. Hoping will be more temporary than qsimd_p.h
workarounds. Better than doing nothing either way, is a no-op
for non-affected users.
Bug: https://bugs.gentoo.org/908420
Closes: https://bugs.gentoo.org/913400
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r1.ebuild | 36 +++++++++++++++++++++++++++++++++++-
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 36 +++++++++++++++++++++++++++++++++++-
dev-qt/qtbase/qtbase-6.9999.ebuild | 36 +++++++++++++++++++++++++++++++++++-
3 files changed, 105 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
index 5fa82d9c7db0..57694adc046b 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build
+inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -222,6 +222,40 @@ src_configure() {
-DQT_FEATURE_sql_tds=OFF # currently a no-op in CMakeLists.txt
)
+ if use amd64 || use x86; then
+ # see bug #913400 for explanations
+ local cpufeats=(
+ # list of checked cpu features in configure.cmake
+ avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
+ f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
+ )
+ # handle odd ones out not matching -m* and macros (keep same order)
+ local cpuflags=( "${cpufeats[@]}" aes sha )
+ local cpufeats+=( aesni shani )
+
+ local -a intrins
+ IFS=' ' read -ra intrins < <(
+ : "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
+ $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
+ #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
+ #include <x86intrin.h>
+ #endif
+ $(printf '__%s__ ' "${cpuflags[@]^^}")
+ EOF
+ assert
+ )
+
+ # do nothing and leave to qtbase if no macros expanded (test failed?)
+ if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
+ local -i i
+ for ((i=0; i<${#cpufeats[@]}; i++)); do
+ [[ ${intrins[i]} == __* ]] &&
+ mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
+ done
+ mycmakeargs+=( -DTEST_x86intrin=ON )
+ fi
+ fi
+
qt6-build_src_configure
}
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 3c339f31f8b7..a71f3078a605 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build
+inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -217,6 +217,40 @@ src_configure() {
-DQT_FEATURE_sql_tds=OFF # currently a no-op in CMakeLists.txt
)
+ if use amd64 || use x86; then
+ # see bug #913400 for explanations
+ local cpufeats=(
+ # list of checked cpu features in configure.cmake
+ avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
+ f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
+ )
+ # handle odd ones out not matching -m* and macros (keep same order)
+ local cpuflags=( "${cpufeats[@]}" aes sha )
+ local cpufeats+=( aesni shani )
+
+ local -a intrins
+ IFS=' ' read -ra intrins < <(
+ : "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
+ $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
+ #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
+ #include <x86intrin.h>
+ #endif
+ $(printf '__%s__ ' "${cpuflags[@]^^}")
+ EOF
+ assert
+ )
+
+ # do nothing and leave to qtbase if no macros expanded (test failed?)
+ if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
+ local -i i
+ for ((i=0; i<${#cpufeats[@]}; i++)); do
+ [[ ${intrins[i]} == __* ]] &&
+ mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
+ done
+ mycmakeargs+=( -DTEST_x86intrin=ON )
+ fi
+ fi
+
qt6-build_src_configure
}
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 3c339f31f8b7..a71f3078a605 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build
+inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -217,6 +217,40 @@ src_configure() {
-DQT_FEATURE_sql_tds=OFF # currently a no-op in CMakeLists.txt
)
+ if use amd64 || use x86; then
+ # see bug #913400 for explanations
+ local cpufeats=(
+ # list of checked cpu features in configure.cmake
+ avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
+ f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
+ )
+ # handle odd ones out not matching -m* and macros (keep same order)
+ local cpuflags=( "${cpufeats[@]}" aes sha )
+ local cpufeats+=( aesni shani )
+
+ local -a intrins
+ IFS=' ' read -ra intrins < <(
+ : "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
+ $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
+ #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
+ #include <x86intrin.h>
+ #endif
+ $(printf '__%s__ ' "${cpuflags[@]^^}")
+ EOF
+ assert
+ )
+
+ # do nothing and leave to qtbase if no macros expanded (test failed?)
+ if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
+ local -i i
+ for ((i=0; i<${#cpufeats[@]}; i++)); do
+ [[ ${intrins[i]} == __* ]] &&
+ mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
+ done
+ mycmakeargs+=( -DTEST_x86intrin=ON )
+ fi
+ fi
+
qt6-build_src_configure
}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-05 14:31 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-05 14:31 UTC (permalink / raw
To: gentoo-commits
commit: 979b05425c3e6a922e87f9613f264709017970e8
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 5 14:24:17 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 14:28:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979b0542
dev-qt/qtbase: avoid triggering opengl support check
-DINPUT_opengl does not do anything but flip qt_feature on/off that
I can see, and we are already controlling these. But the check for
support is not happy if it does not find it set to "no".
Newly happening given this no longer has a hard dependency on libglvnd.
Closes: https://bugs.gentoo.org/913691
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r1.ebuild | 1 +
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 1 +
dev-qt/qtbase/qtbase-6.9999.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
index 92b829c54915..3c566fb935d8 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
@@ -192,6 +192,7 @@ src_configure() {
$(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)
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 45b5126a945e..714ed0db12c8 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -185,6 +185,7 @@ src_configure() {
$(qt_feature evdev)
$(qt_feature evdev mtdev)
$(qt_feature gles2-only opengles2)
+ $(usev !opengl -DINPUT_opengl=no) #913691
$(qt_feature libinput)
$(qt_feature opengl)
$(qt_feature tslib)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 45b5126a945e..15a3ab244492 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -187,6 +187,7 @@ src_configure() {
$(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)
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-06 8:49 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-06 8:49 UTC (permalink / raw
To: gentoo-commits
commit: 53c16fca587360f9975217ca0cea3393d7f85074
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 6 03:39:54 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 6 08:49:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c16fca
dev-qt/qtbase: optionally pdepend on qttranslations
For qt6, had bit of a draft to "merge" qttranslations with their
respective packages, plus a few splits for circular deps. But it
all started to feel churny and looked like it would be a pain to
maintain, prone to mistakes, and with very little to gain. Doing
our own tarballs could work but still requires some tracking and
writing scripts to handle it.
And then I do not think translations should need to be emerged
manually, it is something you can normally expect out of the box
unless you opt-out.
So let's just do the "nls? ( )" in qt6 even if runtime-only IUSE
are kind of terrible on a large package like qtbase.
Not unconditional given it does bring in linguist as extra, and
translations are still a decent ~13MB installed.
Live-only for now, no need to trigger rebuilds over this.
Bug: https://bugs.gentoo.org/810802
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 7 +++++--
dev-qt/qtbase/qtbase-6.9999.ebuild | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 714ed0db12c8..9dff844569da 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -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="
@@ -124,7 +124,10 @@ 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 )
+"
src_prepare() {
qt6-build_src_prepare
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 15a3ab244492..a3394328ab7e 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -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="
@@ -124,7 +124,10 @@ 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 )
+"
src_prepare() {
qt6-build_src_prepare
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-09 16:22 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-09 16:22 UTC (permalink / raw
To: gentoo-commits
commit: 79c47b2e54405c57a59043099aa098faf245d79a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 9 14:23:07 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 16:20:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79c47b2e
dev-qt/qtbase: revbump for examplesdir revert
Not overly worth the revbump (now), but want to clear this up and
other small things now that we are getting examples esp. given may
look at packaging Qt6 Creator soon.
And expect may still be some time before 6.5.3 and 6.6
Bug: https://bugs.gentoo.org/881433
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/{qtbase-6.5.2-r1.ebuild => qtbase-6.5.2-r2.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
similarity index 100%
rename from dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
rename to dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
^ permalink raw reply [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-09 16:22 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-09 16:22 UTC (permalink / raw
To: gentoo-commits
commit: 18d391708df3b32716f1f10f21726a860385062a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 9 14:21:28 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 16:20:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d39170
dev-qt/qtbase: bring nls IUSE change from live to 6.5.2
About to revbump either way, so no longer concerned
about this causing a no-op rebuild.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r1.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
index 90d4a0ba1d4d..ba0ce93ec259 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
@@ -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="
@@ -123,7 +123,10 @@ 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}"/${P}-CVE-2023-38197.patch
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-09 16:22 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-09 16:22 UTC (permalink / raw
To: gentoo-commits
commit: f799c99df449d844f71a00b95912592c0cb4aa20
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 7 23:00:25 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 16:20:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f799c99d
dev-qt/qtbase: remove IUSE=systemd
This is to control where log messages will be sent by default, and
I think enabling this is just going to be confusing. Off-by-default
(even if found), and cmake gives a warning that we should do special
handling for it. Plus no parity for openrc given we were not enabling
syslog as alternative.
Have not looked much, but not seem most distros enable this.
(also adjust disparity in the opengl option sorting)
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/metadata.xml | 1 -
dev-qt/qtbase/qtbase-6.5.2-r1.ebuild | 4 +---
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 6 ++----
dev-qt/qtbase/qtbase-6.9999.ebuild | 4 +---
4 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
index 573775d954fd..1ed99ac060a1 100644
--- a/dev-qt/qtbase/metadata.xml
+++ b/dev-qt/qtbase/metadata.xml
@@ -18,7 +18,6 @@
<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="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>
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
index 3c566fb935d8..90d4a0ba1d4d 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
@@ -13,7 +13,7 @@ fi
declare -A QT6_IUSE=(
[global]="+ssl +udev zstd"
- [core]="icu systemd"
+ [core]="icu"
[modules]="+concurrent +dbus +gui +network +sql +xml"
[gui]="
@@ -60,7 +60,6 @@ RDEPEND="
dev-libs/glib:2
dev-libs/libpcre2:=[pcre16,unicode(+)]
icu? ( dev-libs/icu:= )
- systemd? ( sys-apps/systemd:= )
dbus? ( sys-apps/dbus )
gui? (
@@ -165,7 +164,6 @@ src_configure() {
# qtcore
$(qt_feature icu)
- $(qt_feature systemd journald)
# tools
-DQT_FEATURE_androiddeployqt=OFF
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 9dff844569da..8a845eb86893 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -13,7 +13,7 @@ fi
declare -A QT6_IUSE=(
[global]="+ssl +udev zstd"
- [core]="icu systemd"
+ [core]="icu"
[modules]="+concurrent +dbus +gui +network +sql +xml"
[gui]="
@@ -60,7 +60,6 @@ RDEPEND="
dev-libs/glib:2
dev-libs/libpcre2:=[pcre16,unicode(+)]
icu? ( dev-libs/icu:= )
- systemd? ( sys-apps/systemd:= )
dbus? ( sys-apps/dbus )
gui? (
@@ -163,7 +162,6 @@ src_configure() {
# qtcore
$(qt_feature icu)
- $(qt_feature systemd journald)
# tools
-DQT_FEATURE_androiddeployqt=OFF
@@ -188,9 +186,9 @@ src_configure() {
$(qt_feature evdev)
$(qt_feature evdev mtdev)
$(qt_feature gles2-only opengles2)
- $(usev !opengl -DINPUT_opengl=no) #913691
$(qt_feature libinput)
$(qt_feature opengl)
+ $(usev !opengl -DINPUT_opengl=no) #913691
$(qt_feature tslib)
$(qt_feature vulkan)
$(qt_feature widgets)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index a3394328ab7e..8a845eb86893 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 systemd"
+ [core]="icu"
[modules]="+concurrent +dbus +gui +network +sql +xml"
[gui]="
@@ -60,7 +60,6 @@ RDEPEND="
dev-libs/glib:2
dev-libs/libpcre2:=[pcre16,unicode(+)]
icu? ( dev-libs/icu:= )
- systemd? ( sys-apps/systemd:= )
dbus? ( sys-apps/dbus )
gui? (
@@ -163,7 +162,6 @@ src_configure() {
# qtcore
$(qt_feature icu)
- $(qt_feature systemd journald)
# tools
-DQT_FEATURE_androiddeployqt=OFF
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-11 22:59 Sam James
0 siblings, 0 replies; 80+ messages in thread
From: Sam James @ 2023-09-11 22:59 UTC (permalink / raw
To: gentoo-commits
commit: 8e41b9b5e89264174973fdb8d5b9f26827616ffe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 22:58:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 22:58:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e41b9b5
dev-qt/qtbase: Keyword 6.5.2-r2 arm64, #914026
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index ba0ce93ec259..09fa3aa9c2bc 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm64"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-12 0:13 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-12 0:13 UTC (permalink / raw
To: gentoo-commits
commit: 19522155671362720c52756abb409373c135b325
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 00:07:29 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 00:13:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19522155
dev-qt/qtbase: skip known failing tests on arm32
Again, goal is more or less to get a baseline where things are
not completely broken. Unless get general failures not going
to worry too much about it.
Intentionally skipping everywhere so this does not come back
for other arches either.
Closes: https://bugs.gentoo.org/914028
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 3 +++
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 3 +++
dev-qt/qtbase/qtbase-6.9999.ebuild | 3 +++
3 files changed, 9 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 09fa3aa9c2bc..a2c84c8c2236 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -295,6 +295,9 @@ 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 '
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 8a845eb86893..f3ee319901e2 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -290,6 +290,9 @@ 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 '
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 8a845eb86893..f3ee319901e2 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -290,6 +290,9 @@ 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 '
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-12 1:26 Sam James
0 siblings, 0 replies; 80+ messages in thread
From: Sam James @ 2023-09-12 1:26 UTC (permalink / raw
To: gentoo-commits
commit: da0668bcad554c98b2782d887f3e4406daeb3817
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 01:25:02 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 01:25:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da0668bc
dev-qt/qtbase: Keyword 6.5.2-r2 x86, #914026
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index a2c84c8c2236..bf6f55d21fa9 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-12 1:28 Sam James
0 siblings, 0 replies; 80+ messages in thread
From: Sam James @ 2023-09-12 1:28 UTC (permalink / raw
To: gentoo-commits
commit: 04bb87f0a8a7713cef6b04927ae4ee54c3354df3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 01:27:14 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 01:27:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04bb87f0
dev-qt/qtbase: Keyword 6.5.2-r2 arm, #914026
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index bf6f55d21fa9..0555e1ac9271 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-12 11:44 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-12 11:44 UTC (permalink / raw
To: gentoo-commits
commit: d57056ee227b0cfd7948b9cd531e44c7496174b1
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 11:42:47 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 11:43:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57056ee
dev-qt/qtbase: remove redundant tst_qpainter skip
Had forgotten this caused issues with llvm-musl too,
and is probably fitting for a global skip where it's
been added.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 1 -
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 1 -
dev-qt/qtbase/qtbase-6.9999.ebuild | 1 -
3 files changed, 3 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index bfcfcd20ecd6..fdddf8ec8f89 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -305,7 +305,6 @@ src_test() {
tst_qfiledialog2
tst_qicoimageformat
tst_qimagereader
- tst_qpainter
tst_qimage
')
# note: for linux, upstream only really runs+maintains tests for amd64
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index f385985535ba..bf8d33b74e87 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -300,7 +300,6 @@ src_test() {
tst_qfiledialog2
tst_qicoimageformat
tst_qimagereader
- tst_qpainter
tst_qimage
')
# 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 f385985535ba..bf8d33b74e87 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -300,7 +300,6 @@ src_test() {
tst_qfiledialog2
tst_qicoimageformat
tst_qimagereader
- tst_qpainter
tst_qimage
')
# note: for linux, upstream only really runs+maintains tests for amd64
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-12 11:44 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-12 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 29f67ef26371c955e7cd0ddc4106ccf2d80da2db
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 11:27:37 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 11:28:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f67ef2
dev-qt/qtbase: really disable pch
-DBUILD_WITH_PCH=OFF also causes the feature to be disabled, but the
feature on its own misleadingly does not disable it on qtbase (note
PCH tend to be a source of all sort of issues and is typically not
worth the trouble).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.9999.ebuild | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 0555e1ac9271..bfcfcd20ecd6 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -145,6 +145,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DBUILD_WITH_PCH=OFF
+
-DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}"
-DINSTALL_BINDIR="${QT6_BINDIR}"
-DINSTALL_DATADIR="${QT6_DATADIR}"
@@ -159,7 +161,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)
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index f3ee319901e2..f385985535ba 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -140,6 +140,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DBUILD_WITH_PCH=OFF
+
-DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}"
-DINSTALL_BINDIR="${QT6_BINDIR}"
-DINSTALL_DATADIR="${QT6_DATADIR}"
@@ -154,7 +156,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)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index f3ee319901e2..f385985535ba 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -140,6 +140,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DBUILD_WITH_PCH=OFF
+
-DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}"
-DINSTALL_BINDIR="${QT6_BINDIR}"
-DINSTALL_DATADIR="${QT6_DATADIR}"
@@ -154,7 +156,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)
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-13 16:42 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-13 16:42 UTC (permalink / raw
To: gentoo-commits
commit: e3d179c3b2154a61563100259f181ced4a85aa04
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 05:29:01 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 16:40:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d179c3
dev-qt/qtbase: update sql options in 6.6+
tds option was removed entirely, likely not coming back.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 2 +-
dev-qt/qtbase/qtbase-6.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index bf8d33b74e87..980755e275ba 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -210,6 +210,7 @@ src_configure() {
use sql && mycmakeargs+=(
-DQT_FEATURE_sql_db2=OFF # unpackaged
-DQT_FEATURE_sql_ibase=OFF # unpackaged
+ -DQT_FEATURE_sql_mimer=OFF # unpackaged
$(qt_feature mysql sql_mysql)
$(qt_feature oci8 sql_oci)
$(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
@@ -217,7 +218,6 @@ src_configure() {
$(qt_feature postgres sql_psql)
$(qt_feature sqlite sql_sqlite)
$(qt_feature sqlite system_sqlite)
- -DQT_FEATURE_sql_tds=OFF # currently a no-op in CMakeLists.txt
)
if use amd64 || use x86; then
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index bf8d33b74e87..980755e275ba 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -210,6 +210,7 @@ src_configure() {
use sql && mycmakeargs+=(
-DQT_FEATURE_sql_db2=OFF # unpackaged
-DQT_FEATURE_sql_ibase=OFF # unpackaged
+ -DQT_FEATURE_sql_mimer=OFF # unpackaged
$(qt_feature mysql sql_mysql)
$(qt_feature oci8 sql_oci)
$(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
@@ -217,7 +218,6 @@ src_configure() {
$(qt_feature postgres sql_psql)
$(qt_feature sqlite sql_sqlite)
$(qt_feature sqlite system_sqlite)
- -DQT_FEATURE_sql_tds=OFF # currently a no-op in CMakeLists.txt
)
if use amd64 || use x86; then
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-13 16:42 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-13 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 46febdd863a0782267b27d3e8f3634891db8ce86
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 14:38:13 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 16:40:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46febdd8
dev-qt/qtbase: add IUSE=renderdoc in 6.7+
Have not really looked at 6.7+ yet, but happened to see this one.
Albeit overall kind of obscure, would've hard disabled if not
packaged.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/metadata.xml | 3 ++-
dev-qt/qtbase/qtbase-6.9999.ebuild | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
index 1ed99ac060a1..852224aa2c56 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,10 +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="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.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 980755e275ba..b5545709934f 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -18,7 +18,7 @@ declare -A QT6_IUSE=(
[gui]="
+X accessibility eglfs evdev gles2-only +libinput
- opengl tslib vulkan +widgets
+ opengl renderdoc tslib vulkan +widgets
"
[network]="brotli gssapi libproxy sctp"
[sql]="mysql oci8 odbc postgres +sqlite"
@@ -49,6 +49,7 @@ REQUIRED_USE="
# - qtnetwork (src/network/configure.cmake)
# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
# - qtsql (src/plugins/sqldrivers/configure.cmake)
+# dlopen: renderdoc
RDEPEND="
sys-libs/zlib:=
ssl? ( dev-libs/openssl:= )
@@ -86,6 +87,7 @@ RDEPEND="
evdev? ( sys-libs/mtdev )
libinput? ( dev-libs/libinput:= )
opengl? ( media-libs/libglvnd[X?] )
+ renderdoc? ( media-gfx/renderdoc )
tslib? ( x11-libs/tslib )
widgets? (
cups? ( net-print/cups )
@@ -190,6 +192,7 @@ src_configure() {
$(qt_feature libinput)
$(qt_feature opengl)
$(usev !opengl -DINPUT_opengl=no) #913691
+ $(qt_feature renderdoc graphicsframecapture)
$(qt_feature tslib)
$(qt_feature vulkan)
$(qt_feature widgets)
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-17 1:59 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-17 1:59 UTC (permalink / raw
To: gentoo-commits
commit: 8f6c1cfa60a003d005f648a2e0c55d76baec0216
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 01:39:52 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 01:57:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6c1cfa
dev-qt/qtbase: use INPUT_opengl only to manipulate opengl options
Individual features will be set based on this.
Technically enabling QT_FEATURE_onlygles2 is a no-op without enabling
opengl too, but it can confuse other packages into believing they can
use it.
Technically needs a revbump (qtdeclarative will keep failing until
qtbase is rebuilt), but skipping given qtbase is a long rebuild and
[gles2-only,-opengl] should be scarcely used.
Closes: https://bugs.gentoo.org/914334
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 4 +---
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 4 +---
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 4 +---
dev-qt/qtbase/qtbase-6.9999.ebuild | 4 +---
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index fe37d3d61bf9..d9c63889768c 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -192,13 +192,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
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index d7374a33f357..6f4b1146e6ae 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -190,13 +190,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
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 8580c287a200..912bab574b4d 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -190,13 +190,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
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index b02ce128351b..788fc8ddd22f 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -192,14 +192,12 @@ 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 renderdoc graphicsframecapture)
$(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
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-17 2:11 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-17 2:11 UTC (permalink / raw
To: gentoo-commits
commit: 8ade673e48a5d41eca988c291c0a0f2c9a28c5d5
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 02:05:58 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 02:10:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ade673e
dev-qt/qtbase: still require opengl with gles2-only
Not necessary with the new handling, but on 2nd thought lacking this
may confuse users, e.g. "gles2-only so don't need desktop opengl",
but IUSE=opengl is really to control the QtOpenGL module, and is the
thing revdeps depend on if they want (any) GL.
Bug: https://bugs.gentoo.org/914334
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 1 +
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 1 +
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 1 +
dev-qt/qtbase/qtbase-6.9999.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index d9c63889768c..63c5ac446ad4 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -36,6 +36,7 @@ REQUIRED_USE="
)
accessibility? ( X dbus )
eglfs? ( opengl )
+ gles2-only? ( opengl )
gui? ( || ( X eglfs wayland ) )
libinput? ( udev )
sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 6f4b1146e6ae..c6249d69533c 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -36,6 +36,7 @@ REQUIRED_USE="
)
accessibility? ( X dbus )
eglfs? ( opengl )
+ gles2-only? ( opengl )
gui? ( || ( X eglfs wayland ) )
libinput? ( udev )
sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 912bab574b4d..8502d419a9b4 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -36,6 +36,7 @@ REQUIRED_USE="
)
accessibility? ( X dbus )
eglfs? ( opengl )
+ gles2-only? ( opengl )
gui? ( || ( X eglfs wayland ) )
libinput? ( udev )
sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 788fc8ddd22f..5f0ad59133f0 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -36,6 +36,7 @@ REQUIRED_USE="
)
accessibility? ( X dbus )
eglfs? ( opengl )
+ gles2-only? ( opengl )
gui? ( || ( X eglfs wayland ) )
libinput? ( udev )
sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-19 3:02 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-19 3:02 UTC (permalink / raw
To: gentoo-commits
commit: 9766b6fde49e48247ac9b11b2d52a4b615833c99
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 02:12:07 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 02:12:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9766b6fd
dev-qt/qtbase: skip known failing tests on BE arches
Could use looking into eventually, but these failures should
not have much of an impact. Skipping globally to avoid coming
back to this with other arches.
Bug: https://bugs.gentoo.org/914033
Bug: https://bugs.gentoo.org/914371
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 6 +++++-
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 6 +++++-
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 6 +++++-
dev-qt/qtbase/qtbase-6.9999.ebuild | 6 +++++-
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 63c5ac446ad4..06bb9118196a 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -296,9 +296,13 @@ src_test() {
tst_qglyphrun
tst_qvectornd
tst_rcc
- # similarly, but on armv7 (bug #914028)
+ # similarly, but on armv7 and potentially others (bug #914028)
tst_qlineedit
tst_qpainter
+ # likewise, known failing at least on BE arches (bug #914033,914371)
+ tst_qimagereader
+ tst_qimagewriter
+ tst_qpluginloader
# 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 '
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index c6249d69533c..137c9f694949 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -294,9 +294,13 @@ src_test() {
tst_qglyphrun
tst_qvectornd
tst_rcc
- # similarly, but on armv7 (bug #914028)
+ # similarly, but on armv7 and potentially others (bug #914028)
tst_qlineedit
tst_qpainter
+ # likewise, known failing at least on BE arches (bug #914033,914371)
+ tst_qimagereader
+ tst_qimagewriter
+ tst_qpluginloader
# 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 '
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 8502d419a9b4..58bf530a1d11 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -294,9 +294,13 @@ src_test() {
tst_qglyphrun
tst_qvectornd
tst_rcc
- # similarly, but on armv7 (bug #914028)
+ # similarly, but on armv7 and potentially others (bug #914028)
tst_qlineedit
tst_qpainter
+ # likewise, known failing at least on BE arches (bug #914033,914371)
+ tst_qimagereader
+ tst_qimagewriter
+ tst_qpluginloader
# 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 '
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 5f0ad59133f0..becc650ea1ce 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -297,9 +297,13 @@ src_test() {
tst_qglyphrun
tst_qvectornd
tst_rcc
- # similarly, but on armv7 (bug #914028)
+ # similarly, but on armv7 and potentially others (bug #914028)
tst_qlineedit
tst_qpainter
+ # likewise, known failing at least on BE arches (bug #914033,914371)
+ tst_qimagereader
+ tst_qimagewriter
+ tst_qpluginloader
# 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 '
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-19 3:02 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-19 3:02 UTC (permalink / raw
To: gentoo-commits
commit: efd68dea72969804a4b30a968e037e5ca957bf95
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 02:18:12 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 02:34:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd68dea
dev-qt/qtbase: skip NaN related tests for hppa-only
May or may not have other impacts and could use fixing,
but skipping noise about this for now.
Assuming unlikely to come up on non-hppa, so skipping only
there. Will see if other arches somehow come up.
Bug: https://bugs.gentoo.org/914371
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 5 +++++
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 5 +++++
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 5 +++++
dev-qt/qtbase/qtbase-6.9999.ebuild | 5 +++++
4 files changed, 20 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 06bb9118196a..c47ffa70d566 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -311,6 +311,11 @@ src_test() {
tst_qimagereader
tst_qimage
')
+ # fails due to hppa's NaN handling, needs looking into (bug #914371)
+ $(usev hppa '
+ tst_qcborvalue
+ tst_qnumeric
+ ')
# note: for linux, upstream only really runs+maintains tests for amd64
# https://doc.qt.io/qt-6/supported-platforms.html
)
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 137c9f694949..a5e477d6c8c6 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -309,6 +309,11 @@ src_test() {
tst_qimagereader
tst_qimage
')
+ # fails due to hppa's NaN handling, needs looking into (bug #914371)
+ $(usev hppa '
+ tst_qcborvalue
+ tst_qnumeric
+ ')
# note: for linux, upstream only really runs+maintains tests for amd64
# https://doc.qt.io/qt-6/supported-platforms.html
)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 58bf530a1d11..ba01c16ca68f 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -309,6 +309,11 @@ src_test() {
tst_qimagereader
tst_qimage
')
+ # fails due to hppa's NaN handling, needs looking into (bug #914371)
+ $(usev hppa '
+ tst_qcborvalue
+ tst_qnumeric
+ ')
# note: for linux, upstream only really runs+maintains tests for amd64
# https://doc.qt.io/qt-6/supported-platforms.html
)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index becc650ea1ce..21e519807742 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -312,6 +312,11 @@ src_test() {
tst_qimagereader
tst_qimage
')
+ # fails due to hppa's NaN handling, needs looking into (bug #914371)
+ $(usev hppa '
+ tst_qcborvalue
+ tst_qnumeric
+ ')
# note: for linux, upstream only really runs+maintains tests for amd64
# https://doc.qt.io/qt-6/supported-platforms.html
)
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-20 8:32 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-20 8:32 UTC (permalink / raw
To: gentoo-commits
commit: b7db210faa1523cb8d4d72aae7fbf252a0f1208a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 04:39:09 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 20 07:53:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7db210f
dev-qt/qtbase: adjust comment
"above" is no longer the same thing
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 2 +-
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 2 +-
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 2 +-
dev-qt/qtbase/qtbase-6.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index add31f2972ab..23d269fab10f 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -305,7 +305,7 @@ src_test() {
tst_qimagewriter
tst_qpluginloader
# partially broken on llvm-musl, needs looking into but skip to have
- # a baseline for regressions (like above, rest of dev-qt is fine)
+ # a baseline for regressions (rest of dev-qt still passes with musl)
$(usev elibc_musl '
tst_qfiledialog2
tst_qicoimageformat
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 9511c2c54404..fcb8b96417f2 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -303,7 +303,7 @@ src_test() {
tst_qimagewriter
tst_qpluginloader
# partially broken on llvm-musl, needs looking into but skip to have
- # a baseline for regressions (like above, rest of dev-qt is fine)
+ # a baseline for regressions (rest of dev-qt still passes with musl)
$(usev elibc_musl '
tst_qfiledialog2
tst_qicoimageformat
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 87e7e43c198a..a99420fff1b8 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -303,7 +303,7 @@ src_test() {
tst_qimagewriter
tst_qpluginloader
# partially broken on llvm-musl, needs looking into but skip to have
- # a baseline for regressions (like above, rest of dev-qt is fine)
+ # a baseline for regressions (rest of dev-qt still passes with musl)
$(usev elibc_musl '
tst_qfiledialog2
tst_qicoimageformat
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 0df3665e86a0..ffcc8c5bedb8 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -306,7 +306,7 @@ src_test() {
tst_qimagewriter
tst_qpluginloader
# partially broken on llvm-musl, needs looking into but skip to have
- # a baseline for regressions (like above, rest of dev-qt is fine)
+ # a baseline for regressions (rest of dev-qt still passes with musl)
$(usev elibc_musl '
tst_qfiledialog2
tst_qicoimageformat
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-22 20:53 Sam James
0 siblings, 0 replies; 80+ messages in thread
From: Sam James @ 2023-09-22 20:53 UTC (permalink / raw
To: gentoo-commits
commit: 20ae90cd91d3dde7e1dcebd1a2bc7b5230b871da
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 20:52:54 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 20:52:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ae90cd
dev-qt/qtbase: Keyword 6.5.2-r2 hppa, #914026
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 23d269fab10f..2f489c953187 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-24 17:09 WANG Xuerui
0 siblings, 0 replies; 80+ messages in thread
From: WANG Xuerui @ 2023-09-24 17:09 UTC (permalink / raw
To: gentoo-commits
commit: efa8fedcff3a8c52d5cc6091d7cdd4b7971c9898
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 15:48:01 2023 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 17:05:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa8fedc
dev-qt/qtbase: keyword 6.5.2-r2 for ~loong
Two test cases are failing on a Loongson 3A6000 box:
71 - tst_qprocess (Failed)
304 - tst_qnetworkinterface (Failed)
With the following log messages:
FAIL! : tst_QProcess::startStopStartStopBuffers(separate-separate) 'process.bytesToWrite() > 0' returned FALSE. ()
Loc: [/tmp/portage/dev-qt/qtbase-6.5.2-r2/work/qtbase-everywhere-src-6.5.2/tests/auto/corelib/io/qprocess/tst_qprocess.cpp(2461)]
FAIL! : tst_QProcess::startStopStartStopBuffers(separate-merged) 'process.bytesToWrite() > 0' returned FALSE. ()
Loc: [/tmp/portage/dev-qt/qtbase-6.5.2-r2/work/qtbase-everywhere-src-6.5.2/tests/auto/corelib/io/qprocess/tst_qprocess.cpp(2461)]
FAIL! : tst_QProcess::startStopStartStopBuffers(merged-separate) 'process.bytesToWrite() > 0' returned FALSE. ()
Loc: [/tmp/portage/dev-qt/qtbase-6.5.2-r2/work/qtbase-everywhere-src-6.5.2/tests/auto/corelib/io/qprocess/tst_qprocess.cpp(2461)]
FAIL! : tst_QProcess::startStopStartStopBuffers(merged-merged) 'process.bytesToWrite() > 0' returned FALSE. ()
Loc: [/tmp/portage/dev-qt/qtbase-6.5.2-r2/work/qtbase-everywhere-src-6.5.2/tests/auto/corelib/io/qprocess/tst_qprocess.cpp(2461)]
FAIL! : tst_QProcess::startStopStartStopBuffers(merged-forwarded) 'process.bytesToWrite() > 0' returned FALSE. ()
Loc: [/tmp/portage/dev-qt/qtbase-6.5.2-r2/work/qtbase-everywhere-src-6.5.2/tests/auto/corelib/io/qprocess/tst_qprocess.cpp(2461)]
FAIL! : tst_QNetworkInterface::localAddress(wg0-xxx.xxx.xxx.xxx) 'pmtu <= outgoingIface->maximumTransmissionUnit()' returned FALSE. ()
Loc: [/tmp/portage/dev-qt/qtbase-6.5.2-r2/work/qtbase-everywhere-src-6.5.2/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp(246)]
But both are spurious to some extent.
For the startStopStartStopBuffers case, a 128KiB write is made to
hopefully retain some unwritten data even if the pipe is found writable,
and the comment in the test code indicates that Linux is the "worst
case" defaulting to 64KiB pipe buffers. This is actually
PIPE_DEF_BUFFERS pages, according to include/linux/pipe_fs_i.h; popular
arches use 4KiB pages, so 64KiB for them. Linux/LoongArch defaults to
16KiB pages, however, and the test case passes when the write size is
quadrupled.
And for the localAddress case, it may just be that the WireGuard
interface behaves differently than physical ones, and indeed the other
interfaces passed the test.
So, the library should actually be fully functional on loong, hence the
keyword.
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 2f489c953187..67ce1f180005 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-24 17:09 WANG Xuerui
0 siblings, 0 replies; 80+ messages in thread
From: WANG Xuerui @ 2023-09-24 17:09 UTC (permalink / raw
To: gentoo-commits
commit: a54f70244ccc101101487e403cb0ea970f9d8954
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 16:07:50 2023 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 17:05:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54f7024
dev-qt/qtbase: forward ~loong
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 2 +-
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 2 +-
dev-qt/qtbase/qtbase-6.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index fcb8b96417f2..a9f5f90dbb5e 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~loong"
fi
declare -A QT6_IUSE=(
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index a99420fff1b8..2d2b28ed79e1 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~loong"
fi
declare -A QT6_IUSE=(
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index ffcc8c5bedb8..b10c8bdac9e9 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~loong"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-24 17:51 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-24 17:51 UTC (permalink / raw
To: gentoo-commits
commit: 431564a9344048b2aa898ba65b8a1748552327d0
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 17:48:18 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 17:48:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431564a9
dev-qt/qtbase: use bit more correct libglvnd[X?] dep
Enabling X+opengl+gles2-only but wanting X off on libglvnd is a bit of
a stretch, but technically GLX is not used with gles2-only.
Not worth a revbump.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 5 ++++-
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 5 ++++-
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 5 ++++-
dev-qt/qtbase/qtbase-6.9999.ebuild | 5 ++++-
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 23cf23a2b4ad..277567f58edf 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -86,7 +86,10 @@ RDEPEND="
eglfs? ( media-libs/mesa[gbm(+)] )
evdev? ( sys-libs/mtdev )
libinput? ( dev-libs/libinput:= )
- opengl? ( media-libs/libglvnd[X?] )
+ opengl? (
+ gles2-only? ( media-libs/libglvnd )
+ !gles2-only? ( media-libs/libglvnd[X?] )
+ )
tslib? ( x11-libs/tslib )
widgets? (
cups? ( net-print/cups )
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 7b0f034f5934..9084a0b6223b 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -86,7 +86,10 @@ RDEPEND="
eglfs? ( media-libs/mesa[gbm(+)] )
evdev? ( sys-libs/mtdev )
libinput? ( dev-libs/libinput:= )
- opengl? ( media-libs/libglvnd[X?] )
+ opengl? (
+ gles2-only? ( media-libs/libglvnd )
+ !gles2-only? ( media-libs/libglvnd[X?] )
+ )
tslib? ( x11-libs/tslib )
widgets? (
cups? ( net-print/cups )
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 7b0f89e55b28..2d8d2a18c484 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -86,7 +86,10 @@ RDEPEND="
eglfs? ( media-libs/mesa[gbm(+)] )
evdev? ( sys-libs/mtdev )
libinput? ( dev-libs/libinput:= )
- opengl? ( media-libs/libglvnd[X?] )
+ opengl? (
+ gles2-only? ( media-libs/libglvnd )
+ !gles2-only? ( media-libs/libglvnd[X?] )
+ )
tslib? ( x11-libs/tslib )
widgets? (
cups? ( net-print/cups )
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index b10c8bdac9e9..a968789b80a3 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -87,7 +87,10 @@ RDEPEND="
eglfs? ( media-libs/mesa[gbm(+)] )
evdev? ( sys-libs/mtdev )
libinput? ( dev-libs/libinput:= )
- opengl? ( media-libs/libglvnd[X?] )
+ opengl? (
+ gles2-only? ( media-libs/libglvnd )
+ !gles2-only? ( media-libs/libglvnd[X?] )
+ )
renderdoc? ( media-gfx/renderdoc )
tslib? ( x11-libs/tslib )
widgets? (
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-26 12:24 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-26 12:24 UTC (permalink / raw
To: gentoo-commits
commit: 4e2339d833283f8899de72c05bb93c17b61726ba
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 12:07:32 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 12:23:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e2339d8
dev-qt/qtbase: skip flaky tst_qfont
Similar issues as tst_qrawfont, and that the system is not setup
exactly like Qt's tests expect does not necessarily mean fonts will
not be usable.
Bug: https://bugs.gentoo.org/914737
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 2 +-
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 2 +-
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 2 +-
dev-qt/qtbase/qtbase-6.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 277567f58edf..7ce859ca9b94 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -286,7 +286,7 @@ src_test() {
tst_qsctpsocket
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
- tst_qrawfont # can be affected by available fonts
+ tst_q{,raw}font # affected by available fonts / settings (bug #914737)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 9084a0b6223b..595ac9251ec8 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -284,7 +284,7 @@ src_test() {
tst_qsctpsocket
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
- tst_qrawfont # can be affected by available fonts
+ tst_q{,raw}font # affected by available fonts / settings (bug #914737)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 2d8d2a18c484..6949afbeb6f2 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -284,7 +284,7 @@ src_test() {
tst_qsctpsocket
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
- tst_qrawfont # can be affected by available fonts
+ tst_q{,raw}font # affected by available fonts / settings (bug #914737)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index a968789b80a3..bbd1e7bf6594 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -286,7 +286,7 @@ src_test() {
tst_qsctpsocket
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
- tst_qrawfont # can be affected by available fonts
+ tst_q{,raw}font # affected by available fonts / settings (bug #914737)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-09-26 15:16 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-09-26 15:16 UTC (permalink / raw
To: gentoo-commits
commit: 8562827810e767a167c09d4bd8ad7689c5521f62
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 13:27:23 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 14:26:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85628278
dev-qt/qtbase: skip test newly failing with sandbox in 6.6+
Passes fine if just run it on its own or disable all sandboxes.
Exact cause unknown given gives no sandbox violations and does
not seem to be ipc/pid-sandbox.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 2 ++
dev-qt/qtbase/qtbase-6.9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 98b39111fafa..209286c5d22d 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -280,6 +280,8 @@ src_test() {
tst_qx11info
# fails with network sandbox
tst_qdnslookup
+ # fails with sandbox
+ tst_qsharedmemory
# typical to lack SCTP support on non-generic kernels
tst_qsctpsocket
# these can be flaky depending on the environment/toolchain
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 97f1bd56f733..bda0eaf0fd5c 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -282,6 +282,8 @@ src_test() {
tst_qx11info
# fails with network sandbox
tst_qdnslookup
+ # fails with sandbox
+ tst_qsharedmemory
# typical to lack SCTP support on non-generic kernels
tst_qsctpsocket
# these can be flaky depending on the environment/toolchain
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-10-10 14:51 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-10-10 14:51 UTC (permalink / raw
To: gentoo-commits
commit: 12066f7238965d4b57caf4c93ade44a3e01fe993
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 09:28:26 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 14:49:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12066f72
dev-qt/qtbase: update 6.6+ live required use
xcb is no longer required to enable accessibility (upstream change
did not make it in 6.6.0, will be in 6.6.1).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 2 +-
dev-qt/qtbase/qtbase-6.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 25600cdad0be..c6d39c7ae8f9 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -34,7 +34,7 @@ REQUIRED_USE="
printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
)
- accessibility? ( X dbus )
+ accessibility? ( dbus )
eglfs? ( opengl )
gles2-only? ( opengl )
gui? ( || ( X eglfs wayland ) )
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 0f189b78263b..68573a9d70ce 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -34,7 +34,7 @@ REQUIRED_USE="
printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
)
- accessibility? ( X dbus )
+ accessibility? ( dbus )
eglfs? ( opengl )
gles2-only? ( opengl )
gui? ( || ( X eglfs wayland ) )
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-10-10 18:09 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-10-10 18:09 UTC (permalink / raw
To: gentoo-commits
commit: 9c4318fa81609ebcb29d5b43ab0a82f942956876
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 18:06:48 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 18:08:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4318fa
dev-qt/qtbase: remove xkbcommon patch in live
Technically only in 6.9999 at the moment, but will be picked
to 6.6.9999 soon.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 1 -
dev-qt/qtbase/qtbase-6.9999.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index c6d39c7ae8f9..f75251a83a21 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -136,7 +136,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
- "${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 68573a9d70ce..6a91e7dac3a2 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -137,7 +137,6 @@ PDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
- "${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-10-17 21:19 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-10-17 21:19 UTC (permalink / raw
To: gentoo-commits
commit: adaf5fb78bb93cd496cab023babde1d52b28bdee
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 21:16:22 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 21:19:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adaf5fb7
dev-qt/qtbase: clarify comment about qtprintsupport/cups
Albeit information remains kind of buried in there, but in case
someone happens to look at it when trying to figure out what
to depend on for qtprintsupport -- aka not [cups] but rather
need [gui,widgets].
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.5.3.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.6.0.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.9999.ebuild | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 7ce859ca9b94..511f9d6b0445 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -205,7 +205,8 @@ src_configure() {
-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
+ # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
+ $(qt_feature cups)
$(qt_feature gtk gtk3)
)
diff --git a/dev-qt/qtbase/qtbase-6.5.3.ebuild b/dev-qt/qtbase/qtbase-6.5.3.ebuild
index ce35f875214a..e58d9d0e80e4 100644
--- a/dev-qt/qtbase/qtbase-6.5.3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.3.ebuild
@@ -204,7 +204,8 @@ src_configure() {
-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
+ # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
+ $(qt_feature cups)
$(qt_feature gtk gtk3)
)
diff --git a/dev-qt/qtbase/qtbase-6.6.0.ebuild b/dev-qt/qtbase/qtbase-6.6.0.ebuild
index 25600cdad0be..d41f291526d3 100644
--- a/dev-qt/qtbase/qtbase-6.6.0.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.0.ebuild
@@ -204,7 +204,8 @@ src_configure() {
-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
+ # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
+ $(qt_feature cups)
$(qt_feature gtk gtk3)
)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index f75251a83a21..1817d33795df 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -203,7 +203,8 @@ src_configure() {
-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
+ # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
+ $(qt_feature cups)
$(qt_feature gtk gtk3)
)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 6a91e7dac3a2..85ce4a1717ce 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -205,7 +205,8 @@ src_configure() {
-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
+ # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
+ $(qt_feature cups)
$(qt_feature gtk gtk3)
)
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-10-22 4:51 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-10-22 4:51 UTC (permalink / raw
To: gentoo-commits
commit: 6654ff0be819f6f99bbcef1747addc8302527322
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 04:48:09 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 04:50:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6654ff0b
dev-qt/qtbase: add xkbcommon upper bound in stable
Stabilization is dragging wrt bug #915549, so may as well
add a bound in stable while waiting for fixed version.
Depend-only w/o revbump given non-issue if it is already built.
Closes: https://bugs.gentoo.org/915907
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 511f9d6b0445..58ad15249b57 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -115,6 +115,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
+ <x11-libs/libxkbcommon-1.6
X? ( x11-base/xorg-proto )
gui? (
vulkan? ( dev-util/vulkan-headers )
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-10-27 11:40 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-10-27 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 73c0680781c804aa71c189217ddbcde2faa63d0a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 11:28:43 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 11:39:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c06807
dev-qt/qtbase: skip tst_qfiledialog{,2} regardless of musl
Seems the issue I had with musl were unrelated and just random,
so let's just skip it globally (along with the first one).
*Could* use -j1, but qtbase has the longest test suite out of Qt
package and would rather keep the extra jobs unless the issues
are more widespread (as usual the tests here are more to get a
baseline for regressions than for full coverage either way).
Closes: https://bugs.gentoo.org/916181
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.3-r1.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.6.0-r1.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.9999.ebuild | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
index 53a15e06df37..3da4fb303ca4 100644
--- a/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
@@ -285,6 +285,8 @@ src_test() {
tst_qdnslookup
# typical to lack SCTP support on non-generic kernels
tst_qsctpsocket
+ # randomly fails without -j1, and not worth it over this (bug #916181)
+ tst_qfiledialog{,2}
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
@@ -313,7 +315,6 @@ src_test() {
# partially broken on llvm-musl, needs looking into but skip to have
# a baseline for regressions (rest of dev-qt still passes with musl)
$(usev elibc_musl '
- tst_qfiledialog2
tst_qicoimageformat
tst_qimagereader
tst_qimage
diff --git a/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
index 4a43d52dca79..2451f3f8fbda 100644
--- a/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
@@ -287,6 +287,8 @@ src_test() {
tst_qsharedmemory
# typical to lack SCTP support on non-generic kernels
tst_qsctpsocket
+ # randomly fails without -j1, and not worth it over this (bug #916181)
+ tst_qfiledialog{,2}
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
@@ -315,7 +317,6 @@ src_test() {
# partially broken on llvm-musl, needs looking into but skip to have
# a baseline for regressions (rest of dev-qt still passes with musl)
$(usev elibc_musl '
- tst_qfiledialog2
tst_qicoimageformat
tst_qimagereader
tst_qimage
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 39b3cce96928..adbaf526bcf1 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -285,6 +285,8 @@ src_test() {
tst_qsharedmemory
# typical to lack SCTP support on non-generic kernels
tst_qsctpsocket
+ # randomly fails without -j1, and not worth it over this (bug #916181)
+ tst_qfiledialog{,2}
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
@@ -313,7 +315,6 @@ src_test() {
# partially broken on llvm-musl, needs looking into but skip to have
# a baseline for regressions (rest of dev-qt still passes with musl)
$(usev elibc_musl '
- tst_qfiledialog2
tst_qicoimageformat
tst_qimagereader
tst_qimage
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index d039607035f3..9516155745e3 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -287,6 +287,8 @@ src_test() {
tst_qsharedmemory
# typical to lack SCTP support on non-generic kernels
tst_qsctpsocket
+ # randomly fails without -j1, and not worth it over this (bug #916181)
+ tst_qfiledialog{,2}
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
@@ -315,7 +317,6 @@ src_test() {
# partially broken on llvm-musl, needs looking into but skip to have
# a baseline for regressions (rest of dev-qt still passes with musl)
$(usev elibc_musl '
- tst_qfiledialog2
tst_qicoimageformat
tst_qimagereader
tst_qimage
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-10-27 11:40 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-10-27 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 9511bed148b8a9a46af0d3961ecf2e538dc3f5b3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 11:15:32 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 11:39:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9511bed1
dev-qt/qtbase: skip tst_qprinter
Closes: https://bugs.gentoo.org/916216
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.3-r1.ebuild | 1 +
dev-qt/qtbase/qtbase-6.6.0-r1.ebuild | 1 +
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 1 +
dev-qt/qtbase/qtbase-6.9999.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
index b166e0302241..53a15e06df37 100644
--- a/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
@@ -288,6 +288,7 @@ src_test() {
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
+ tst_qprinter # checks system's printers (bug #916216)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
index 044f46b80925..4a43d52dca79 100644
--- a/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
@@ -290,6 +290,7 @@ src_test() {
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
+ tst_qprinter # checks system's printers (bug #916216)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 1817d33795df..39b3cce96928 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -288,6 +288,7 @@ src_test() {
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
+ tst_qprinter # checks system's printers (bug #916216)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 85ce4a1717ce..d039607035f3 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -290,6 +290,7 @@ src_test() {
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
+ tst_qprinter # checks system's printers (bug #916216)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-11-29 22:33 Sam James
0 siblings, 0 replies; 80+ messages in thread
From: Sam James @ 2023-11-29 22:33 UTC (permalink / raw
To: gentoo-commits
commit: a14e625cb2ace1f65941289d9a68de3ed0f0b2a8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 22:32:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 22:32:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14e625c
dev-qt/qtbase: Keyword 6.6.1-r1 ppc, #914026
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
index 90146aaed3c8..530aad079a60 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-11-30 5:29 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-11-30 5:29 UTC (permalink / raw
To: gentoo-commits
commit: 3c920c22b4ba6280e04ed73153ed95c406f6f305
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 05:21:35 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 05:28:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c920c22
dev-qt/qtbase: skip tst_quuid for now
uint128 parts for this test are new, and is likely not
worth holding back keywording over. Unlikely to result
in real runtime problems.
Needs confirmation, but believed that this would (now) fail
on other 64bit BE arches as well and is not ppc64be-specific.
Closes: https://bugs.gentoo.org/918878
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r1.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.9999.ebuild | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
index 530aad079a60..dcd300df75b5 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
@@ -309,10 +309,11 @@ src_test() {
# similarly, but on armv7 and potentially others (bug #914028)
tst_qlineedit
tst_qpainter
- # likewise, known failing at least on BE arches (bug #914033,914371)
+ # likewise, known failing on BE arches (bug #914033,914371,918878)
tst_qimagereader
tst_qimagewriter
tst_qpluginloader
+ tst_quuid
# partially broken on llvm-musl, needs looking into but skip to have
# a baseline for regressions (rest of dev-qt still passes with musl)
$(usev elibc_musl '
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 90146aaed3c8..bd6be89d3028 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -309,10 +309,11 @@ src_test() {
# similarly, but on armv7 and potentially others (bug #914028)
tst_qlineedit
tst_qpainter
- # likewise, known failing at least on BE arches (bug #914033,914371)
+ # likewise, known failing on BE arches (bug #914033,914371,918878)
tst_qimagereader
tst_qimagewriter
tst_qpluginloader
+ tst_quuid
# partially broken on llvm-musl, needs looking into but skip to have
# a baseline for regressions (rest of dev-qt still passes with musl)
$(usev elibc_musl '
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 4de73e3c0c2f..3ee457c228f7 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -311,10 +311,11 @@ src_test() {
# similarly, but on armv7 and potentially others (bug #914028)
tst_qlineedit
tst_qpainter
- # likewise, known failing at least on BE arches (bug #914033,914371)
+ # likewise, known failing on BE arches (bug #914033,914371,918878)
tst_qimagereader
tst_qimagewriter
tst_qpluginloader
+ tst_quuid
# partially broken on llvm-musl, needs looking into but skip to have
# a baseline for regressions (rest of dev-qt still passes with musl)
$(usev elibc_musl '
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-12-01 6:21 Sam James
0 siblings, 0 replies; 80+ messages in thread
From: Sam James @ 2023-12-01 6:21 UTC (permalink / raw
To: gentoo-commits
commit: 6592472d490a3b769327fe62a8c7747e29d05ad1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 1 06:20:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 1 06:20:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6592472d
dev-qt/qtbase: Keyword 6.6.1-r1 sparc, #914026
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
index dcd300df75b5..ca37a80f59f1 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~sparc ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-12-01 6:21 Sam James
0 siblings, 0 replies; 80+ messages in thread
From: Sam James @ 2023-12-01 6:21 UTC (permalink / raw
To: gentoo-commits
commit: 45819528a9bb01c0b8a3916ea977cea04482f555
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 1 06:20:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 1 06:20:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45819528
dev-qt/qtbase: Keyword 6.6.1-r1 ppc64, #914026
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
index ca37a80f59f1..7f8bf3c30db3 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-12-01 7:04 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-12-01 7:04 UTC (permalink / raw
To: gentoo-commits
commit: 675a3b799821b2d2cb9be7fcab014ad3011d186b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 1 07:04:04 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Dec 1 07:04:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675a3b79
dev-qt/qtbase: skip a few known failing tests only for sparc
Closes: https://bugs.gentoo.org/914033
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r1.ebuild | 6 ++++++
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 6 ++++++
dev-qt/qtbase/qtbase-6.9999.ebuild | 6 ++++++
3 files changed, 18 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
index 7f8bf3c30db3..48bbab59255a 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
@@ -326,6 +326,12 @@ src_test() {
tst_qcborvalue
tst_qnumeric
')
+ # bug #914033
+ $(usev sparc '
+ tst_qbuffer
+ tst_qprocess
+ tst_qtconcurrentiteratekernel
+ ')
# note: for linux, upstream only really runs+maintains tests for amd64
# https://doc.qt.io/qt-6/supported-platforms.html
)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index bd6be89d3028..f3b43daedeae 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -326,6 +326,12 @@ src_test() {
tst_qcborvalue
tst_qnumeric
')
+ # bug #914033
+ $(usev sparc '
+ tst_qbuffer
+ tst_qprocess
+ tst_qtconcurrentiteratekernel
+ ')
# note: for linux, upstream only really runs+maintains tests for amd64
# https://doc.qt.io/qt-6/supported-platforms.html
)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 3ee457c228f7..d52508982db3 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -328,6 +328,12 @@ src_test() {
tst_qcborvalue
tst_qnumeric
')
+ # bug #914033
+ $(usev sparc '
+ tst_qbuffer
+ tst_qprocess
+ tst_qtconcurrentiteratekernel
+ ')
# note: for linux, upstream only really runs+maintains tests for amd64
# https://doc.qt.io/qt-6/supported-platforms.html
)
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-12-01 19:48 Jakov Smolić
0 siblings, 0 replies; 80+ messages in thread
From: Jakov Smolić @ 2023-12-01 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 7770ee902136a5b17da2559f176967185b9769cf
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 1 19:48:39 2023 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Dec 1 19:48:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7770ee90
dev-qt/qtbase: Keyword 6.6.1-r1 riscv, #914026
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
index 48bbab59255a..91b4078ba7a0 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2023-12-18 1:37 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2023-12-18 1:37 UTC (permalink / raw
To: gentoo-commits
commit: 3b88166e6621a80c6ea344585dc56f203bba1a7a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 01:28:50 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 01:36:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b88166e
dev-qt/qtbase: extend testlib comment a bit
Just to clarify that this was an issue when not building tests too.
Primary reason this been made default was because some other dev-qt
packages (qtdeclarative I recall?) failed even with USE=-test and
did not felt worth working around nor have a IUSE=+testlib (saves
the need to declare it for tests on a whole lot of packages too).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.5.3-r1.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.6.1-r1.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 3 ++-
dev-qt/qtbase/qtbase-6.9999.ebuild | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
index ce2ea30fc9f3..8c60fe9a49b6 100644
--- a/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
@@ -185,7 +185,8 @@ src_configure() {
$(qt_feature gui)
$(qt_feature network)
$(qt_feature sql)
- -DQT_FEATURE_testlib=ON # trivial and often needed to build revdeps
+ # trivial, and is often needed (sometimes even when not building tests)
+ -DQT_FEATURE_testlib=ON
$(qt_feature xml)
)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
index 4e879f6996d9..e6a2b849eb51 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
@@ -184,7 +184,8 @@ src_configure() {
$(qt_feature gui)
$(qt_feature network)
$(qt_feature sql)
- -DQT_FEATURE_testlib=ON # trivial and often needed to build revdeps
+ # trivial, and is often needed (sometimes even when not building tests)
+ -DQT_FEATURE_testlib=ON
$(qt_feature xml)
)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index f3b43daedeae..e0e435925cbc 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -184,7 +184,8 @@ src_configure() {
$(qt_feature gui)
$(qt_feature network)
$(qt_feature sql)
- -DQT_FEATURE_testlib=ON # trivial and often needed to build revdeps
+ # trivial, and is often needed (sometimes even when not building tests)
+ -DQT_FEATURE_testlib=ON
$(qt_feature xml)
)
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 4f56473ee60f..2056d447ada9 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -185,7 +185,8 @@ src_configure() {
$(qt_feature gui)
$(qt_feature network)
$(qt_feature sql)
- -DQT_FEATURE_testlib=ON # trivial and often needed to build revdeps
+ # trivial, and is often needed (sometimes even when not building tests)
+ -DQT_FEATURE_testlib=ON
$(qt_feature xml)
)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 4f56473ee60f..2056d447ada9 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -185,7 +185,8 @@ src_configure() {
$(qt_feature gui)
$(qt_feature network)
$(qt_feature sql)
- -DQT_FEATURE_testlib=ON # trivial and often needed to build revdeps
+ # trivial, and is often needed (sometimes even when not building tests)
+ -DQT_FEATURE_testlib=ON
$(qt_feature xml)
)
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-01-07 15:20 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-01-07 15:20 UTC (permalink / raw
To: gentoo-commits
commit: 6de131fbfcfa0b85d0beb945c6272d7da649c94b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 15:17:25 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 15:18:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de131fb
dev-qt/qtbase: skip tst_qtimer (randomly hangs)
Ran into this while testing the previous patch (which did
not touch anything timer-related), and worked again after
another rebuild.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r3.ebuild | 2 ++
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 4 +++-
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 4 +++-
dev-qt/qtbase/qtbase-6.9999.ebuild | 4 +++-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
index 6125bd277f01..4ff680df2dbf 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
@@ -292,6 +292,8 @@ src_test() {
tst_qsctpsocket
# 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_qtimer
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index e0e435925cbc..967bb5716ee6 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -289,6 +289,8 @@ src_test() {
tst_qsctpsocket
# 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_qtimer
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 2056d447ada9..c05adee9ff93 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -292,6 +292,8 @@ src_test() {
tst_qsctpsocket
# 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_qtimer
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 2056d447ada9..c05adee9ff93 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -292,6 +292,8 @@ src_test() {
tst_qsctpsocket
# 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_qtimer
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-01-07 15:20 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-01-07 15:20 UTC (permalink / raw
To: gentoo-commits
commit: 9006d1fdbdfce4ad61a1893892d433cd8f860ce8
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 15:08:47 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 15:18:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9006d1fd
dev-qt/qtbase: backport fix for QTBUG-116905
As recommended for use with Plasma 6 which is currently being tested:
https://community.kde.org/Plasma/Plasma_6.0_Release_notes#Required_Qt_Version
Tests changes were excluded due to not applying cleanly, but this
does not prevent current tests from building and passing.
Will be properly included in qtbase-6.6.2
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/Manifest | 1 +
dev-qt/qtbase/{qtbase-6.6.1-r2.ebuild => qtbase-6.6.1-r3.ebuild} | 2 ++
2 files changed, 3 insertions(+)
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 67b563a63d76..fa0011732b3d 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1 +1,2 @@
+DIST qtbase-6.6.1-QTBUG-116905.patch.xz 7132 BLAKE2B 5ad6108f3d278c7014a124733a7e0151d79ab9b82256948c09f2d7d93494020131ec52bae0a0c9ae1959afe724bc033805b28f12676b018dce7d04668d8dec01 SHA512 61c13a96b19bd9c06056681101c2c9d301a5d014c4a155b82ba9b7bce2ba0e715041cd6c3e8e45c9ec3d52c3b77bcf3145fbbf502a72ffbaac02f4eb6b82c912
DIST qtbase-everywhere-src-6.6.1.tar.xz 48370760 BLAKE2B 2dd551d15eef30c7d9a5f4c406143d6f8908d7ebade9daf9fbd3d82a25765425956f2cb8689c50f87f6477de2150eee7b820ef25bb4355c51e7e7fad3ef73005 SHA512 93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r2.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
similarity index 98%
rename from dev-qt/qtbase/qtbase-6.6.1-r2.ebuild
rename to dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
index 5b21d1f773b8..6125bd277f01 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
@@ -6,6 +6,7 @@ EAPI=8
inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
+SRC_URI+=" https://dev.gentoo.org/~ionen/distfiles/${P}-QTBUG-116905.patch.xz"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
@@ -138,6 +139,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
"${FILESDIR}"/${P}-CVE-2023-51714.patch
+ "${WORKDIR}"/${P}-QTBUG-116905.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-01-08 12:59 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-01-08 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 4da4badad37f5ee4a625355187d3d99d10de0081
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 09:24:01 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 12:57:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da4bada
dev-qt/qtbase: stabilize 6.6.1-r3 for amd64
Bug: https://bugs.gentoo.org/921292
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
index 4ff680df2dbf..838a64070d8f 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Cross-platform application development framework"
SRC_URI+=" https://dev.gentoo.org/~ionen/distfiles/${P}-QTBUG-116905.patch.xz"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-01-08 12:59 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-01-08 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 10c63aca797d914527158e1a10958e094b210071
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 09:24:12 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 12:57:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c63aca
dev-qt/qtbase: drop vulnerable 6.6.1-r1
All done for Qt6's qtbase end wrt bug #921292.
Bug: https://bugs.gentoo.org/921292
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r1.ebuild | 361 -----------------------------------
1 file changed, 361 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
deleted file mode 100644
index e6a2b849eb51..000000000000
--- a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build toolchain-funcs
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-declare -A QT6_IUSE=(
- [global]="+ssl +udev zstd"
- [core]="icu"
- [modules]="+concurrent +dbus +gui +network +sql +xml"
-
- [gui]="
- +X accessibility eglfs evdev gles2-only +libinput
- opengl tslib vulkan +widgets
- "
- [network]="brotli gssapi libproxy sctp"
- [sql]="mysql oci8 odbc postgres +sqlite"
- [widgets]="cups gtk"
-
- [optfeature]="nls wayland" #810802,864509
-)
-IUSE="${QT6_IUSE[*]}"
-REQUIRED_USE="
- $(
- printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
- printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
- printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
- printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
- )
- accessibility? ( dbus )
- eglfs? ( opengl )
- gles2-only? ( opengl )
- gui? ( || ( X eglfs wayland ) )
- libinput? ( udev )
- sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
- test? ( icu sql? ( sqlite ) )
-"
-
-# groups:
-# - global (configure.cmake)
-# - qtcore (src/corelib/configure.cmake)
-# - qtgui (src/gui/configure.cmake)
-# - qtnetwork (src/network/configure.cmake)
-# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
-# - qtsql (src/plugins/sqldrivers/configure.cmake)
-RDEPEND="
- sys-libs/zlib:=
- ssl? ( dev-libs/openssl:= )
- udev? ( virtual/libudev:= )
- zstd? ( app-arch/zstd:= )
-
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode(+)]
- icu? ( dev-libs/icu:= )
-
- dbus? ( sys-apps/dbus )
- gui? (
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/harfbuzz:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- x11-libs/libdrm
- x11-libs/libxkbcommon[X?]
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libxcb:=
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- accessibility? ( app-accessibility/at-spi2-core:2 )
- eglfs? ( media-libs/mesa[gbm(+)] )
- evdev? ( sys-libs/mtdev )
- libinput? ( dev-libs/libinput:= )
- opengl? (
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X?] )
- )
- tslib? ( x11-libs/tslib )
- widgets? (
- cups? ( net-print/cups )
- gtk? (
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/pango
- )
- )
- )
- network? (
- brotli? ( app-arch/brotli:= )
- gssapi? ( virtual/krb5 )
- libproxy? ( net-libs/libproxy )
- )
- sql? (
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( dev-db/sqlite:3 )
- )
-"
-DEPEND="
- ${RDEPEND}
- X? ( x11-base/xorg-proto )
- gui? (
- vulkan? ( dev-util/vulkan-headers )
- )
- network? (
- sctp? ( net-misc/lksctp-tools )
- )
- test? (
- elibc_musl? ( sys-libs/timezone-data )
- )
-"
-BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392
-PDEPEND="
- nls? ( ~dev-qt/qttranslations-${PV}:6 )
- wayland? ( ~dev-qt/qtwayland-${PV}:6 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
- "${FILESDIR}"/${PN}-6.5.2-no-glx.patch
- "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
- "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
-)
-
-src_prepare() {
- qt6-build_src_prepare
-
- if use test; then
- # test itself has -Werror=strict-aliasing issues, drop for simplicity
- sed -e '/add_subdirectory(qsharedpointer)/d' \
- -i tests/auto/corelib/tools/CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_WITH_PCH=OFF
-
- -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}"
- -DINSTALL_BINDIR="${QT6_BINDIR}"
- -DINSTALL_DATADIR="${QT6_DATADIR}"
- -DINSTALL_DOCDIR="${QT6_DOCDIR}"
- -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}"
- -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}"
- -DINSTALL_LIBDIR="${QT6_LIBDIR}"
- -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}"
- -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}"
- -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}"
- -DINSTALL_QMLDIR="${QT6_QMLDIR}"
- -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}"
- -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}"
-
- $(qt_feature ssl openssl)
- $(qt_feature ssl openssl_linked)
- $(qt_feature udev libudev)
- $(qt_feature zstd)
-
- # qtcore
- $(qt_feature icu)
-
- # tools
- -DQT_FEATURE_androiddeployqt=OFF
-
- # modules
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature network)
- $(qt_feature sql)
- # trivial, and is often needed (sometimes even when not building tests)
- -DQT_FEATURE_testlib=ON
- $(qt_feature xml)
- )
-
- use gui && mycmakeargs+=(
- $(qt_feature X xcb)
- $(qt_feature X system_xcb_xinput)
- $(qt_feature X xkbcommon_x11)
- $(cmake_use_find_package X X11) # needed for truly no automagic
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature eglfs)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- $(qt_feature libinput)
- $(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+=(
- # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
-
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(usev test -DQT_SKIP_DOCKER_COMPOSE=ON)
- )
-
- use sql && mycmakeargs+=(
- -DQT_FEATURE_sql_db2=OFF # unpackaged
- -DQT_FEATURE_sql_ibase=OFF # unpackaged
- -DQT_FEATURE_sql_mimer=OFF # unpackaged
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- if use amd64 || use x86; then
- # see bug #913400 for explanations
- local cpufeats=(
- # list of checked cpu features in configure.cmake
- avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
- f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
- )
- # handle odd ones out not matching -m* and macros (keep same order)
- local cpuflags=( "${cpufeats[@]}" aes sha )
- local cpufeats+=( aesni shani )
-
- local -a intrins
- IFS=' ' read -ra intrins < <(
- : "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
- $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
- #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
- #include <x86intrin.h>
- #endif
- $(printf '__%s__ ' "${cpuflags[@]^^}")
- EOF
- assert
- )
-
- # do nothing and leave to qtbase if no macros expanded (test failed?)
- if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
- local -i i
- for ((i=0; i<${#cpufeats[@]}; i++)); do
- [[ ${intrins[i]} == __* ]] &&
- mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
- done
- mycmakeargs+=( -DTEST_x86intrin=ON )
- fi
- fi
-
- qt6-build_src_configure
-}
-
-src_test() {
- local -x TZ=UTC
- local -x LC_TIME=C
-
- local CMAKE_SKIP_TESTS=(
- # broken with out-of-source + if qtbase is not already installed
- tst_moc
- tst_qmake
- # needs x11/opengl, we *could* run these but tend to be flaky
- # when opengl rendering is involved (even if software-only)
- tst_qopengl{,config,widget,window}
- tst_qgraphicsview
- tst_qx11info
- # fails with network sandbox
- tst_qdnslookup
- # fails with sandbox
- tst_qsharedmemory
- # typical to lack SCTP support on non-generic kernels
- tst_qsctpsocket
- # randomly fails without -j1, and not worth it over this (bug #916181)
- tst_qfiledialog{,2}
- # these can be flaky depending on the environment/toolchain
- tst_qlogging # backtrace log test can easily vary
- tst_q{,raw}font # affected by available fonts / settings (bug #914737)
- tst_qprinter # checks system's printers (bug #916216)
- tst_qstorageinfo # checks mounted filesystems
- # flaky due to using different test framework and fails with USE=-gui
- tst_selftests
- # known failing when using clang+glibc+stdc++, needs looking into
- tst_qthread
- # partially failing on x86 chroots and seemingly(?) harmless (dev-qt
- # revdeps tests pass), skip globally to avoid keywording flakiness
- tst_json
- tst_qcolorspace
- tst_qdoublevalidator
- tst_qglobal
- tst_qglyphrun
- tst_qvectornd
- tst_rcc
- # similarly, but on armv7 and potentially others (bug #914028)
- tst_qlineedit
- tst_qpainter
- # likewise, known failing on BE arches (bug #914033,914371,918878)
- tst_qimagereader
- tst_qimagewriter
- tst_qpluginloader
- tst_quuid
- # partially broken on llvm-musl, needs looking into but skip to have
- # a baseline for regressions (rest of dev-qt still passes with musl)
- $(usev elibc_musl '
- tst_qicoimageformat
- tst_qimagereader
- tst_qimage
- ')
- # fails due to hppa's NaN handling, needs looking into (bug #914371)
- $(usev hppa '
- tst_qcborvalue
- tst_qnumeric
- ')
- # bug #914033
- $(usev sparc '
- tst_qbuffer
- tst_qprocess
- tst_qtconcurrentiteratekernel
- ')
- # note: for linux, upstream only really runs+maintains tests for amd64
- # https://doc.qt.io/qt-6/supported-platforms.html
- )
-
- qt6-build_src_test
-}
-
-src_install() {
- qt6-build_src_install
-
- if use test; then
- local delete_bins=( # need a better way to handle this
- clientserver copier crashingServer desktopsettingsaware_helper
- echo fileWriterProcess modal_helper nospace 'one space'
- paster qcommandlineparser_test_helper qfileopeneventexternal
- socketprocess syslocaleapp tst_qhashseed_helper 'two space s'
- write-read-write
- )
- local delete=( # sigh
- "${D}${QT6_BINDIR}"/test*
- "${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
- )
- # using -f given not tracking which tests may be skipped or not
- rm -rf -- "${delete[@]}" || die
- fi
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-01-08 21:09 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-01-08 21:09 UTC (permalink / raw
To: gentoo-commits
commit: 6f37da0124c03cf8dc62e8cfdd28013aa8e35521
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 15:55:33 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 21:08:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f37da01
dev-qt/qtbase: shorten intrin test a bit
Felt more correct but do not actually need the header for these.
Could alternatively use tc-cpp-is-true too, but fwiw current
method allows batching in a single compiler call.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r3.ebuild | 3 ---
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 3 ---
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 3 ---
dev-qt/qtbase/qtbase-6.9999.ebuild | 3 ---
4 files changed, 12 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
index 838a64070d8f..a0defb2de975 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
@@ -249,9 +249,6 @@ src_configure() {
IFS=' ' read -ra intrins < <(
: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
- #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
- #include <x86intrin.h>
- #endif
$(printf '__%s__ ' "${cpuflags[@]^^}")
EOF
assert
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 967bb5716ee6..dcaf37200a90 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -246,9 +246,6 @@ src_configure() {
IFS=' ' read -ra intrins < <(
: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
- #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
- #include <x86intrin.h>
- #endif
$(printf '__%s__ ' "${cpuflags[@]^^}")
EOF
assert
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index c05adee9ff93..10afd1ff2ad0 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -249,9 +249,6 @@ src_configure() {
IFS=' ' read -ra intrins < <(
: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
- #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
- #include <x86intrin.h>
- #endif
$(printf '__%s__ ' "${cpuflags[@]^^}")
EOF
assert
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index c05adee9ff93..10afd1ff2ad0 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -249,9 +249,6 @@ src_configure() {
IFS=' ' read -ra intrins < <(
: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
- #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
- #include <x86intrin.h>
- #endif
$(printf '__%s__ ' "${cpuflags[@]^^}")
EOF
assert
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-01-19 22:13 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-01-19 22:13 UTC (permalink / raw
To: gentoo-commits
commit: c198f69e66547b5ba7d2ba1b9bae576ce93ee703
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 21:07:22 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 22:12:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c198f69e
dev-qt/qtbase: add IUSE=cpu_flags_x86_rdrand
Hopefully this is enough to (actually) fix bug #922498, doing
-mno-rdrnd had a similar effect of passing QT_FEATURE_rdrnd=OFF
(but don't have a cpu to test behavior with just -march=native).
Maybe will extend this at some point, but let's treat this
one as as a special case given not the first I've seen of this
with rdrand.
For anyone with rdrand issues, obviously do not enable this.
Probably not worth a revbump considering issue is at build time,
seems safe and could save a few rebuilds. fwiw also won't fail in
case of an aberrant rdrand being set combined with -mno-rdrnd.
Closes: https://bugs.gentoo.org/922498
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r3.ebuild | 11 ++++++++++-
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 11 ++++++++++-
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 11 ++++++++++-
dev-qt/qtbase/qtbase-6.9999.ebuild | 11 ++++++++++-
4 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
index a0defb2de975..d9f21bee7611 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
@@ -25,6 +25,8 @@ declare -A QT6_IUSE=(
[sql]="mysql oci8 odbc postgres +sqlite"
[widgets]="cups gtk"
+ [cpuflags]="cpu_flags_x86_rdrand"
+
[optfeature]="nls wayland" #810802,864509
)
IUSE="${QT6_IUSE[*]}"
@@ -235,7 +237,14 @@ src_configure() {
)
if use amd64 || use x86; then
- # see bug #913400 for explanations
+ # see bug #922498, let detection do its thing if set
+ use cpu_flags_x86_rdrand ||
+ mycmakeargs+=(
+ -DQT_FEATURE_rdrnd=OFF
+ -DQT_FEATURE_rdseed=OFF
+ )
+
+ # see bug #913400 for explanations, mostly to handle -mno-*
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index dcaf37200a90..1df2ecec87b6 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -24,6 +24,8 @@ declare -A QT6_IUSE=(
[sql]="mysql oci8 odbc postgres +sqlite"
[widgets]="cups gtk"
+ [cpuflags]="cpu_flags_x86_rdrand"
+
[optfeature]="nls wayland" #810802,864509
)
IUSE="${QT6_IUSE[*]}"
@@ -232,7 +234,14 @@ src_configure() {
)
if use amd64 || use x86; then
- # see bug #913400 for explanations
+ # see bug #922498, let detection do its thing if set
+ use cpu_flags_x86_rdrand ||
+ mycmakeargs+=(
+ -DQT_FEATURE_rdrnd=OFF
+ -DQT_FEATURE_rdseed=OFF
+ )
+
+ # see bug #913400 for explanations, mostly to handle -mno-*
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 10afd1ff2ad0..558e1b6b1caf 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -24,6 +24,8 @@ declare -A QT6_IUSE=(
[sql]="mysql oci8 odbc postgres +sqlite"
[widgets]="cups gtk"
+ [cpuflags]="cpu_flags_x86_rdrand"
+
[optfeature]="nls" #810802
)
IUSE="${QT6_IUSE[*]}"
@@ -235,7 +237,14 @@ src_configure() {
)
if use amd64 || use x86; then
- # see bug #913400 for explanations
+ # see bug #922498, let detection do its thing if set
+ use cpu_flags_x86_rdrand ||
+ mycmakeargs+=(
+ -DQT_FEATURE_rdrnd=OFF
+ -DQT_FEATURE_rdseed=OFF
+ )
+
+ # see bug #913400 for explanations, mostly to handle -mno-*
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 10afd1ff2ad0..558e1b6b1caf 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -24,6 +24,8 @@ declare -A QT6_IUSE=(
[sql]="mysql oci8 odbc postgres +sqlite"
[widgets]="cups gtk"
+ [cpuflags]="cpu_flags_x86_rdrand"
+
[optfeature]="nls" #810802
)
IUSE="${QT6_IUSE[*]}"
@@ -235,7 +237,14 @@ src_configure() {
)
if use amd64 || use x86; then
- # see bug #913400 for explanations
+ # see bug #922498, let detection do its thing if set
+ use cpu_flags_x86_rdrand ||
+ mycmakeargs+=(
+ -DQT_FEATURE_rdrnd=OFF
+ -DQT_FEATURE_rdseed=OFF
+ )
+
+ # see bug #913400 for explanations, mostly to handle -mno-*
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-01-23 14:36 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-01-23 14:36 UTC (permalink / raw
To: gentoo-commits
commit: 666e7caae1dd37040ddff9afeca76786f20de1d3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 14:32:30 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 14:36:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=666e7caa
dev-qt/qtbase: revbump to ensure rdrand is enabled
Following previous commit.
Apologies for the rebuilds, can't rely on --changed-use
to do the right thing here.
Bug: https://bugs.gentoo.org/922498
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/{qtbase-6.6.1-r3.ebuild => qtbase-6.6.1-r4.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r4.ebuild
similarity index 100%
rename from dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
rename to dev-qt/qtbase/qtbase-6.6.1-r4.ebuild
^ permalink raw reply [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-01-23 14:36 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-01-23 14:36 UTC (permalink / raw
To: gentoo-commits
commit: c1b0c6d2e86fcba4c9f198d3945c17f5d96dcc92
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 14:28:38 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 14:33:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1b0c6d2
Revert "dev-qt/qtbase: add IUSE=cpu_flags_x86_rdrand"
Regardless of if that worked or not, on second thought this was a
bad idea. The flag is rather misleading for generic binhosts because
they should actually *enable* it to allow optional usage (runtime
detection). And then, this is actually broken on top, so let's just
return to the previous state.
This reverts commit c198f69e66547b5ba7d2ba1b9bae576ce93ee703.
Bug: https://bugs.gentoo.org/922498
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.1-r3.ebuild | 11 +----------
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 11 +----------
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 11 +----------
dev-qt/qtbase/qtbase-6.9999.ebuild | 11 +----------
4 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
index d9f21bee7611..a0defb2de975 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
@@ -25,8 +25,6 @@ declare -A QT6_IUSE=(
[sql]="mysql oci8 odbc postgres +sqlite"
[widgets]="cups gtk"
- [cpuflags]="cpu_flags_x86_rdrand"
-
[optfeature]="nls wayland" #810802,864509
)
IUSE="${QT6_IUSE[*]}"
@@ -237,14 +235,7 @@ src_configure() {
)
if use amd64 || use x86; then
- # see bug #922498, let detection do its thing if set
- use cpu_flags_x86_rdrand ||
- mycmakeargs+=(
- -DQT_FEATURE_rdrnd=OFF
- -DQT_FEATURE_rdseed=OFF
- )
-
- # see bug #913400 for explanations, mostly to handle -mno-*
+ # see bug #913400 for explanations
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 1df2ecec87b6..dcaf37200a90 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -24,8 +24,6 @@ declare -A QT6_IUSE=(
[sql]="mysql oci8 odbc postgres +sqlite"
[widgets]="cups gtk"
- [cpuflags]="cpu_flags_x86_rdrand"
-
[optfeature]="nls wayland" #810802,864509
)
IUSE="${QT6_IUSE[*]}"
@@ -234,14 +232,7 @@ src_configure() {
)
if use amd64 || use x86; then
- # see bug #922498, let detection do its thing if set
- use cpu_flags_x86_rdrand ||
- mycmakeargs+=(
- -DQT_FEATURE_rdrnd=OFF
- -DQT_FEATURE_rdseed=OFF
- )
-
- # see bug #913400 for explanations, mostly to handle -mno-*
+ # see bug #913400 for explanations
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 558e1b6b1caf..10afd1ff2ad0 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -24,8 +24,6 @@ declare -A QT6_IUSE=(
[sql]="mysql oci8 odbc postgres +sqlite"
[widgets]="cups gtk"
- [cpuflags]="cpu_flags_x86_rdrand"
-
[optfeature]="nls" #810802
)
IUSE="${QT6_IUSE[*]}"
@@ -237,14 +235,7 @@ src_configure() {
)
if use amd64 || use x86; then
- # see bug #922498, let detection do its thing if set
- use cpu_flags_x86_rdrand ||
- mycmakeargs+=(
- -DQT_FEATURE_rdrnd=OFF
- -DQT_FEATURE_rdseed=OFF
- )
-
- # see bug #913400 for explanations, mostly to handle -mno-*
+ # see bug #913400 for explanations
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 558e1b6b1caf..10afd1ff2ad0 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -24,8 +24,6 @@ declare -A QT6_IUSE=(
[sql]="mysql oci8 odbc postgres +sqlite"
[widgets]="cups gtk"
- [cpuflags]="cpu_flags_x86_rdrand"
-
[optfeature]="nls" #810802
)
IUSE="${QT6_IUSE[*]}"
@@ -237,14 +235,7 @@ src_configure() {
)
if use amd64 || use x86; then
- # see bug #922498, let detection do its thing if set
- use cpu_flags_x86_rdrand ||
- mycmakeargs+=(
- -DQT_FEATURE_rdrnd=OFF
- -DQT_FEATURE_rdseed=OFF
- )
-
- # see bug #913400 for explanations, mostly to handle -mno-*
+ # see bug #913400 for explanations
local cpufeats=(
# list of checked cpu features in configure.cmake
avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-02-29 2:09 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-02-29 2:09 UTC (permalink / raw
To: gentoo-commits
commit: e0226bb33e74851ac96f181ae9bf43f60e7e991c
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 29 02:05:07 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 29 02:06:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0226bb3
dev-qt/qtbase: drop upstreamed x32 fix from live
Thanks for getting this fixed upstream.
Bug: https://bugs.gentoo.org/925103
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 1 -
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 1 -
dev-qt/qtbase/qtbase-6.9999.ebuild | 1 -
3 files changed, 3 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index a39a20691815..d7b14a3f1a66 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -137,7 +137,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
- "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index c2827c3f3ac9..e2aa70f1ea9b 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -138,7 +138,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
- "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index c2827c3f3ac9..e2aa70f1ea9b 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -138,7 +138,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
- "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-03-22 6:16 Arthur Zamarin
0 siblings, 0 replies; 80+ messages in thread
From: Arthur Zamarin @ 2024-03-22 6:16 UTC (permalink / raw
To: gentoo-commits
commit: 351232bf2ce9ddb236fee05a77a03735bcb7521d
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 06:15:06 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 06:15:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=351232bf
dev-qt/qtbase: Stabilize 6.6.2 arm64, #927197
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.2.ebuild b/dev-qt/qtbase/qtbase-6.6.2.ebuild
index 14520bcdd35c..b91ae109dba2 100644
--- a/dev-qt/qtbase/qtbase-6.6.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-03-24 18:39 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-03-24 18:39 UTC (permalink / raw
To: gentoo-commits
commit: d2c7ce699ffbf9c9ba54b51acad2f08182dc54d9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 12:15:31 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 18:37:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c7ce69
dev-qt/qtbase: drop 6.7.0_rc
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/Manifest | 1 -
dev-qt/qtbase/qtbase-6.7.0_rc.ebuild | 373 -----------------------------------
2 files changed, 374 deletions(-)
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 65303cab051c..c255456bc0c6 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,3 +1,2 @@
DIST qtbase-everywhere-src-6.6.2.tar.xz 48689304 BLAKE2B e00f4ac7ede0694b7934612f7dc3acdd50139d385492034c3046625a973d8adbca059e9d4081e248502cab8c673806cdb6b8bc5cee6d9356bbb0a7845db528a2 SHA512 ea343bcf269779a4e078ed8baddfbe6c5ec4a34275c7d72b3f3928da60feece2ddc9ce4a380c6536a4e1654b483cee8918f8ad3038904725d2dd1c653ae83ece
-DIST qtbase-everywhere-src-6.7.0-rc.tar.xz 49303532 BLAKE2B 5cea931d7ef03432289b112f47671d59d6ef6debade6d7b6d2e4ea6ff8132e3f27c2c887aa4bb811661b838611511b8b6c6cf7a511c94e3ee8b983cd1b0b5a1c SHA512 984a0a5b83a71d4150f13a69de3e9f286094894b51bd4de8cd2210bcf3a41ef5053fe453ced4c7b49deb6ebafd0ddba78cf1b3098e1f1a5a27f2c58016959525
DIST qtbase-everywhere-src-6.7.0-rc2.tar.xz 49307632 BLAKE2B ffae9f9f93cef3f72b89d3cd4c09ca3927fa2341efe49d485e979cf70480ad6fd82578776cb44f1df6fcb3f03dafb3a4883d45966af1b01f3b6b05d4e02f658d SHA512 72f06ea8a2329b790398a7fe899d3ee851fcb719d9b81073db5705500b478bb96b283b0eac0bdc9c3f0f0ef302ba287ce0e987a98dba76e29d72e5f296e54332
diff --git a/dev-qt/qtbase/qtbase-6.7.0_rc.ebuild b/dev-qt/qtbase/qtbase-6.7.0_rc.ebuild
deleted file mode 100644
index 5efe5d84f51e..000000000000
--- a/dev-qt/qtbase/qtbase-6.7.0_rc.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build toolchain-funcs
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-declare -A QT6_IUSE=(
- [global]="+ssl +udev zstd"
- [core]="icu"
- [modules]="+concurrent +dbus +gui +network +sql +xml"
-
- [gui]="
- +X accessibility eglfs evdev gles2-only +libinput
- opengl renderdoc tslib vulkan wayland +widgets
- "
- [network]="brotli gssapi libproxy sctp"
- [sql]="mysql oci8 odbc postgres +sqlite"
- [widgets]="cups gtk"
-
- [optfeature]="nls" #810802
-)
-IUSE="${QT6_IUSE[*]}"
-REQUIRED_USE="
- $(
- printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
- printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
- printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
- printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
- )
- accessibility? ( dbus )
- eglfs? ( opengl )
- gles2-only? ( opengl )
- gui? ( || ( X eglfs wayland ) )
- libinput? ( udev )
- sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
- test? ( icu sql? ( sqlite ) )
-"
-
-# groups:
-# - global (configure.cmake)
-# - qtcore (src/corelib/configure.cmake)
-# - qtgui (src/gui/configure.cmake)
-# - qtnetwork (src/network/configure.cmake)
-# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
-# - qtsql (src/plugins/sqldrivers/configure.cmake)
-# dlopen: renderdoc
-RDEPEND="
- sys-libs/zlib:=
- ssl? ( dev-libs/openssl:= )
- udev? ( virtual/libudev:= )
- zstd? ( app-arch/zstd:= )
-
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode(+)]
- icu? ( dev-libs/icu:= )
-
- dbus? ( sys-apps/dbus )
- gui? (
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/harfbuzz:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- x11-libs/libdrm
- x11-libs/libxkbcommon[X?]
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libxcb:=
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- accessibility? ( app-accessibility/at-spi2-core:2 )
- eglfs? ( media-libs/mesa[gbm(+)] )
- evdev? ( sys-libs/mtdev )
- libinput? ( dev-libs/libinput:= )
- opengl? (
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X?] )
- )
- renderdoc? ( media-gfx/renderdoc )
- tslib? ( x11-libs/tslib )
- widgets? (
- cups? ( net-print/cups )
- gtk? (
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/pango
- )
- )
- )
- network? (
- brotli? ( app-arch/brotli:= )
- gssapi? ( virtual/krb5 )
- libproxy? ( net-libs/libproxy )
- )
- sql? (
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( dev-db/sqlite:3 )
- )
-"
-DEPEND="
- ${RDEPEND}
- X? ( x11-base/xorg-proto )
- gui? (
- vulkan? ( dev-util/vulkan-headers )
- )
- network? (
- sctp? ( net-misc/lksctp-tools )
- )
- test? (
- elibc_musl? ( sys-libs/timezone-data )
- )
-"
-BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392
-PDEPEND="
- nls? ( ~dev-qt/qttranslations-${PV}:6 )
- wayland? ( ~dev-qt/qtwayland-${PV}:6 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
- "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
- "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
-)
-
-src_prepare() {
- qt6-build_src_prepare
-
- if use test; then
- # test itself has -Werror=strict-aliasing issues, drop for simplicity
- sed -e '/add_subdirectory(qsharedpointer)/d' \
- -i tests/auto/corelib/tools/CMakeLists.txt || die
-
- # workaround for __extendhfxf2 being used for tst_qfloat16.cpp
- # which is unavailable with compiler-rt (assume used if clang)
- if tc-is-clang; then
- sed -e '/add_subdirectory(qfloat16)/d' \
- -i tests/auto/corelib/global/CMakeLists.txt || die
- fi
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_WITH_PCH=OFF
-
- -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}"
- -DINSTALL_BINDIR="${QT6_BINDIR}"
- -DINSTALL_DATADIR="${QT6_DATADIR}"
- -DINSTALL_DOCDIR="${QT6_DOCDIR}"
- -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}"
- -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}"
- -DINSTALL_LIBDIR="${QT6_LIBDIR}"
- -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}"
- -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}"
- -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}"
- -DINSTALL_QMLDIR="${QT6_QMLDIR}"
- -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}"
- -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}"
-
- -DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
-
- $(qt_feature ssl openssl)
- $(qt_feature ssl openssl_linked)
- $(qt_feature udev libudev)
- $(qt_feature zstd)
-
- # qtcore
- $(qt_feature icu)
-
- # tools
- -DQT_FEATURE_androiddeployqt=OFF
-
- # modules
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature network)
- $(qt_feature sql)
- # trivial, and is often needed (sometimes even when not building tests)
- -DQT_FEATURE_testlib=ON
- $(qt_feature xml)
- )
-
- use gui && mycmakeargs+=(
- $(qt_feature X xcb)
- $(qt_feature X system_xcb_xinput)
- $(qt_feature X xkbcommon_x11)
- $(cmake_use_find_package X X11) # needed for truly no automagic
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature eglfs)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- $(qt_feature libinput)
- $(qt_feature renderdoc graphicsframecapture)
- $(qt_feature tslib)
- $(qt_feature vulkan)
- $(qt_feature wayland)
- $(qt_feature widgets)
- -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no)
- -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c
- ) && use widgets && mycmakeargs+=(
- # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
-
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(usev test -DQT_SKIP_DOCKER_COMPOSE=ON)
- )
-
- use sql && mycmakeargs+=(
- -DQT_FEATURE_sql_db2=OFF # unpackaged
- -DQT_FEATURE_sql_ibase=OFF # unpackaged
- -DQT_FEATURE_sql_mimer=OFF # unpackaged
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- if use amd64 || use x86; then
- # see bug #913400 for explanations
- local cpufeats=(
- # list of checked cpu features in configure.cmake
- avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
- f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
- )
- # handle odd ones out not matching -m* and macros (keep same order)
- local cpuflags=( "${cpufeats[@]}" aes sha )
- local cpufeats+=( aesni shani )
-
- local -a intrins
- IFS=' ' read -ra intrins < <(
- : "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
- $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
- $(printf '__%s__ ' "${cpuflags[@]^^}")
- EOF
- assert
- )
-
- # do nothing and leave to qtbase if no macros expanded (test failed?)
- if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
- local -i i
- for ((i=0; i<${#cpufeats[@]}; i++)); do
- [[ ${intrins[i]} == __* ]] &&
- mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
- done
- mycmakeargs+=( -DTEST_x86intrin=ON )
- fi
- fi
-
- qt6-build_src_configure
-}
-
-src_test() {
- local -x TZ=UTC
- local -x LC_TIME=C
-
- local CMAKE_SKIP_TESTS=(
- # broken with out-of-source + if qtbase is not already installed
- tst_moc
- tst_qmake
- # needs x11/opengl, we *could* run these but tend to be flaky
- # when opengl rendering is involved (even if software-only)
- tst_qopengl{,config,widget,window}
- tst_qgraphicsview
- tst_qx11info
- # fails with network sandbox
- tst_qdnslookup
- # fails with sandbox
- tst_qsharedmemory
- # typical to lack SCTP support on non-generic kernels
- tst_qsctpsocket
- # 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_qtimer
- # these can be flaky depending on the environment/toolchain
- tst_qlogging # backtrace log test can easily vary
- tst_q{,raw}font # affected by available fonts / settings (bug #914737)
- tst_qprinter # checks system's printers (bug #916216)
- tst_qstorageinfo # checks mounted filesystems
- # flaky due to using different test framework and fails with USE=-gui
- tst_selftests
- # known failing when using clang+glibc+stdc++, needs looking into
- tst_qthread
- # partially failing on x86 chroots and seemingly(?) harmless (dev-qt
- # revdeps tests pass), skip globally to avoid keywording flakiness
- tst_json
- tst_qcolorspace
- tst_qdoublevalidator
- tst_qglobal
- tst_qglyphrun
- tst_qvectornd
- tst_rcc
- # similarly, but on armv7 and potentially others (bug #914028)
- tst_qlineedit
- tst_qpainter
- # likewise, known failing on BE arches (bug #914033,914371,918878)
- tst_qimagereader
- tst_qimagewriter
- tst_qpluginloader
- tst_quuid # >=6.6.2 had related fixes, needs retesting
- # partially broken on llvm-musl, needs looking into but skip to have
- # a baseline for regressions (rest of dev-qt still passes with musl)
- $(usev elibc_musl '
- tst_qicoimageformat
- tst_qimagereader
- tst_qimage
- tst_qprocess
- ')
- # fails due to hppa's NaN handling, needs looking into (bug #914371)
- $(usev hppa '
- tst_qcborvalue
- tst_qnumeric
- ')
- # bug #914033
- $(usev sparc '
- tst_qbuffer
- tst_qprocess
- tst_qtconcurrentiteratekernel
- ')
- # note: for linux, upstream only really runs+maintains tests for amd64
- # https://doc.qt.io/qt-6/supported-platforms.html
- )
-
- qt6-build_src_test
-}
-
-src_install() {
- qt6-build_src_install
-
- if use test; then
- local delete_bins=( # need a better way to handle this
- clientserver copier crashingServer desktopsettingsaware_helper
- echo fileWriterProcess modal_helper nospace 'one space'
- paster qcommandlineparser_test_helper qfileopeneventexternal
- socketprocess syslocaleapp tst_qhashseed_helper 'two space s'
- write-read-write
- )
- local delete=( # sigh
- "${D}${QT6_BINDIR}"/test*
- "${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
- )
- # using -f given not tracking which tests may be skipped or not
- rm -rf -- "${delete[@]}" || die
- fi
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-03-25 22:10 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-03-25 22:10 UTC (permalink / raw
To: gentoo-commits
commit: 4d83f8f0859e6060cb191e2b7b66259937369f20
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 11:37:58 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 22:08:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d83f8f0
dev-qt/qtbase: disable relocatable builds
And skip 3 tests that newly fail to find some resources (or at least,
if qtbase is not already installed). Not worth keeping enabled over
these.
Meant to wait for 6.6.3 to merge this to lessen rebuilds, but looks
like it may(?) be delayed again.
Bug: https://bugs.gentoo.org/927691
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/{qtbase-6.6.2.ebuild => qtbase-6.6.2-r1.ebuild} | 5 +++++
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 5 +++++
.../qtbase/{qtbase-6.7.0_rc2.ebuild => qtbase-6.7.0_rc2-r1.ebuild} | 5 +++++
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 5 +++++
dev-qt/qtbase/qtbase-6.9999.ebuild | 5 +++++
5 files changed, 25 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.6.2.ebuild b/dev-qt/qtbase/qtbase-6.6.2-r1.ebuild
similarity index 98%
rename from dev-qt/qtbase/qtbase-6.6.2.ebuild
rename to dev-qt/qtbase/qtbase-6.6.2-r1.ebuild
index b91ae109dba2..f842fee2eae4 100644
--- a/dev-qt/qtbase/qtbase-6.6.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.2-r1.ebuild
@@ -168,6 +168,7 @@ src_configure() {
-DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}"
-DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}"
+ -DQT_FEATURE_relocatable=OFF #927691
$(qt_feature ssl openssl)
$(qt_feature ssl openssl_linked)
$(qt_feature udev libudev)
@@ -274,6 +275,10 @@ src_test() {
# broken with out-of-source + if qtbase is not already installed
tst_moc
tst_qmake
+ # similarly broken when relocatable=OFF (bug #927691)
+ tst_qapplication
+ tst_qt_cmake_create
+ tst_uic
# needs x11/opengl, we *could* run these but tend to be flaky
# when opengl rendering is involved (even if software-only)
tst_qopengl{,config,widget,window}
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 76bd87ab7e87..1adebe3c5958 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -169,6 +169,7 @@ src_configure() {
-DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
+ -DQT_FEATURE_relocatable=OFF #927691
$(qt_feature ssl openssl)
$(qt_feature ssl openssl_linked)
$(qt_feature udev libudev)
@@ -275,6 +276,10 @@ src_test() {
# broken with out-of-source + if qtbase is not already installed
tst_moc
tst_qmake
+ # similarly broken when relocatable=OFF (bug #927691)
+ tst_qapplication
+ tst_qt_cmake_create
+ tst_uic
# needs x11/opengl, we *could* run these but tend to be flaky
# when opengl rendering is involved (even if software-only)
tst_qopengl{,config,widget,window}
diff --git a/dev-qt/qtbase/qtbase-6.7.0_rc2.ebuild b/dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild
similarity index 98%
rename from dev-qt/qtbase/qtbase-6.7.0_rc2.ebuild
rename to dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild
index 5efe5d84f51e..87d5fb955203 100644
--- a/dev-qt/qtbase/qtbase-6.7.0_rc2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild
@@ -177,6 +177,7 @@ src_configure() {
-DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
+ -DQT_FEATURE_relocatable=OFF #927691
$(qt_feature ssl openssl)
$(qt_feature ssl openssl_linked)
$(qt_feature udev libudev)
@@ -285,6 +286,10 @@ src_test() {
# broken with out-of-source + if qtbase is not already installed
tst_moc
tst_qmake
+ # similarly broken when relocatable=OFF (bug #927691)
+ tst_qapplication
+ tst_qt_cmake_create
+ tst_uic
# needs x11/opengl, we *could* run these but tend to be flaky
# when opengl rendering is involved (even if software-only)
tst_qopengl{,config,widget,window}
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 5efe5d84f51e..87d5fb955203 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -177,6 +177,7 @@ src_configure() {
-DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
+ -DQT_FEATURE_relocatable=OFF #927691
$(qt_feature ssl openssl)
$(qt_feature ssl openssl_linked)
$(qt_feature udev libudev)
@@ -285,6 +286,10 @@ src_test() {
# broken with out-of-source + if qtbase is not already installed
tst_moc
tst_qmake
+ # similarly broken when relocatable=OFF (bug #927691)
+ tst_qapplication
+ tst_qt_cmake_create
+ tst_uic
# needs x11/opengl, we *could* run these but tend to be flaky
# when opengl rendering is involved (even if software-only)
tst_qopengl{,config,widget,window}
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 5efe5d84f51e..87d5fb955203 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -177,6 +177,7 @@ src_configure() {
-DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
+ -DQT_FEATURE_relocatable=OFF #927691
$(qt_feature ssl openssl)
$(qt_feature ssl openssl_linked)
$(qt_feature udev libudev)
@@ -285,6 +286,10 @@ src_test() {
# broken with out-of-source + if qtbase is not already installed
tst_moc
tst_qmake
+ # similarly broken when relocatable=OFF (bug #927691)
+ tst_qapplication
+ tst_qt_cmake_create
+ tst_uic
# needs x11/opengl, we *could* run these but tend to be flaky
# when opengl rendering is involved (even if software-only)
tst_qopengl{,config,widget,window}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-03-30 0:29 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-03-30 0:29 UTC (permalink / raw
To: gentoo-commits
commit: bcfafb98985b8422bf02078576130a8c3e146340
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 22:16:54 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 00:27:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcfafb98
dev-qt/qtbase: drop 6.6.9999
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 368 -----------------------------------
1 file changed, 368 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
deleted file mode 100644
index 40a65fab575d..000000000000
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build toolchain-funcs
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-declare -A QT6_IUSE=(
- [global]="+ssl +udev zstd"
- [core]="icu"
- [modules]="+concurrent +dbus +gui +network +sql +xml"
-
- [gui]="
- +X accessibility eglfs evdev gles2-only +libinput
- opengl tslib vulkan +widgets
- "
- [network]="brotli gssapi libproxy sctp"
- [sql]="mysql oci8 odbc postgres +sqlite"
- [widgets]="cups gtk"
-
- [optfeature]="nls wayland" #810802,864509
-)
-IUSE="${QT6_IUSE[*]}"
-REQUIRED_USE="
- $(
- printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
- printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
- printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
- printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
- )
- accessibility? ( dbus )
- eglfs? ( opengl )
- gles2-only? ( opengl )
- gui? ( || ( X eglfs wayland ) )
- libinput? ( udev )
- sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
- test? ( icu sql? ( sqlite ) )
-"
-
-# groups:
-# - global (configure.cmake)
-# - qtcore (src/corelib/configure.cmake)
-# - qtgui (src/gui/configure.cmake)
-# - qtnetwork (src/network/configure.cmake)
-# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
-# - qtsql (src/plugins/sqldrivers/configure.cmake)
-RDEPEND="
- sys-libs/zlib:=
- ssl? ( dev-libs/openssl:= )
- udev? ( virtual/libudev:= )
- zstd? ( app-arch/zstd:= )
-
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode(+)]
- icu? ( dev-libs/icu:= )
-
- dbus? ( sys-apps/dbus )
- gui? (
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/harfbuzz:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- x11-libs/libdrm
- x11-libs/libxkbcommon[X?]
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libxcb:=
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- accessibility? ( app-accessibility/at-spi2-core:2 )
- eglfs? ( media-libs/mesa[gbm(+)] )
- evdev? ( sys-libs/mtdev )
- libinput? ( dev-libs/libinput:= )
- opengl? (
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X?] )
- )
- tslib? ( x11-libs/tslib )
- widgets? (
- cups? ( net-print/cups )
- gtk? (
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/pango
- )
- )
- )
- network? (
- brotli? ( app-arch/brotli:= )
- gssapi? ( virtual/krb5 )
- libproxy? ( net-libs/libproxy )
- )
- sql? (
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( dev-db/sqlite:3 )
- )
-"
-DEPEND="
- ${RDEPEND}
- X? ( x11-base/xorg-proto )
- gui? (
- vulkan? ( dev-util/vulkan-headers )
- )
- network? (
- sctp? ( net-misc/lksctp-tools )
- )
- test? (
- elibc_musl? ( sys-libs/timezone-data )
- )
-"
-BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392
-PDEPEND="
- nls? ( ~dev-qt/qttranslations-${PV}:6 )
- wayland? ( ~dev-qt/qtwayland-${PV}:6 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
- "${FILESDIR}"/${PN}-6.5.2-no-glx.patch
- "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
- "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
- "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
-)
-
-src_prepare() {
- qt6-build_src_prepare
-
- if use test; then
- # test itself has -Werror=strict-aliasing issues, drop for simplicity
- sed -e '/add_subdirectory(qsharedpointer)/d' \
- -i tests/auto/corelib/tools/CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_WITH_PCH=OFF
-
- -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}"
- -DINSTALL_BINDIR="${QT6_BINDIR}"
- -DINSTALL_DATADIR="${QT6_DATADIR}"
- -DINSTALL_DOCDIR="${QT6_DOCDIR}"
- -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}"
- -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}"
- -DINSTALL_LIBDIR="${QT6_LIBDIR}"
- -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}"
- -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}"
- -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}"
- -DINSTALL_QMLDIR="${QT6_QMLDIR}"
- -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}"
- -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}"
-
- -DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
-
- -DQT_FEATURE_relocatable=OFF #927691
- $(qt_feature ssl openssl)
- $(qt_feature ssl openssl_linked)
- $(qt_feature udev libudev)
- $(qt_feature zstd)
-
- # qtcore
- $(qt_feature icu)
-
- # tools
- -DQT_FEATURE_androiddeployqt=OFF
-
- # modules
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature network)
- $(qt_feature sql)
- # trivial, and is often needed (sometimes even when not building tests)
- -DQT_FEATURE_testlib=ON
- $(qt_feature xml)
- )
-
- use gui && mycmakeargs+=(
- $(qt_feature X xcb)
- $(qt_feature X system_xcb_xinput)
- $(qt_feature X xkbcommon_x11)
- $(cmake_use_find_package X X11) # needed for truly no automagic
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature eglfs)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- $(qt_feature libinput)
- $(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+=(
- # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
-
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(usev test -DQT_SKIP_DOCKER_COMPOSE=ON)
- )
-
- use sql && mycmakeargs+=(
- -DQT_FEATURE_sql_db2=OFF # unpackaged
- -DQT_FEATURE_sql_ibase=OFF # unpackaged
- -DQT_FEATURE_sql_mimer=OFF # unpackaged
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- if use amd64 || use x86; then
- # see bug #913400 for explanations
- local cpufeats=(
- # list of checked cpu features in configure.cmake
- avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
- f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
- )
- # handle odd ones out not matching -m* and macros (keep same order)
- local cpuflags=( "${cpufeats[@]}" aes sha )
- local cpufeats+=( aesni shani )
-
- local -a intrins
- IFS=' ' read -ra intrins < <(
- : "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
- $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
- $(printf '__%s__ ' "${cpuflags[@]^^}")
- EOF
- assert
- )
-
- # do nothing and leave to qtbase if no macros expanded (test failed?)
- if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
- local -i i
- for ((i=0; i<${#cpufeats[@]}; i++)); do
- [[ ${intrins[i]} == __* ]] &&
- mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
- done
- mycmakeargs+=( -DTEST_x86intrin=ON )
- fi
- fi
-
- qt6-build_src_configure
-}
-
-src_test() {
- local -x TZ=UTC
- local -x LC_TIME=C
-
- local CMAKE_SKIP_TESTS=(
- # broken with out-of-source + if qtbase is not already installed
- tst_moc
- tst_qmake
- # similarly broken when relocatable=OFF (bug #927691)
- tst_qapplication
- tst_qt_cmake_create
- tst_uic
- # needs x11/opengl, we *could* run these but tend to be flaky
- # when opengl rendering is involved (even if software-only)
- tst_qopengl{,config,widget,window}
- tst_qgraphicsview
- tst_qx11info
- # fails with network sandbox
- tst_qdnslookup
- # fails with sandbox
- tst_qsharedmemory
- # typical to lack SCTP support on non-generic kernels
- tst_qsctpsocket
- # 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_qtimer
- # these can be flaky depending on the environment/toolchain
- tst_qlogging # backtrace log test can easily vary
- tst_q{,raw}font # affected by available fonts / settings (bug #914737)
- tst_qprinter # checks system's printers (bug #916216)
- tst_qstorageinfo # checks mounted filesystems
- # flaky due to using different test framework and fails with USE=-gui
- tst_selftests
- # known failing when using clang+glibc+stdc++, needs looking into
- tst_qthread
- # partially failing on x86 chroots and seemingly(?) harmless (dev-qt
- # revdeps tests pass), skip globally to avoid keywording flakiness
- tst_json
- tst_qcolorspace
- tst_qdoublevalidator
- tst_qglobal
- tst_qglyphrun
- tst_qvectornd
- tst_rcc
- # similarly, but on armv7 and potentially others (bug #914028)
- tst_qlineedit
- tst_qpainter
- # likewise, known failing on BE arches (bug #914033,914371,918878)
- tst_qimagereader
- tst_qimagewriter
- tst_qpluginloader
- tst_quuid # >=6.6.2 had related fixes, needs retesting
- # partially broken on llvm-musl, needs looking into but skip to have
- # a baseline for regressions (rest of dev-qt still passes with musl)
- $(usev elibc_musl '
- tst_qicoimageformat
- tst_qimagereader
- tst_qimage
- ')
- # fails due to hppa's NaN handling, needs looking into (bug #914371)
- $(usev hppa '
- tst_qcborvalue
- tst_qnumeric
- ')
- # bug #914033
- $(usev sparc '
- tst_qbuffer
- tst_qprocess
- tst_qtconcurrentiteratekernel
- ')
- # note: for linux, upstream only really runs+maintains tests for amd64
- # https://doc.qt.io/qt-6/supported-platforms.html
- )
-
- qt6-build_src_test
-}
-
-src_install() {
- qt6-build_src_install
-
- if use test; then
- local delete_bins=( # need a better way to handle this
- clientserver copier crashingServer desktopsettingsaware_helper
- echo fileWriterProcess modal_helper nospace 'one space'
- paster qcommandlineparser_test_helper qfileopeneventexternal
- socketprocess syslocaleapp tst_qhashseed_helper 'two space s'
- write-read-write
- )
- local delete=( # sigh
- "${D}${QT6_BINDIR}"/test*
- "${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
- )
- # using -f given not tracking which tests may be skipped or not
- rm -rf -- "${delete[@]}" || die
- fi
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-04-02 6:09 Arthur Zamarin
0 siblings, 0 replies; 80+ messages in thread
From: Arthur Zamarin @ 2024-04-02 6:09 UTC (permalink / raw
To: gentoo-commits
commit: c3ef99a228ef10375fccdeab3590dddd13992a10
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 2 05:55:38 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 2 05:55:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ef99a2
dev-qt/qtbase: Stabilize 6.6.3 arm64, #928382
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.3.ebuild b/dev-qt/qtbase/qtbase-6.6.3.ebuild
index 3a2e7d77128d..61f586a93393 100644
--- a/dev-qt/qtbase/qtbase-6.6.3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.3.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-06-02 8:22 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-06-02 8:22 UTC (permalink / raw
To: gentoo-commits
commit: 7b48b3f78072691a3e4170abfd150bdeea065f93
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 07:15:03 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 08:22:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b48b3f7
dev-qt/qtbase: remove obsolete cpu feature workaround
qt6-build.eclass does a different type of workaround,
see the new _qt6-build_sanitize_cpu_flags function.
Bug: https://bugs.gentoo.org/933374
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.7.0-r2.ebuild | 33 +--------------------------------
dev-qt/qtbase/qtbase-6.7.1.ebuild | 33 +--------------------------------
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 33 +--------------------------------
dev-qt/qtbase/qtbase-6.9999.ebuild | 33 +--------------------------------
4 files changed, 4 insertions(+), 128 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild b/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild
index 203bcb3c6d6f..b3b3f80bb86a 100644
--- a/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -248,37 +248,6 @@ src_configure() {
$(qt_feature sqlite system_sqlite)
)
- if use amd64 || use x86; then
- # see bug #913400 for explanations
- local cpufeats=(
- # list of checked cpu features in configure.cmake
- avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
- f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
- )
- # handle odd ones out not matching -m* and macros (keep same order)
- local cpuflags=( "${cpufeats[@]}" aes sha )
- local cpufeats+=( aesni shani )
-
- local -a intrins
- IFS=' ' read -ra intrins < <(
- : "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
- $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
- $(printf '__%s__ ' "${cpuflags[@]^^}")
- EOF
- assert
- )
-
- # do nothing and leave to qtbase if no macros expanded (test failed?)
- if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
- local -i i
- for ((i=0; i<${#cpufeats[@]}; i++)); do
- [[ ${intrins[i]} == __* ]] &&
- mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
- done
- mycmakeargs+=( -DTEST_x86intrin=ON )
- fi
- fi
-
qt6-build_src_configure
}
diff --git a/dev-qt/qtbase/qtbase-6.7.1.ebuild b/dev-qt/qtbase/qtbase-6.7.1.ebuild
index 40845fc00e5b..8fcaa6b8b960 100644
--- a/dev-qt/qtbase/qtbase-6.7.1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -247,37 +247,6 @@ src_configure() {
$(qt_feature sqlite system_sqlite)
)
- if use amd64 || use x86; then
- # see bug #913400 for explanations
- local cpufeats=(
- # list of checked cpu features in configure.cmake
- avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
- f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
- )
- # handle odd ones out not matching -m* and macros (keep same order)
- local cpuflags=( "${cpufeats[@]}" aes sha )
- local cpufeats+=( aesni shani )
-
- local -a intrins
- IFS=' ' read -ra intrins < <(
- : "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
- $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
- $(printf '__%s__ ' "${cpuflags[@]^^}")
- EOF
- assert
- )
-
- # do nothing and leave to qtbase if no macros expanded (test failed?)
- if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
- local -i i
- for ((i=0; i<${#cpufeats[@]}; i++)); do
- [[ ${intrins[i]} == __* ]] &&
- mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
- done
- mycmakeargs+=( -DTEST_x86intrin=ON )
- fi
- fi
-
qt6-build_src_configure
}
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 016279f8fec5..fbe1ce6c1da1 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -245,37 +245,6 @@ src_configure() {
$(qt_feature sqlite system_sqlite)
)
- if use amd64 || use x86; then
- # see bug #913400 for explanations
- local cpufeats=(
- # list of checked cpu features in configure.cmake
- avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
- f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
- )
- # handle odd ones out not matching -m* and macros (keep same order)
- local cpuflags=( "${cpufeats[@]}" aes sha )
- local cpufeats+=( aesni shani )
-
- local -a intrins
- IFS=' ' read -ra intrins < <(
- : "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
- $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
- $(printf '__%s__ ' "${cpuflags[@]^^}")
- EOF
- assert
- )
-
- # do nothing and leave to qtbase if no macros expanded (test failed?)
- if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
- local -i i
- for ((i=0; i<${#cpufeats[@]}; i++)); do
- [[ ${intrins[i]} == __* ]] &&
- mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
- done
- mycmakeargs+=( -DTEST_x86intrin=ON )
- fi
- fi
-
qt6-build_src_configure
}
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 016279f8fec5..fbe1ce6c1da1 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -245,37 +245,6 @@ src_configure() {
$(qt_feature sqlite system_sqlite)
)
- if use amd64 || use x86; then
- # see bug #913400 for explanations
- local cpufeats=(
- # list of checked cpu features in configure.cmake
- avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
- f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
- )
- # handle odd ones out not matching -m* and macros (keep same order)
- local cpuflags=( "${cpufeats[@]}" aes sha )
- local cpufeats+=( aesni shani )
-
- local -a intrins
- IFS=' ' read -ra intrins < <(
- : "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
- $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
- $(printf '__%s__ ' "${cpuflags[@]^^}")
- EOF
- assert
- )
-
- # do nothing and leave to qtbase if no macros expanded (test failed?)
- if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
- local -i i
- for ((i=0; i<${#cpufeats[@]}; i++)); do
- [[ ${intrins[i]} == __* ]] &&
- mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
- done
- mycmakeargs+=( -DTEST_x86intrin=ON )
- fi
- fi
-
qt6-build_src_configure
}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-07-03 0:39 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-07-03 0:39 UTC (permalink / raw
To: gentoo-commits
commit: dbc91345b3bd1783a729aa2241ed5f0dae6e9c4c
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 23:49:36 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 00:39:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc91345
dev-qt/qtbase: skip flaky tst_qhighdpi
Closes: https://bugs.gentoo.org/935364
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.7.1.ebuild | 1 +
dev-qt/qtbase/qtbase-6.7.2.ebuild | 1 +
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 1 +
dev-qt/qtbase/qtbase-6.8.9999.ebuild | 1 +
dev-qt/qtbase/qtbase-6.9999.ebuild | 1 +
5 files changed, 5 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.7.1.ebuild b/dev-qt/qtbase/qtbase-6.7.1.ebuild
index 534c7504e39a..63fdc141c19c 100644
--- a/dev-qt/qtbase/qtbase-6.7.1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.1.ebuild
@@ -281,6 +281,7 @@ src_test() {
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
tst_qprinter # checks system's printers (bug #916216)
+ tst_qhighdpi # may detect users' settings and fail (bug #935364)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.7.2.ebuild b/dev-qt/qtbase/qtbase-6.7.2.ebuild
index fbe1ce6c1da1..435584eeecbe 100644
--- a/dev-qt/qtbase/qtbase-6.7.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.2.ebuild
@@ -279,6 +279,7 @@ src_test() {
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
tst_qprinter # checks system's printers (bug #916216)
+ tst_qhighdpi # may detect users' settings and fail (bug #935364)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index fbe1ce6c1da1..435584eeecbe 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -279,6 +279,7 @@ src_test() {
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
tst_qprinter # checks system's printers (bug #916216)
+ tst_qhighdpi # may detect users' settings and fail (bug #935364)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index ea4d281fc895..04fb1a0aaefe 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -291,6 +291,7 @@ src_test() {
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
tst_qprinter # checks system's printers (bug #916216)
+ tst_qhighdpi # may detect users' settings and fail (bug #935364)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index ea4d281fc895..04fb1a0aaefe 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -291,6 +291,7 @@ src_test() {
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
tst_qprinter # checks system's printers (bug #916216)
+ tst_qhighdpi # may detect users' settings and fail (bug #935364)
tst_qstorageinfo # checks mounted filesystems
# flaky due to using different test framework and fails with USE=-gui
tst_selftests
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-07-08 10:09 Sam James
0 siblings, 0 replies; 80+ messages in thread
From: Sam James @ 2024-07-08 10:09 UTC (permalink / raw
To: gentoo-commits
commit: 71dff60b47b861d325f6094c1642f98d289c66b2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 10:08:26 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 10:08:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71dff60b
dev-qt/qtbase: Stabilize 6.7.2 arm, #935728
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.7.2.ebuild b/dev-qt/qtbase/qtbase-6.7.2.ebuild
index e1820d92dc28..0b833357dd52 100644
--- a/dev-qt/qtbase/qtbase-6.7.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-07-08 16:40 Arthur Zamarin
0 siblings, 0 replies; 80+ messages in thread
From: Arthur Zamarin @ 2024-07-08 16:40 UTC (permalink / raw
To: gentoo-commits
commit: c775db3627cbfcda92e3a5a57bfaadf94e3150e7
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 16:39:18 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 16:39:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c775db36
dev-qt/qtbase: Stabilize 6.7.2 ppc, #935728
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtbase/qtbase-6.7.2.ebuild b/dev-qt/qtbase/qtbase-6.7.2.ebuild
index 8003dc2432c7..439453a48b82 100644
--- a/dev-qt/qtbase/qtbase-6.7.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
declare -A QT6_IUSE=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-07-21 12:54 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-07-21 12:54 UTC (permalink / raw
To: gentoo-commits
commit: 82e647db0aad2ea52f63a2d1babb681a5c02f909
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 12:51:37 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 12:53:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e647db
dev-qt/qtbase: drop vulnerable 6.7.2
Bug: https://bugs.gentoo.org/935869
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.7.2.ebuild | 349 --------------------------------------
1 file changed, 349 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.7.2.ebuild b/dev-qt/qtbase/qtbase-6.7.2.ebuild
deleted file mode 100644
index 3882a09e6d82..000000000000
--- a/dev-qt/qtbase/qtbase-6.7.2.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build toolchain-funcs
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-declare -A QT6_IUSE=(
- [global]="+ssl +udev zstd"
- [core]="icu"
- [modules]="+concurrent +dbus +gui +network +sql +xml"
-
- [gui]="
- +X accessibility eglfs evdev gles2-only +libinput
- opengl renderdoc tslib vulkan wayland +widgets
- "
- [network]="brotli gssapi libproxy sctp"
- [sql]="mysql oci8 odbc postgres +sqlite"
- [widgets]="cups gtk"
-
- [optfeature]="nls" #810802
-)
-IUSE="${QT6_IUSE[*]}"
-REQUIRED_USE="
- $(
- printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
- printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
- printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
- printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
- )
- accessibility? ( dbus )
- eglfs? ( opengl )
- gles2-only? ( opengl )
- gui? ( || ( X eglfs wayland ) )
- libinput? ( udev )
- sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
- test? ( icu sql? ( sqlite ) )
-"
-
-# groups:
-# - global (configure.cmake)
-# - qtcore (src/corelib/configure.cmake)
-# - qtgui (src/gui/configure.cmake)
-# - qtnetwork (src/network/configure.cmake)
-# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
-# - qtsql (src/plugins/sqldrivers/configure.cmake)
-# dlopen: renderdoc
-RDEPEND="
- sys-libs/zlib:=
- ssl? ( dev-libs/openssl:= )
- udev? ( virtual/libudev:= )
- zstd? ( app-arch/zstd:= )
-
- app-crypt/libb2
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2:=[pcre16,unicode(+)]
- icu? ( dev-libs/icu:= )
-
- dbus? ( sys-apps/dbus )
- gui? (
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/harfbuzz:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- x11-libs/libdrm
- x11-libs/libxkbcommon[X?]
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libxcb:=
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- accessibility? ( app-accessibility/at-spi2-core:2 )
- eglfs? ( media-libs/mesa[gbm(+)] )
- evdev? ( sys-libs/mtdev )
- libinput? ( dev-libs/libinput:= )
- opengl? (
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X?] )
- )
- renderdoc? ( media-gfx/renderdoc )
- tslib? ( x11-libs/tslib )
- widgets? (
- cups? ( net-print/cups )
- gtk? (
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/pango
- )
- )
- )
- network? (
- brotli? ( app-arch/brotli:= )
- gssapi? ( virtual/krb5 )
- libproxy? ( net-libs/libproxy )
- )
- sql? (
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( dev-db/sqlite:3 )
- )
-"
-DEPEND="
- ${RDEPEND}
- X? ( x11-base/xorg-proto )
- gui? (
- vulkan? ( dev-util/vulkan-headers )
- )
- network? (
- sctp? ( net-misc/lksctp-tools )
- )
- test? (
- elibc_musl? ( sys-libs/timezone-data )
- )
-"
-BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392
-PDEPEND="
- nls? ( ~dev-qt/qttranslations-${PV}:6 )
- wayland? ( ~dev-qt/qtwayland-${PV}:6 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
- "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
- "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
- "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
-)
-
-src_prepare() {
- qt6-build_src_prepare
-
- if use test; then
- # test itself has -Werror=strict-aliasing issues, drop for simplicity
- sed -e '/add_subdirectory(qsharedpointer)/d' \
- -i tests/auto/corelib/tools/CMakeLists.txt || die
-
- # workaround for __extendhfxf2 being used for tst_qfloat16.cpp
- # which is unavailable with compiler-rt (assume used if clang)
- if tc-is-clang; then
- sed -e '/add_subdirectory(qfloat16)/d' \
- -i tests/auto/corelib/global/CMakeLists.txt || die
- fi
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_WITH_PCH=OFF
-
- -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}"
- -DINSTALL_BINDIR="${QT6_BINDIR}"
- -DINSTALL_DATADIR="${QT6_DATADIR}"
- -DINSTALL_DOCDIR="${QT6_DOCDIR}"
- -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}"
- -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}"
- -DINSTALL_LIBDIR="${QT6_LIBDIR}"
- -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}"
- -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}"
- -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}"
- -DINSTALL_QMLDIR="${QT6_QMLDIR}"
- -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}"
- -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}"
-
- -DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
-
- -DQT_FEATURE_relocatable=OFF #927691
- $(qt_feature ssl openssl)
- $(qt_feature ssl openssl_linked)
- $(qt_feature udev libudev)
- $(qt_feature zstd)
-
- # qtcore
- $(qt_feature icu)
-
- # tools
- -DQT_FEATURE_androiddeployqt=OFF
-
- # modules
- $(qt_feature concurrent)
- $(qt_feature dbus)
- $(qt_feature gui)
- $(qt_feature network)
- $(qt_feature sql)
- # trivial, and is often needed (sometimes even when not building tests)
- -DQT_FEATURE_testlib=ON
- $(qt_feature xml)
- )
-
- use gui && mycmakeargs+=(
- $(qt_feature X xcb)
- $(qt_feature X system_xcb_xinput)
- $(qt_feature X xkbcommon_x11)
- $(cmake_use_find_package X X11) # needed for truly no automagic
- $(qt_feature accessibility accessibility_atspi_bridge)
- $(qt_feature eglfs)
- $(qt_feature evdev)
- $(qt_feature evdev mtdev)
- $(qt_feature libinput)
- $(qt_feature renderdoc graphicsframecapture)
- $(qt_feature tslib)
- $(qt_feature vulkan)
- $(qt_feature wayland)
- $(qt_feature widgets)
- -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no)
- -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c
- ) && use widgets && mycmakeargs+=(
- # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
- $(qt_feature cups)
- $(qt_feature gtk gtk3)
- )
-
- use network && mycmakeargs+=(
- $(qt_feature brotli)
- $(qt_feature gssapi)
- $(qt_feature libproxy)
- $(qt_feature sctp)
- $(usev test -DQT_SKIP_DOCKER_COMPOSE=ON)
- )
-
- use sql && mycmakeargs+=(
- -DQT_FEATURE_sql_db2=OFF # unpackaged
- -DQT_FEATURE_sql_ibase=OFF # unpackaged
- -DQT_FEATURE_sql_mimer=OFF # unpackaged
- $(qt_feature mysql sql_mysql)
- $(qt_feature oci8 sql_oci)
- $(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
- $(qt_feature odbc sql_odbc)
- $(qt_feature postgres sql_psql)
- $(qt_feature sqlite sql_sqlite)
- $(qt_feature sqlite system_sqlite)
- )
-
- qt6-build_src_configure
-}
-
-src_test() {
- local -x TZ=UTC
- local -x LC_TIME=C
-
- local CMAKE_SKIP_TESTS=(
- # broken with out-of-source + if qtbase is not already installed
- tst_moc
- tst_qmake
- # similarly broken when relocatable=OFF (bug #927691)
- tst_qapplication
- tst_qt_cmake_create
- tst_uic
- # needs x11/opengl, we *could* run these but tend to be flaky
- # when opengl rendering is involved (even if software-only)
- tst_qopengl{,config,widget,window}
- tst_qgraphicsview
- tst_qx11info
- # fails with network sandbox
- tst_qdnslookup
- # fails with sandbox
- tst_qsharedmemory
- # typical to lack SCTP support on non-generic kernels
- tst_qsctpsocket
- # 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_qtimer
- # these can be flaky depending on the environment/toolchain
- tst_qlogging # backtrace log test can easily vary
- tst_q{,raw}font # affected by available fonts / settings (bug #914737)
- tst_qprinter # checks system's printers (bug #916216)
- tst_qhighdpi # may detect users' settings and fail (bug #935364)
- tst_qstorageinfo # checks mounted filesystems
- # flaky due to using different test framework and fails with USE=-gui
- tst_selftests
- # known failing when using clang+glibc+stdc++, needs looking into
- tst_qthread
- # partially failing on x86 chroots and seemingly(?) harmless (dev-qt
- # revdeps tests pass), skip globally to avoid keywording flakiness
- tst_json
- tst_qcolorspace
- tst_qdoublevalidator
- tst_qglobal
- tst_qglyphrun
- tst_qvectornd
- tst_rcc
- # similarly, but on armv7 and potentially others (bug #914028)
- tst_qlineedit
- tst_qpainter
- # likewise, known failing on BE arches (bug #914033,914371,918878)
- tst_qimagereader
- tst_qimagewriter
- tst_qpluginloader
- tst_quuid # >=6.6.2 had related fixes, needs retesting
- # partially broken on llvm-musl, needs looking into but skip to have
- # a baseline for regressions (rest of dev-qt still passes with musl)
- $(usev elibc_musl '
- tst_qicoimageformat
- tst_qimagereader
- tst_qimage
- tst_qprocess
- ')
- # fails due to hppa's NaN handling, needs looking into (bug #914371)
- $(usev hppa '
- tst_qcborvalue
- tst_qnumeric
- ')
- # bug #914033
- $(usev sparc '
- tst_qbuffer
- tst_qprocess
- tst_qtconcurrentiteratekernel
- ')
- # note: for linux, upstream only really runs+maintains tests for amd64
- # https://doc.qt.io/qt-6/supported-platforms.html
- )
-
- qt6-build_src_test
-}
-
-src_install() {
- qt6-build_src_install
-
- if use test; then
- local delete_bins=( # need a better way to handle this
- clientserver copier crashingServer desktopsettingsaware_helper
- echo fileWriterProcess modal_helper nospace 'one space'
- paster qcommandlineparser_test_helper qfileopeneventexternal
- socketprocess syslocaleapp tst_qhashseed_helper 'two space s'
- write-read-write
- )
- local delete=( # sigh
- "${D}${QT6_BINDIR}"/test*
- "${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
- )
- # using -f given not tracking which tests may be skipped or not
- rm -rf -- "${delete[@]}" || die
- fi
-}
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-07-22 22:53 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-07-22 22:53 UTC (permalink / raw
To: gentoo-commits
commit: d6bad4026d30c5cd1de2b5f3e91c60fef2842330
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 22:46:57 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 22:52:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6bad402
dev-qt/qtbase: skip flaky tst_qprocess
Closes: https://bugs.gentoo.org/936484
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.7.2-r1.ebuild | 3 +--
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 3 +--
dev-qt/qtbase/qtbase-6.8.9999.ebuild | 3 +--
dev-qt/qtbase/qtbase-6.9999.ebuild | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
index 428654198862..54a41ae62c97 100644
--- a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
@@ -275,6 +275,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 +310,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 +319,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..21ce4da21682 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -274,6 +274,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 +309,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 +318,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..a07ea4a4d232 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -286,6 +286,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 +321,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 +330,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..a07ea4a4d232 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -286,6 +286,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 +321,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 +330,6 @@ src_test() {
# bug #914033
$(usev sparc '
tst_qbuffer
- tst_qprocess
tst_qtconcurrentiteratekernel
')
# note: for linux, upstream only really runs+maintains tests for amd64
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-07-25 6:22 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-07-25 6:22 UTC (permalink / raw
To: gentoo-commits
commit: 2c080804290e4b6114cbde1d9fe83e8d87df53c4
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 05:27:58 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 06:19:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c080804
dev-qt/qtbase: depend on virtual/logger with syslog
Not super important but it shouldn't hurt, esp. given
unsure how Qt behaves when it's missing.
Introduce COMMON_DEPEND while at it to be correct,
feel may potentially need it for other dependencies
in the future.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.7.2-r1.ebuild | 8 ++++++--
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 8 ++++++--
dev-qt/qtbase/qtbase-6.8.9999.ebuild | 8 ++++++--
dev-qt/qtbase/qtbase-6.9999.ebuild | 8 ++++++--
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
index f33fdc4a6d2b..ef5475795d66 100644
--- a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
@@ -52,7 +52,7 @@ REQUIRED_USE="
# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
# - qtsql (src/plugins/sqldrivers/configure.cmake)
# dlopen: renderdoc
-RDEPEND="
+COMMON_DEPEND="
sys-libs/zlib:=
ssl? ( dev-libs/openssl:= )
udev? ( virtual/libudev:= )
@@ -117,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 )
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 1745b5822a2f..1e708080ccd0 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -52,7 +52,7 @@ REQUIRED_USE="
# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
# - qtsql (src/plugins/sqldrivers/configure.cmake)
# dlopen: renderdoc
-RDEPEND="
+COMMON_DEPEND="
sys-libs/zlib:=
ssl? ( dev-libs/openssl:= )
udev? ( virtual/libudev:= )
@@ -117,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 )
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 89be67c5f6ec..8c263c91dad5 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -52,7 +52,7 @@ REQUIRED_USE="
# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
# - qtsql (src/plugins/sqldrivers/configure.cmake)
# dlopen: renderdoc
-RDEPEND="
+COMMON_DEPEND="
sys-libs/zlib:=
ssl? ( dev-libs/openssl:= )
udev? ( virtual/libudev:= )
@@ -117,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 )
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 89be67c5f6ec..8c263c91dad5 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -52,7 +52,7 @@ REQUIRED_USE="
# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
# - qtsql (src/plugins/sqldrivers/configure.cmake)
# dlopen: renderdoc
-RDEPEND="
+COMMON_DEPEND="
sys-libs/zlib:=
ssl? ( dev-libs/openssl:= )
udev? ( virtual/libudev:= )
@@ -117,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 )
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-07-25 6:22 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-07-25 6:22 UTC (permalink / raw
To: gentoo-commits
commit: 196cb5209b9d157bcecfc9de3be5211e9e5b52d5
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 05:23:38 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 06:20:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196cb520
dev-qt/qtbase: extend description for journald and syslog
Primary reason not using (profile default) USE=systemd or
global descriptions is because this disables stderr and
may come as unexpected.
Arguably syslog should've been renamed too, albeit fwiw
it's not a default and likely few people set it globally.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/metadata.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
index 3c04495eff72..ceb3786524f7 100644
--- a/dev-qt/qtbase/metadata.xml
+++ b/dev-qt/qtbase/metadata.xml
@@ -14,15 +14,15 @@
<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>
- <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>
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-07-25 6:22 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-07-25 6:22 UTC (permalink / raw
To: gentoo-commits
commit: 9a47c3b8aeeab8b397410e01cf9ef97c948521a4
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 05:13:37 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 06:20:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a47c3b8
dev-qt/qtbase: minor style/comment adjustments
Note that if needed this ?? () could be dropped, syslog just
becomes a no-op if both are set, but given journald is not a
global USE it shouldn't cause problems at this stage and lets
users know only one will work.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.7.2-r1.ebuild | 4 ++--
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 4 ++--
dev-qt/qtbase/qtbase-6.8.9999.ebuild | 4 ++--
dev-qt/qtbase/qtbase-6.9999.ebuild | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
index ef5475795d66..37e0b5c51a97 100644
--- a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
@@ -28,13 +28,13 @@ declare -A QT6_IUSE=(
)
IUSE="${QT6_IUSE[*]}"
REQUIRED_USE="
+ ?? ( journald syslog )
$(
printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
)
- ?? ( journald syslog )
accessibility? ( dbus )
eglfs? ( opengl )
gles2-only? ( opengl )
@@ -51,7 +51,7 @@ REQUIRED_USE="
# - qtnetwork (src/network/configure.cmake)
# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
# - qtsql (src/plugins/sqldrivers/configure.cmake)
-# dlopen: renderdoc
+# nolink: renderdoc, systemd
COMMON_DEPEND="
sys-libs/zlib:=
ssl? ( dev-libs/openssl:= )
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 1e708080ccd0..66720e44d615 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -28,13 +28,13 @@ declare -A QT6_IUSE=(
)
IUSE="${QT6_IUSE[*]}"
REQUIRED_USE="
+ ?? ( journald syslog )
$(
printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
)
- ?? ( journald syslog )
accessibility? ( dbus )
eglfs? ( opengl )
gles2-only? ( opengl )
@@ -51,7 +51,7 @@ REQUIRED_USE="
# - qtnetwork (src/network/configure.cmake)
# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
# - qtsql (src/plugins/sqldrivers/configure.cmake)
-# dlopen: renderdoc
+# nolink: renderdoc, systemd
COMMON_DEPEND="
sys-libs/zlib:=
ssl? ( dev-libs/openssl:= )
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 8c263c91dad5..0f0f5cc3cd3a 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -28,13 +28,13 @@ declare -A QT6_IUSE=(
)
IUSE="${QT6_IUSE[*]}"
REQUIRED_USE="
+ ?? ( journald syslog )
$(
printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
)
- ?? ( journald syslog )
accessibility? ( dbus )
eglfs? ( opengl )
gles2-only? ( opengl )
@@ -51,7 +51,7 @@ REQUIRED_USE="
# - qtnetwork (src/network/configure.cmake)
# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
# - qtsql (src/plugins/sqldrivers/configure.cmake)
-# dlopen: renderdoc
+# nolink: renderdoc, systemd
COMMON_DEPEND="
sys-libs/zlib:=
ssl? ( dev-libs/openssl:= )
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 8c263c91dad5..0f0f5cc3cd3a 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -28,13 +28,13 @@ declare -A QT6_IUSE=(
)
IUSE="${QT6_IUSE[*]}"
REQUIRED_USE="
+ ?? ( journald syslog )
$(
printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
)
- ?? ( journald syslog )
accessibility? ( dbus )
eglfs? ( opengl )
gles2-only? ( opengl )
@@ -51,7 +51,7 @@ REQUIRED_USE="
# - qtnetwork (src/network/configure.cmake)
# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
# - qtsql (src/plugins/sqldrivers/configure.cmake)
-# dlopen: renderdoc
+# nolink: renderdoc, systemd
COMMON_DEPEND="
sys-libs/zlib:=
ssl? ( dev-libs/openssl:= )
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-08-25 20:27 Eli Schwartz
0 siblings, 0 replies; 80+ messages in thread
From: Eli Schwartz @ 2024-08-25 20:27 UTC (permalink / raw
To: gentoo-commits
commit: 45a465608ea72d3de1aa22b6d250873251751aeb
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 06:30:56 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 20:23:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a46560
dev-qt/qtbase: prevent automagically building against gtk[X,wayland]
e.g. the upstream code checks whether GDK_WINDOWING_WAYLAND is defined
by the gtk headers, and if so will compile against the wayland symbols
it provides. This means that qtbase built on a system with
gtk+[-wayland] will be compatible with anything, but when built on a
system with gtk+[wayland], requires that at runtime.
It's only needed, of course, by the qgtk3 platformtheme plugin which not
necessarily everyone builds, wants, or uses at runtime :) but still.
We can solve this with a (new) gentoo-specific macro that hides the
GTK implementations when we don't want it. This is gated on our existing
USE flags for wayland/X support.
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
.../qtbase/{qtbase-6.7.2-r3.ebuild => qtbase-6.7.2-r4.ebuild} | 11 +++++++++--
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 11 +++++++++--
dev-qt/qtbase/qtbase-6.8.9999.ebuild | 11 +++++++++--
dev-qt/qtbase/qtbase-6.9999.ebuild | 11 +++++++++--
4 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.7.2-r3.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r4.ebuild
similarity index 96%
rename from dev-qt/qtbase/qtbase-6.7.2-r3.ebuild
rename to dev-qt/qtbase/qtbase-6.7.2-r4.ebuild
index 2782f8186d06..e7e909a26a94 100644
--- a/dev-qt/qtbase/qtbase-6.7.2-r3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.2-r4.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build toolchain-funcs
+inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -99,7 +99,7 @@ COMMON_DEPEND="
cups? ( net-print/cups )
gtk? (
x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
+ >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
x11-libs/pango
)
)
@@ -170,6 +170,13 @@ src_prepare() {
}
src_configure() {
+ # The only component that uses gdk backends is the qgtk3 platformtheme plugin
+ if use gtk; then
+ # defang automagic dependencies
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ fi
+
local mycmakeargs=(
-DBUILD_WITH_PCH=OFF
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index e4a66f7137f8..580f9e80474a 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build toolchain-funcs
+inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -99,7 +99,7 @@ COMMON_DEPEND="
cups? ( net-print/cups )
gtk? (
x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
+ >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
x11-libs/pango
)
)
@@ -166,6 +166,13 @@ src_prepare() {
}
src_configure() {
+ # The only component that uses gdk backends is the qgtk3 platformtheme plugin
+ if use gtk; then
+ # defang automagic dependencies
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ fi
+
local mycmakeargs=(
-DBUILD_WITH_PCH=OFF
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 9af015d9b088..1381d70d7a19 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build toolchain-funcs
+inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -99,7 +99,7 @@ COMMON_DEPEND="
cups? ( net-print/cups )
gtk? (
x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
+ >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
x11-libs/pango
)
)
@@ -166,6 +166,13 @@ src_prepare() {
}
src_configure() {
+ # The only component that uses gdk backends is the qgtk3 platformtheme plugin
+ if use gtk; then
+ # defang automagic dependencies
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ fi
+
local mycmakeargs=(
-DBUILD_WITH_PCH=OFF
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 9af015d9b088..1381d70d7a19 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build toolchain-funcs
+inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -99,7 +99,7 @@ COMMON_DEPEND="
cups? ( net-print/cups )
gtk? (
x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
+ >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
x11-libs/pango
)
)
@@ -166,6 +166,13 @@ src_prepare() {
}
src_configure() {
+ # The only component that uses gdk backends is the qgtk3 platformtheme plugin
+ if use gtk; then
+ # defang automagic dependencies
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ fi
+
local mycmakeargs=(
-DBUILD_WITH_PCH=OFF
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-08-26 22:08 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-08-26 22:08 UTC (permalink / raw
To: gentoo-commits
commit: d949be9fd01f16d6f6ddaf55f4bbc418d1be8ba4
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 26 22:06:26 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 22:06:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d949be9f
dev-qt/qtbase: drop upstreamed patch
Bug: https://bugs.gentoo.org/937809
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 1 -
dev-qt/qtbase/qtbase-6.8.9999.ebuild | 1 -
dev-qt/qtbase/qtbase-6.9999.ebuild | 1 -
3 files changed, 3 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 580f9e80474a..cc0ae2b0de2c 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -145,7 +145,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
- "${FILESDIR}"/${PN}-6.7.2-gcc15-odr.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 1381d70d7a19..e2867369035a 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -145,7 +145,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
- "${FILESDIR}"/${PN}-6.7.2-gcc15-odr.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 1381d70d7a19..e2867369035a 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -145,7 +145,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
- "${FILESDIR}"/${PN}-6.7.2-gcc15-odr.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-09-02 17:52 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-09-02 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 384a0dc2a523ac6f68a1ab844ebb7dd52b9e65dd
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 2 14:59:00 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Sep 2 17:51:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384a0dc2
dev-qt/qtbase: skip tst_qlatin1stringmatcher in 6.8+
Haven't tried 6.7.9999 yet, may possibly be needed depending
on what changes made it in from dev branch.
Will notice when bump 6.7.3 (assuming this ever releases),
it's hard to miss when the whole system slows down until the
OOM killer kicks in.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.8.9999.ebuild | 2 ++
dev-qt/qtbase/qtbase-6.9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index e2867369035a..7c4afe2f0a19 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -303,6 +303,8 @@ src_test() {
# may randomly hang+timeout, perhaps related to -j as well
tst_qprocess #936484
tst_qtimer
+ # haystacksWithMoreThan4GiBWork can easily OOM (16GB ram not enough)
+ tst_qlatin1stringmatcher
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index e2867369035a..7c4afe2f0a19 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -303,6 +303,8 @@ src_test() {
# may randomly hang+timeout, perhaps related to -j as well
tst_qprocess #936484
tst_qtimer
+ # haystacksWithMoreThan4GiBWork can easily OOM (16GB ram not enough)
+ tst_qlatin1stringmatcher
# these can be flaky depending on the environment/toolchain
tst_qlogging # backtrace log test can easily vary
tst_q{,raw}font # affected by available fonts / settings (bug #914737)
^ permalink raw reply related [flat|nested] 80+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
@ 2024-09-03 7:44 Ionen Wolkens
0 siblings, 0 replies; 80+ messages in thread
From: Ionen Wolkens @ 2024-09-03 7:44 UTC (permalink / raw
To: gentoo-commits
commit: df482aab0062cc4cfd13a051b0bdb48707a06d54
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 07:17:39 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 3 07:43:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df482aab
dev-qt/qtbase: minor style adjustments + add missing bug number
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 5 ++---
dev-qt/qtbase/qtbase-6.8.9999.ebuild | 5 ++---
dev-qt/qtbase/qtbase-6.9999.ebuild | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index cc0ae2b0de2c..b4cd4854a401 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -165,11 +165,10 @@ src_prepare() {
}
src_configure() {
- # The only component that uses gdk backends is the qgtk3 platformtheme plugin
if use gtk; then
- # defang automagic dependencies
- use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ # defang automagic dependencies (bug #624960)
use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
fi
local mycmakeargs=(
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 7c4afe2f0a19..3c595f73638f 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -165,11 +165,10 @@ src_prepare() {
}
src_configure() {
- # The only component that uses gdk backends is the qgtk3 platformtheme plugin
if use gtk; then
- # defang automagic dependencies
- use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ # defang automagic dependencies (bug #624960)
use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
fi
local mycmakeargs=(
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 7c4afe2f0a19..3c595f73638f 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -165,11 +165,10 @@ src_prepare() {
}
src_configure() {
- # The only component that uses gdk backends is the qgtk3 platformtheme plugin
if use gtk; then
- # defang automagic dependencies
- use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ # defang automagic dependencies (bug #624960)
use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
fi
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 80+ messages in thread
end of thread, other threads:[~2024-09-03 7:44 UTC | newest]
Thread overview: 80+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-20 8:32 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2024-09-03 7:44 Ionen Wolkens
2024-09-02 17:52 Ionen Wolkens
2024-08-26 22:08 Ionen Wolkens
2024-08-25 20:27 Eli Schwartz
2024-07-25 6:22 Ionen Wolkens
2024-07-25 6:22 Ionen Wolkens
2024-07-25 6:22 Ionen Wolkens
2024-07-22 22:53 Ionen Wolkens
2024-07-21 12:54 Ionen Wolkens
2024-07-08 16:40 Arthur Zamarin
2024-07-08 10:09 Sam James
2024-07-03 0:39 Ionen Wolkens
2024-06-02 8:22 Ionen Wolkens
2024-04-02 6:09 Arthur Zamarin
2024-03-30 0:29 Ionen Wolkens
2024-03-25 22:10 Ionen Wolkens
2024-03-24 18:39 Ionen Wolkens
2024-03-22 6:16 Arthur Zamarin
2024-02-29 2:09 Ionen Wolkens
2024-01-23 14:36 Ionen Wolkens
2024-01-23 14:36 Ionen Wolkens
2024-01-19 22:13 Ionen Wolkens
2024-01-08 21:09 Ionen Wolkens
2024-01-08 12:59 Ionen Wolkens
2024-01-08 12:59 Ionen Wolkens
2024-01-07 15:20 Ionen Wolkens
2024-01-07 15:20 Ionen Wolkens
2023-12-18 1:37 Ionen Wolkens
2023-12-01 19:48 Jakov Smolić
2023-12-01 7:04 Ionen Wolkens
2023-12-01 6:21 Sam James
2023-12-01 6:21 Sam James
2023-11-30 5:29 Ionen Wolkens
2023-11-29 22:33 Sam James
2023-10-27 11:40 Ionen Wolkens
2023-10-27 11:40 Ionen Wolkens
2023-10-22 4:51 Ionen Wolkens
2023-10-17 21:19 Ionen Wolkens
2023-10-10 18:09 Ionen Wolkens
2023-10-10 14:51 Ionen Wolkens
2023-09-26 15:16 Ionen Wolkens
2023-09-26 12:24 Ionen Wolkens
2023-09-24 17:51 Ionen Wolkens
2023-09-24 17:09 WANG Xuerui
2023-09-24 17:09 WANG Xuerui
2023-09-22 20:53 Sam James
2023-09-19 3:02 Ionen Wolkens
2023-09-19 3:02 Ionen Wolkens
2023-09-17 2:11 Ionen Wolkens
2023-09-17 1:59 Ionen Wolkens
2023-09-13 16:42 Ionen Wolkens
2023-09-13 16:42 Ionen Wolkens
2023-09-12 11:44 Ionen Wolkens
2023-09-12 11:44 Ionen Wolkens
2023-09-12 1:28 Sam James
2023-09-12 1:26 Sam James
2023-09-12 0:13 Ionen Wolkens
2023-09-11 22:59 Sam James
2023-09-09 16:22 Ionen Wolkens
2023-09-09 16:22 Ionen Wolkens
2023-09-09 16:22 Ionen Wolkens
2023-09-06 8:49 Ionen Wolkens
2023-09-05 14:31 Ionen Wolkens
2023-09-05 13:05 Ionen Wolkens
2023-06-10 14:33 Jimi Huotari
2023-06-10 14:33 Jimi Huotari
2023-06-02 15:39 Jimi Huotari
2023-05-24 6:52 Jimi Huotari
2023-05-23 2:52 Sam James
2023-05-06 11:26 Jimi Huotari
2023-04-17 19:39 Jimi Huotari
2023-04-17 19:39 Jimi Huotari
2023-03-26 16:59 Jimi Huotari
2023-03-19 13:09 Jimi Huotari
2023-02-09 10:02 Andreas Sturmlechner
2023-01-05 22:39 Jimi Huotari
2022-12-01 19:19 Andreas Sturmlechner
2022-09-24 14:32 Andreas Sturmlechner
2022-08-02 22:00 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox