From 8afe4133ba3d8586301516885427809020a3cafa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Feb 2023 15:17:03 +0000 Subject: gentoo auto-resync : 05:02:2023 - 15:17:02 --- dev-qt/Manifest.gz | Bin 11196 -> 11199 bytes dev-qt/qtcore/Manifest | 4 +- .../files/qtcore-5.15.8-fix-crash-w-debug.patch | 41 ----- dev-qt/qtcore/qtcore-5.15.8-r2.ebuild | 125 --------------- dev-qt/qtcore/qtcore-5.15.8-r3.ebuild | 123 ++++++++++++++ dev-qt/qtgui/Manifest | 4 +- dev-qt/qtgui/qtgui-5.15.8-r2.ebuild | 177 --------------------- dev-qt/qtgui/qtgui-5.15.8-r3.ebuild | 177 +++++++++++++++++++++ dev-qt/qtwidgets/Manifest | 4 +- dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild | 63 -------- dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild | 63 ++++++++ 11 files changed, 369 insertions(+), 412 deletions(-) delete mode 100644 dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch delete mode 100644 dev-qt/qtcore/qtcore-5.15.8-r2.ebuild create mode 100644 dev-qt/qtcore/qtcore-5.15.8-r3.ebuild delete mode 100644 dev-qt/qtgui/qtgui-5.15.8-r2.ebuild create mode 100644 dev-qt/qtgui/qtgui-5.15.8-r3.ebuild delete mode 100644 dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild create mode 100644 dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index 09600f13179c..9b27e2645272 100644 Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 6dd7fc9e8f05..224221cf38a9 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,7 +1,7 @@ -AUX qtcore-5.15.8-fix-crash-w-debug.patch 1427 BLAKE2B 3ef8d7e4fcd2969e6ce3931e0bd07fe7d410d18834bb2de7a760949dd4c822bb9942a4245d720a2736c4927ea536bc0a41efe3ac7e0913dd9b7ca35eb27d313b SHA512 dfdd1f30057498b0f3043faa84fda1239b17ecc02c3838a329cad46b157e91cb2cbbe488eeeebd761b0449e4c045e8a47e7354d081453bf6fe7f35a6989f30da DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34 +DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce EBUILD qtcore-5.15.8-r1.ebuild 3070 BLAKE2B 610fccc1d08332b4ca2b1681906812fa1ca3b900ff487dfbd83fb4c0cafc5aa3accea3cd4450a3b7d46d261faf7fe7308a45642e73f84b37a9d16ea3af34afdb SHA512 d19b28d91138bfce589907ba79b67a0db2d3b248640050851017343f0400a1ccfeffa6f414d2849fc38c901893cad95c5bae0cd3e5eb22fa5f7ae94c252a10dc -EBUILD qtcore-5.15.8-r2.ebuild 3194 BLAKE2B 92d43b2ce123f36845f69e2c45624d78cdc00d64d4c378ee62ee35bf576208550a710b4d6d11b59f58bc6a49255857a2c59a0fb16b54a1cd910218fa94b9cd15 SHA512 dd94327d908cab92e8b3b7f5bcaaac3a3a2aca6ceebda40e4d87fe0a088ec0fdcaba06aae2ada4791243fb710ed3f556468fcaf32dae68af7c1cd73394f36ee4 +EBUILD qtcore-5.15.8-r3.ebuild 3107 BLAKE2B 7855127e83de7642560f8dd89fa483f4cc4df667d82d5a34949502905144fd4b5b7e43c240930e0c0f427d105d9dbd0614d2c3381e28f5f8c2bfc52d9168640e SHA512 b45c52da1d9bf82d922ff7e030834dc8a2fdac3b3666ec558490f8c0ecd5083402d1d382d2731227c88503ce41c234f78b8024082f9871b203b71f1d4f22b951 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5 diff --git a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch b/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch deleted file mode 100644 index 74f5ed5c4886..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0c0b34badb8a56f5c0d7d43c3847508774c8e553 Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Mon, 2 Jan 2023 12:38:02 +0100 -Subject: [PATCH] correctly set up ref counting in - QThreadPool::tryStart(std::function) - -this function was inconsistent with the QThreadPool::tryStart(QRunnable) -overload, where ref counting does get set up correctly. the lack of ref -counting setup would later cause trouble because we assert the ref -counting state all over QThreadPool. to prevent failed assertions we -correctly set up ref counting now. - -this change is not applicable to Qt6 because the ref counting has -already been removed there: -https://github.com/qt/qtbase/commit/ecfda98d1f91c6a7da0d89826558d856cd88e670 - -BUG: 449688 ---- - src/corelib/thread/qthreadpool.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp -index 40cc646519..8aa06a4c8f 100644 ---- a/src/corelib/thread/qthreadpool.cpp -+++ b/src/corelib/thread/qthreadpool.cpp -@@ -602,8 +602,12 @@ bool QThreadPool::tryStart(std::function functionToRun) - return false; - - QRunnable *runnable = QRunnable::create(std::move(functionToRun)); -+ Q_ASSERT(runnable->ref == 0); -+ ++runnable->ref; - if (d->tryStart(runnable)) - return true; -+ --runnable->ref; -+ Q_ASSERT(runnable->ref == 0); - delete runnable; - return false; - } --- -GitLab - diff --git a/dev-qt/qtcore/qtcore-5.15.8-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.8-r2.ebuild deleted file mode 100644 index 5817a2b70616..000000000000 --- a/dev-qt/qtcore/qtcore-5.15.8-r2.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=3 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -QT5_MODULE="qtbase" -inherit linux-info flag-o-matic toolchain-funcs qt5-build - -DESCRIPTION="Cross-platform application development framework" -SLOT=5/${QT5_PV} - -IUSE="icu old-kernel systemd" - -DEPEND=" - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2[pcre16,unicode] - sys-libs/zlib:= - icu? ( dev-libs/icu:= ) - !icu? ( virtual/libiconv ) - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/corelib - src/tools/qlalr - doc -) - -QT5_GENTOO_PRIVATE_CONFIG=( - !:network - !:sql - !:testlib - !:xml -) - -PATCHES=( "${FILESDIR}/${P}-fix-crash-w-debug.patch" ) # bug 889160, pending upstream - -pkg_pretend() { - use kernel_linux || return - get_running_version - if kernel_is -lt 4 11 && ! use old-kernel; then - ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for" - ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856" - fi -} - -src_prepare() { - # don't add -O3 to CXXFLAGS, bug 549140 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die - - # fix missing qt_version_tag symbol w/ LTO, bug 674382 - sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die - - # Broken with FORTIFY_SOURCE=3 - # Our toolchain sets F_S=2 by default w/ >= -O2, so we need - # to unset F_S first, then explicitly set 2, to negate any default - # and anything set by the user if they're choosing 3 (or if they've - # modified GCC to set 3). - # - # Refs: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078 - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709 - # https://bugreports.qt.io/browse/QTBUG-103782 - # bug #847145 - if is-flagq '-O[23]' || is-flagq '-Ofast' ; then - # We can't unconditionally do this b/c we fortify needs - # some level of optimisation. - filter-flags -D_FORTIFY_SOURCE=3 - # (Qt doesn't seem to respect CPPFLAGS?) - append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 - fi - - # Leads to miscompiled qtcore, bug #865339 - tc-is-clang && append-flags -fno-stack-clash-protection - - qt5-build_src_prepare - - # workaround for 0148-Annotate-QMutex-...patch adding a header - perl bin/syncqt.pl -version ${PV} || die -} - -src_configure() { - local myconf=( - $(qt_use icu) - $(qt_use !icu iconv) - $(qt_use systemd journald) - ) - use old-kernel && myconf+=( - -no-feature-renameat2 # needs Linux 3.16, bug 669994 - -no-feature-getentropy # needs Linux 3.17, bug 669994 - -no-feature-statx # needs Linux 4.11, bug 672856 - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - qt5_symlink_binary_to_path qmake 5 - - local flags=( - DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG - OPENGL OPENSSL SSL WIDGETS - ) - - for flag in ${flags[@]}; do - cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die - - #if defined(QT_NO_${flag}) && defined(QT_${flag}) - # undef QT_NO_${flag} - #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) - # define QT_NO_${flag} - #endif - _EOF_ - done -} diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild new file mode 100644 index 000000000000..7e19031cbe35 --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=5 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit linux-info flag-o-matic toolchain-funcs qt5-build + +DESCRIPTION="Cross-platform application development framework" +SLOT=5/${QT5_PV} + +IUSE="icu old-kernel systemd" + +DEPEND=" + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2[pcre16,unicode] + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/tools/bootstrap + src/tools/moc + src/tools/rcc + src/corelib + src/tools/qlalr + doc +) + +QT5_GENTOO_PRIVATE_CONFIG=( + !:network + !:sql + !:testlib + !:xml +) + +pkg_pretend() { + use kernel_linux || return + get_running_version + if kernel_is -lt 4 11 && ! use old-kernel; then + ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for" + ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856" + fi +} + +src_prepare() { + # don't add -O3 to CXXFLAGS, bug 549140 + sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die + + # fix missing qt_version_tag symbol w/ LTO, bug 674382 + sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die + + # Broken with FORTIFY_SOURCE=3 + # Our toolchain sets F_S=2 by default w/ >= -O2, so we need + # to unset F_S first, then explicitly set 2, to negate any default + # and anything set by the user if they're choosing 3 (or if they've + # modified GCC to set 3). + # + # Refs: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709 + # https://bugreports.qt.io/browse/QTBUG-103782 + # bug #847145 + if is-flagq '-O[23]' || is-flagq '-Ofast' ; then + # We can't unconditionally do this b/c we fortify needs + # some level of optimisation. + filter-flags -D_FORTIFY_SOURCE=3 + # (Qt doesn't seem to respect CPPFLAGS?) + append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + fi + + # Leads to miscompiled qtcore, bug #865339 + tc-is-clang && append-flags -fno-stack-clash-protection + + qt5-build_src_prepare + + # workaround for 0148-Annotate-QMutex-...patch adding a header + perl bin/syncqt.pl -version ${PV} || die +} + +src_configure() { + local myconf=( + $(qt_use icu) + $(qt_use !icu iconv) + $(qt_use systemd journald) + ) + use old-kernel && myconf+=( + -no-feature-renameat2 # needs Linux 3.16, bug 669994 + -no-feature-getentropy # needs Linux 3.17, bug 669994 + -no-feature-statx # needs Linux 4.11, bug 672856 + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + qt5_symlink_binary_to_path qmake 5 + + local flags=( + DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG + OPENGL OPENSSL SSL WIDGETS + ) + + for flag in ${flags[@]}; do + cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 344f667722f7..5c7708b220ff 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,7 +1,7 @@ DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34 -DIST qtbase-5.15.8-gentoo-kde-4.tar.xz 789072 BLAKE2B bc781da32e7ad917fcbe3ec6fbf1ad17b5128f994e96f38590305b792b288b5c63ba8f71740bb2bb84bbf62386d154aa643cf162d0c5804a626f6c57682d7713 SHA512 1a65c40a82a2ae8cdfcb06ed6d0267f7c6257ed6e0637e17c8ca342702834d19c8ee12c02128754f41c7c4744e44cbc647982b2f8f215e36401b0eb47334a9bd +DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce EBUILD qtgui-5.15.8-r1.ebuild 3836 BLAKE2B a5216fc2e7a1ee2c146a89c79de2ea69f1300025740ba34fd076da437416c0e4a6b761e4e85699ec60b9a266482147b79f8e0874acf064af6685998b62b45072 SHA512 54409e756b9362237bc50b40f73d00da5b3d859002036ffb32ab59de9f29c05349300b1a386313738c7a99c6336fab1d920e714c93e94aad67d3de45ac2a84e3 -EBUILD qtgui-5.15.8-r2.ebuild 3842 BLAKE2B 504ec9c9caff125035fab7cd8f45eeaae1e9d881cb127728742a778a87f15ef652bd2877f7e0ec330696aa2afb065cdb2550c49d99d47092d1977f3b0a17e492 SHA512 71d67bf48cfdb5863fecf451a8361d1edb425fde98ae459044d4732ace99e5717b695269fc613886ad63e0e2e2575f508213d25e4e9340774dd231dd1ebfefa9 +EBUILD qtgui-5.15.8-r3.ebuild 3842 BLAKE2B b13a7f63898005d3759ae61407392853d64650502716bf72e4a308fb2523548574ed138a9cfd93eaf1959738793785869b43bd6931cf755c5e3863cb44d0df0a SHA512 643421d9486a4f887dc09ebf90a569d25e28d6e4d3a0c18bed8db3b29624870f75a12eededd2a5448d63462f032d75402c3382b6842e1b19a7d06ec9d989e2ec MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5 diff --git a/dev-qt/qtgui/qtgui-5.15.8-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r2.ebuild deleted file mode 100644 index c7b0d5ead51a..000000000000 --- a/dev-qt/qtgui/qtgui-5.15.8-r2.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=4 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" - -SLOT=5/${QT5_PV} # bug 707658 -IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput - linuxfb +png tslib tuio +udev vnc vulkan wayland +X" -REQUIRED_USE=" - || ( eglfs linuxfb vnc X ) - accessibility? ( dbus X ) - eglfs? ( egl ) - ibus? ( dbus ) - libinput? ( udev ) - X? ( gles2-only? ( egl ) ) -" - -RDEPEND=" - dev-libs/glib:2 - =dev-qt/qtcore-${QT5_PV}*:5= - dev-util/gtk-update-icon-cache - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:= - sys-libs/zlib:= - dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) - eglfs? ( - media-libs/mesa[gbm(+)] - x11-libs/libdrm - ) - evdev? ( sys-libs/mtdev ) - jpeg? ( media-libs/libjpeg-turbo:= ) - gles2-only? ( media-libs/libglvnd ) - !gles2-only? ( media-libs/libglvnd[X] ) - libinput? ( - dev-libs/libinput:= - x11-libs/libxkbcommon - ) - png? ( media-libs/libpng:= ) - tslib? ( >=x11-libs/tslib-1.21 ) - tuio? ( =dev-qt/qtnetwork-${QT5_PV}* ) - udev? ( virtual/libudev:= ) - vnc? ( =dev-qt/qtnetwork-${QT5_PV}* ) - vulkan? ( dev-util/vulkan-headers ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/libxkbcommon[X] - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) -" -DEPEND="${RDEPEND} - evdev? ( sys-kernel/linux-headers ) - linuxfb? ( sys-kernel/linux-headers ) - udev? ( sys-kernel/linux-headers ) -" -PDEPEND=" - ibus? ( app-i18n/ibus ) - wayland? ( =dev-qt/qtwayland-${QT5_PV}* ) -" - -QT5_TARGET_SUBDIRS=( - src/tools/qvkgen - src/gui - src/openglextensions - src/platformheaders - src/platformsupport - src/plugins/generic - src/plugins/imageformats - src/plugins/platforms - src/plugins/platforminputcontexts -) - -QT5_GENTOO_CONFIG=( - accessibility:accessibility-atspi-bridge - egl:egl: - eglfs:eglfs: - eglfs:eglfs_egldevice: - eglfs:eglfs_gbm: - evdev:evdev: - evdev:mtdev: - :fontconfig: - :system-freetype:FREETYPE - !:no-freetype: - gles2-only::OPENGL_ES - gles2-only:opengles2:OPENGL_ES_2 - !:no-gui: - :system-harfbuzz: - !:no-harfbuzz: - jpeg:system-jpeg:IMAGEFORMAT_JPEG - !jpeg:no-jpeg: - libinput - libinput:xkbcommon: - :opengl - png:png: - png:system-png:IMAGEFORMAT_PNG - !png:no-png: - tslib:tslib: - udev:libudev: - vulkan:vulkan: - X:xcb: - X:xcb-glx: - X:xcb-plugin: - X:xcb-render: - X:xcb-sm: - X:xcb-xlib: - X:xcb-xinput: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :gui -) - -src_prepare() { - # don't add -O3 to CXXFLAGS, bug 549140 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die - - # egl_x11 is activated when both egl and X are enabled - use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) - - qt_use_disable_config dbus dbus \ - src/platformsupport/themes/genericunix/genericunix.pri - - qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro - - qt_use_disable_mod ibus dbus \ - src/plugins/platforminputcontexts/platforminputcontexts.pro - - use vnc || sed -i -e '/SUBDIRS += vnc/d' \ - src/plugins/platforms/platforms.pro || die - - qt5-build_src_prepare -} - -src_configure() { - local myconf=( - $(usev dbus -dbus-linked) - $(qt_use egl) - $(qt_use eglfs) - $(usev eglfs '-gbm -kms') - $(qt_use evdev) - $(qt_use evdev mtdev) - -fontconfig - -system-freetype - -gui - -system-harfbuzz - $(qt_use jpeg libjpeg system) - $(qt_use libinput) - $(qt_use linuxfb) - -opengl $(usex gles2-only es2 desktop) - $(qt_use png libpng system) - $(qt_use tslib) - $(qt_use udev libudev) - $(qt_use vulkan) - $(qt_use X xcb) - $(usev X '-xcb-xlib') - ) - if use libinput || use X; then - myconf+=( -xkbcommon ) - fi - qt5-build_src_configure -} diff --git a/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild new file mode 100644 index 000000000000..f2af77c15d55 --- /dev/null +++ b/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=5 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" + +SLOT=5/${QT5_PV} # bug 707658 +IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput + linuxfb +png tslib tuio +udev vnc vulkan wayland +X" +REQUIRED_USE=" + || ( eglfs linuxfb vnc X ) + accessibility? ( dbus X ) + eglfs? ( egl ) + ibus? ( dbus ) + libinput? ( udev ) + X? ( gles2-only? ( egl ) ) +" + +RDEPEND=" + dev-libs/glib:2 + =dev-qt/qtcore-${QT5_PV}*:5= + dev-util/gtk-update-icon-cache + media-libs/fontconfig + media-libs/freetype:2 + media-libs/harfbuzz:= + sys-libs/zlib:= + dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) + eglfs? ( + media-libs/mesa[gbm(+)] + x11-libs/libdrm + ) + evdev? ( sys-libs/mtdev ) + jpeg? ( media-libs/libjpeg-turbo:= ) + gles2-only? ( media-libs/libglvnd ) + !gles2-only? ( media-libs/libglvnd[X] ) + libinput? ( + dev-libs/libinput:= + x11-libs/libxkbcommon + ) + png? ( media-libs/libpng:= ) + tslib? ( >=x11-libs/tslib-1.21 ) + tuio? ( =dev-qt/qtnetwork-${QT5_PV}* ) + udev? ( virtual/libudev:= ) + vnc? ( =dev-qt/qtnetwork-${QT5_PV}* ) + vulkan? ( dev-util/vulkan-headers ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/libxkbcommon[X] + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) +" +DEPEND="${RDEPEND} + evdev? ( sys-kernel/linux-headers ) + linuxfb? ( sys-kernel/linux-headers ) + udev? ( sys-kernel/linux-headers ) +" +PDEPEND=" + ibus? ( app-i18n/ibus ) + wayland? ( =dev-qt/qtwayland-${QT5_PV}* ) +" + +QT5_TARGET_SUBDIRS=( + src/tools/qvkgen + src/gui + src/openglextensions + src/platformheaders + src/platformsupport + src/plugins/generic + src/plugins/imageformats + src/plugins/platforms + src/plugins/platforminputcontexts +) + +QT5_GENTOO_CONFIG=( + accessibility:accessibility-atspi-bridge + egl:egl: + eglfs:eglfs: + eglfs:eglfs_egldevice: + eglfs:eglfs_gbm: + evdev:evdev: + evdev:mtdev: + :fontconfig: + :system-freetype:FREETYPE + !:no-freetype: + gles2-only::OPENGL_ES + gles2-only:opengles2:OPENGL_ES_2 + !:no-gui: + :system-harfbuzz: + !:no-harfbuzz: + jpeg:system-jpeg:IMAGEFORMAT_JPEG + !jpeg:no-jpeg: + libinput + libinput:xkbcommon: + :opengl + png:png: + png:system-png:IMAGEFORMAT_PNG + !png:no-png: + tslib:tslib: + udev:libudev: + vulkan:vulkan: + X:xcb: + X:xcb-glx: + X:xcb-plugin: + X:xcb-render: + X:xcb-sm: + X:xcb-xlib: + X:xcb-xinput: +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :gui +) + +src_prepare() { + # don't add -O3 to CXXFLAGS, bug 549140 + sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die + + # egl_x11 is activated when both egl and X are enabled + use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) + + qt_use_disable_config dbus dbus \ + src/platformsupport/themes/genericunix/genericunix.pri + + qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro + + qt_use_disable_mod ibus dbus \ + src/plugins/platforminputcontexts/platforminputcontexts.pro + + use vnc || sed -i -e '/SUBDIRS += vnc/d' \ + src/plugins/platforms/platforms.pro || die + + qt5-build_src_prepare +} + +src_configure() { + local myconf=( + $(usev dbus -dbus-linked) + $(qt_use egl) + $(qt_use eglfs) + $(usev eglfs '-gbm -kms') + $(qt_use evdev) + $(qt_use evdev mtdev) + -fontconfig + -system-freetype + -gui + -system-harfbuzz + $(qt_use jpeg libjpeg system) + $(qt_use libinput) + $(qt_use linuxfb) + -opengl $(usex gles2-only es2 desktop) + $(qt_use png libpng system) + $(qt_use tslib) + $(qt_use udev libudev) + $(qt_use vulkan) + $(qt_use X xcb) + $(usev X '-xcb-xlib') + ) + if use libinput || use X; then + myconf+=( -xkbcommon ) + fi + qt5-build_src_configure +} diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest index 15c5dedb5bcb..6b26bcab5d17 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -1,7 +1,7 @@ DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016 -DIST qtbase-5.15.8-gentoo-kde-4.tar.xz 789072 BLAKE2B bc781da32e7ad917fcbe3ec6fbf1ad17b5128f994e96f38590305b792b288b5c63ba8f71740bb2bb84bbf62386d154aa643cf162d0c5804a626f6c57682d7713 SHA512 1a65c40a82a2ae8cdfcb06ed6d0267f7c6257ed6e0637e17c8ca342702834d19c8ee12c02128754f41c7c4744e44cbc647982b2f8f215e36401b0eb47334a9bd +DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce -EBUILD qtwidgets-5.15.8-r1.ebuild 1206 BLAKE2B 073672cf8e9da7c0f092397468c0e41a0a364bb9f8312359510e9fdc4df1ea396c2aae8641d77fe6922ebdc02c576a335c1f2c508d5f179bb11662bfe5f11c41 SHA512 e5e3918e84147aa1488053f51990cec089b2b02740e2272c1ffc8272ddfbebe7d549a4ac69c62c858036eb8651195b7d3b75ecef087b7882e032ebb9e22a15a4 +EBUILD qtwidgets-5.15.8-r2.ebuild 1206 BLAKE2B 6437af15f1a3793cdf1fa64be23baf416b49d0b2239f69aa0a058845c009156e5108621edc8a65e2be270c5f1cd6650760248c8008b6db568a0d2c43ca590a7b SHA512 eb22969ca1164ad0664397c00d13d444d7cabe6cbe91a73f10bf7821d0a9a3e1bc79a84f5c86f6c2ed2f0ad097bc5b7f776ad697ce6b027ff546d47004d0287e EBUILD qtwidgets-5.15.8.ebuild 1200 BLAKE2B 2bc1142dc7261140c06366e41c370464735ec597938eb5fe82176546733e14ab7f8b413ed7f2d3315d2b69d7d9e3b6d3741139ca684b8705a0fce71feca290b2 SHA512 ffa0a95e59423a680a9a4a7761c5bd391ef84b1ca718203175185185f3bde56516acaad6f852280ff8f06590f1ba6a7f3d94537014c84a50fdcd5868a203463d MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1 diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild deleted file mode 100644 index fbbc45ae8079..000000000000 --- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=4 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework" - -# keep IUSE defaults in sync with qtgui -IUSE="dbus gles2-only gtk +png +X" -REQUIRED_USE="gtk? ( dbus )" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?] - dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) - gtk? ( - dev-libs/glib:2 - =dev-qt/qtgui-${QT5_PV}*:5=[dbus] - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/tools/uic - src/widgets - src/plugins/platformthemes -) - -QT5_GENTOO_CONFIG=( - dbus:xdgdesktopportal: - gtk:gtk3: - ::widgets - !:no-widgets: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :widgets -) - -src_configure() { - local myconf=( - -opengl $(usex gles2-only es2 desktop) - $(usev dbus -dbus-linked) - $(qt_use gtk) - -gui - $(qt_use png libpng system) - -widgets - $(qt_use X xcb) - $(usev X '-xcb-xlib -xkbcommon') - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild new file mode 100644 index 000000000000..c6c374f18d5e --- /dev/null +++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=5 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework" + +# keep IUSE defaults in sync with qtgui +IUSE="dbus gles2-only gtk +png +X" +REQUIRED_USE="gtk? ( dbus )" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?] + dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) + gtk? ( + dev-libs/glib:2 + =dev-qt/qtgui-${QT5_PV}*:5=[dbus] + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/pango + ) +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/tools/uic + src/widgets + src/plugins/platformthemes +) + +QT5_GENTOO_CONFIG=( + dbus:xdgdesktopportal: + gtk:gtk3: + ::widgets + !:no-widgets: +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :widgets +) + +src_configure() { + local myconf=( + -opengl $(usex gles2-only es2 desktop) + $(usev dbus -dbus-linked) + $(qt_use gtk) + -gui + $(qt_use png libpng system) + -widgets + $(qt_use X xcb) + $(usev X '-xcb-xlib -xkbcommon') + ) + qt5-build_src_configure +} -- cgit v1.2.3