From fbba40085f5d1591a67b49f5aa48b4071b7560f1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Jun 2023 21:52:51 +0100 Subject: gentoo auto-resync : 10:06:2023 - 21:52:51 --- dev-qt/qtbase/Manifest | 2 +- dev-qt/qtbase/qtbase-6.5.1-r1.ebuild | 190 +++++++++++++++++++++++++++++++++++ dev-qt/qtbase/qtbase-6.5.1.ebuild | 189 ---------------------------------- 3 files changed, 191 insertions(+), 190 deletions(-) create mode 100644 dev-qt/qtbase/qtbase-6.5.1-r1.ebuild delete mode 100644 dev-qt/qtbase/qtbase-6.5.1.ebuild (limited to 'dev-qt/qtbase') diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index def4801572f2..11e78f42ddd4 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -1,4 +1,4 @@ AUX qtbase-6.5.1-CVE-2023-34410.patch 2731 BLAKE2B a0b894782aad05e904e76112391df4895606fa95cdd6365bdfcf5096be769750c4e3c5a331a43498d5a4c84b712a4df595eb4c629fa47e458fda6475c7ff8451 SHA512 eb19ff548835ca208d1209fc8c712dfb2cca91170b23535e87879e843d599bf5d4939b2f3d9c47ef73c238ff8c939f6fd85f0b5300ee97457a4bae76d0d29f67 DIST qtbase-everywhere-src-6.5.1.tar.xz 48287392 BLAKE2B 47872492f21a936d980891c28df61591380bc236adc66b57a90fbb87dd292cdeb3c632fb1159231ba40142d25e02944e4c5e8568153f1286e0a1abc8c5b26699 SHA512 7f7b20bbc25cda65266d6067cdd68e3e077636988d67dbf5783f79a61186135fb3a36d57ac72cfe4501012035b630ab1f5849148e4817726d4f459fa1937e91a -EBUILD qtbase-6.5.1.ebuild 5024 BLAKE2B 7f1a1ee51b3a887c8f8331102a2b4c96276164af8e03ceadc3fd1392fc6c603e8aed11ecb6c1d068bd5668fe59cc49420837ad0cc9a9427c90ce532e7720e370 SHA512 032e019184ab6c78aae283dbdc7595b6f62844f75b62a8b299b40d692c8100ddb9277b8a204b1f38767929bdb1ae2f14e023f0e31fe35789b56c3b8839e0160e +EBUILD qtbase-6.5.1-r1.ebuild 5080 BLAKE2B 34fe36cf300d39b2592445e47c1bea8dd9f1754378d5c2fa37ed873a145f5e0ae42e0a68fecda5110792acbd7a04c301441dedfb9e0722a136c5023f92328282 SHA512 e62f4294afed0049ad425c4a751cbd2a6f53ff9673741e9049f6ca28ae23f99ca74fa2af715d60bd4d279943b34a364aea432f1cbb85dfb1f2a6067729c2ed0d MISC metadata.xml 1762 BLAKE2B fd53799e4a3668fb8d32798f1d128df86aaa7181563655ffb71d6c15a7bab33e5fb08f3c5b41695e8fee4a46f5a5216030d0aeb0927eaeec387136ec66964a8f SHA512 6e05599e981d07f7a6d79eda9e1ef9e41383e05aec5442fed8a46be87245b6e9a77fb9b469fe656f9fdd29ffb69767136c0922baed3c5448ca8c58ee70ad713d 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 +} 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 -} -- cgit v1.2.3