commit: e4ba36795cc108de6ef439c315c3198c15764139 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Sat Jun 4 12:51:22 2022 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Mon Jun 20 18:02:03 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e4ba3679
dev-qt/qtbase: miscellaneous qt6 adjustments per review - add USE="brotli" - add USE="zstd" - adjust openssl dependency - always build with gif and ico support - fix formatting - flip 'testlib' with USE="gui" due to a quick dependency - remove 'virtual/opengl' dependency As requested at: https://github.com/gentoo/gentoo/pull/25635 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> dev-qt/qtbase/metadata.xml | 2 +- dev-qt/qtbase/qtbase-6.3.0.ebuild | 24 ++++++++++++------------ dev-qt/qtbase/qtbase-6.3.9999.ebuild | 24 ++++++++++++------------ dev-qt/qtbase/qtbase-6.9999.ebuild | 24 ++++++++++++------------ 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml index b33a37e9..1dd79121 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="brotli">Enable support for Brotli decompression</flag> <flag name="concurrent">Build Qt6Concurrent module</flag> <flag name="dbus">Build Qt6DBus module</flag> <flag name="egl">Enable EGL integration</flag> @@ -14,7 +15,6 @@ <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="ico">Enable ico image support</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> diff --git a/dev-qt/qtbase/qtbase-6.3.0.ebuild b/dev-qt/qtbase/qtbase-6.3.0.ebuild index 65c14f48..a8e1f084 100644 --- a/dev-qt/qtbase/qtbase-6.3.0.ebuild +++ b/dev-qt/qtbase/qtbase-6.3.0.ebuild @@ -13,14 +13,15 @@ fi # Qt Modules # TODO: Restore/patch xml flag support (seems fixed in 6.9999). -IUSE="+concurrent +dbus +gui +network +sql opengl +widgets" +IUSE="+concurrent +dbus +gui +network +sql opengl +widgets zstd" REQUIRED_USE=" - opengl? ( gui ) widgets? ( gui ) + opengl? ( gui ) + widgets? ( gui ) X? ( || ( evdev libinput ) ) " -QTGUI_IUSE="accessibility egl eglfs evdev +gif gles2-only +ico +jpeg +libinput tslib tuio vulkan +X" -QTNETWORK_IUSE="gssapi libproxy sctp +ssl vnc" +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. @@ -44,9 +45,6 @@ REQUIRED_USE+=" # qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c # qtnetwork: connman, networkmanager DEPEND=" - app-arch/brotli:= - app-arch/libarchive[zstd] - app-arch/zstd:= app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 @@ -58,7 +56,7 @@ DEPEND=" media-libs/tiff:0 >=sys-apps/dbus-1.4.20 sys-libs/zlib:= - virtual/opengl + brotli? ( app-arch/brotli:= ) evdev? ( sys-libs/mtdev ) freetds? ( dev-db/freetds ) gles2-only? ( media-libs/libglvnd ) @@ -84,7 +82,7 @@ DEPEND=" postgres? ( dev-db/postgresql:* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tslib? ( >=x11-libs/tslib-1.21 ) udev? ( virtual/libudev:= ) @@ -101,6 +99,7 @@ DEPEND=" x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) + zstd? ( app-arch/zstd:= ) " RDEPEND="${DEPEND}" @@ -120,16 +119,16 @@ src_configure() { -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} -DQT_FEATURE_androiddeployqt=OFF - -DQT_FEATURE_zstd=ON $(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) - -DQT_FEATURE_testlib=ON # TODO: install QtTest by default? $(qt_feature udev libudev) + $(qt_feature zstd) ) use gui && mycmakeargs+=( $(qt_feature accessibility accessibility_atspi_bridge) @@ -138,7 +137,7 @@ src_configure() { $(qt_feature eglfs eglfs_gbm) $(qt_feature evdev) $(qt_feature evdev mtdev) - $(qt_feature gif) + -DQT_FEATURE_gif=ON $(qt_feature jpeg) $(qt_feature opengl) $(qt_feature gles2-only opengles2) @@ -158,6 +157,7 @@ src_configure() { mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON ) fi use network && mycmakeargs+=( + $(qt_feature brotli) $(qt_feature gssapi) $(qt_feature libproxy) $(qt_feature sctp) diff --git a/dev-qt/qtbase/qtbase-6.3.9999.ebuild b/dev-qt/qtbase/qtbase-6.3.9999.ebuild index 65c14f48..a8e1f084 100644 --- a/dev-qt/qtbase/qtbase-6.3.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.3.9999.ebuild @@ -13,14 +13,15 @@ fi # Qt Modules # TODO: Restore/patch xml flag support (seems fixed in 6.9999). -IUSE="+concurrent +dbus +gui +network +sql opengl +widgets" +IUSE="+concurrent +dbus +gui +network +sql opengl +widgets zstd" REQUIRED_USE=" - opengl? ( gui ) widgets? ( gui ) + opengl? ( gui ) + widgets? ( gui ) X? ( || ( evdev libinput ) ) " -QTGUI_IUSE="accessibility egl eglfs evdev +gif gles2-only +ico +jpeg +libinput tslib tuio vulkan +X" -QTNETWORK_IUSE="gssapi libproxy sctp +ssl vnc" +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. @@ -44,9 +45,6 @@ REQUIRED_USE+=" # qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c # qtnetwork: connman, networkmanager DEPEND=" - app-arch/brotli:= - app-arch/libarchive[zstd] - app-arch/zstd:= app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 @@ -58,7 +56,7 @@ DEPEND=" media-libs/tiff:0 >=sys-apps/dbus-1.4.20 sys-libs/zlib:= - virtual/opengl + brotli? ( app-arch/brotli:= ) evdev? ( sys-libs/mtdev ) freetds? ( dev-db/freetds ) gles2-only? ( media-libs/libglvnd ) @@ -84,7 +82,7 @@ DEPEND=" postgres? ( dev-db/postgresql:* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tslib? ( >=x11-libs/tslib-1.21 ) udev? ( virtual/libudev:= ) @@ -101,6 +99,7 @@ DEPEND=" x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) + zstd? ( app-arch/zstd:= ) " RDEPEND="${DEPEND}" @@ -120,16 +119,16 @@ src_configure() { -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} -DQT_FEATURE_androiddeployqt=OFF - -DQT_FEATURE_zstd=ON $(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) - -DQT_FEATURE_testlib=ON # TODO: install QtTest by default? $(qt_feature udev libudev) + $(qt_feature zstd) ) use gui && mycmakeargs+=( $(qt_feature accessibility accessibility_atspi_bridge) @@ -138,7 +137,7 @@ src_configure() { $(qt_feature eglfs eglfs_gbm) $(qt_feature evdev) $(qt_feature evdev mtdev) - $(qt_feature gif) + -DQT_FEATURE_gif=ON $(qt_feature jpeg) $(qt_feature opengl) $(qt_feature gles2-only opengles2) @@ -158,6 +157,7 @@ src_configure() { mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON ) fi use network && mycmakeargs+=( + $(qt_feature brotli) $(qt_feature gssapi) $(qt_feature libproxy) $(qt_feature sctp) diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index 485c0d24..a7b3797a 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -12,14 +12,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi # Qt Modules -IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml" +IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd" REQUIRED_USE=" - opengl? ( gui ) widgets? ( gui ) + opengl? ( gui ) + widgets? ( gui ) X? ( || ( evdev libinput ) ) " -QTGUI_IUSE="accessibility egl eglfs evdev +gif gles2-only +ico +jpeg +libinput tslib tuio vulkan +X" -QTNETWORK_IUSE="gssapi libproxy sctp +ssl vnc" +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. @@ -43,9 +44,6 @@ REQUIRED_USE+=" # qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c # qtnetwork: connman, networkmanager DEPEND=" - app-arch/brotli:= - app-arch/libarchive[zstd] - app-arch/zstd:= app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 @@ -57,7 +55,7 @@ DEPEND=" media-libs/tiff:0 >=sys-apps/dbus-1.4.20 sys-libs/zlib:= - virtual/opengl + brotli? ( app-arch/brotli:= ) evdev? ( sys-libs/mtdev ) freetds? ( dev-db/freetds ) gles2-only? ( media-libs/libglvnd ) @@ -83,7 +81,7 @@ DEPEND=" postgres? ( dev-db/postgresql:* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tslib? ( >=x11-libs/tslib-1.21 ) udev? ( virtual/libudev:= ) @@ -100,6 +98,7 @@ DEPEND=" x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) + zstd? ( app-arch/zstd:= ) " RDEPEND="${DEPEND}" @@ -119,17 +118,17 @@ src_configure() { -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} -DQT_FEATURE_androiddeployqt=OFF - -DQT_FEATURE_zstd=ON $(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) - -DQT_FEATURE_testlib=ON # TODO: install QtTest by default? $(qt_feature udev libudev) $(qt_feature xml) + $(qt_feature zstd) ) use gui && mycmakeargs+=( $(qt_feature accessibility accessibility_atspi_bridge) @@ -138,7 +137,7 @@ src_configure() { $(qt_feature eglfs eglfs_gbm) $(qt_feature evdev) $(qt_feature evdev mtdev) - $(qt_feature gif) + -DQT_FEATURE_gif=ON $(qt_feature jpeg) $(qt_feature opengl) $(qt_feature gles2-only opengles2) @@ -158,6 +157,7 @@ src_configure() { mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON ) fi use network && mycmakeargs+=( + $(qt_feature brotli) $(qt_feature gssapi) $(qt_feature libproxy) $(qt_feature sctp)
