diff options
| author |   Jimi Huotari <chiitoo@gentoo.org> | 2022-10-14 18:30:50 +0300 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-11-02 05:09:45 +0000 |
| commit | c2b15ca2f28c0decd82dff7167b73a455ac1c7b1 (patch) | |
| tree | 12faa77e4e5a7d7972c14606fab54d457d2ea6a8 /dev-qt | |
| parent | qt6-build.eclass: add qt6-build_src_install (diff) | |
| download | gentoo-c2b15ca2f28c0decd82dff7167b73a455ac1c7b1.tar.gz gentoo-c2b15ca2f28c0decd82dff7167b73a455ac1c7b1.tar.bz2 gentoo-c2b15ca2f28c0decd82dff7167b73a455ac1c7b1.zip | |
dev-qt/*: add version 6.4.0
Bug: https://bugs.gentoo.org/838970
Bug: https://bugs.gentoo.org/863224
Bug: https://bugs.gentoo.org/875956
Closes: https://bugs.gentoo.org/862525
Closes: https://bugs.gentoo.org/863395
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/27812
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-qt')
38 files changed, 955 insertions, 0 deletions
diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest index 1b89d952013d..5c7caa627000 100644 --- a/dev-qt/qt5compat/Manifest +++ b/dev-qt/qt5compat/Manifest @@ -1 +1,2 @@ DIST qt5compat-everywhere-src-6.3.2.tar.xz 8194996 BLAKE2B cd874a41dc667f8d8e970c962c8475d41139081c8587249204779800bb7e50cf6f33e024cc43a9ab67ff5ae37536ca01e1365c2bca449ae53586b8d410d9b8cc SHA512 12407b27871a3972e3400d9832e454ea221fd18f6c5ce19be8084d085c148d70097b5de8fcedf2a53777b38ce9511f215e56dc145a618e472ceb2caf584c689e +DIST qt5compat-everywhere-src-6.4.0.tar.xz 14641720 BLAKE2B abed031d736e2f05856a02e96251bf77c12823866c722247360a19d592a71e52a2fb5bac121baa91dd264806fff6b2230d41ab92346ee92c4fcef7607838d4a0 SHA512 d14ebf4ed6061b7154fdd67ac71849bcfb109c9911dcc9279c01bf07b6f58cf26a882f16be6228040e6465345259a16be2296481c2129c88710fa7b4da747ba5 diff --git a/dev-qt/qt5compat/qt5compat-6.4.0.ebuild b/dev-qt/qt5compat/qt5compat-6.4.0.ebuild new file mode 100644 index 000000000000..2bf0684e946d --- /dev/null +++ b/dev-qt/qt5compat/qt5compat-6.4.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module containing the unsupported Qt 5 APIs" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND=" + =dev-qt/qtbase-${PV}*[gui,network] + =dev-qt/qtdeclarative-${PV}* +" +RDEPEND="${DEPEND}" diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 469b7132fb46..2102f829b611 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -1 +1,2 @@ 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.4.0.ebuild b/dev-qt/qtbase/qtbase-6.4.0.ebuild new file mode 100644 index 000000000000..7139d94a1678 --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.4.0.ebuild @@ -0,0 +1,185 @@ +# 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: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:= + >=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 +} diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest index 2b797cf511d8..9e4cf98cce27 100644 --- a/dev-qt/qtcharts/Manifest +++ b/dev-qt/qtcharts/Manifest @@ -1 +1,2 @@ DIST qtcharts-everywhere-opensource-src-5.15.5.tar.xz 4254052 BLAKE2B 73214ee96bf56c19889f01608259ee067f39025f9d42a18e25058060faf320c6f83c844500104f9ef858c90d59c7f5de616e6d9ec6c9e790873d70ea2bf5433c SHA512 4ee495e932b288b18d0375b754036ecfda2447284d8a0c08b06be4588c4d5802856b2ee2ac3582427ffd08a7f4ba47626ede6524b6289acc0bbe66df0fe14ec7 +DIST qtcharts-everywhere-src-6.4.0.tar.xz 4387060 BLAKE2B 8c948ef461961986c64263e5c5fca73e00ad272787e1d3b7bf38b8b072293bcdf102a080733a0dfb4c419f2af429ca6a40850ef2c8b68afda34f83f28bdbfaf2 SHA512 63f231d553fad0f5801c4abeeae0864dba3160c703e49be2ef49e7484d979621b27544408c59c903e8ac89bdf5aae6472f9e8b1d49f50951db257b52c5e60947 diff --git a/dev-qt/qtcharts/qtcharts-6.4.0.ebuild b/dev-qt/qtcharts/qtcharts-6.4.0.ebuild new file mode 100644 index 000000000000..d9ff085fc729 --- /dev/null +++ b/dev-qt/qtcharts/qtcharts-6.4.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Chart component library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND=" + =dev-qt/qtbase-${PV}*[gui,opengl,widgets] + =dev-qt/qtdeclarative-${PV}* +" +RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 184e586a5065..ea11dbbc5b45 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,3 +1,4 @@ DIST qtdeclarative-5.15.5-gentoo-kde-1.tar.xz 21772 BLAKE2B 83a19f79355102da7c3bb705a85fd6d9cfe7b0906a60664c56ca43e47ede33dffc0655ea71c79aeb60048e8c7810ae4279a6a0f491ff8a687743fe715a7ee033 SHA512 6a8e979f3673373bfae29d30b909f8d4034e64206ef5b09e34e2168421ad8c0d58972d1fe446ee61d8dcb2e27dafce455885749d8f4df45abdaeb5ed66358a3c DIST qtdeclarative-everywhere-opensource-src-5.15.5.tar.xz 21581628 BLAKE2B 4cd378a0e55269c9b22349c161f81653e43326e2e78ed7880f776aa787a934412bc83196fefdbc09250db283aff883668eb29fab326bdee4a5a966e57028b538 SHA512 b4b2754ae3566bbfa3e0162738ae6ea3b36d506841ce7e4b5651d0b0ca1c341ab19f653aebc23d13a17840d391280137c463c29fcf4866fc1f1c3adf8ebb5e5b DIST qtdeclarative-everywhere-src-6.3.2.tar.xz 30157476 BLAKE2B 54914ca16a85201232d14f3596b74d91f1cb11c59d03b8b79aa4b7ff26b45a76dcd3d2aba5a47b3ba9c9bb89f073cda20a785997f092ee57197217d95e95d967 SHA512 4929bd1e5ff16475847ddd75322353afc35c7a06688d32e6186649b38a08d88f435a134fdcfbb4f9fe588f9cd317eb8c0fb6aa0f08416b900064156f3af926af +DIST qtdeclarative-everywhere-src-6.4.0.tar.xz 30538764 BLAKE2B 919081ba8a29a07daa01084388454a3d5f814e12ff5d1a4d3b647650e4bd6a839876baee1ab09e664e55e814338dbf675e70e4c44c28842a363c8f2dcf1a2b18 SHA512 6d43c09a14e2ca236fc50166ed477e37084e89a67a04d914f30f31662a18a4e6d0433cb9b2f0654ba9ffcbcd7abcb5dadcb7b12f0ef5928fc11b10925ee6f41e diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.4.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.4.0.ebuild new file mode 100644 index 000000000000..e8ac7eddceb2 --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-6.4.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt Declarative (Quick 2)" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="opengl +sql +widgets" + +DEPEND=" + =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] + =dev-qt/qtshadertools-${PV}* +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + $(qt_feature opengl) + $(qt_feature sql) + $(qt_feature widgets) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest index 923a3639d95e..5370f8088d5d 100644 --- a/dev-qt/qtimageformats/Manifest +++ b/dev-qt/qtimageformats/Manifest @@ -1,3 +1,4 @@ DIST qtimageformats-5.15.5-gentoo-kde-3.tar.xz 3268 BLAKE2B 21ada34678a2b999190ac9e642065d654e8bbc30ebe7789d20b97a49f3cae2d5e6893325b0019af695460fec8cb1f25e15b9573752396034a7db8ff6d7e49431 SHA512 fb2324d73db23da1ca13d1e050b9f045f1fd0b09cf722b94dc39eaea457629a643adacac16471841d4204cea7becfae11354674b70a4edf272dddc8863a10b22 DIST qtimageformats-everywhere-opensource-src-5.15.5.tar.xz 1829872 BLAKE2B 7b240291e6076537daa9bc3b87f13f3285f19a4638de5b5db44a2b55275fbe843dc974226e999cd90e6bf902b43fbcd25f052619f291fa36807830a26c10cd52 SHA512 50a68bbe83fac710f21f05f3c0637beff17de00f9309aab2ceb27cfe7a178a1a56b0906f357584eef3188d7b89504591c924a9d4988a7321fb18a72271bb2dfd DIST qtimageformats-everywhere-src-6.3.2.tar.xz 1859996 BLAKE2B e6254fc0e60b445aaa89f25a12c0060e807ba2c825a384a79a7deb56cb46415b82a973c520e866c53db19263ac23039aa36e8c7ffd46390d7a64b7e44b85e67e SHA512 5964c1f0e5fc4032495641268881f2288f90f361cb5a7e4953e05005ea907033ef634192ef26e1b0343e09c1a0306f83bef88ad4a5dba4665387001290dccc77 +DIST qtimageformats-everywhere-src-6.4.0.tar.xz 1861400 BLAKE2B be2d99999a29b5876981d0768d63dab6a70181a1643be73e83cb7bf6771bd35462165e1a848206d4f69018c3388118f4bd94a336ff28ab19dbc75973eb86463b SHA512 3a7302cfbe9187ffb753c7171c62bbf43223c9c876bb0df20de8b593d51ef775bffeff124d269ed8d4ce7e1fb3d55790acd75bce0b5d5bfa223e5e83dfb41f01 diff --git a/dev-qt/qtimageformats/qtimageformats-6.4.0.ebuild b/dev-qt/qtimageformats/qtimageformats-6.4.0.ebuild new file mode 100644 index 000000000000..f1a8354ec61c --- /dev/null +++ b/dev-qt/qtimageformats/qtimageformats-6.4.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Additional format plugins for the Qt image I/O system" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="mng" + +DEPEND=" + =dev-qt/qtbase-${PV}*[gui] + media-libs/libwebp:= + media-libs/tiff + mng? ( media-libs/libmng:= ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DQT_FEATURE_jasper=OFF + $(qt_feature mng) + -DQT_FEATURE_tiff=ON + -DQT_FEATURE_webp=ON + -DQT_FEATURE_system-tiff=ON + -DQT_FEATURE_system-webp=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index fb672f1ad617..2f67a46cf7d8 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,3 +1,4 @@ DIST qtmultimedia-5.15.5-gentoo-kde-1.tar.xz 1324 BLAKE2B d29d8102e6fd55f2c2f6037e292a3c4039c7532fb63c34cc19fbedc8cf3f8082c6d75debd1617a5d29fcdf5b8c7a7fef35f103c9179f980986b646dae9ff867b SHA512 7b37f0db1de002f2cbaad6852edcf772dd0220f81d9dd836b3c1266df7eb49ec40d3eba6d3ccaf68f621c8e93b2812e2d882291fb2f07d0b80e4c9975a408cdc DIST qtmultimedia-everywhere-opensource-src-5.15.5.tar.xz 3832656 BLAKE2B 6098fe14344ed03dbfcbb2db429c431a47282bbbb89602742be2fe44ef063ceb98322bb576eeb559a649b24f142cd5e21b652fed8c96814b8e3b8b0a66b51fe9 SHA512 f798ffe0a32bc9f16f584b7a322c321dc2ef62c18395987ffce1f7f6cac10722c6f1166c64a1fda9877f3970a8e7b3ef8b7d9763af4c59ff313adc6081a7acfb DIST qtmultimedia-everywhere-src-6.3.2.tar.xz 4746380 BLAKE2B 677f2cf3979cd132f9ef6ba9e47de2a328775e2fac767ed6e47c073b4e76b077a504c9b96b903310ea8727afa324630b8cbf0b5cbf135e4eac3afdf6a3ad1414 SHA512 d6b31aad99a71096cac0655da99245553efdeabb67f6625893d23a31ce7c8b7e15219558933174a6577913ef903092b3230f211dd36b29ecfac782d7f358df27 +DIST qtmultimedia-everywhere-src-6.4.0.tar.xz 5936088 BLAKE2B 7e469db96e145a4bc496daa6547685c84e199a8942452b406a3e661e9da2b8d4306b41fc82551e9257f6f41d2d269cc7a359b6087111d092073b8cdaf683a2c1 SHA512 fd5f0d73374290ecf70d30395b2ddbb05439979a29b5e6b37a1ac40338ffe602ea62b7bb8f3c053b2da35fa9c4101bd6e0a12ee9479c04bb2d63c527c77cb685 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.4.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.4.0.ebuild new file mode 100644 index 000000000000..508673acc814 --- /dev/null +++ b/dev-qt/qtmultimedia/qtmultimedia-6.4.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt Multimedia" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="gstreamer" + +RDEPEND=" + =dev-qt/qtbase-${PV}*[gui,network,widgets] + =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtshadertools-${PV}* + =dev-qt/qtsvg-${PV}* + gstreamer? ( + dev-libs/glib:2 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-base:1.0 + media-libs/libglvnd + ) +" +DEPEND="${RDEPEND} + gstreamer? ( x11-base/xorg-proto ) +" + +src_configure() { + # TODO: linux_v4l automagic + local mycmakeargs=( + -DQT_FEATURE_alsa=off + -DQT_FEATURE_pulseaudio=off + $(qt_feature gstreamer) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest index aab570cf68fb..cef420978412 100644 --- a/dev-qt/qtnetworkauth/Manifest +++ b/dev-qt/qtnetworkauth/Manifest @@ -1,2 +1,3 @@ DIST qtnetworkauth-everywhere-opensource-src-5.15.5.tar.xz 143584 BLAKE2B f3f6342b5d997d6fe6ff42640f808cced26acbe35dda476a4d8aa822dd903f1362bee4d9155a642c5fba3c07cd27dc704e64b217420e3b9f3d88687718b0c6c1 SHA512 b506fc2d44af9947e4150a4a8b1797ac41889341e60d78fbb8ebd3f27d7846e6fd8e10b694df54f04b01f16aa5af36cf1ef8e0bb30f32881074fb72beb471a1d DIST qtnetworkauth-everywhere-src-6.3.2.tar.xz 145400 BLAKE2B e763b766e0a9ee9ace8598dfe9c0e62d4cbfccc775107947d69ec0acfc177e70f25d1697111a7a3777f98a70e901367b5ff9a5eb8cb18b625bdfc3f291dc0d84 SHA512 dfe52c4ce02d07181293f80ebffe9ff7060f5f63f7c9a6d38c7e13aa131ab5ef4d51e07a16303458f85b04bd6b1bfe3878614d05d1936877c1ce1f6b34da2fe0 +DIST qtnetworkauth-everywhere-src-6.4.0.tar.xz 144928 BLAKE2B 468ca604f81c3592fc0ffbf6df314cb044a2c5ad53f6464cec069e6a9bae017f35d3e1fa4abe97794e15efa86785ea09e6c733e991e90fb4c868982d074bf46c SHA512 fdefb6ec3477f8da9e78419414f850d94baddfa83b7252c402cde91dabee7cdc51eeee6e761bbadb07d37cef4525131adfd4bdeadb25e977934d4be1a85d8d57 diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.4.0.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.4.0.ebuild new file mode 100644 index 000000000000..02ff76dac340 --- /dev/null +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.4.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Network authorization library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND=" + =dev-qt/qtbase-${PV}*[network,widgets] +" +RDEPEND="${DEPEND}" diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest index ba3a081057ea..8caf3c8c3b99 100644 --- a/dev-qt/qtpositioning/Manifest +++ b/dev-qt/qtpositioning/Manifest @@ -1,2 +1,3 @@ DIST qtlocation-everywhere-opensource-src-5.15.5.tar.xz 6559912 BLAKE2B 4f546293b2cfddf5512f3648aef9c527762d6c6ddbaca6583cf0287178524bae9f84e4b94950ce1139042efa995a4f31ef20f26b8d5479048df2ba75cac35d23 SHA512 5090f68926a7bc2f25ea5ae259cb87653b83fcf337c3255a7a2700724f6ac83ec2e1d9b6f38f185ab7dab84e5e042b72c58f4e4cacada6fb7d729378b93d9b3e DIST qtpositioning-everywhere-src-6.3.2.tar.xz 1493616 BLAKE2B 9cdd3d4167674317c95ced5e24b6902b473b57c8094c0666594cdec96675011c2a9116f66429c70a48a757b0915c9706f22cb93aae6a60f427a5a4d015f85535 SHA512 0b65ca2157bf38f5a5b716c921f13cafadb4b98ba30d34893ea587b82dff9fbead2dd03af6ef6d1c75fd57dce85f8bae2b2b0b79f66ff2abb6b660f45a039df7 +DIST qtpositioning-everywhere-src-6.4.0.tar.xz 1491860 BLAKE2B 07d9ed3a62ea8b91931749fe5064e3556cc5a6de2d38f428a99a4112c726e16ae01a70a769e353110e74287fb1a5d6090dc011e407b5dc2deeda8e0a7fd2a619 SHA512 298c484ed3e5f4d11c0e865005f8c0ddf422c8bbe9ff725fe01a8960403c55cfbc96ded62e77af4b14e549349501b7555f169e7a4b99435cecfc4b57b5a2b5cb diff --git a/dev-qt/qtpositioning/qtpositioning-6.4.0.ebuild b/dev-qt/qtpositioning/qtpositioning-6.4.0.ebuild new file mode 100644 index 000000000000..7be915ffecea --- /dev/null +++ b/dev-qt/qtpositioning/qtpositioning-6.4.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Physical position determination library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND=" + =dev-qt/qtbase-${PV}*[dbus,gui,widgets] + =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtserialport-${PV}* +" +RDEPEND="${DEPEND}" diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest index a10b0f82fe32..10d78134e0e6 100644 --- a/dev-qt/qtquick3d/Manifest +++ b/dev-qt/qtquick3d/Manifest @@ -1 +1,2 @@ DIST qtquick3d-everywhere-src-6.3.2.tar.xz 37291276 BLAKE2B fadccaa41ad5e0783bda545cb627d450539b984bc80a7871676dde2de46e916f88eefa961bf23ce6b5f2e2fb6aea5633781cee4dc0cb2db36855c0c0d7eb9472 SHA512 ffe2ff5f64278640c1cc543737cf4fe3d814630fef24602ffd1d166e32dee5d5e929d029abb7573cb28502bd00e1b6217998dc54a3ab4606d053809ff12acf20 +DIST qtquick3d-everywhere-src-6.4.0.tar.xz 41490276 BLAKE2B 4743ae4ab1941d404c9c55065801b97642a8f14253603b1bc53cf7074a4fca925eab5791711ca849bddaf796af23a0a406ed72e559ef4e97c5c2b2cc89bcbbf8 SHA512 4fb9e4e40355a83dd19970fc6e942a3a510ce68becd7df92a19ffad7cb4eb6f0bd9b826bde9e0040776018802b756e20978092a6ea4a4d8cc38e7862529610d3 diff --git a/dev-qt/qtquick3d/qtquick3d-6.4.0.ebuild b/dev-qt/qtquick3d/qtquick3d-6.4.0.ebuild new file mode 100644 index 000000000000..6eb36deec911 --- /dev/null +++ b/dev-qt/qtquick3d/qtquick3d-6.4.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +elif [[ ${QT6_BUILD_TYPE} == live ]]; then + # Don't clone qtquick3d-assimp. + EGIT_SUBMODULES=() +fi + +DEPEND=" + =dev-qt/qtbase-${PV}*[concurrent,network,widgets] + =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtshadertools-${PV}* + =dev-qt/qtquicktimeline-${PV}* + media-libs/assimp:= +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DQT_FEATURE_system_assimp=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest index a2a059930dff..3056984ee040 100644 --- a/dev-qt/qtquicktimeline/Manifest +++ b/dev-qt/qtquicktimeline/Manifest @@ -1,2 +1,3 @@ DIST qtquicktimeline-everywhere-opensource-src-5.15.5.tar.xz 104344 BLAKE2B e542add97b60963a91f7f4c9c8871ec095392a86b80a4ce9876eabf2040d7b03cd426a25ab03d109f822bbc8b557e04d03695bcd9598befe101cf3d0ddbdc635 SHA512 7fccb88fc371714ad4c1632e2919f6239cc240f8f5452796dac13e9ee6875b91e07a18ac039bdaf135d7cc44a5bc8d7adc6f48116910af73a2990b76f20e0742 DIST qtquicktimeline-everywhere-src-6.3.2.tar.xz 113448 BLAKE2B 1f8e7e4d147924a6f806f28955dca1d98a7bf2c917f594060cdb585212ba1c5a80d999708e517e77207cac67f1112b057e27ff90cff108afb06e7c18a5d8e0f4 SHA512 fb1807c80bf0af34514aa8db76f167fec75e0e9604c266dba6bf1a560a61ee1395d440fee25457a2a3913708e6fca6b708ccf6a62002b03a0880e5256fba2bed +DIST qtquicktimeline-everywhere-src-6.4.0.tar.xz 112976 BLAKE2B b2370293362dc0cfb7c231788332ff740842318a654db4a8efce475f9b5e5f1bcb72e7777e91ecd1e5f0ac92a9a65c427e69790339173351aebf6cb43ce34521 SHA512 3818056b6f1b16ec443e895ce07582717331b768c036d073735c52b7ce385d8b53a93a9748eaa915885916e9267de7c4e731a5b01dfd5d643b0a594ed58ca577 diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.4.0.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.4.0.ebuild new file mode 100644 index 000000000000..0673606b845e --- /dev/null +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.4.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module for keyframe-based timeline construction" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND=" + =dev-qt/qtbase-${PV}* + =dev-qt/qtdeclarative-${PV}* +" +RDEPEND="${DEPEND}" diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest index 6e47f1d3999c..8f9726326704 100644 --- a/dev-qt/qtserialport/Manifest +++ b/dev-qt/qtserialport/Manifest @@ -1,2 +1,3 @@ DIST qtserialport-everywhere-opensource-src-5.15.5.tar.xz 323168 BLAKE2B 68a3ae2f513d73908c48e87493c5213429160d41e770f9883439ca5d7f58c7cafead1acaf9b1a845c3480d5db0747cf9a356e14ecc1c7b69276979b618864aaf SHA512 479bc5a4bddc4cb7659d2768b51947847f3c413102554fe3883e1decc42e6c9d0ad693627f607bd8cec43fd014e495fa9812934dd1b8ce1cf3f3ad46b5f6c774 DIST qtserialport-everywhere-src-6.3.2.tar.xz 319536 BLAKE2B eb59ed13076bbd3de8c04afa9362cfa177713c6650577f2ccd940f820d4d8ad673440538d2e5a4e5df10bf2bf45afd88443d5b4098ae12984dc4b51215b2343c SHA512 d71ca3b004133eb86fbfc4e8e22daa1d6317b4dab8a7b8bf252509a226477b28647c20ad01368fb7b5b4d2fc1007606a287a3d38ca904e722efda7dfb7cec2ab +DIST qtserialport-everywhere-src-6.4.0.tar.xz 318952 BLAKE2B 806ae200c6a253eefadfff368d6e559129ce2158fea26fa8005eb8d0b3b594d5d68591bbede8b767462731d6557107ad280a721e12fcef88be7dd5ed6aa7c65f SHA512 b2e78302f9ec55b52dfab6f8086a63444f0c6d8ac8dd3b5b39a32c24c8e01d4799b5539144f6e9f4a376c36bcfe4f15c0b9eb5933d45ccc4433e881b9e15b182 diff --git a/dev-qt/qtserialport/qtserialport-6.4.0.ebuild b/dev-qt/qtserialport/qtserialport-6.4.0.ebuild new file mode 100644 index 000000000000..218a7f2dd3c2 --- /dev/null +++ b/dev-qt/qtserialport/qtserialport-6.4.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Serial port abstraction library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND=" + =dev-qt/qtbase-${PV}*[gui,widgets] + virtual/libudev:= +" +RDEPEND="${DEPEND}" diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest index 7c15ca8643f8..d2f7173504cf 100644 --- a/dev-qt/qtshadertools/Manifest +++ b/dev-qt/qtshadertools/Manifest @@ -1 +1,2 @@ DIST qtshadertools-everywhere-src-6.3.2.tar.xz 998380 BLAKE2B 74df7bd0b0b931ea1c8e2c67c821805de5be6729e76ec9734a3b36f6c3b4605718464da01bf037af8cdb0f9dcccedaa211fc10f2ffd04dc3ebdf831db32b5f0c SHA512 8394b5467a391fb2b87d22a4b4a2b5b8c0b5d6eb9ea4273aa115fd9b3cab6d955473ed0dc66858390df3d9b6655977baa47b52762cef5c6e95e44330f9040b8a +DIST qtshadertools-everywhere-src-6.4.0.tar.xz 1001332 BLAKE2B ac241e69eb5f27a33ab42f70f0b8ba1e2d0a3634cb43a54c9c4c289b7b3cfa6a16357cab23427271405390ec347838a6ed1757a7b425992969f0110dfbc69635 SHA512 80f00b623e546786a2019c979fe8cc54f982665bf3f2d122db1b4d437c847f749a68ed7e316100a853d59ddf04dd10147cad55252a40cd9ff3511db963f3212b diff --git a/dev-qt/qtshadertools/qtshadertools-6.4.0.ebuild b/dev-qt/qtshadertools/qtshadertools-6.4.0.ebuild new file mode 100644 index 000000000000..755d9ae0bbbb --- /dev/null +++ b/dev-qt/qtshadertools/qtshadertools-6.4.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt APIs and Tools for Graphics Pipelines" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND=" + =dev-qt/qtbase-${PV}*[gui] +" +RDEPEND="${DEPEND}" diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index d5b85b83664e..bc252e4f518f 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -1,3 +1,4 @@ DIST qtsvg-5.15.5-gentoo-kde-2.tar.xz 7428 BLAKE2B 8a061086a08f6f8a493685989c62d6360f55bc62e759b00ab2b501e7128b7ddf3c510df25cc8121a3abd47b4040bf9024ac44c9a8288ab8590ce2b80e8e20e59 SHA512 5b537d58886444e58089284473a9fac504edc6e2ac6b34102e6ac23965d0488b05294b185783ff1d3ae65dd3e519ff39213f8215fb34cf7a13b982850879de67 DIST qtsvg-everywhere-opensource-src-5.15.5.tar.xz 1888600 BLAKE2B 3bf675d3ac14f64c9afd096342ef4fb574c6b9d93f52b6cba3a5184b8f0f54204c90a133193685a4838236eecb72e5329eb2254c80948fa55a6a103d52256b0f SHA512 7938a84abca282f263f7840425863379ed9e0f9854ecfe38e5d1edacdaf39b2516e9e9b8b5dbcf52113785d8c4123ebea550f441abc000d01c07a20a6a742ac4 DIST qtsvg-everywhere-src-6.3.2.tar.xz 1726940 BLAKE2B c2280020deeb66245ba09e8fc7b0bd72c7d719aeb6c617489cad93fa4467df5303b4c56499b3844982d9eedf25f7e82717dffc494b83cfc38457f4a99556a970 SHA512 2238f1eb3d325b2e17b7e64de5c7f55d1f6129fab7b123ff4c3290307b586d1e894d07a71faaa7f4cb30c1d28e2cc11b11705e03fa5e83c6baebe056a6b3c751 +DIST qtsvg-everywhere-src-6.4.0.tar.xz 1726036 BLAKE2B b18473cfef70b159ae40942bc88103a082f6e6e05b7e3e4b1cb310702123be0f4f9cc2f052ebed09904069b586f46adce3116480cb5ee3abbede5bed41a763c4 SHA512 f3a6b3bda1c0a3395528f99b5f7b9647a19aeeda0f97dc96bfb551b9c134a50166d1d58d7d63a411a84bcb482580c6907b2c231d570794a482f42126cec9dd89 diff --git a/dev-qt/qtsvg/qtsvg-6.4.0.ebuild b/dev-qt/qtsvg/qtsvg-6.4.0.ebuild new file mode 100644 index 000000000000..037c2eb09b80 --- /dev/null +++ b/dev-qt/qtsvg/qtsvg-6.4.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="SVG rendering library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND=" + =dev-qt/qtbase-${PV}*[gui,widgets] + sys-libs/zlib:= +" +RDEPEND="${DEPEND}" diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest index 229a67e4b708..4c16602d8ca0 100644 --- a/dev-qt/qttools/Manifest +++ b/dev-qt/qttools/Manifest @@ -1 +1,2 @@ DIST qttools-everywhere-src-6.3.2.tar.xz 8629400 BLAKE2B 594f7f31e0f10006d1c58d26c5ae13b7f9c8b5770adaddee90a176676dff2029215501d01d599da0656876cd6f8b97275754a9b8c37735412154ca3f458656b3 SHA512 ca8b11dac82027979ff9b17b8beb50ea316cba6d8f422a291caa63a4f7c345942bf852733fd7243a27bcf46b1ca6a5af30e283377a8c6b73193004e3aa3837f1 +DIST qttools-everywhere-src-6.4.0.tar.xz 8738432 BLAKE2B 0bd6c3e1e4badf16ec74209c1ddc45820bee9403753b6603000fcad8e82b5ee73b4df0f4d346de5c855e0b545e43c17b11ba5702e9caa5b8b2e6280d82a3fab5 SHA512 ff4ed95491d26227b3bfea665fe810572f537a295dda0cffa26b18525961026db0471e7ef04667e3e4b8ae6b92dbedccb0fa77d733274c34d489d448b961ab44 diff --git a/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch b/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch new file mode 100644 index 000000000000..eb2d8027cc09 --- /dev/null +++ b/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch @@ -0,0 +1,73 @@ +Gentoo Bug: https://bugs.gentoo.org/873640 +Qt Bug: https://bugreports.qt.io/browse/QTBUG-106224 +Patch: https://codereview.qt-project.org/c/qt/qttools/+/436135 + +From 6495329e6de803025e6e4e8291b648f94893551c Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@hazardy.de> +Date: Sat, 1 Oct 2022 07:19:52 +0200 +Subject: [PATCH] lupdate: Fix build with clang 15+ +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +The signature of InclusionDirective changed for clang 15. + +Pick-to: 6.4 +Change-Id: Ic259b3508088671b40f6f615524137ce8837c487 +Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> +--- + src/linguist/lupdate/lupdatepreprocessoraction.cpp | 13 +++++++++++-- + src/linguist/lupdate/lupdatepreprocessoraction.h | 7 ++++++- + 2 files changed, 17 insertions(+), 3 deletions(-) + +diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp b/src/linguist/lupdate/lupdatepreprocessoraction.cpp +index abfab34e5c..d963747d8e 100644 +--- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp ++++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp +@@ -156,14 +156,23 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange, + // To list the included files + void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/, + const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool /*isAngled*/, +- clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file, ++ clang::CharSourceRange /*filenameRange*/, ++#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) ++ const clang::Optional<clang::FileEntryRef> file, ++#else ++ const clang::FileEntry *file, ++#endif + clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/, + const clang::Module */*imported*/, clang::SrcMgr::CharacteristicKind /*fileType*/) + { + if (!file) + return; + +- clang::StringRef fileNameRealPath = file->tryGetRealPathName(); ++ clang::StringRef fileNameRealPath = file-> ++#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) ++ getFileEntry(). ++#endif ++ tryGetRealPathName(); + if (!LupdatePrivate::isFileSignificant(fileNameRealPath.str())) + return; + +diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h +index b1ee468d4e..3e44cee839 100644 +--- a/src/linguist/lupdate/lupdatepreprocessoraction.h ++++ b/src/linguist/lupdate/lupdatepreprocessoraction.h +@@ -51,7 +51,12 @@ private: + void SourceRangeSkipped(clang::SourceRange sourceRange, clang::SourceLocation endifLoc) override; + void InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token &/*includeTok*/, + clang::StringRef /*fileName*/, bool /*isAngled*/, +- clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file, ++ clang::CharSourceRange /*filenameRange*/, ++#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) ++ const clang::Optional<clang::FileEntryRef> file, ++#else ++ const clang::FileEntry *file, ++#endif + clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/, + const clang::Module */*imported*/, + clang::SrcMgr::CharacteristicKind /*fileType*/) override; +-- +2.16.3 + diff --git a/dev-qt/qttools/qttools-6.4.0.ebuild b/dev-qt/qttools/qttools-6.4.0.ebuild new file mode 100644 index 000000000000..6aa7cb05da97 --- /dev/null +++ b/dev-qt/qttools/qttools-6.4.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt Tools Collection" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE=" + assistant designer distancefieldgenerator +linguist pixeltool + qdbus qdoc qtattributionsscanner qtdiag qtplugininfo +" + +DEPEND=" + =dev-qt/qtbase-${PV}*[network] + assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] ) + designer? ( =dev-qt/qtbase-${PV}*[widgets] ) + distancefieldgenerator? ( + =dev-qt/qtbase-${PV}*[widgets] + =dev-qt/qtdeclarative-${PV}* + ) + pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] ) + qdbus? ( =dev-qt/qtbase-${PV}*[widgets] ) + qdoc? ( sys-devel/clang:= ) + qtdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-6.4.0-clang-15-build.patch" # Bug 873640 +) + +src_configure() { + local mycmakeargs=( + $(qt_feature assistant) + -DQT_FEATURE_commandlineparser=ON + $(qt_feature designer) + $(qt_feature distancefieldgenerator) + $(qt_feature linguist) + $(qt_feature pixeltool) + $(qt_feature qdbus) + $(qt_feature qdoc clang) + $(qt_feature qtattributionsscanner) + $(qt_feature qtdiag) + $(qt_feature qtplugininfo) + -DQT_FEATURE_thread=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index b4fc1b99908c..6533bb0349f1 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1,3 +1,4 @@ DIST qtwayland-5.15.5-gentoo-kde-2.tar.xz 35492 BLAKE2B 91334609155e4bd227d76e5972422b400ab4b6196389a1b6b4c271994287851bc3b624ae761ece1418037735784edf7740ed5337ef6972bf708c598c202b7e86 SHA512 2663b59c7647e8a7d5f64905be114fc1b248cd8e10c2eba6bddc25b74fbbc5216e8264f41f50b6368819664921e27dfe96d4c1556c0e56f8c3c2c0ed75a72080 DIST qtwayland-everywhere-opensource-src-5.15.5.tar.xz 567384 BLAKE2B 01ce4d546bda7bf332f8cc4f86a5e8bfb1be0ef60336ee3cae58266a25d51cf00fef3e6c4204f0179abc2ef748f88bd3a20f89f36da74d5d15c70ae7b4975186 SHA512 828dceb7bc54ce610a73f110f0aca332a90cf95df4a3bc971bd21c4e878366cb8d2248e609b73ce4d381579a143843c87a62f23dcc95767e522874e53a1b0327 DIST qtwayland-everywhere-src-6.3.2.tar.xz 836192 BLAKE2B 3cb7c72c37d4b69a798cd14cc9aca694ba6ed01330e71772653e841717dcdd1c6e0d77597066647430e5f52dd5cd48636e1a6a2dcaadc2ab86a52be803c90f92 SHA512 475ba168bacb2d35a5962b27542f43420e3baf42d2026699b272174076ee6a26f8c3663ba8e44508f2011c5b7a2e4b3086390264cdf621b393c79fe89265bd03 +DIST qtwayland-everywhere-src-6.4.0.tar.xz 836088 BLAKE2B 3efc506e1a0bc63182397d483bf352e21d39c75a7360ee3fe839527451950875748aea5cf62207ffef38b845a12c2bbbefde918d14333d1b194a4ea39b82670f SHA512 745fcc84c936c3f2fa7382291b5013679f9e57d6c680f1d352b0a132ba7cbaaea1495211f8fc4f1af85a81c711794987e4e05284d3ac06c94e92e9b601dae924 diff --git a/dev-qt/qtwayland/qtwayland-6.4.0.ebuild b/dev-qt/qtwayland/qtwayland-6.4.0.ebuild new file mode 100644 index 000000000000..09413e556f22 --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-6.4.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Wayland platform plugin for Qt" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +BDEPEND="dev-util/wayland-scanner" +DEPEND=" + dev-libs/wayland + =dev-qt/qtbase-${PV}*[gui,opengl] + =dev-qt/qtdeclarative-${PV}* + media-libs/libglvnd + x11-libs/libxkbcommon +" +RDEPEND="${DEPEND}" diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest index cb3a7ae78e22..813e8dd5ce0f 100644 --- a/dev-qt/qtwebchannel/Manifest +++ b/dev-qt/qtwebchannel/Manifest @@ -1,3 +1,4 @@ DIST qtwebchannel-5.15.5-gentoo-kde-1.tar.xz 5780 BLAKE2B 304a4cc0c5598412bb516679f65c5771eadf517e19d6fb026b3496664360e5a2b07d37b3d47cbe4b6e2638f35aa631f7dd4c17b8debe6805a0ea7c6749f491a5 SHA512 b5ca4905f8dc2b1efaf7e5d81c7cbd7decde95887132a548b3b1e1f1ff3c57d6af28020c53c7f9a714633753836bc4c04a6353e7bf587655e9f59d98ac3b8703 DIST qtwebchannel-everywhere-opensource-src-5.15.5.tar.xz 210712 BLAKE2B a07998872a3e790decb68c5a5294259cbeb393bcf90293b9f2a54484cefb7e443534b95866d5a90a28b2eeb3b55fbc7d33b4355c106e5e4acd6dc610a6327a2e SHA512 74ac09f418fd918cf5930f7d985fd69477da3ef1ecdedcf4b59eb9c17b43849876141ed6483dc32ef3e5e3f3fbc2a6babeb281f72da7850bfc677f2acfaad3fe DIST qtwebchannel-everywhere-src-6.3.2.tar.xz 213916 BLAKE2B 156be5b1917151c0ee0c9bd72725fe6de9276730c901cc1f0b64afd71a4eb108af5870b18714d4e5f7eed1431f0c03e204cc481b5a0f508cea7103c5ee1237ac SHA512 83de9a61d25bcf8346ff46417173ecffe15cff9802db524def1afbce4367f3d414b10e8042d45db36555945544dfe1c1d081e4ec33756250afca7ad58975c9d9 +DIST qtwebchannel-everywhere-src-6.4.0.tar.xz 213096 BLAKE2B 04450f13d6af7996624c5c1e1f1b7f3c6a8ee64088086da3b237c1e1775ac90fad5a7a13ed1213d321f9703565c7ca42cf899dae675a616dd25fa6abad6e7f8a SHA512 5e668869646e9a4a115680004180948777c9cc2b4e6cc3afb4be74e298ec1e7338f61643ac1f46649d39f65e3f50de05d2b635d77bf211105e91dd0d5324fff6 diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.4.0.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.4.0.ebuild new file mode 100644 index 000000000000..62dd2732151a --- /dev/null +++ b/dev-qt/qtwebchannel/qtwebchannel-6.4.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt WebChannel" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND=" + =dev-qt/qtbase-${PV}*[concurrent] + =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtwebsockets-${PV}* +" +RDEPEND="${DEPEND}" diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 504702a1976a..5e8385ebb3cf 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -3,3 +3,4 @@ DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d140687 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840 DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d SHA512 b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944 DIST qtwebengine-everywhere-src-6.3.2.tar.xz 398294888 BLAKE2B 7fb59e9c0a09e4ffc2c59398e9249cb91c864168b81befa9ea7e2044ed328bc010f0e6d03ecfc74e006044b56c826b35dba05375aba6fee29e5d5aa08b33fa4c SHA512 deff0a7ad71c4c81b3f5cfff77919d9971eec0ba3713a94a28d902404189b4f92b237a89cc6ef3dec2ea7a766f8a7241638a1310e4ac68fe46ecdc61f69a958a +DIST qtwebengine-everywhere-src-6.4.0.tar.xz 440346968 BLAKE2B ffe9ad9f71034d14f016a71bf3e6034853d5c2b17a3ab3e8aefc1c3a79896363eb2ce41446f16e126ec313608619900ee7ac41750978c28f135df5bbc2e0be5c SHA512 a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7 diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch b/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch new file mode 100644 index 000000000000..941c39c0a5a9 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch @@ -0,0 +1,38 @@ +Qt Bug: https://bugreports.qt.io/browse/QTBUG-107144 +Gerrit: https://codereview.qt-project.org/c/qt/qtwebengine/+/436316 +Patch: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebengine.git;a=commit;h=81bf140583f7b7bf13cc8dd522e1ca2aba873fc4 + +From 81bf140583f7b7bf13cc8dd522e1ca2aba873fc4 Mon Sep 17 00:00:00 2001 +From: Martin Negyokru <negyokru@inf.u-szeged.hu> +Date: Mon, 3 Oct 2022 12:20:00 +0200 +Subject: [PATCH] Do not intercept websocket connection when there is no + associated frame + +This fix is based on chrome's implementation. + +Fixes: QTBUG-107144 +Change-Id: If042e4156b8a4bdb27a210c4db94e3a6198aed7d +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> +(cherry picked from commit 64b7da9dab82713fdcb2e03d8a2715421eae5685) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +--- + src/core/content_browser_client_qt.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp +index 020ae916af..99a3aa3f4f 100644 +--- a/src/core/content_browser_client_qt.cpp ++++ b/src/core/content_browser_client_qt.cpp +@@ -1237,8 +1237,7 @@ ContentBrowserClientQt::WillCreateURLLoaderRequestInterceptors(content::Navigati + + bool ContentBrowserClientQt::WillInterceptWebSocket(content::RenderFrameHost *frame) + { +- Q_UNUSED(frame); +- return true; // It is probably not worth it to only intercept when interceptors are installed ++ return frame != nullptr; + } + + QWebEngineUrlRequestInterceptor *getProfileInterceptorFromFrame(content::RenderFrameHost *frame) +-- +2.16.3 + diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild new file mode 100644 index 000000000000..6b9a8677483e --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild @@ -0,0 +1,245 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_REQ_USE="xml(+)" +CHROMIUM_VER="102.0.5005.177" +CHROMIUM_PATCHES_VER="104.0.5112.102" + +inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build + +DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE=" + alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast + +system-ffmpeg +system-icu widgets +" +REQUIRED_USE="designer? ( widgets )" + +BDEPEND=" + $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') + dev-util/gperf + dev-util/ninja + dev-util/re2c + net-libs/nodejs[ssl] + sys-devel/bison + sys-devel/flex +" +RDEPEND=" + app-arch/snappy:= + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + dev-libs/expat + dev-libs/libevent:= + dev-libs/libxml2[icu] + dev-libs/libxslt + dev-libs/re2:= + =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtwebchannel-${PV}* + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/libpng:= + >=media-libs/libvpx-1.5:=[svc(+)] + media-libs/libwebp:= + media-libs/opus + sys-apps/dbus + sys-apps/pciutils + sys-libs/zlib[minizip] + virtual/libudev + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libxcb:= + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxkbcommon + x11-libs/libxkbfile + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libxshmfence:= + x11-libs/libXtst + alsa? ( media-libs/alsa-lib ) + geolocation? ( =dev-qt/qtpositioning-${PV}* ) + kerberos? ( virtual/krb5 ) + pulseaudio? ( media-libs/libpulse:= ) + screencast? ( media-video/pipewire:= ) + system-ffmpeg? ( media-video/ffmpeg:= ) + system-icu? ( >=dev-libs/icu-69.1:= ) + widgets? ( + =dev-qt/qtbase-${PV}*[widgets] + ) +" +DEPEND="${RDEPEND} + media-libs/libglvnd +" + +PATCHES=( "${FILESDIR}/${PN}-6.4.0-no-websocket-intercept.patch" ) # QTBUG-107144 + +python_check_deps() { + python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" +} + +qtwebengine_check-reqs() { + # bug #307861 + eshopts_push -s extglob + if is-flagq '-g?(gdb)?([1-9])'; then + ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." + ewarn "You may experience really long compilation times and/or increased memory usage." + ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." + fi + eshopts_pop + + [[ ${MERGE_TYPE} == binary ]] && return + + # (check-reqs added for bug #570534) + # + # Estimate the amount of RAM required + # Multiplier is *10 because Bash doesn't do floating point maths. + # Let's crudely assume ~2GB per compiler job for GCC. + local multiplier=20 + + # And call it ~1.5GB for Clang. + if tc-is-clang ; then + multiplier=15 + fi + + local CHECKREQS_DISK_BUILD="7G" + local CHECKREQS_DISK_USR="150M" + if ! has "distcc" ${FEATURES} ; then + # bug #830661 + # Not super realistic to come up with good estimates for distcc right now + local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G + fi + + check-reqs_${EBUILD_PHASE_FUNC} +} + +pkg_pretend() { + qtwebengine_check-reqs +} + +pkg_setup() { + qtwebengine_check-reqs + python-any-r1_pkg_setup +} + +pkg_preinst() { + elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with" + elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the" + elog "list of backports is impossible to evaluate, but always bound to be behind" + elog "Chromium's release schedule." + elog "In addition, various online services may deny service based on an outdated" + elog "user agent version (and/or other checks). Google is already known to do so." + elog + elog "tldr: Your web browsing experience will be compromised." +} + +src_unpack() { + # bug 307861 + eshopts_push -s extglob + if is-flagq '-g?(gdb)?([1-9])'; then + ewarn + ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." + ewarn "You may experience really long compilation times and/or increased memory usage." + ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." + ewarn + fi + eshopts_pop + + case ${QT6_BUILD_TYPE} in + live) git-r3_src_unpack ;& + release) default ;; + esac +} + +src_prepare() { + # bug 620444 - ensure local headers are used + find . -type f -name "*.pr[fio]" -exec \ + sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die + + if use system-icu; then + # Sanity check to ensure that bundled copy of ICU is not used. + # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because + # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system. + # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in + # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in + # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated. + local file + while read file; do + echo "#error This file should not be used!" > "${file}" || die + done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) + fi + + qt6-build_src_prepare +} + +src_configure() { + export NINJA_PATH="${BROOT}"/usr/bin/ninja + export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + + local mycmakeargs=( + #-DQT_FEATURE_accessibility=off + #-DQT_FEATURE_force_asserts=off + #-DQT_FEATURE_opengl=off + #-DQT_FEATURE_printer=off + -DQT_FEATURE_qtpdf_build=off + -DQT_FEATURE_qtpdf_quick_build=off + -DQT_FEATURE_qtpdf_widgets_build=off + -DQT_FEATURE_qtwebengine_build=on + -DQT_FEATURE_qtwebengine_quick_build=on + -DQT_FEATURE_qtwebengine_widgets_build=on + #-DQT_FEATURE_ssl=off + #-DQT_FEATURE_static=off + #-DQT_FEATURE_system_zlib=off + #-DQT_FEATURE_system_png=off + #-DQT_FEATURE_system_jpeg=off + #-DQT_FEATURE_system_freetype=off + #-DQT_FEATURE_system_harfbuzz=off + #-DQT_FEATURE_use_gold_linker=off + #-DQT_FEATURE_use_lld_linker=off + -DQT_FEATURE_webengine_embedded_build=off + -DQT_FEATURE_webengine_extensions=on + #-DQT_FEATURE_webengine_full_debug_info=$(usex debug) + -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off) + -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build) + #-DQT_FEATURE_webengine_jumbo_file_merge_limit + -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off) + -DQT_FEATURE_webengine_native_spellchecker=off + -DQT_FEATURE_webengine_ozone_x11=on + -DQT_FEATURE_webengine_pepper_plugins=on + -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on) + -DQT_FEATURE_webengine_printing_and_pdf=on + -DQT_FEATURE_webengine_sanitizer=on + -DQT_FEATURE_webengine_spellchecker=on + -DQT_FEATURE_webengine_system_opus=on + -DQT_FEATURE_webengine_system_libwebp=on + -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off) + -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg) + -DQT_FEATURE_webengine_system_icu=$(usex system-icu) + -DQT_FEATURE_webengine_system_libevent=on + -DQT_FEATURE_webengine_system_libpci=on + -DQT_FEATURE_webengine_system_libpng=on + -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off) + -DQT_FEATURE_webengine_system_zlib=on + -DQT_FEATURE_webengine_webchannel=on + -DQT_FEATURE_webengine_webrtc=on + -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off) + #-DQT_FEATURE_xcb=off + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest index 4297ecf8e8e1..aed72c72de50 100644 --- a/dev-qt/qtwebsockets/Manifest +++ b/dev-qt/qtwebsockets/Manifest @@ -1,3 +1,4 @@ DIST qtwebsockets-5.15.5-gentoo-kde-1.tar.xz 2052 BLAKE2B 18a4cb3ccc6d08f5142601cb53c501f4883c3aa47f56ba977c5979be6ae3c90765c5a6205fd62caee1f93006d5bdf0ede8ca48e34ab11ef673e0287811fd9980 SHA512 7ae654741be15954da8d729180186e3590c88140e86260241ccb27badface40a76946d048c0dd3220734f19888433f3bd4f7a2094c6ea548703b961db3a2c189 DIST qtwebsockets-everywhere-opensource-src-5.15.5.tar.xz 260676 BLAKE2B a8a35e697c204cf1b2d87c80f6332809d3a9ee85cd26cf99cedbab13eb8cf386cbb74614bbb1146f3f734795b3123e25ac0059d898501b801c6843084601ff74 SHA512 2d44983e462a899c4adb90998b84d24466d70d8fab340481bc916228b289c45456ea5acde61a70aa9e3f9233216c5ca80375f190d9cbc406f8d40b535e90e480 DIST qtwebsockets-everywhere-src-6.3.2.tar.xz 264360 BLAKE2B 3a03d638d63fc00a1957682089c308c7830b4cadd7c2f25a8c3f4be9ff90cf9e3883e72ab4c25112b478100b71de146711ffb2a2a1694804c5c734b6267d2f88 SHA512 b57621b00d0919c57ced9eabd553a624585b16f9b061366af53abdd00c5ca6b203ed01323728d8de61b2dee7c905a20be3c31baf73780afe1cce4d5f0308483d +DIST qtwebsockets-everywhere-src-6.4.0.tar.xz 266400 BLAKE2B cbe11902a3743e54aea2e75141360fc18d57d44ffed7e862de80ce374fe35b94862d12d3408328c80ced07cae24f6df0064303947b7c4b0a758866cc911b4f0a SHA512 dc2e86332a7c493afa66c3844443c3a5dbe830786f1127a0eac66594bb254ba1294389c24221d1984044caddc4afa1e4f9832382b403c7c9a8bf5c9dd21d53d0 diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.4.0.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.4.0.ebuild new file mode 100644 index 000000000000..6b0e253a28cb --- /dev/null +++ b/dev-qt/qtwebsockets/qtwebsockets-6.4.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND=" + =dev-qt/qtbase-${PV}*[network] + =dev-qt/qtdeclarative-${PV}* +" +RDEPEND="${DEPEND}" |