diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
| commit | 46eedbedafdb0040c37884982d4c775ce277fb7b (patch) | |
| tree | db33a91259730be84999e13a8d8168c799f50ac0 /dev-qt | |
| parent | e23a08d0c97a0cc415aaa165da840b056f93c997 (diff) | |
gentoo resync : 20.10.2021
Diffstat (limited to 'dev-qt')
119 files changed, 406 insertions, 2481 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 3761ba07697b..62cf771c3487 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest index e6b5e353c447..445713de5f6c 100644 --- a/dev-qt/assistant/Manifest +++ b/dev-qt/assistant/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b -EBUILD assistant-5.15.2-r11.ebuild 1269 BLAKE2B ef32a30011891811c4dc896d917759a3dc01c992175cdda3413aa66cd55808596b19d7c553377a25988a25f416fa0b04e865f116992b104170badc3f0df8eb79 SHA512 f592f2790cee0b0dccbbd555e7a24234f9f94f3ee4e819eb906b5751adafb6f10c3e49f7ea1595338e756f56aed48cf6c14f93fecf53081f6879f35849eada18 -EBUILD assistant-5.15.2.ebuild 1172 BLAKE2B 279c9a3c861bae74c79d52a8549b06167a7ca4adc3e4da5b2de0eada3414702adf36f0055790221e3cf725e9dcd1a959a6a507dbb823ddef061c7ffaff34ff8c SHA512 65a1a15cc074952f79a15adf8f57dca1283d246c34367e467e591af4c3ae3284539592efcf10edbf035bf8e450688205d5c3ab9ce3c909c60e7b83f0691ea067 +EBUILD assistant-5.15.2-r11.ebuild 1268 BLAKE2B 544f6db99e16de4974069f3dae1587da31357870d86244c186ac498e55360a752740944a8fc8ddf4abeef94d8be74954cc918b54e78f4f0c1d33daf44f8498b4 SHA512 282e2a2d22fb092567909e25b754150213cc637c37dd632fd56d9634fe3ad4c483b3f90bd608721c647a32a7d98a4c96485807bcf8175b34a9eb0e6ce911e036 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/assistant/assistant-5.15.2-r11.ebuild b/dev-qt/assistant/assistant-5.15.2-r11.ebuild index 7f52c026f468..4fb7695223e1 100644 --- a/dev-qt/assistant/assistant-5.15.2-r11.ebuild +++ b/dev-qt/assistant/assistant-5.15.2-r11.ebuild @@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils DESCRIPTION="Tool for viewing on-line documentation in Qt help file format" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" fi IUSE="" diff --git a/dev-qt/assistant/assistant-5.15.2.ebuild b/dev-qt/assistant/assistant-5.15.2.ebuild deleted file mode 100644 index da691bbbaefe..000000000000 --- a/dev-qt/assistant/assistant-5.15.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit desktop qt5-build xdg-utils - -DESCRIPTION="Tool for viewing on-line documentation in Qt help file format" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV} - ~dev-qt/qthelp-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtprintsupport-${PV} - ~dev-qt/qtsql-${PV}[sqlite] - ~dev-qt/qtwidgets-${PV} -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/assistant/assistant -) - -src_prepare() { - sed -e "s/qtHaveModule(webkitwidgets)/false/g" \ - -i src/assistant/assistant/assistant.pro || die - - qt5-build_src_prepare -} - -src_install() { - qt5-build_src_install - - doicon -s 32 src/assistant/assistant/images/assistant.png - newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png - make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation' -} - -pkg_postinst() { - qt5-build_pkg_postinst - xdg_icon_cache_update -} - -pkg_postrm() { - qt5-build_pkg_postrm - xdg_icon_cache_update -} diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest index 31695defecf4..1763a4e8011a 100644 --- a/dev-qt/designer/Manifest +++ b/dev-qt/designer/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b -EBUILD designer-5.15.2-r11.ebuild 1324 BLAKE2B a9e5c78b5689b1f129a627d14f84a4e0a71e9e2ba18dca32cf95964ce220f219522909387f311a92b82c02749243daacef3e585e29305b8105d7de895657570f SHA512 d9fb5b0025c455141c44ae3740b14b0474c74777db81e715cffe0446cf7264b84fd4f346a26223faabf155c2e521ea48bec717c9f82335ac78869b07b61dabf9 -EBUILD designer-5.15.2.ebuild 1207 BLAKE2B 164db9e578cf8ec76a9b319c0a40abf63dc318e9f8b697920f2123cc10ab07b2fdd85245fff218a09e70f9e69726c29f1c2e7327c59a040639845f5df9580895 SHA512 89f7f89384daf7d88afdea95ce93552f3430f79f75bfcc4b233c20cf700c2c1db25fedd722183eb13e80fdcbc04dddcdeea999a8cc6524259f8d10ace7fd952e +EBUILD designer-5.15.2-r11.ebuild 1322 BLAKE2B 96e2f9396e6fa9a85c0e7428f126424fd1eb02d1906fcc64aa287dae9a03705de71c1c5a3c81348d24a2bb4c2967be9663f211691bb7a6a82cf06f3c6b0e7ce5 SHA512 41f3fc586ec362e271c5aee7eaa4c829b2e3454fb014df418e464e992a40ef0597c959aa7e5a71b811144f535530d7a2486c3b495fcb15880060e44d3798de9b MISC metadata.xml 565 BLAKE2B ff18f784bf09ba4add0fe5a9966a07ba2694dd84046bc528b22bcfd643a7e57be99235bd98eca4e58f68636f9fe6c8e274aabf82ed2055c6a4c70d10c60864ed SHA512 357d80b857e508aeceefcb45ab3757ce24d6ec3e1fd67642f2cbedf496748f89ab5a9726eb974bea8d5b1693601a965571913f79b1325aeaf9020183882ba16d diff --git a/dev-qt/designer/designer-5.15.2-r11.ebuild b/dev-qt/designer/designer-5.15.2-r11.ebuild index b6d8f4d22af1..0d41f6d0c413 100644 --- a/dev-qt/designer/designer-5.15.2-r11.ebuild +++ b/dev-qt/designer/designer-5.15.2-r11.ebuild @@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86" fi IUSE="declarative" diff --git a/dev-qt/designer/designer-5.15.2.ebuild b/dev-qt/designer/designer-5.15.2.ebuild deleted file mode 100644 index 72ca74544f78..000000000000 --- a/dev-qt/designer/designer-5.15.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit desktop qt5-build xdg-utils - -DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86" -fi - -IUSE="declarative" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}:5= - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtprintsupport-${PV} - ~dev-qt/qtwidgets-${PV} - ~dev-qt/qtxml-${PV} - declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] ) -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" - -src_prepare() { - qt_use_disable_mod declarative quickwidgets \ - src/designer/src/plugins/plugins.pro - - sed -e "s/qtHaveModule(webkitwidgets)/false/g" \ - -i src/designer/src/plugins/plugins.pro || die - - qt5-build_src_prepare -} - -src_install() { - qt5-build_src_install - - doicon -s 128 src/designer/src/designer/images/designer.png - make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner' -} - -pkg_postinst() { - qt5-build_pkg_postinst - xdg_icon_cache_update -} - -pkg_postrm() { - qt5-build_pkg_postrm - xdg_icon_cache_update -} diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest index cdda59cbc0b7..839aee2a66e9 100644 --- a/dev-qt/linguist-tools/Manifest +++ b/dev-qt/linguist-tools/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b -EBUILD linguist-tools-5.15.2-r10.ebuild 763 BLAKE2B 12ed0c804c055985d923f87564fc85747051cd85e3b04be62af7e58766aaf6defc339b277fa81ffcd5494f36a1d2464c19696f78435adc6bef0a712d5dbb2a3d SHA512 58b8b8298280bb3ac50692a1631c85d7f8f1990bf755cf34c2d06c96f1b3022ec83811d1306058bc36bdb934062a8ac346359b71d3062dd2d53b79125acbd288 -EBUILD linguist-tools-5.15.2.ebuild 1022 BLAKE2B ceaefee8134e4ec654d8eaf3dde8ae085332b72a4e6efc61e31e71cbb3ab1bd593bb286beab9bb444329bd1c2bdc09c282dbe15fde7ca5fb1552e42f7771140c SHA512 597c04f3ebc80a32a601beeb9a760b0dfb1cced4fa5e74f0fd4687b775196fde21a26ed42182ce4b1ea3c409503de674dcec60142ce39ed09db522cdef4e2a7e +EBUILD linguist-tools-5.15.2-r10.ebuild 761 BLAKE2B 0a0a92dd4c3ea44dd16f21dfc172c28dea25cd70c932ef4122a65b535738cd0602e11ee3edf38a9f2b93db0f5fee71e6a0fe22e9fb6c222ff7460566fd75658b SHA512 cb25ea547ae2dbdab01cbca18fc5e2f06bc56c1aefc6b503ce2a7396eca9a2815a9dcc0f16b1fffaff727376e435655253e2357899a0abb5de4d671142c5de56 MISC metadata.xml 553 BLAKE2B 0306175072e5a0abff04f61eca76aa56daba272d1308419efd9ab80c4693eb795012b4e45a4cc102f6a9ec842105a805d9c5e75f84ae8007508a4d7d807d444b SHA512 d1edc09cbb7d757cd72b9b3dce980e0fede2cf69a83b78a072d81aea97692cb235227213cf02aa8207f33bc4a510a63baee359d5e8669ea7e0e5268dcd522e79 diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild index 639bf1ae2cad..b41bec103407 100644 --- a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild +++ b/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Tools for working with Qt translation data files" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="qml" diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild deleted file mode 100644 index 9d680f58c928..000000000000 --- a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Tools for working with Qt translation data files" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="qml" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtxml-${PV} - qml? ( ~dev-qt/qtdeclarative-${PV} ) -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" - -QT5_TARGET_SUBDIRS=( - src/linguist -) - -src_prepare() { - sed -i -e '/SUBDIRS += linguist/d' \ - src/linguist/linguist.pro || die - - qt_use_disable_mod qml qmldevtools-private \ - src/linguist/lupdate/lupdate.pro - - qt5-build_src_prepare -} - -src_configure() { - # Most of qttools require files that are only generated when qmake is - # run in the root directory. - # Related bugs: 633776, 676948, and 716514. - mkdir -p "${QT5_BUILD_DIR}" || die - qt5_qmake "${QT_BUILD_DIR}" - cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die - qt5-build_src_configure -} diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest index 35c3f57b6d9f..868d0045cde0 100644 --- a/dev-qt/linguist/Manifest +++ b/dev-qt/linguist/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b -EBUILD linguist-5.15.2-r11.ebuild 1070 BLAKE2B 6d9ed2aab0e45b4adfa776de921e87caf616ba38ee3d0602e12fddcf47074a0dec2bd97e3d8c51275171a5ad1bab97de56b1ea302c3783a497c7806a57bda646 SHA512 3acc87a9c1ff8c0e5367b39784b9721348c0bb4df53ca8e6eecec109f5b75d8d494ed4ceef1d1636683dfc7b176ba77ffc7c1ca2ec3ab11f5d9b06844cc6af26 -EBUILD linguist-5.15.2.ebuild 978 BLAKE2B 9a0597ccbbe503e80793cb39ea06f12f98f9ea30119eefc569f01cc7540eec38c7088230133ea44792e34b66c60c71f1a26afe3ae2ad33e7c726127fa5c3ce0a SHA512 3cdb00dd950edc643b8c60d7f33600e76c059e36b7bad8c549f08ab504bdba58641ab9ec81e7b4d084ddccc71593ef984716e52a63a9a84f98692696b7304306 +EBUILD linguist-5.15.2-r11.ebuild 1069 BLAKE2B 16a610b157e34327a9a45d8377823646ad3d0cc98e5aaacfe34ff00b44b285e5d9644da3ecf05c02aeaaa7b2172e5ca94e6c0bfee3d7be0f757e42089f01a345 SHA512 b3570d4edfe75427b23ceb1e2b049018cfae3441c66413f5c0479e354652ac45edc7432562a9d984637cddc0649d2324d218acc0a225e8e9b68427056308c316 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/linguist/linguist-5.15.2-r11.ebuild b/dev-qt/linguist/linguist-5.15.2-r11.ebuild index adbeaf678947..686904fe227f 100644 --- a/dev-qt/linguist/linguist-5.15.2-r11.ebuild +++ b/dev-qt/linguist/linguist-5.15.2-r11.ebuild @@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils DESCRIPTION="Graphical tool for translating Qt applications" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86" fi IUSE="" diff --git a/dev-qt/linguist/linguist-5.15.2.ebuild b/dev-qt/linguist/linguist-5.15.2.ebuild deleted file mode 100644 index 23446cbce0c2..000000000000 --- a/dev-qt/linguist/linguist-5.15.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit desktop qt5-build xdg-utils - -DESCRIPTION="Graphical tool for translating Qt applications" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/designer-${PV} - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}:5= - ~dev-qt/qtprintsupport-${PV} - ~dev-qt/qtwidgets-${PV} - ~dev-qt/qtxml-${PV} -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/linguist/linguist -) - -src_install() { - qt5-build_src_install - - local size - for size in 16 32 48 64 128; do - newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png - done - make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation' -} - -pkg_postinst() { - qt5-build_pkg_postinst - xdg_icon_cache_update -} - -pkg_postrm() { - qt5-build_pkg_postrm - xdg_icon_cache_update -} diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest index f5c8691b4934..a544be8e93d9 100644 --- a/dev-qt/pixeltool/Manifest +++ b/dev-qt/pixeltool/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b -EBUILD pixeltool-5.15.2-r11.ebuild 518 BLAKE2B 2f0e3ffc946464b8d05f9226c0997e54d7d425a70276e60e76aa79e66f6d0bccbf4a648042335854d7950c5d7e71bb2275a189173d42198bbaa9363e0e676a58 SHA512 ea6618607cad3523e3b113e6b9d647fa628a6b989f43c48b75b6dc2db14b696cb9241b2a97eae69fad92ad21c43aa5cbc4dfb9c5c16be6792fc5f23f544f29a5 -EBUILD pixeltool-5.15.2.ebuild 421 BLAKE2B 4e1e63db67d042bf03d2ee606682fa210e7c48ab314a4f78e71c198e3b920c45a930826054c7f9ba6af5b12f7e881c4fa9a605c96910f0317b7d88e37dcddf58 SHA512 6e8c19d9cfe7e5b8a651817499a72b5e8cb4a538cdd865a68fdf0c388ed093379297143916aa6fd3e55fe9ec25345554e072917a8096fc6a05fec241da329a89 +EBUILD pixeltool-5.15.2-r11.ebuild 517 BLAKE2B e985bd5d8d3ed90835a90ac58e6a7751fb01dcffe2b26d0cfc8ebe3a702a46db596ef5fc04c76095ae582a567a1642845f0bf14075bcc43c44f18753d0f4320d SHA512 83148b3fe154b1961da83e4583558ba52659ac7e32b494ada961f64d7519bb51b5dd2828d044c5525bb0501f21bb8b971a39382b85e51f46d4cfcd16f1eb16ef MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild b/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild index 15694f09c002..3e456b213ccf 100644 --- a/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild +++ b/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Qt screen magnifier" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" fi IUSE="" diff --git a/dev-qt/pixeltool/pixeltool-5.15.2.ebuild b/dev-qt/pixeltool/pixeltool-5.15.2.ebuild deleted file mode 100644 index c90103ced4e4..000000000000 --- a/dev-qt/pixeltool/pixeltool-5.15.2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Qt screen magnifier" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}:5= - ~dev-qt/qtwidgets-${PV} -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest index 41592a18bc89..206fd5213e8f 100644 --- a/dev-qt/qdbus/Manifest +++ b/dev-qt/qdbus/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b -EBUILD qdbus-5.15.2-r10.ebuild 552 BLAKE2B da2c253446a5346f185ab7b45d110478abe0c0fd114198dafbb36fa9184ca37c78700d83de0ab33bcafef1a2feec9117783ad1a5916fa44ea5b3a17394fa52c0 SHA512 98721df33c67dd0787c8e381a7d93cc93011569327b2466b378fa192d972a1ef1785c229c9bde18994caf52291bbdbfe981290dc8728d606a45e86bda7d1b23f -EBUILD qdbus-5.15.2.ebuild 479 BLAKE2B 1bbd1e7fabca5b7fe69348b35f043c8b405a3531d4376cde7014b325175507a3cdc1f7957caa83b467845b72296c7d4dc583ab577cfd4e5065633baa8d721651 SHA512 a67672a40c2673e507842372972a9fc5fb74f6cfede0a60f1c1d8c1d3d6285e1de7ae73c82bb699111b7f9e753b1ff0694bb40d8e953bb1ca777283a3369dcda +EBUILD qdbus-5.15.2-r10.ebuild 550 BLAKE2B 61c2e4a3de7631511a6ecb2f5d1cc5b05cb72ae547c9bcb3b16d93180ad59283ce07c37a05b3d712f418752f04c2dc26ecbebaed4d058933456cadfebb1a6ab9 SHA512 7c031f9e9a702d622b2d13a86bf39cff64263c29dc21662ea0d7d5793bcb746c2a944008394df51eda40c703fcfcfe7872607804a8e8ffccd7c8a10027752a1a MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild b/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild index 3819a6b0caea..2c7623dbaf80 100644 --- a/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild +++ b/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Interface to Qt applications communicating over D-Bus" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="" diff --git a/dev-qt/qdbus/qdbus-5.15.2.ebuild b/dev-qt/qdbus/qdbus-5.15.2.ebuild deleted file mode 100644 index 42552e0fb275..000000000000 --- a/dev-qt/qdbus/qdbus-5.15.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Interface to Qt applications communicating over D-Bus" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdbus-${PV} - ~dev-qt/qtxml-${PV} -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/qdbus/qdbus -) diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest index 0b4268cb3e34..460d1f9c9c5f 100644 --- a/dev-qt/qdbusviewer/Manifest +++ b/dev-qt/qdbusviewer/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b -EBUILD qdbusviewer-5.15.2-r10.ebuild 1042 BLAKE2B 6bbeee3455096dd33047db64ae66caf764f35672b9ca9cc311700e888b1b0faa0aaa8fb3e694aa328eb1b0770b132a2d5ee84c5cdca72eafd35178b6f6763913 SHA512 178563ee4a2f52a1aa9325157cfad66c62c9c82e5efb478624e59ca1c8a118d2bd25ca73c4ce990630517ec1a4b1a008450be020ee9a797a525c34e78554f610 -EBUILD qdbusviewer-5.15.2.ebuild 960 BLAKE2B 1d2910182ed9b6830230106d2596c393aae23544651cec3fa4e9ed1b65aa3eab3a2a25c8080d034c6988aa1366d3e56c98eb70cac7f946ff7cbed96aff89324f SHA512 9091c3d7a17e3481458b9dcb4116f7e973ca4e43ae0d47aa0f28e8595f16b100c843c11b7779867150d5159e9b0cfa140d94e0a6995c4c65962f0538a6a3ca62 +EBUILD qdbusviewer-5.15.2-r10.ebuild 1041 BLAKE2B b967aba8b225e5e9a9bd36d1350445b48a153342a96828771e86f23b8063878681413ab63799d7fba07850691d03644027c222331503d3da35c06f00ea986564 SHA512 0014aebe0181579b471539204c98ca991163fc6dadaddf798a74d4f47d955713388c200861f091ce9a902a4fa1a651fe23e168f9485a4229adc938cdf7ca1e7a MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild index 09d3b0f1cd86..11f5c9a1d50a 100644 --- a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild +++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild @@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" fi IUSE="" diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild deleted file mode 100644 index a9976bf60249..000000000000 --- a/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit desktop qt5-build xdg-utils - -DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdbus-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtwidgets-${PV} - ~dev-qt/qtxml-${PV} -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/qdbus/qdbusviewer -) - -src_install() { - qt5-build_src_install - - doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png - newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png - make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development' -} - -pkg_postinst() { - qt5-build_pkg_postinst - xdg_icon_cache_update -} - -pkg_postrm() { - qt5-build_pkg_postrm - xdg_icon_cache_update -} diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest index 602682a19cec..767a8ed69388 100644 --- a/dev-qt/qdoc/Manifest +++ b/dev-qt/qdoc/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b EBUILD qdoc-5.15.2-r10.ebuild 884 BLAKE2B 9e2fbd20d3e8e17452f25dccf0ac0118e2658a9a71d9ce38bbda5edcd9284daff970419d1b836e1c06e26dfbe61f4317aad2b829709f0f8c34a7cd5d9746938e SHA512 a6ad4bfc07d7a8d1a7a739ba2a4e9a088744e2cb2fa4af4b3035ece210a00d22cbfe4b15d556ff6e704906a09fcd587d4af65483922d7541a71f99869f59d4a5 -EBUILD qdoc-5.15.2.ebuild 543 BLAKE2B 049d072f3fe6f36d4703150ebe4326f0ade72c2e415743da40bd2015dfe9818595f606ecd4e7ed543fd9175b2f1df77da811c3a655dae4112f816f901e3771f8 SHA512 4de93172b553430ff0507f32519b22e4668e024ada835c938defec5037f95f9752dc6f58951f6d3a3167586083f20679ba1eadf5927abcd6b3e2ab15de7824b8 MISC metadata.xml 553 BLAKE2B 6512e790088d4b7a76a22edfb8e278399315d3136239d5ea1e37ba5fcdd761fec2a1a30504882e7660b5ced6d582ad37cb9cfc68775e8593d638a4594f693339 SHA512 40075da7d634cc291dcc15c00d1fc63debc6704443fcc0c5d3d06d227b8cf86f89884ea43eb3a1cf8a722a6b260cf9cb6cd7f88c0b14babe301e4344533d472e diff --git a/dev-qt/qdoc/qdoc-5.15.2.ebuild b/dev-qt/qdoc/qdoc-5.15.2.ebuild deleted file mode 100644 index 5af64b53d743..000000000000 --- a/dev-qt/qdoc/qdoc-5.15.2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Qt documentation generator" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -fi - -IUSE="qml" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - sys-devel/clang:= - qml? ( ~dev-qt/qtdeclarative-${PV} ) -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" - -src_prepare() { - qt_use_disable_mod qml qmldevtools-private \ - src/qdoc/qdoc.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest index d93fd667cc35..12cc27fd44ce 100644 --- a/dev-qt/qt3d/Manifest +++ b/dev-qt/qt3d/Manifest @@ -1,5 +1,3 @@ DIST qt3d-5.15.2-7edec6e0.tar.gz 86196121 BLAKE2B c6009fa8b94da1a498e14f61680be40cbc5e32e390d89911b5a7b7d19bae7c66e048101e6f3b6c1f7e5cc4e64da7ea801f4bf95c346b35d28a49866d9541e146 SHA512 73941c2052aeb9611cf24bbb7b3ba317e53207c080070bb5d602c9f2725d2ab305674e0f29b737ea62ff7a285b362ec53b3588b31c18635e250bc90081d9b5e7 -DIST qt3d-everywhere-src-5.15.2.tar.xz 81925416 BLAKE2B 358a071f775d460d794ce3451ea6904f9d1ac0a388176ba62f7d6c7c574621cdcd3db8f7af3aaa361e5ac172056e8e8a32b894b401720e93ae2a2cfad4282da3 SHA512 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b EBUILD qt3d-5.15.2-r10.ebuild 1000 BLAKE2B d6b708dcc748e395b5cb6cf74d36627f54322b46b237b52fbbc6dd87cc691c6b4dbd9fcfd1919f794f2caf460a8b59d8a299a9659ea75378c65e89f0da136cd1 SHA512 df4376ab76ca598655911d686aec0784291a89a14f59638a4eb239835d56a422651458765bfdf3c020d01125cef6e8444ec2f41d460cd71aecb72cc6451a721d -EBUILD qt3d-5.15.2.ebuild 880 BLAKE2B bcd097060dbb5e6673b7f5c4fd314a58c0f4d3412ece2b8542f83565d9ee0a0ad0df189e7af927bf836f8c200ccdfa689c366408720c069e21d093ab33fdf4ca SHA512 77f8a1f095598e798479a1e7d62e6b40188bbcc662da7948898364b0b5cd61bbf8b560a271969ae15e7a9f4fa4c49edc064a85cea1e1ae04a0a2778b7bd43d4b MISC metadata.xml 700 BLAKE2B 3f7d01ca331e1f43b3333f86f10901e6fdb6fb8482d9d0cebbd9c5d498b2a5971c7a17fe78aefe23d31eccfcf64eaee8b581f8f749ecb6c0eba286608d6c75e0 SHA512 3f6c2d8f227760e9e14f873147fc79bc5027cac6d5dc134c9ac071fd30c7fba39afad272829f8ae446682c3a1a5ba80b056b263963dcbdf308b0f55337563394 diff --git a/dev-qt/qt3d/qt3d-5.15.2.ebuild b/dev-qt/qt3d/qt3d-5.15.2.ebuild deleted file mode 100644 index 6a12fcf3062a..000000000000 --- a/dev-qt/qt3d/qt3d-5.15.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qt5-build - -DESCRIPTION="3D rendering module for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64 x86" -fi - -# TODO: tools -IUSE="gamepad gles2-only qml vulkan" - -COMMON_DEPEND=" - ~dev-qt/qtconcurrent-${PV} - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}:5=[vulkan=] - ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-4.0.0 - gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) -" -DEPEND="${COMMON_DEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -RDEPEND="${COMMON_DEPEND} - dev-qt/qtchooser -" - -src_prepare() { - rm -r src/3rdparty/assimp/{code,contrib,include} || die - - qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri - qt_use_disable_mod qml quick src/src.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest index 5297eb264a52..f5b83bb7949b 100644 --- a/dev-qt/qtchooser/Manifest +++ b/dev-qt/qtchooser/Manifest @@ -1,4 +1,3 @@ DIST qtchooser-66.tar.xz 32008 BLAKE2B 1faf4a44406655621e65132289af6a8b0d23f0c1027a3b99017c3951705378bebcfbc3cb32aa59975a101f21294ff701ca6eb6ec18ce977b714a426be0fbcd6d SHA512 0c7d3588ddd7b21e6e9d799204924e06e0b0950c898dfd23088f1e7657b7f821a35579aa062658499809f9d9757e82c3c592591aa2e5ec453463929bf2b33bac -EBUILD qtchooser-66-r1.ebuild 1471 BLAKE2B b5950833cea37935e202268272817e1bd6d8f4dc80dc88220d592f8536b2f101d4ef6ee6a552f158b969e837b51f658a0d97da2feb257a1784d0c64608562955 SHA512 a280f54b1c41068929d993cb973d07f4f836b14164f51fd884f3689c1ad2fb19621ba80253e2fdbd78355ba25f7d582f742446e3fdf3db0f4e2606463c8e0c40 -EBUILD qtchooser-66.ebuild 977 BLAKE2B a28e55c2c6f55082c93f8d7ba3e1e0d4b5cc378663ae94cd0026a46745625e1f7240cba603458ab756ced69950c3059a8bb63b94b7b45f96f0d783d542f9c823 SHA512 a10663af25e02e9f59bf3d9bf93ce5662bce5dd489382916e7396350d7dd738cea432ae8aaede433bee6a3db378e79d23ce0a8af063d7d5c2f99c5c6887c1765 +EBUILD qtchooser-66-r1.ebuild 1469 BLAKE2B ed5257a4134828f864229b04020171fa471bbfa6b4e9ac874b59027df4dbc2e6ad794a80a758cb2a7031d8a3754f1c867138dcf7959eb7ef271bf43920c004df SHA512 9bc54b406129e04df48a2bff185024c559622d1c793c4842c4ce8d64ec0af210ea18f1e6d6ac730bbeb5c1e8968823dfb0aa7ec69da1bafeb667a5e4e034c95f MISC metadata.xml 248 BLAKE2B 51adf67bdc3e6c30f18cb7c177694882c71c1207bf4e6b88aa0eb8d5f6fdbaea0c364777967125219ba8ea4be4a9ad3eb41269a7139cb211ce26f2985ac103ac SHA512 c2976d1256f14d4dcf6ea53ed248a43e9b76530c19eefb0e586d64b1080b75d1f4ac17171c6c27a491ce6623d34e9318fcba5ce3f78039f21ccaabbebf209345 diff --git a/dev-qt/qtchooser/qtchooser-66-r1.ebuild b/dev-qt/qtchooser/qtchooser-66-r1.ebuild index 69b3acc84d7e..e25d60437642 100644 --- a/dev-qt/qtchooser/qtchooser-66-r1.ebuild +++ b/dev-qt/qtchooser/qtchooser-66-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi LICENSE="|| ( LGPL-2.1 GPL-3 )" diff --git a/dev-qt/qtchooser/qtchooser-66.ebuild b/dev-qt/qtchooser/qtchooser-66.ebuild deleted file mode 100644 index 50298a23a94b..000000000000 --- a/dev-qt/qtchooser/qtchooser-66.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils toolchain-funcs - -DESCRIPTION="Tool to quickly switch between multiple Qt installations" -HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/" -SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz" - -LICENSE="|| ( LGPL-2.1 GPL-3 )" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( - dev-qt/qtcore:5 - dev-qt/qttest:5 - )" -RDEPEND="" - -qtchooser_make() { - emake \ - CXX="$(tc-getCXX)" \ - LFLAGS="${LDFLAGS}" \ - prefix="${EPREFIX}/usr" \ - "$@" -} - -src_compile() { - qtchooser_make -} - -src_test() { - pushd tests/auto >/dev/null || die - eqmake5 - popd >/dev/null || die - - qtchooser_make check -} - -src_install() { - qtchooser_make INSTALL_ROOT="${D}" install - - keepdir /etc/xdg/qtchooser - - # TODO: bash and zsh completion - # newbashcomp scripts/${PN}.bash ${PN} -} diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest index a710c4dd2e37..3b8bba0341e8 100644 --- a/dev-qt/qtconcurrent/Manifest +++ b/dev-qt/qtconcurrent/Manifest @@ -1,8 +1,3 @@ -AUX qtconcurrent-5.15.2-gcc11.patch 1709 BLAKE2B ee8a0a0a591fcbd242406bc37a5b29959d4a82cba78dd5650b60e0526316a1ac511c2f4e053db29d365394f38cf481772e659f194576f58aa2cb4d50ba240c51 SHA512 895c35ee745ff34cc939463c1d0b433d4bcf53c78af3b6c14304608ff282cb77ef292c63a1368885c7b3db5ec7c4acbff1827a014f08a768fdc50fc87dc64222 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtconcurrent-5.15.2-r1.ebuild 640 BLAKE2B 6b92535edb473b634658302c1863569c147b9271e016a77c88bed6bec845612f520fb68f426476600e3473ff66c87ffb1420015aba12ccb606d8dd330639022a SHA512 01ad79d9fd101c42eba17851270ef6058f167204e515016b47bbf8001fffce94c23ee909c496ac73d5d38c0a71ac03c1ccf0dc006082516114343164b4e2d2bb -EBUILD qtconcurrent-5.15.2-r10.ebuild 511 BLAKE2B eca734f370dec9b2af186cc480c05c952b92b7e44712f68c2bd05dfdce39a8fa0bbdd864e9f0881f29f60e2b1b3eac222da920ffd9993c611e3e5b0c0d1cbf05 SHA512 b77595336baf696b0f9c6678b55f0b5eea3ea8bea7e944a43e46edcd292f5194901df4048a12306dbe23b03dde49782b2e6b37c62b7a4f58556dab17c85d9f78 -EBUILD qtconcurrent-5.15.2.ebuild 593 BLAKE2B 44f6a1c8dac390908bb2d5d8f9ffaabd96333ffc07a680ec4ae65a0d4ddd737c24eb376d99afb9cffef954d7b0daa2fa4436c80ea839a43db71f4fc6edf30f7e SHA512 abca397ab254a2d3fcecf6d7ba04814f15184a1589c3fa2e26c8c4bb2fa965f2b9437ad2a0874fea44ea97490320e8589f596b26c91a0af17a10cbd30f16b296 +EBUILD qtconcurrent-5.15.2-r10.ebuild 509 BLAKE2B f6aff87eb8b0aa86ed93a9ada769ccc04db6cd4c5379db1bd601f6370db0b1fb9d3d88073cf4a126d571ceeee0e4ca4adba9a0368f5aaaa294dc6729dfbbef71 SHA512 f9f067dde6879342839e5e4ecae4c0e5e8bf99abc8aff547d3137a18257452124203ba27040394edb7d5314b162b854dc1a0b3de0afc047842166a0ef268ab64 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch b/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch deleted file mode 100644 index b27ac767b064..000000000000 --- a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.gentoo.org/764977 -https://invent.kde.org/qt/qt/qtbase/-/commit/c9543da6998b0827fb75ffe22327c99e2da7d364 - -From c9543da6998b0827fb75ffe22327c99e2da7d364 Mon Sep 17 00:00:00 2001 -From: Sona Kurazyan <sona.kurazyan@qt.io> -Date: Wed, 17 Mar 2021 16:04:00 +0100 -Subject: [PATCH] Remove the unnecessary template parameter from the class - specialization -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This seems to cause errors when compiling with gcc-11. Although this is -most likely a compiler bug, specifiying the template parameter type in -this case isn't necessary. - -Fixes: QTBUG-91909 -Fixes: QTBUG-90568 -Change-Id: Ib231257ccb2e16cc533f23ca5840d31e26a66d53 -Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> -(cherry picked from commit 659f7a06e91c04b239e3f4c0bcfccbe3581af1c3) -Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> -(cherry picked from commit 049e14870c13235cd066758f29c42dc96c1ccdf8) ---- - src/concurrent/qtconcurrentthreadengine.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h -index af413707e4..a4c8548cc4 100644 ---- a/src/concurrent/qtconcurrentthreadengine.h -+++ b/src/concurrent/qtconcurrentthreadengine.h -@@ -247,8 +247,8 @@ template <> - class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void> - { - public: -- ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine) -- :ThreadEngineStarterBase<void>(_threadEngine) {} -+ ThreadEngineStarter(ThreadEngine<void> *_threadEngine) -+ : ThreadEngineStarterBase<void>(_threadEngine) {} - - void startBlocking() - { --- -GitLab - diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild deleted file mode 100644 index f0ecb6cd1f63..000000000000 --- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/concurrent -) - -PATCHES=( - "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 - "${FILESDIR}"/${P}-gcc11.patch # bug #764977 -) diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild index 7488ab63fecd..f226909ed339 100644 --- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild +++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="" diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild deleted file mode 100644 index 346697ad3187..000000000000 --- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/concurrent -) - -PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012 diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index a51fde7df472..f124a0ce2dff 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,12 +1,6 @@ AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2 AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097 -AUX qtcore-5.15.2-fix-UB-in-QDateTime.patch 3707 BLAKE2B 7b1ed1b539d04e299b3148acf85d69c014a8a76882a682910b323117e176c68dab8b48de12c0a5c885508dd6d97a4ae9da4a27162323ba743d25f9a83319b367 SHA512 62beec1be070ff6136f1b52c1789e31f877bf728ca12c54c90de6302f6c35008d0d9e939f99a92465ca14ee977faed507b2acdea553d8904eb201aed41a97805 -AUX qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch 1944 BLAKE2B 71f3a02d89e3604cec0f021fe28bddc0ab43e242742d0f5af17a46bbfdc444f7d3244fe995195ef0c1c9119313a472bd7e64a6fd02986f7cb6cb544553fbd36d SHA512 6f9f57eb2b374b56576fe0046518810e07482aae1a74f45c9692ffbd797ad1653aedfcd896d89909ade4572564164e92698de64da9f98ce876952c2c96b15aa3 -AUX qtcore-5.15.2-gcc11.patch 1002 BLAKE2B 5104165920881f0ec960a96b5e82430acf32eaf2a3b2a1724844c18a2b0661d71820401d4f6c8d25e56b3a5dfb99cc47f024a96c8fc48f9ddcb1fb8dacc8a90d SHA512 658169f8d7fa42d492f69b44feadd369bccf9a76d01989fd8b14991f97cdf3c8291ff316e195a05a8bb015bae477d5c49d495eefcfc4f3e25dbc58f33688854e DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtcore-5.15.2-r10.ebuild 2327 BLAKE2B a5535fa9f65e6f99df0e964896594f063dc4730312b6262b8aa2cbe80cf47d0705593724f5fbe6df0501f574a77e0c1ebf62f17e3b24303515a2f7bf22b2eb00 SHA512 3851c850f13eb28edf4a0dd06b628b2675803eaf7419b7338a726a3a500c42764fc7c0146f3bae718cdf1de191f030ee0c9e07d32a0e2ad8c3362cee72fe9ca6 -EBUILD qtcore-5.15.2-r3.ebuild 2609 BLAKE2B 5ba2d7be01a791bfc9afcbe4d7cb7589df58b8ce5d343e9c35c7b69ff1ec2f80d701209e18bc2966fb154314e397b7577759b2bfa9271bb576558e6fa5ec2b49 SHA512 f4b64260fb2c66fdd106db7f464b212b7f63b506d4c3026cdbb15402a88f89f95742bc616f86bd6d92cfa4900b98e85dd50b9cfe9d49f3965c8df8fdeee42c51 +EBUILD qtcore-5.15.2-r10.ebuild 2325 BLAKE2B 14b93476a682c92c918445bdb3d8e66c097c60e90065050b13240c990c5cebed882fb0dc9be85a5ca2de487d4f20ba45c53a553f85ec217897c0ea6b7281c85a SHA512 1edc816208a111a4efbbcb2ab229c24e3ec8ed1ecd72961d42f1df17318a1d81dcb28f8ca61526a1c4cd0a6da3b19d962e5c06b2b7e46b6969fe870d18f951bf MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5 diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch deleted file mode 100644 index b131b7af3657..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch +++ /dev/null @@ -1,88 +0,0 @@ -From d2c0fc2b5f1c07c1e0acb1c0127578066b6f9b8e Mon Sep 17 00:00:00 2001 -From: Edward Welbourne <edward.welbourne@qt.io> -Date: Tue, 24 Nov 2020 12:45:11 +0100 -Subject: [PATCH] Bounds-check time-zone offsets when parsing - -Parsing of time-zone offsets should check the offset string conforms -to the expected format and has valid values in its fields. The -QDateTime parser, fromOffsetString(), neglected the bounds check on -hours; the QTzTimeZonePrivate parser, parsePosixTime(), neglected all -upper bounds checks, only checking against negative valus. - -Drive-by - refined phrasing of a comment. - -Fixes: QTBUG-88656 -Change-Id: If04cdbe65064108eaa87c42310527783ad21b4c0 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -(cherry picked from commit 380d97e1bd15e753907c378a070bdf7f1c1cf06e) -Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> ---- - src/corelib/time/qdatetime.cpp | 2 +- - src/corelib/time/qtimezoneprivate_tz.cpp | 27 ++++++++++++++++----------- - 2 files changed, 17 insertions(+), 12 deletions(-) - -diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp -index e824787880c..a2816e87f4a 100644 ---- a/src/corelib/time/qdatetime.cpp -+++ b/src/corelib/time/qdatetime.cpp -@@ -240,7 +240,7 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept - const QStringView hhRef = time.left(qMin(hhLen, time.size())); - bool ok = false; - const int hour = C.toInt(hhRef, &ok); -- if (!ok) -+ if (!ok || hour > 23) // More generous than QTimeZone::MaxUtcOffsetSecs - return 0; - - const QStringView mmRef = time.mid(qMin(mmIndex, time.size())); -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index b816b4ecff2..adc590878d7 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -394,29 +394,34 @@ static int parsePosixTime(const char *begin, const char *end) - // Format "hh[:mm[:ss]]" - int hour, min = 0, sec = 0; - -- // Note that the calls to qstrtoll do *not* check the end pointer, which -- // means they proceed until they find a non-digit. We check that we're -- // still in range at the end, but we may have read from past end. It's the -- // caller's responsibility to ensure that begin is part of a -- // null-terminated string. -+ // Note that the calls to qstrtoll do *not* check against the end pointer, -+ // which means they proceed until they find a non-digit. We check that we're -+ // still in range at the end, but we may have read past end. It's the -+ // caller's responsibility to ensure that begin is part of a null-terminated -+ // string. - -+ const int maxHour = QTimeZone::MaxUtcOffsetSecs / 3600; - bool ok = false; -- hour = qstrtoll(begin, &begin, 10, &ok); -- if (!ok || hour < 0) -+ const char *cut = begin; -+ hour = qstrtoll(begin, &cut, 10, &ok); -+ if (!ok || hour < 0 || hour > maxHour || cut > begin + 2) - return INT_MIN; -+ begin = cut; - if (begin < end && *begin == ':') { - // minutes - ++begin; -- min = qstrtoll(begin, &begin, 10, &ok); -- if (!ok || min < 0) -+ min = qstrtoll(begin, &cut, 10, &ok); -+ if (!ok || min < 0 || min > 59 || cut > begin + 2) - return INT_MIN; - -+ begin = cut; - if (begin < end && *begin == ':') { - // seconds - ++begin; -- sec = qstrtoll(begin, &begin, 10, &ok); -- if (!ok || sec < 0) -+ sec = qstrtoll(begin, &cut, 10, &ok); -+ if (!ok || sec < 0 || sec > 59 || cut > begin + 2) - return INT_MIN; -+ begin = cut; - } - } - --- -2.16.3 diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch deleted file mode 100644 index 892d89d2948c..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6485b6d45ad165cf976138cf8ab683c42515e794 Mon Sep 17 00:00:00 2001 -From: Kai Koehne <kai.koehne@qt.io> -Date: Tue, 13 Oct 2020 15:47:31 +0200 -Subject: [PATCH] Fix allocated memory of QByteArray returned by - QIODevice::readLine - -If the maxSize argument is 0 (the default), QIODevice::readLine will -allocate a QByteArray with the size of the next chunk of data, which -may be quite large. Before returning, it then resizes the byte array -to the actual size that was read. - -But since change 6b884d2aa129, QByteArray::resize() does no -longer shrink the capacity. This means that the returned QByteArray -keeps it's maximum size as allocated memory. This can lead to -excessive memory consumption, especially if the returned QByteArray's -are stored for further processing in the client code. - -Fix this by explicitly calling QByteArray::squeeze() before returning. - -[ChangeLog][QtCore][QIODevice] Fixes a regression in Qt 5.15 causing -QByteArray's that are returned by QIODevice::readLine() to -consume large amounts of memory. - -Fixes: QTBUG-87010 -Change-Id: I1f95fc4098849e900680fc945238bfeda881022c -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -(cherry picked from commit 263b29eedb223dec1ecaee193302070af87a1852, -limited squeeze() call if bytes are actually read to preserve retVal.isNull() -behavior in 5.15) ---- - src/corelib/io/qiodevice.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp -index cc1d1102522..0f11c2e805c 100644 ---- a/src/corelib/io/qiodevice.cpp -+++ b/src/corelib/io/qiodevice.cpp -@@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 maxSize) - } else - readBytes = readLine(result.data(), result.size()); - -- if (readBytes <= 0) -+ if (readBytes <= 0) { - result.clear(); -- else -+ } else { - result.resize(readBytes); -+ result.squeeze(); -+ } - - return result; - } --- -2.16.3 diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch b/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch deleted file mode 100644 index 9d391311c345..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: include <limits> to fix some GCC 11 build issues -Origin: upstream, commits: - https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986 - https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8 -Last-Update: 2021-01-26 - ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -44,6 +44,8 @@ - #include <QtCore/qfloat16.h> - #include <QtCore/qglobal.h> - -+#include <limits> -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include <stdlib.h> - #include <string.h> ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -43,6 +43,7 @@ - - #include <QtCore/qglobal.h> - #include <QtCore/qmetatype.h> -+#include <limits> - #include <string.h> - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include <QtCore/qbytearray.h> - -+#include <limits> -+ - QT_BEGIN_NAMESPACE - - diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild index 44e955e9f6e0..ee99b42e8112 100644 --- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework" SLOT=5/${QT5_PV} if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="icu old-kernel systemd" diff --git a/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild deleted file mode 100644 index dadcd5585a58..000000000000 --- a/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit linux-info qt5-build - -DESCRIPTION="Cross-platform application development framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -SLOT=5/$(ver_cut 1-3) - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -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} - !<dev-qt/qtcore-4.8.7-r4:4 - dev-qt/qtchooser -" - -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}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306 - "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914 - "${FILESDIR}"/${P}-fix-UB-in-QDateTime.patch # QTBUG-88656 - "${FILESDIR}"/${P}-fix-alloc-mem-of-QByteArray.patch # QTBUG-87010 - "${FILESDIR}"/${P}-gcc11.patch # bug 768342, 768354 - "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 -) - -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 - - qt5-build_src_prepare -} - -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 - - 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/qtdbus/Manifest b/dev-qt/qtdbus/Manifest index 042af408bed6..b711a9010d6d 100644 --- a/dev-qt/qtdbus/Manifest +++ b/dev-qt/qtdbus/Manifest @@ -1,6 +1,3 @@ DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtdbus-5.15.2-r1.ebuild 856 BLAKE2B 3a6ba7d726b81e51b26b27a542b583fd7a539bfff572d1a2a4ac8679efadc7e2b7316afa92d43ae9950a31df07a543d124d58c55f1600fb8e08d0553bc52acb5 SHA512 01ac379102445c5150cb0d74314eed7f8dc805103ae7e71907451fad5211baee5b9cd70e9f0061ad297f728dc13cc51ec99dbf29f011442db026fdb2ee80e383 -EBUILD qtdbus-5.15.2-r10.ebuild 755 BLAKE2B 28fbd65e1ad97a4e49221497793e9143ee77c91eeef8a7f013a8a146806f7bc80d78d743e1a390e9e144c19daa407227f2ff5a36cd3dfc761ec05e50baffc81c SHA512 a7983c283c9fe4f713ba4129af9d69213c8e2a288f181f61cfa8af85050b298b841468d8496a17052a2aefeed4e3c72588bad0cc1d6a31ee3ec0d0252d6b9c98 +EBUILD qtdbus-5.15.2-r10.ebuild 753 BLAKE2B e785955ed4907a22f7df6f1395318ce790b63e720b3b7b3d344e30edb24355dfd32835cc570c90e5998350c540e43fc16519eed2a3b7572e662ff4fac73ac883 SHA512 bdceaa9884ba7a9483dd0e1f8542b20c01c9dbc0de7d3b5050b4acf25cea8eff71143d32943b27d155acef204c943188f4b288e6c0940e430ec6b8169016d45e MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild deleted file mode 100644 index 3cc9ecda38d2..000000000000 --- a/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - >=sys-apps/dbus-1.4.20 -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" - -QT5_TARGET_SUBDIRS=( - src/dbus - src/tools/qdbusxml2cpp - src/tools/qdbuscpp2xml -) - -QT5_GENTOO_CONFIG=( - :dbus - :dbus-linked: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :dbus - :dbus-linked -) - -PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012 - -src_configure() { - local myconf=( - -dbus-linked - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild index 6ebb1d4d1577..0d2d952579e1 100644 --- a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="" diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 0c96b39ead41..35cd362c8331 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,9 +1,6 @@ AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3 -AUX qtdeclarative-5.15.2-gcc11.patch 950 BLAKE2B 06677d7c96c045eef941279f7bd263ad27fee355ce0c394c9c50a0609a024be3da546e38ac44345202845d151da16b119bbf2c99cbc5feff4062f7973f844e94 SHA512 8c6cc7314f4976f84a3232ab006592136fafe94100c4cd463a5ca94c36705072a7fcf7963ba3d316304bd1085b5b8abfe5af028591a6f95dd9b715083db67ebd AUX qtdeclarative-5.15.2-riscv-atomic.patch 426 BLAKE2B 163aecf69229482ca4909ff8e618324388f80314520671a254a265e102cdaf3ae25ab9ed64cac25bb4d04377fb110fce3f38f00660efabab5d2ee0b463edd81c SHA512 3450a3e7676b7e56a97771ecbd6c835bdb2f77e4fd0802927b90d5fecc4c55abe5d9ea2d7a576e3668d8f23d838cf7a5dd25ca77cbdad789056c0fe37b9b5a8f AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d DIST qtdeclarative-5.15.2-1c33a9d0.tar.gz 24342460 BLAKE2B f83d01c9bd28842f53b5bf9e95d1b83738792ae6969309ef702fef2e943a4e886313445c7332a2a5cb72cd99aa5db7520a04a054b16d8065bc03b95cbe14026d SHA512 a1b6ae66c83cc7385c51845f1cbafb55cadd69c121196cd138abc92e964d0bb594ce20267244e4202a9108d92b9bf0f107536774f2a76da71b434692559c1fb4 -DIST qtdeclarative-everywhere-src-5.15.2.tar.xz 21559880 BLAKE2B 07fa82a55f79c081cf3cb713e6b90274f2b2c420eba958042f58989502e2ae572294c4cd02eb73767e87d84c9173fb154e45370c043f6adfc7fb1a93377e2edc SHA512 a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3 -EBUILD qtdeclarative-5.15.2-r1.ebuild 1369 BLAKE2B fb3857c567472d259b15bdfb2cdf15f9d2b36cf237a8839051e5dcb1d64310a5760ee180c90b3880e68c6f74b38911f7f9aa7cadbfa596a6d88dfbf9f7d8766d SHA512 fe359a279c42693905970ebbacacd69a246b7710e443b82ec12f781ca667fcdc5b4173887fb19c5c1882cd56a4adac98b444216e320a1af1654eb3b312271ae3 -EBUILD qtdeclarative-5.15.2-r12.ebuild 1426 BLAKE2B 1a89658f717f47c0d89bdfe910b11a110209739e40e2386f470c59ae5367bac79ea9b31c966c59055de5bffc30e703dacb0da64a19119a4249a508358ae76df9 SHA512 a9844c3d223afc4dda2bdf2e0b010b52d4f8b16e754fe75bbf2d6400161354637b5bf57ff67234815b7a6ed7de65b71e7507fc521ea56b5d7eb1d8f1fe3983b3 +EBUILD qtdeclarative-5.15.2-r12.ebuild 1424 BLAKE2B 7c22e422e9f11505017285947604fc663e05639b64f839cee4916a3687741233ed8601a922158b0919f2b9ab2836413fb58a2c7ff52a856f9cc963e26cba18f6 SHA512 e5d64299648370cd10502e6da09582cd259d7b82688bd4658eba9033a4dd50c34c984895591a56cfbf527865599459ddc9dd8cc87ed557433db3747434241916 MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch deleted file mode 100644 index c5dd916912d1..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 543594243ad0006bf4d98998ecfa52b46242f0ed Mon Sep 17 00:00:00 2001 -From: Jeff Law <law@redhat.com> -Date: Oct 16 2020 21:12:18 +0000 -Subject: Fix missing #include for gcc-11 - - -diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp -index 76daead8..4f707703 100644 ---- a/src/qml/jsruntime/qv4regexp.cpp -+++ b/src/qml/jsruntime/qv4regexp.cpp -@@ -37,6 +37,7 @@ - ** - ****************************************************************************/ - -+#include <limits> - #include "qv4regexp_p.h" - #include "qv4engine_p.h" - #include "qv4scopedvalue_p.h" -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d19..21c3b465 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -40,6 +40,8 @@ - #ifndef QQMLPROFILEREVENT_P_H - #define QQMLPROFILEREVENT_P_H - -+#include <limits> -+ - #include "qqmlprofilerclientdefinitions_p.h" - - #include <QtCore/qstring.h> diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild deleted file mode 100644 index 643829a93cc1..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2009-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit python-any-r1 qt5-build - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="gles2-only +jit localstorage vulkan +widgets" - -BDEPEND="${PYTHON_DEPS}" -# qtgui[gles2-only=] is needed because of bug 504322 -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=] - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qttest-${PV} - localstorage? ( ~dev-qt/qtsql-${PV} ) - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] ) -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" - -PATCHES=( - "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 - "${FILESDIR}/${P}-gcc11.patch" # bug 752093 - "${FILESDIR}/${P}-riscv-atomic.patch" #bug 790689 -) - -src_prepare() { - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") - - qt_use_disable_mod localstorage sql \ - src/imports/imports.pro - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/qmltest/qmltest.pro \ - tests/auto/auto.pro \ - tools/tools.pro \ - tools/qmlscene/qmlscene.pro \ - tools/qml/qml.pro - - qt5-build_src_prepare -} - -src_configure() { - local myqmakeargs=( - -- - -qml-debug - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild index 6e86ee6070b2..7987361ecfdd 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild @@ -10,7 +10,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="gles2-only +jit localstorage vulkan +widgets" diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest index 0fb8bd7b5005..45bff7df9050 100644 --- a/dev-qt/qtdiag/Manifest +++ b/dev-qt/qtdiag/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b EBUILD qtdiag-5.15.2-r10.ebuild 801 BLAKE2B 3b8ab840db0c237141f5bd01259871bc6771a71b28af609881839ca9c0a1c0f5ce6fedb4d2c764d2f797596ed622ef537932c6b567de5179c12ebe7ad86be1c1 SHA512 b348fcecb778227671c879937ce0da9b62cbb5c8588b44a9d6ddb3e87bdb8109a31a99f3a63fd1f8556d1ba5ad5aa3609457ee9b7430bef208e24f7047d991e1 -EBUILD qtdiag-5.15.2.ebuild 844 BLAKE2B b2fc4783c2910ef62aee3d66404b2c2974afcd0323dba3611c18649bf376e4560531c5d2b209acf9492c179865035939302d2e941dc52712db938dcd162c7891 SHA512 e421c1d18d168e132a99c6ecebd2a8004f1faa3eb9414470ce262995f177c5ce87e4315ef50cac38e39ac9e5f518db72ac39e41880dc30fbd9c841fb216d359d MISC metadata.xml 616 BLAKE2B c2e815f14a4c3967140cfeed9d4266b668217994cbdbc58300e3736b428f05449d83ae6ed746bb29debaaa1ab8371a37c054d03395be1f7b66e23c3209449a20 SHA512 8747ad7226372dc06c7e6b44afa0c5cf20a7fb877974c67bf4f599b6ffafff292f3c8a2a80243f6243dcc4c158034dc731451e3af9af8790a302c43ae83907fa diff --git a/dev-qt/qtdiag/qtdiag-5.15.2.ebuild b/dev-qt/qtdiag/qtdiag-5.15.2.ebuild deleted file mode 100644 index b0713c09732f..000000000000 --- a/dev-qt/qtdiag/qtdiag-5.15.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86" -fi - -IUSE="+network +widgets" - -COMMON_DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}:5= - network? ( ~dev-qt/qtnetwork-${PV}[ssl] ) - widgets? ( ~dev-qt/qtwidgets-${PV} ) -" -# TODO: we know it is bogus, figure out how to disable checks, bug 728278 -DEPEND="${COMMON_DEPEND} - ~dev-qt/qtxml-${PV} -" -RDEPEND="${COMMON_DEPEND} - dev-qt/qtchooser -" - -src_prepare() { - qt_use_disable_mod network network \ - src/qtdiag/qtdiag.pro - - qt_use_disable_mod widgets widgets \ - src/qtdiag/qtdiag.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest index 6aafea17a342..f831464e29de 100644 --- a/dev-qt/qtgamepad/Manifest +++ b/dev-qt/qtgamepad/Manifest @@ -1,4 +1,3 @@ DIST qtgamepad-everywhere-src-5.15.2.tar.xz 387084 BLAKE2B bced25244afb2f97adb7b05dbe68021923c45083abaeec92ff405a8c65b89910803dcfe28f4982f9d54dacab616b9917c7cd04b475ac7c36e8002bb6cbbc9b6a SHA512 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1 EBUILD qtgamepad-5.15.2-r1.ebuild 711 BLAKE2B a41760d44e6661082277b38aad6d26b2f8ba489060b58d83b5a68dc4de11dca5cf97a708984e227296cc392e793bf25d790400439cd7351e589bd80aa30b89d2 SHA512 4761581eae4b40756f472e1da1f5e1c9c25eec51896c2d1974d25ee3249f4c25f1d98c56af81ef45cfaaf5162a121d408010808073c64eb19a0783e832a12674 -EBUILD qtgamepad-5.15.2.ebuild 694 BLAKE2B 5dd4717b94e9f59004d45ebbd1874c9efc179cf2bd5f3795aaef22b60265d7588b21a18ef34de0feb430982051dbd42cfdcdc43613f5d5184d6e66a07765f347 SHA512 6832fc14111778b914d687cb4986ef682eeb5c2d8d47d1b2f98c9485260c3e2a5c22ec78b90ee5c9f863e292298b1f46b6f7176b1e9919adbf8bfe3c25e8e48c MISC metadata.xml 613 BLAKE2B 02cac703ee9a9083829e963e9bc97424b58a36949b8237157976d9628f9623f806dee434e5eea3b63a1f2a4ac06509a3d0f0cd094590f12cb3b97ee09f9d6cf1 SHA512 9304973708ee729dc06cef8ac5b206a21ada747ca4efb36e2fc21007da61bfaf43947319be20b0ce73411f5eda2d13a4b226503c12b1d094d5f9180e84579432 diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.2.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.2.ebuild deleted file mode 100644 index 4da7b8c4a69c..000000000000 --- a/dev-qt/qtgamepad/qtgamepad-5.15.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Qt module to support gamepad hardware" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64 x86" -fi - -IUSE="evdev qml sdl" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[evdev?] - evdev? ( virtual/libudev:= ) - qml? ( ~dev-qt/qtdeclarative-${PV} ) - sdl? ( media-libs/libsdl ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - qt_use_disable_mod qml quick \ - src/src.pro - - qt_use_disable_config evdev evdev \ - src/plugins/gamepads/gamepads.pro - - qt_use_disable_config sdl sdl2 \ - src/plugins/gamepads/gamepads.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 22fe147ff09d..e6b3b5cb80f4 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,9 +1,5 @@ AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b -AUX qtgui-5.15.2-bogus-xcb-util-dep.patch 2685 BLAKE2B d281ae95f88f853cf902438680c73b1660aa0e4df384c1b5b96fcf63d5ccef8f97acda57a077ec1bdf20fef64eca7be8bc1e329f90fd4d59e40b746c394725b4 SHA512 b4a7c65cdca80ec3ea9ee17db2bc07b69cee5da82b11ab6ae32cb7e05b6288e3d3ec8a82d91887e86a96286bea2c5918796131c71c5c5a076577dedd4b82189a DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtgui-5.15.2-r13.ebuild 3980 BLAKE2B 9182562e9014fc9a9f23aeef08e8bc75445886e8aabff1cb026cce1889de06dfb73478bb500e6396e4283ca16ba7f1252414bc0467339e01d669871bc2e30266 SHA512 bb5ab3d1b598ab09bc979f4f061edbdb96a2122a4be8470f8598de1c152e275153533195977db699cebd91812384a9fc3e61055d824aacc72ca502baf36aeb1a -EBUILD qtgui-5.15.2-r2.ebuild 4248 BLAKE2B 245ccc465ffa0a68ef3e0811072052511b28ec7b864567545f3bf2c35437a680d260c3f7fc9e44cb770186937fcb9e7641516efa3f485f4c18d486295b6afb56 SHA512 b3ec9c89421bbe6605c1f0b9f97706879274e675306d218975dd24352044850cd543df73c15e85f2e50462bd5c4205fddf45dc2a3bb265c53f4272a0b3521101 +EBUILD qtgui-5.15.2-r13.ebuild 3978 BLAKE2B 7f38984ac52889d62394dc89d9ca9430ae59bc375e14fae9b4865d0e30caf0da36fce27c5af8b436de9a97896d5e53783f46938009f17a08bf04516bacd6fe0b SHA512 e2726a1fa299ae6d09997f49f256ef4346b431eb2eebbaf496094613b448468fd886b6efcb734c089f92945ecdab6e31f2ff92898fd8e74293a7c8cbe1b38f1f MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5 diff --git a/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch b/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch deleted file mode 100644 index b7f65483fb1b..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 61b07d75f96d4dfb07b485b2a9bd7aed099df987 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@qt.io> -Date: Tue, 1 Dec 2020 08:43:28 +0100 -Subject: [PATCH] Revert "xcb: add xcb-util dependency for xcb-image" -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -This reverts commit adc42bebcac764ca8de78578e3a4ac39b621bd09. - -adc42beb is wrong, the bug is for static build of qt with static -xcb. It adds the explicit dependency of xcb-util 0.3.9, which is -not available on Debian yet. - -Task-number: QTBUG-86287 -Fixes: QTBUG-88688 -Change-Id: Iffc821f49bdfcad3f2556951d3677c35a7682266 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> -(adapted from commit 92a57e0b016f811876ec1d62328ca8edfe452a3a) ---- - src/gui/configure.json | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) - -diff --git a/src/gui/configure.json b/src/gui/configure.json -index c8c4864eca6..1f08795c57b 100644 ---- a/src/gui/configure.json -+++ b/src/gui/configure.json -@@ -601,15 +601,6 @@ - ], - "use": "xcb" - }, -- "xcb_util": { -- "label": "XCB Util >= 0.3.9", -- "headers": "xcb/xcb_util.h", -- "sources": [ -- { "type": "pkgConfig", "args": "xcb-util >= 0.3.9" }, -- "-lxcb-util" -- ], -- "use": "xcb" -- }, - "xcb_image": { - "label": "XCB Image >= 0.3.9", - "headers": "xcb/xcb_image.h", -@@ -617,7 +608,7 @@ - { "type": "pkgConfig", "args": "xcb-image >= 0.3.9" }, - "-lxcb-image" - ], -- "use": "xcb_shm xcb_util xcb" -+ "use": "xcb_shm xcb" - }, - "xcb_keysyms": { - "label": "XCB Keysyms >= 0.3.9", -@@ -1065,7 +1056,6 @@ - "tail": "#undef explicit", - "include": [ - "xcb/xcb.h", -- "xcb/xcb_util.h", - "xcb/xcb_image.h", - "xcb/xcb_keysyms.h", - "xcb/randr.h", -@@ -1097,7 +1087,7 @@ - "xcb_xkb_get_kbd_by_name_replies_key_names_value_list_sizeof(nullptr, 0, 0, 0, 0, 0, 0, 0, 0);" - ] - }, -- "use": "xcb_icccm xcb_util xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb" -+ "use": "xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb" - }, - "x11prefix": { - "label": "X11 prefix", --- -2.16.3 diff --git a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild index 6504f3385425..f7f9b5e7c58a 100644 --- a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" SLOT=5/${QT5_PV} # bug 707658 if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg diff --git a/dev-qt/qtgui/qtgui-5.15.2-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r2.ebuild deleted file mode 100644 index 34d58b305ba0..000000000000 --- a/dev-qt/qtgui/qtgui-5.15.2-r2.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -SLOT=5/$(ver_cut 1-3) # bug 707658 - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -# TODO: linuxfb -IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg - +libinput +png tslib tuio +udev vnc vulkan wayland +X" -REQUIRED_USE=" - || ( eglfs X ) - accessibility? ( dbus X ) - eglfs? ( egl ) - ibus? ( dbus ) - libinput? ( udev ) - X? ( gles2-only? ( egl ) ) -" - -COMMON_DEPEND=" - dev-libs/glib:2 - ~dev-qt/qtcore-${PV}:5= - dev-util/gtk-update-icon-cache - media-libs/fontconfig - >=media-libs/freetype-2.6.1:2 - >=media-libs/harfbuzz-1.6.0:= - sys-libs/zlib:= - dbus? ( ~dev-qt/qtdbus-${PV} ) - egl? ( media-libs/mesa[egl] ) - eglfs? ( - media-libs/mesa[gbm] - x11-libs/libdrm - ) - evdev? ( sys-libs/mtdev ) - gles2-only? ( media-libs/mesa[gles2] ) - !gles2-only? ( virtual/opengl ) - jpeg? ( virtual/jpeg:0 ) - libinput? ( - dev-libs/libinput:= - >=x11-libs/libxkbcommon-0.5.0 - ) - png? ( media-libs/libpng:0= ) - tslib? ( >=x11-libs/tslib-1.21 ) - tuio? ( ~dev-qt/qtnetwork-${PV} ) - udev? ( virtual/libudev:= ) - vnc? ( ~dev-qt/qtnetwork-${PV} ) - vulkan? ( dev-util/vulkan-headers ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libxcb-1.12:=[xkb] - >=x11-libs/libxkbcommon-0.5.0[X] - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) -" -DEPEND="${COMMON_DEPEND} - evdev? ( sys-kernel/linux-headers ) - udev? ( sys-kernel/linux-headers ) -" -RDEPEND="${COMMON_DEPEND} - dev-qt/qtchooser -" -PDEPEND=" - ibus? ( app-i18n/ibus ) - wayland? ( ~dev-qt/qtwayland-${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: - !gif:no-gif: - 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 -) - -PATCHES=( - "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 - "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306 - "${FILESDIR}/${P}-bogus-xcb-util-dep.patch" # QTBUG-86287, QTBUG-88688 - "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 764038 -) - -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=( - $(usex dbus -dbus-linked '') - $(qt_use egl) - $(qt_use eglfs) - $(usex eglfs '-gbm -kms' '') - $(qt_use evdev) - $(qt_use evdev mtdev) - -fontconfig - -system-freetype - $(usex gif '' -no-gif) - -gui - -system-harfbuzz - $(qt_use jpeg libjpeg system) - $(qt_use libinput) - -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) - $(usex X '-xcb-xlib' '') - ) - if use libinput || use X; then - myconf+=( -xkbcommon ) - fi - qt5-build_src_configure -} diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest index bd383ba6c1a7..2a47f2157616 100644 --- a/dev-qt/qthelp/Manifest +++ b/dev-qt/qthelp/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b -EBUILD qthelp-5.15.2-r10.ebuild 702 BLAKE2B 5e546ad17673780e6ffac79da89b37c80011ace1c6b31b3103387bfeddc4576e65825a54d4184cc0f963a2995155842abca19f4d7d35f0862b404ab4cc0743aa SHA512 792ffe7e225c6dce59436f2954b6c682a9741f5204457948a2e223a25b533f2f72a8166eea4da4cfdd775a273cae8440fac35211ba4487faafe6180908f4ad25 -EBUILD qthelp-5.15.2.ebuild 638 BLAKE2B 8333b21d25d777f2e7e2ebec3eda8c9ee440cf3fc7763b16d4246748e4bd937ef0edde019e0b104f86b8087ebb05186922f006b50bb4544afbb7fe5333ba4951 SHA512 6eebcd2844c14d5f9cb2b55f44cfeb8da425829fb7ebad7312d4ef9afaab3522ae1a082411a822c7d77b9dce120518dbd6d39f10e98b3857198c929cbf195720 +EBUILD qthelp-5.15.2-r10.ebuild 700 BLAKE2B 6f0c190fe49227e969e536444e4a431601918e7f01fa0fb551883386b37662fea6b9f3181300b1e5458c9343b9dfd9bc6dbb669d190e3da8f4dc9780bdb8c857 SHA512 fc900fcef47f69b07cb1c49d1180140539370bc6dfb545ce6dc7ac45a008ffb4d8e757f7ce1aaa44d540c7cb494a2fa8ee56540d888f6f398d1792196bf43eb0 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild b/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild index 752358908948..94ca49f56430 100644 --- a/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild +++ b/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Qt5 module for integrating online documentation into applications" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="" diff --git a/dev-qt/qthelp/qthelp-5.15.2.ebuild b/dev-qt/qthelp/qthelp-5.15.2.ebuild deleted file mode 100644 index c6f472aab2bd..000000000000 --- a/dev-qt/qthelp/qthelp-5.15.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Qt5 module for integrating online documentation into applications" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtsql-${PV}[sqlite] - ~dev-qt/qtwidgets-${PV} -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" - -QT5_TARGET_SUBDIRS=( - src/assistant/help - src/assistant/qcollectiongenerator - src/assistant/qhelpgenerator -) diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest index fa2f5632459b..1ebe15e34ec5 100644 --- a/dev-qt/qtimageformats/Manifest +++ b/dev-qt/qtimageformats/Manifest @@ -1,5 +1,3 @@ DIST qtimageformats-5.15.2-cb82c743.tar.gz 2366626 BLAKE2B 76edd4d0fc2908d466e4b7f9af1e93c50cae086c1da1144d4b8230d19163e2c43704365e396769d9ba10d48f46b42a1ce793e49686d6757790c32a1c0ff4db2b SHA512 f202f3abcdea0b49ae4f286fd50c1855c8b84d502b89f8350666828c6e29c4fa0bafd72b891513330e2541dc407d298076ffb519a030b4bb50517b5196ff9a3f -DIST qtimageformats-everywhere-src-5.15.2.tar.xz 1806740 BLAKE2B 11da7926a50c17d5a36259d15a5c7e6af68f9f2e7e26626b7e04a031ae428a8d220daa8fa4461efd4b8db85bcbaa1ccf24b72271f3599c7298a4d1a49c25f9c3 SHA512 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e -EBUILD qtimageformats-5.15.2-r10.ebuild 745 BLAKE2B 4eed2aec2b17fea3009fe4dc945178f642d58066819dc0291889200be87d68bb680938c959f8982ced16d445ba333e6fa4a2ff162d5ce4252e777af8210929ef SHA512 15b2a3d075ea013d2655c30421bfda58905f12cd1ce5a8fa54bea335af5159dc8cfec7961e939fffba13946df8185bc04b5a0a805b5ecadc3e7c1241d7de37cf -EBUILD qtimageformats-5.15.2.ebuild 677 BLAKE2B c4c31cdf56a20dc88b7af4040528090da9cd7a5a15b89756037e800c2029ccb869c6effd57afddf039a16e65ad3b2abd348fef90dea165be2078f8fa29fbf439 SHA512 2ad09118bcf970992efc7881429074fa4128af92ca8008cd14242bf09109a78712e5330ed03c494cfc2f8789e7997f57dc3cd09e8dbdb626c0213e4f27db4bef +EBUILD qtimageformats-5.15.2-r10.ebuild 744 BLAKE2B aa7b49d667c1bc5c9ed3172d461d356d45d889e5aea131b46b10bf7b0c73be6556b0c6609b0df63ddd90040f0d9c2e763158334721b58cdd8fa8fe2fef8edc05 SHA512 71f01383629cdfe6c9181c7c018b7aa6b648529cf9f35cc04bdb18d5c65dcb2e712818b56d17f7fd879989a9ae24adf9abb8819761ca58f16dec08f57b86fa3c MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild index 2abdd63fcca8..5d58b6ffc55b 100644 --- a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild @@ -9,7 +9,7 @@ inherit qt5-build DESCRIPTION="Additional format plugins for the Qt image I/O system" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86" fi IUSE="mng" diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild deleted file mode 100644 index dc39e71a9b7c..000000000000 --- a/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Additional format plugins for the Qt image I/O system" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86" -fi - -IUSE="mng" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} - media-libs/libwebp:= - media-libs/tiff:0 - mng? ( media-libs/libmng:= ) -" -RDEPEND="${DEPEND}" - -src_configure() { - sed -e 's/qtConfig(jasper)/false:/' \ - -i src/plugins/imageformats/imageformats.pro || die - qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro - - qt5-build_src_configure -} diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest index 0788150a19fa..2f006e2812de 100644 --- a/dev-qt/qtlocation/Manifest +++ b/dev-qt/qtlocation/Manifest @@ -1,8 +1,4 @@ -AUX qtlocation-5.15.2-qsg-render-thread-crash-1.patch 2445 BLAKE2B 17e043da1710ee64979310b1b37ed1364d9688c62e4a61b68b0f5cb92b0a19b7f00266a571fdfbe164c2d7cd7e9d2aa89424a67af4276b0a9f07a541003399ee SHA512 45124a3607a69d01f63cff705d1ce19e5e996f2b0aa39dc23bb65337c77889775e2d885a39e6fdded7604c4018cbfd3bb3a74b2d46c889f6917dd5aa0b6e753f -AUX qtlocation-5.15.2-qsg-render-thread-crash-2.patch 5154 BLAKE2B f93fab080a63bbdd3e0fc78667291d4201ca1f93668185adf73f2fd918df02e210cdc367b006dea0275b8f38c1a34372efe796ec3bf11f161f62b421d4a6ec87 SHA512 344660f52eb13981832cbc384beafce79627e0d4c7d54920ec04a302915848a0e069d483f9f6a2005beaba40bf5e540822ecbc96542fccb9fa29f399cc02d3fd DIST qtlocation-5.15.2-861e372b.tar.gz 5431120 BLAKE2B c66e81f7e726b53000a0f8a4eafa9a4a6168aa08c89d4d0e2ef11b02e3598fd0b3f30dbd21e6c5436814bb88fa69c96d141b0d0d79f13239ec61396269af089a SHA512 b7cac8cd42185504c6140f1dcd4e8c0c749e3d8f22bf9977e97268e0ad6fbd3733e571a255ab7824eba31e30e707e804b07317f2ec9b7be15a4a5756c78c9e41 -DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f DIST qtlocation-mapboxgl-5.15.2-d3101bbc.tar.gz 3726244 BLAKE2B e571a72e041b80b155eae7d171cee7f996fbe223c8d3337f549ea2a40472fc2da9dd8abf54238f22c1828d467aaf01307a61acecd3aedc4f5f7cabc06f48d830 SHA512 6e38e5ca0b9e17de690af79f4702278bdc933a74561aa135b3e82245df7d795602403048bcc5bce00237f774ce3957540a8bded1a71f8730a08da05dec1f039f -EBUILD qtlocation-5.15.2-r1.ebuild 1177 BLAKE2B e9c5790ce4fc44188864161a0b7847a7ed3ea644bc63bb68d251a34b23735ee7bf84e66fe7dfd59dbee214c8137d766622920b130b5653fb760378ece611344e SHA512 4b35636ef302f41210086bf92c55db50fd0e93b04f00688b558462b1f2d5bcd81b3e426b18b2e170c4b1b6bb3cfc91014aae6d79a5d5cd609045d4630b7229a2 EBUILD qtlocation-5.15.2-r10.ebuild 1604 BLAKE2B e03e24a09ce4047332cdc6d65da88ee88d078283867523bde64b8ada59077b65e59cb22cb477065b3766b5fe5fad3f3fb01741e08f745ae54f5b0fd02d720649 SHA512 a34e5276f3a6ac15a20bfb8a5ebc7fbb7bf14d48a085d5a840a126130723c49877f97e3d6690fd734253c41adf8e8fd534a62c760abb9a87a4cdd901b99569c3 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch b/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch deleted file mode 100644 index d4cd0188d1a1..000000000000 --- a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4fe9e0ed027134a833b2243597a2ccd00987b559 Mon Sep 17 00:00:00 2001 -From: Piotr Mikolajczyk <piotr.mikolajczyk@qt.io> -Date: Tue, 29 Sep 2020 10:41:23 +0200 -Subject: [PATCH] Fix crash when showing Map QML comp. for 2nd+ time - -Crash caused by storing pointer to a node that could be deleted elsewhere - -Fixes: QTBUG-85260 -Change-Id: I871123322fac84b8bf91e9bab8ecad08e75c2854 -Reviewed-by: Paolo Angelelli <paolo.angelelli.qt@gmail.com> ---- - src/location/labs/qsg/qgeomapobjectqsgsupport.cpp | 29 ++++++++++++++++++++++- - 1 file changed, 28 insertions(+), 1 deletion(-) - -diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -index 0e1df8f6c..cd1801305 100644 ---- a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -@@ -48,7 +48,32 @@ static int findMapObject(QGeoMapObject *o, const QList<MapObject> &list) - } - return -1; - } -+namespace { -+bool findNodeInStructure(QSGNode *root, QSGNode *item) -+{ -+ if (root == nullptr || item == nullptr) -+ return false; -+ if (root == item) -+ return true; -+ auto currentChild = root->firstChild(); -+ // First check the direct child nodes and if not found let's dive deeper -+ bool bFound = (item == currentChild); -+ -+ while (!bFound && currentChild) { -+ currentChild = currentChild->nextSibling(); -+ bFound = (item == currentChild); -+ } - -+ if (!bFound) { -+ currentChild = root->firstChild(); -+ while (!bFound && currentChild) { -+ bFound = findNodeInStructure(currentChild, item); -+ currentChild = currentChild->nextSibling(); -+ } -+ } -+ return bFound; -+} -+} - bool QGeoMapObjectQSGSupport::createMapObjectImplementation(QGeoMapObject *obj, QGeoMapPrivate *d) - { - QExplicitlySharedDataPointer<QGeoMapObjectPrivate> pimpl = -@@ -157,9 +182,11 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind - { - if (!root) - return; -+ if (!findNodeInStructure(root, m_mapObjectsRootNode)) -+ m_mapObjectsRootNode = nullptr; - if (!m_mapObjectsRootNode) { - m_mapObjectsRootNode = new QDeclarativePolygonMapItemPrivateOpenGL::RootNode(); -- root->appendChildNode(m_mapObjectsRootNode); -+ root->appendChildNode(m_mapObjectsRootNode); // PASSING OWNERSHIP! - } - - m_mapObjectsRootNode->removeAllChildNodes(); --- -2.16.3 diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch b/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch deleted file mode 100644 index 4bd70b99abbf..000000000000 --- a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 861e372b6ad81570d4f496e42fb25a6699b72f2f Mon Sep 17 00:00:00 2001 -From: Piotr Mikolajczyk <piotr.mikolajczyk@qt.io> -Date: Tue, 3 Nov 2020 11:43:22 +0100 -Subject: [PATCH] Simpler fix to crashing Qml Map appearing 2nd+ time - -Previous solution did not take advantage of the QSGNode::OwnedByParent -flag. Setting this flag to false allows to use parent() property -to determine if the node has been removed from node tree. -This amends 4fe9e0ed027134a833b2243597a2ccd00987b559 - -Fixes: QTBUG-85260 -Change-Id: I705848483d7dc2639dffffa0ff66c682b3fffca0 -Reviewed-by: Andy Shaw <andy.shaw@qt.io> ---- - src/location/labs/qsg/qgeomapobjectqsgsupport.cpp | 40 +++++------------------ - src/location/labs/qsg/qgeomapobjectqsgsupport_p.h | 3 +- - 2 files changed, 11 insertions(+), 32 deletions(-) - -diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -index cd1801305..a978573d6 100644 ---- a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -@@ -48,32 +48,7 @@ static int findMapObject(QGeoMapObject *o, const QList<MapObject> &list) - } - return -1; - } --namespace { --bool findNodeInStructure(QSGNode *root, QSGNode *item) --{ -- if (root == nullptr || item == nullptr) -- return false; -- if (root == item) -- return true; -- auto currentChild = root->firstChild(); -- // First check the direct child nodes and if not found let's dive deeper -- bool bFound = (item == currentChild); -- -- while (!bFound && currentChild) { -- currentChild = currentChild->nextSibling(); -- bFound = (item == currentChild); -- } - -- if (!bFound) { -- currentChild = root->firstChild(); -- while (!bFound && currentChild) { -- bFound = findNodeInStructure(currentChild, item); -- currentChild = currentChild->nextSibling(); -- } -- } -- return bFound; --} --} - bool QGeoMapObjectQSGSupport::createMapObjectImplementation(QGeoMapObject *obj, QGeoMapPrivate *d) - { - QExplicitlySharedDataPointer<QGeoMapObjectPrivate> pimpl = -@@ -182,11 +157,14 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind - { - if (!root) - return; -- if (!findNodeInStructure(root, m_mapObjectsRootNode)) -- m_mapObjectsRootNode = nullptr; -+ -+ if (m_mapObjectsRootNode && m_mapObjectsRootNode->parent()) -+ root->appendChildNode(m_mapObjectsRootNode.get()); -+ - if (!m_mapObjectsRootNode) { -- m_mapObjectsRootNode = new QDeclarativePolygonMapItemPrivateOpenGL::RootNode(); -- root->appendChildNode(m_mapObjectsRootNode); // PASSING OWNERSHIP! -+ m_mapObjectsRootNode = std::make_unique<QDeclarativePolygonMapItemPrivateOpenGL::RootNode>(); -+ root->appendChildNode(m_mapObjectsRootNode.get()); -+ m_mapObjectsRootNode->setFlag(QSGNode::OwnedByParent, false); - } - - m_mapObjectsRootNode->removeAllChildNodes(); -@@ -211,7 +189,7 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind - MapObject &mo = m_mapObjects[i]; - QQSGMapObject *sgo = mo.sgObject; - QSGNode *oldNode = mo.qsgNode; -- mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode, window); -+ mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode.get(), window); - if (Q_UNLIKELY(!mo.qsgNode)) { - qWarning() << "updateMapObjectNode for "<<mo.object->type() << " returned NULL"; - } else if (mo.visibleNode && (mo.visibleNode->visible() != mo.object->visible())) { -@@ -227,7 +205,7 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind - QQSGMapObject *sgo = mo.sgObject; - QSGNode *oldNode = mo.qsgNode; - sgo->updateGeometry(); // or subtree will be blocked -- mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode, window); -+ mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode.get(), window); - if (mo.qsgNode) { - if (mo.visibleNode && (mo.visibleNode->visible() != mo.object->visible())) { - mo.visibleNode->setVisible(mo.object->visible()); -diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h b/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h -index 1ec966fa9..cbbc09691 100644 ---- a/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h -+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h -@@ -59,6 +59,7 @@ - #include <QtLocation/private/qdeclarativepolylinemapitem_p.h> - #include <QtLocation/private/qdeclarativepolygonmapitem_p_p.h> - #include <QtCore/qpointer.h> -+#include <memory> - - QT_BEGIN_NAMESPACE - struct Q_LOCATION_PRIVATE_EXPORT MapObject { -@@ -85,7 +86,7 @@ public: - QList<MapObject> m_pendingMapObjects; - QList<MapObject> m_removedMapObjects; - QGeoMap *m_map = nullptr; -- QDeclarativePolygonMapItemPrivateOpenGL::RootNode *m_mapObjectsRootNode = nullptr; -+ std::unique_ptr<QDeclarativePolygonMapItemPrivateOpenGL::RootNode> m_mapObjectsRootNode; - }; - - QT_END_NAMESPACE --- -2.16.3 diff --git a/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild deleted file mode 100644 index f1ee8b34f188..000000000000 --- a/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qt5-build - -DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~riscv x86" -fi - -IUSE="" - -RDEPEND=" - dev-libs/icu:= - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtpositioning-${PV}[qml] - ~dev-qt/qtsql-${PV} - sys-libs/zlib -" -DEPEND="${RDEPEND} - ~dev-qt/qtconcurrent-${PV} -" - -QT5_TARGET_SUBDIRS=( - src/3rdparty/clipper - src/3rdparty/poly2tri - src/3rdparty/clip2tri - src/3rdparty/mapbox-gl-native - src/location - src/imports/location - src/imports/locationlabs - src/plugins/geoservices -) - -PATCHES=( "${FILESDIR}"/${P}-qsg-render-thread-crash-{1,2}.patch ) # QTBUG-85260 - -src_configure() { - # src/plugins/geoservices requires files that are only generated when - # qmake is run in the root directory. Bug 633776. - mkdir -p "${QT5_BUILD_DIR}"/src/location || die - qt5_qmake "${QT5_BUILD_DIR}" - cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die - qt5-build_src_configure -} diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 9dbe86ab140f..dd6fec07efc5 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,5 +1,4 @@ AUX qtmultimedia-5.15.2-no-qtopengl.patch 445 BLAKE2B 9224c90ef5a57b0da8c5ea5a51eb03d4702824fbb435101d5d9d559bdc4d30ece2de7457ed1bb80ca7f028a0b1a5abfa7436501d5d30c87680fb46707de17f53 SHA512 2f3dbb4dcbcedd01e3d911cf1f665e78dc08b383a5c8f2e17f96072330242e7463e6e403159f90f60b799110371ca923f502619548d5db3fd264af4298e4b587 DIST qtmultimedia-everywhere-src-5.15.2.tar.xz 3828172 BLAKE2B 6d492abdd563788e601eba8183197863f5ddf0697c8f72939f8d6de8043d0575333bc6effd17182a2b5e2e0a93d6f431054282ad34f4ea0f0a0a67e1502a948d SHA512 be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd -EBUILD qtmultimedia-5.15.2-r1.ebuild 1505 BLAKE2B 7e9049970a904dbec7accd0db053faa8e6755f93296cc3f2a67ab15b28c35814ab31f218abbbe1f21c0be7bbcee6b13731fa962137ca80597517c0088245586d SHA512 fd943e28d689fea3af9cc1dbbb66fc1c5a101201e2b79bf7be72491038c3e5c33b8628c99334d75a7b2714ca7c0b3de76100023d41eca95ceba3af6b3eab9414 -EBUILD qtmultimedia-5.15.2-r2.ebuild 1557 BLAKE2B 3ccfa55e403dbb4bc31883480fe6b3b1624c0cdc7cb8952e919a5d9c5f88d66efebe68194d52ae6b955fb6f277b7c6ab0112e20306ea69c6edf48888aaa17255 SHA512 5dd6a7ae6693f1e1c86874ece1746497d76ebf69ed7c7b413de7d6d0e0e2509f9457615024ab92f508876b6cd0dfe3ef3695c867d35eee1c8870af118ba3abef +EBUILD qtmultimedia-5.15.2-r2.ebuild 1555 BLAKE2B 47ef551cb098b7cf6156b4366b1b6d06d316a1e56a3f24a67bd69973d55b272c4ea8d5b68bffdd6c1427440b633ecd640af24bf87a59510922ddbbb8b7bdc0f7 SHA512 bd74236fa946d731b2232c80795f63c939bb19f7543594cdc56b00de82fa790b2bc9f0a88871b486857da8c0c4611fbfe28d2071ed67560184263ae6d94cf46a MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild deleted file mode 100644 index 2ed94944ea31..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt5-build - -DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets" - -RDEPEND=" - =dev-qt/qtcore-${QT5_PV}* - =dev-qt/qtgui-${QT5_PV}*[gles2-only=] - =dev-qt/qtnetwork-${QT5_PV}* - alsa? ( media-libs/alsa-lib ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0 - ) - pulseaudio? ( media-sound/pulseaudio[glib] ) - qml? ( - =dev-qt/qtdeclarative-${QT5_PV}* - gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] ) - openal? ( media-libs/openal ) - ) - widgets? ( - =dev-qt/qtopengl-${QT5_PV}* - =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] - ) -" -DEPEND="${RDEPEND} - gstreamer? ( x11-base/xorg-proto ) -" - -src_prepare() { - sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ - src/multimedia/multimedia.pro || die - - qt_use_disable_config openal openal \ - src/imports/imports.pro - - qt_use_disable_mod qml quick \ - src/src.pro \ - src/plugins/plugins.pro - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/gsttools/gsttools.pro \ - src/plugins/gstreamer/common.pri - - qt5-build_src_prepare -} - -src_configure() { - local myqmakeargs=( - -- - $(qt_use alsa) - $(qt_use gstreamer) - $(qt_use pulseaudio) - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild index 08b9b1a9521c..54ae53fe2eed 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets" diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index f02663a15713..e4e03f7d449a 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,7 +1,3 @@ -AUX qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch 2104 BLAKE2B 2fdeae57b0751f68273e79edb602b90c96d9a3287dec43c1fb3cf1e3b5cf17ae1570e62bc59b330748938cd1ca2b9326062ee61415114d1f08211235dcdae7a6 SHA512 880cab4279a663e4709f93aedf875f2fd3c17dcfd45fe57aa9b75887fbee981b13ff899d9223a37186f2c93493823ca36d4128500f2943b7ca67e409e6523ed3 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtnetwork-5.15.2-r11.ebuild 1663 BLAKE2B b4a6516dadb1b9127cf709bc25211459edf322120200e8e31b7bfba17d80ec2f8f92aaf48bdc443f120430bca1d5e68be8b0881f8c592e8ea6449bff30aca971 SHA512 a38ca5907ca1ba04e1cd327ec78540a8e65326e8fbc880340ba1fe9f8b82f4cefcf9ade6f12bf17b525a00b1ee0b44e9dcd23edba473b2ad3444771e2181c89e -EBUILD qtnetwork-5.15.2-r2.ebuild 1835 BLAKE2B 683c4b2d419a041c89c08975db612d0e2c40d6c1969c7ce77640fd1c3259b39772485d89114fe71ceb7f3232ccb4b9cda9d3e2aded1b62ea8bd191116ef28e39 SHA512 2c58ed1f755b4a2b982534644aab38f0d59017ebc0168b79e77e1b3f6450f922edeff12a54f7701952baff278e02569b5cd41ae960b49b6fe0292b773109d6e4 +EBUILD qtnetwork-5.15.2-r11.ebuild 1661 BLAKE2B 72d1089771b6546c2425872e547420e7c4326af64b21f92b7008633fa36e7cbd0f064a339f486ad7ebcfefac76e136242273b9b902aacac92cd2fc1933a1af15 SHA512 e08756281594e069079dcb3fa2688c93a42a30f3efec0f7cfa1662edfc2bd5b444db75be2f47ac341192d44fef3610692eb76f2cbe048c2a2cb48756c52daa25 MISC metadata.xml 958 BLAKE2B 7d9b64c45710ec4b80132463178d63563b09fdb7c79f527a84017faa524f6f45f5ff566abea92f8cee5f9c62c7d6bb505d3789520559fd3864f402c18c35f771 SHA512 11948c91b244c607f2cd84c8165db6794be18d0f465ae27ed02086fcc1f8b3755e451b8203f447a05f53437cb04c8e4859de8e077f85360fe87ce846939408c1 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch deleted file mode 100644 index be2c1f6e1a04..000000000000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0807f16eb407eaf8a5b34b67602d0a97778d945d Mon Sep 17 00:00:00 2001 -From: =?utf8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io> -Date: Fri, 6 Nov 2020 12:51:42 +0100 -Subject: [PATCH] QNAM: Work around QObject finicky orphan cleanup details - -Details described in a comment. - -Task-number: QTBUG-88063 -Change-Id: I763ecfedf518de97615e04a8eaae0fe1fd784f52 -Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> -(cherry picked from commit 1c6d6cbb62c5e93cbcad2d740c3b0ed01095618c) -Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> ---- - src/network/access/qnetworkreplyhttpimpl.cpp | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp -index 21916f53f15..727c1a0316d 100644 ---- a/src/network/access/qnetworkreplyhttpimpl.cpp -+++ b/src/network/access/qnetworkreplyhttpimpl.cpp -@@ -808,7 +808,17 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq - - // For the synchronous HTTP, this is the normal way the delegate gets deleted - // For the asynchronous HTTP this is a safety measure, the delegate deletes itself when HTTP is finished -- QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater())); -+ QMetaObject::Connection threadFinishedConnection = -+ QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater())); -+ -+ // QTBUG-88063: When 'delegate' is deleted the connection will be added to 'thread''s orphaned -+ // connections list. This orphaned list will be cleaned up next time 'thread' emits a signal, -+ // unfortunately that's the finished signal. It leads to a soft-leak so we do this to disconnect -+ // it on deletion so that it cleans up the orphan immediately. -+ QObject::connect(delegate, &QObject::destroyed, delegate, [threadFinishedConnection]() { -+ if (bool(threadFinishedConnection)) -+ QObject::disconnect(threadFinishedConnection); -+ }); - - // Set the properties it needs - delegate->httpRequest = httpRequest; --- -2.16.3 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild index bc183a01e728..babaf742b4c9 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Network abstraction library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl" diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild deleted file mode 100644 index 23709c175e8b..000000000000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - sys-libs/zlib:= - connman? ( ~dev-qt/qtdbus-${PV} ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - networkmanager? ( ~dev-qt/qtdbus-${PV} ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( - >=dev-libs/openssl-1.1.1:0=[bindist(-)=] - ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -QT5_TARGET_SUBDIRS=( - src/network - src/plugins/bearer/generic -) - -QT5_GENTOO_CONFIG=( - libproxy:libproxy: - ssl::SSL - ssl::OPENSSL - ssl:openssl-linked:LINKED_OPENSSL -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :network -) - -PATCHES=( - "${FILESDIR}"/${P}-QNetworkAccessManager-memleak.patch # QTBUG-88063 - "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 -) - -pkg_setup() { - use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) - use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) -} - -src_configure() { - local myconf=( - $(usex connman -dbus-linked '') - $(usex gssapi -feature-gssapi -no-feature-gssapi) - $(qt_use libproxy) - $(usex networkmanager -dbus-linked '') - $(qt_use sctp) - $(usex ssl -openssl-linked '') - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - # workaround for bug 652650 - if use ssl; then - sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ - -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die - fi -} diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest index 8dcbc2d7d4a3..cc653433a286 100644 --- a/dev-qt/qtopengl/Manifest +++ b/dev-qt/qtopengl/Manifest @@ -1,6 +1,3 @@ DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtopengl-5.15.2-r1.ebuild 827 BLAKE2B f0cdf498740c5fa109d2700284f5476c85c9dee0bee3708c8777360bab704b88b0d04387523a5a31f246acd40178caca6a17faf60e01c1ce05d19f95ca6e11e5 SHA512 8df750310b2f177a529d36061589756e36cd387fd935174c94e47af5bab79ceec631a3bf7b2d94ec8f3c82048d2b11dcbd47e9c8d9d1ebc873eb0d6f96a2e00d -EBUILD qtopengl-5.15.2-r11.ebuild 722 BLAKE2B cb6b4fae1d80bdcb46ea24bc1853a8b4de373a6dca3649b32eadabd20c70521e9b9931bd9e2fae71e83c9f79f9db7d22cca94f42233344c3024bde2def8a12e9 SHA512 1d5f8a5c85213699983d03e817a6e0a932d8a758189051fe1bd4d0f3066783e1bca056a866fe7b0f8d263fe628080a4dd91ff39448641249a2ccd98fa612250a +EBUILD qtopengl-5.15.2-r11.ebuild 720 BLAKE2B 8239d955e885c821f56afab690a27d01dd49313b2df705bc61b6aeaf8fb921d925c7d6c7255a7dd4cf0a667c92204ae659792802bb904a7661da8331d644b5c9 SHA512 0545b133c3a5362300467c59f1094fc74cd70688d6a1b02a797e522f33cb6bc5ea2d36202d8414c7f4e806872e337c821e0ff09a9cd712430aae57ea5eb3b80c MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild b/dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild deleted file mode 100644 index 916bc3174710..000000000000 --- a/dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -VIRTUALX_REQUIRED="test" -inherit qt5-build - -DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="gles2-only" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}[gles2-only=] - ~dev-qt/qtwidgets-${PV}[gles2-only=] - !gles2-only? ( virtual/opengl ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/opengl -) - -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 - -src_configure() { - local myconf=( - -opengl $(usex gles2-only es2 desktop) - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild b/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild index 340303cebc41..e665ed8dace0 100644 --- a/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild @@ -11,7 +11,7 @@ inherit qt5-build DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="gles2-only" diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest index b9e4b768ea6f..e3e82d20d8c2 100644 --- a/dev-qt/qtpaths/Manifest +++ b/dev-qt/qtpaths/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b -EBUILD qtpaths-5.15.2-r10.ebuild 479 BLAKE2B f4ff192c537ae3e38c832386d0f4b9ed79657f2fa0c40e61b112328de6d47eaf2696ff491a19d8083b9ee609333643fc87ca0180e4f53ac2eeb965f03013a0ac SHA512 0c00c1e345f550940d3176c85ded9c9d24ad02bb3d84a2d132bf58840ff43cbd1469963e19e82749f96fe45a78cf3341eff67e99b85106795236353e73286155 -EBUILD qtpaths-5.15.2.ebuild 397 BLAKE2B 2cda259a7a23d11676c72137944b339813b064ad8e61f93b717e276f28d244674c5494046746e4a60cfee876dc85b10067cea3711c56418f231bb77cec53a982 SHA512 47df5c78a84e07d26ad708c300cb2c02cd0cef90b5fc79471be652537dc58cbe9f324b3fbc3c09ce6e384abca73b465abb5919b0bd9a75937eaf709df444a9e2 +EBUILD qtpaths-5.15.2-r10.ebuild 477 BLAKE2B 1c37b6d6dd530f11de42903f7b263f4998e94a89005a128de29cb11e805a0feecd95db1b514945b6c2e3fef3f0b06633e56fb394d8c7dbbb9db3eb2fc2fb02c4 SHA512 f7b8f09e193a234dba405f060447d2e9052f5b6cd28793c6b50c8ee07ace08bb8e08d84231d0a34f447a6ee5a43feab15f220c1da42adfdd047d98369d355d65 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild b/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild index f1221627b894..1d79d126f610 100644 --- a/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild +++ b/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Command line client to QStandardPaths" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="" diff --git a/dev-qt/qtpaths/qtpaths-5.15.2.ebuild b/dev-qt/qtpaths/qtpaths-5.15.2.ebuild deleted file mode 100644 index ab89b1b991ed..000000000000 --- a/dev-qt/qtpaths/qtpaths-5.15.2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Command line client to QStandardPaths" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest index 608e0c689a4c..770b84494f25 100644 --- a/dev-qt/qtplugininfo/Manifest +++ b/dev-qt/qtplugininfo/Manifest @@ -1,5 +1,3 @@ DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b EBUILD qtplugininfo-5.15.2-r10.ebuild 432 BLAKE2B ee87e66ebc299d7348a1af578483339ad35dc53cb66cdffc7b380af96b30724631c5b12642f95d7fa9d1de4fba5f4d914e8db1ae237ccf834e99b928671b49d1 SHA512 44c7621a2658a1cb0e4101aba4978ffcd2fa4fa784449ad802b5bbb971407b077a1b58601c94518c24b93a1efcf76080c2a3afccaffa4907389a8052e17381f8 -EBUILD qtplugininfo-5.15.2.ebuild 347 BLAKE2B 27ff111ca6151127fd562c56bfb79b374f2d19137106b703b925ff0925749ff5a18eb411d5905766aef55761235c4dfc08ddfb8f3dae73306cfa3d26e1fef0d4 SHA512 35fb6f758b7aafbcf3c30fda07afdfdd7f25da0ad6d872fc8047074dd532b07553b2a460d1fd966ced4a44569b9db77e071d85a8a0993a4e07b78a6164d47154 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild deleted file mode 100644 index 69fcef78f572..000000000000 --- a/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Qt5 plugin metadata dumper" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest index 51b12f33703d..e2f9d7dd3eb0 100644 --- a/dev-qt/qtprintsupport/Manifest +++ b/dev-qt/qtprintsupport/Manifest @@ -1,6 +1,3 @@ DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtprintsupport-5.15.2-r1.ebuild 935 BLAKE2B 9e0b3c43b40a0613178bf7f982af94fe26bbfbb9206991c302d9de1bcd393cf23184b459630a78f8cd0807c28fee37d32761146c1305037012cb7839cc46253f SHA512 359e813b072edd78d404f0d889120a9b571cdfbd2f34a0b5b194e62da3d262f2769b81503965e83aa22dd6b81821fce60fd880b21d7a45033b451ada58f0ebad -EBUILD qtprintsupport-5.15.2-r10.ebuild 868 BLAKE2B fe65c7641902c6c1301b807b07e79a7e38c3642e046fed7933d9c1386681ddc3e8314d8bc3d79e000bf27fb598e4f422ceb4bb60d7c227397ab7a8d1f68442b9 SHA512 7262240e023eff99dc75c3ae77f436632159daed144f4a7dd6ca09a0b0ed783bbec673fc78c923b7f9f0806c79fe92ade719ce37ffaf9ea5e5fb6f247a48ef48 +EBUILD qtprintsupport-5.15.2-r10.ebuild 866 BLAKE2B 433f157b58c633db7a96bf6799575b92cfc4b463aa0eef3756adf9e3682500cf2ba187f7d8686420815b61723a39405aacb32a2dd3216364a5841c3d98b79242 SHA512 ef1c0f1e1af368cbafb5fa3d1c15796d24eb9cdddd6dd486c7282e3cd27509a9100f23e6de54979e84ac09e283559a8839bcabd1f4079dfb93653c12261e10aa MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r1.ebuild deleted file mode 100644 index 6442c1d07e48..000000000000 --- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -VIRTUALX_REQUIRED="test" -inherit qt5-build - -DESCRIPTION="Printing support library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="cups gles2-only" - -RDEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}[gles2-only=] - ~dev-qt/qtwidgets-${PV}[gles2-only=] - cups? ( >=net-print/cups-1.4 ) -" -DEPEND="${RDEPEND} - test? ( ~dev-qt/qtnetwork-${PV} ) -" - -QT5_TARGET_SUBDIRS=( - src/printsupport - src/plugins/printsupport -) - -QT5_GENTOO_CONFIG=( - cups -) - -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 - -src_configure() { - local myconf=( - $(qt_use cups) - -opengl $(usex gles2-only es2 desktop) - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild index eb51bc0eae2b..39e464926b22 100644 --- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild +++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild @@ -11,7 +11,7 @@ inherit qt5-build DESCRIPTION="Printing support library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="cups gles2-only" diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest index d0ccfae31222..93acee6204ab 100644 --- a/dev-qt/qtquickcontrols2/Manifest +++ b/dev-qt/qtquickcontrols2/Manifest @@ -1,5 +1,3 @@ DIST qtquickcontrols2-5.15.2-be66bf9a.tar.gz 9243427 BLAKE2B 7fcb46a69b8ea5a149f489b8ef6302185976fcf2a1afbcc19a05156647e00e037c9b447d763f0e1055464ece9bef0daa12e1b094d91d61c1a20f06727c232ae2 SHA512 7edfacbab302e3e0492d7bdf2b2b761818104452be95e20d52e2bc2649ca684ffb7e6ce709ed47ef6072b965cd63e7943746b193ec3a959dbb9a5540cc5a7567 -DIST qtquickcontrols2-everywhere-src-5.15.2.tar.xz 8284692 BLAKE2B c5c4550ff75bf655969b8601f36c38a0d5a6c9dbe406bc03d431c133f8f0b83a89098c3a64afa4073e4810ee73016a19e11fde1685732c3a9124ddaa2b21393f SHA512 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f EBUILD qtquickcontrols2-5.15.2-r11.ebuild 695 BLAKE2B 7ec9449ac8f30acd8f8f464909e50101fb9fd15b3535dab61d9739419d1335172fda8791a9bc1a2eca30a497b6e9937f3534ef5bd099bea1a3d8ad3297c97cc4 SHA512 c0317dd97c14333bea2b83970d1b03aec02aa3c7be0a5b64e958f7d33166cf54d8c9b0e496bb0a255f7bc8f98373e4ca3b7235dab8396948785915d36a07cb52 -EBUILD qtquickcontrols2-5.15.2.ebuild 613 BLAKE2B da66e8d09b01a0818ad23e32fd627b955c8cde3a86130c349da5f1ce301036eb2339b48aed95545275b290df55fce18c23598d7ee08e8b7db3cfa3c380e46532 SHA512 d272f73610dd55378ae08e9df01a3ecf59903924ef01c2e05c7d33976ad2655cbf747ca7ff70d8ddbb5b27561be7a37fa1548a536e9103a1068c62b46859b4ef MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2.ebuild deleted file mode 100644 index 10f200644e51..000000000000 --- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -fi - -IUSE="widgets" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - widgets? ( ~dev-qt/qtwidgets-${PV} ) -" -RDEPEND="${DEPEND} - ~dev-qt/qtgraphicaleffects-${PV} -" - -src_prepare() { - qt_use_disable_mod widgets widgets \ - src/imports/platform/platform.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest index 5722412337b3..2e4e4e840233 100644 --- a/dev-qt/qtspeech/Manifest +++ b/dev-qt/qtspeech/Manifest @@ -1,4 +1,3 @@ DIST qtspeech-everywhere-src-5.15.2.tar.xz 101940 BLAKE2B 0b100fddac7bc880b79914be54a8618e3e31e9a2486e8cd4ab9f65eabaec605d9aba7c66f71569466798b9cc94e97a2e136868a6f8eda3208f9d0a9515e71ac9 SHA512 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05 EBUILD qtspeech-5.15.2-r1.ebuild 714 BLAKE2B 3dab8c2615c3d412fe02525b2db6831efbc544740c142a487caa09b161c7ae7f33229d325b2806c9bf8d57bec98dc3a6d49971c52cb0f5c24126d584d7e52a3d SHA512 16a689b9ee743e826f518ccd69ea6bc2adbbeac764fe247fe00808e733a78e804c0dcbea1109ca208fbddcfcccaee41a09acab1032738d1acfd228fddfae58bd -EBUILD qtspeech-5.15.2.ebuild 446 BLAKE2B d8cf7215bbd9c6b02a30ffe0bf0a9ebb13a2a75b5abab9a3ebd73be44284a4a64ada8c752ead883eeb45319a12a325b84ef51a28e4970c10cf78b94fb64c396f SHA512 677c652115cd8bfc1d6a538330900d0da041ebfa4c331687a6ab70457d3055eed85e831da31602ab29c569e9c2aa7b5028b01a82952810e21c01b8411162c52b MISC metadata.xml 614 BLAKE2B 93e681cc8d9a330c55a86b22fd190c98c9d834cdf85755c4e61365e288f51fa31854788df2ed2a73aab1736b47f0e7e79f8cb6ec504d74614a0e068d8b783365 SHA512 780dc74110dc359d3764fa7f3a1e4c60f1e05f51cfeb377de8ab043d95c8154535657e46e5f026b66dcc612a1f36e007ae2d531622766518a108bd58407dc2f9 diff --git a/dev-qt/qtspeech/qtspeech-5.15.2.ebuild b/dev-qt/qtspeech/qtspeech-5.15.2.ebuild deleted file mode 100644 index 8acecdbb1d38..000000000000 --- a/dev-qt/qtspeech/qtspeech-5.15.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Text-to-speech library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" -fi - -# TODO: flite plugin - needs 2.0.0 (not yet in tree) -IUSE="" - -RDEPEND=" - >=app-accessibility/speech-dispatcher-0.8.7 - ~dev-qt/qtcore-${PV} -" -DEPEND="${RDEPEND}" diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index c2febd9cd28c..d727c52282bc 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,6 +1,3 @@ DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtsql-5.15.2-r1.ebuild 1393 BLAKE2B 36b8a1f0d9aeac4b52438806b083313ac05085a08c05587e968e51a6fa22c42b70b02a20dc0bb358755cd241e080c95cb906df071c0ebc8fb67e649e68622bcd SHA512 bec25ca39a193fcfaf39fc14e98c18623ca12fd35b3eeead00a4dff8664a51af3408c913b988481f68ccd1003c0e718b7dd06125f8808271cf9fb842fc2dbcee -EBUILD qtsql-5.15.2-r10.ebuild 1302 BLAKE2B 2cf33e12878c1313f8e4f3efef74da46284f914b439ab91bbfe45bee704c23e2d8b45bda306180d7f4047d72a5114784f545ef3cafcba9b4ed8969b4aecd2344 SHA512 698ad4109aa5ec355943c9c9b00b36b538fe265484ba7033b92336db2d8b093705857f55d68d00691e83b60b2ddc3b5ff34fb2a856d70d7f706cad34a80f3f94 +EBUILD qtsql-5.15.2-r10.ebuild 1300 BLAKE2B 7eab82ffaa7105af8a96f41703a436eddd1c4842f82658ab2f2760b375d551623d213f4180d7e365929a5a9ba38381edbcea9d160527955684a96f566d52eaef SHA512 e0145ff510741ca9f94e5396ff4cb26ccd97ae6ac7a4498a04045dbcbddd324741dd48de39a510d20a9cc79d86cf6b8a08483ce84794df7606ea5ba0dd289cee MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild deleted file mode 100644 index f94643be7b4b..000000000000 --- a/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="SQL abstraction library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -SLOT=5/$(ver_cut 1-3) # bug 639140 - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="freetds mysql oci8 odbc postgres +sqlite" - -REQUIRED_USE=" - || ( freetds mysql oci8 odbc postgres sqlite ) -" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - freetds? ( dev-db/freetds ) - mysql? ( dev-db/mysql-connector-c:= ) - oci8? ( dev-db/oracle-instantclient:=[sdk] ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite:3 ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/sql - src/plugins/sqldrivers -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :sql -) - -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 - -src_configure() { - local myconf=( - $(qt_use freetds sql-tds plugin) - $(qt_use mysql sql-mysql plugin) - $(qt_use oci8 sql-oci plugin) - $(qt_use odbc sql-odbc plugin) - $(qt_use postgres sql-psql plugin) - $(qt_use sqlite sql-sqlite plugin) - $(usex sqlite -system-sqlite '') - ) - - use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)") - - qt5-build_src_configure -} diff --git a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild index 20503946883f..7d2229ef0738 100644 --- a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild +++ b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework" SLOT=5/${QT5_PV} # bug 639140 if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="freetds mysql oci8 odbc postgres +sqlite" diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index bac552eab653..28c7a180a246 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -1,5 +1,3 @@ DIST qtsvg-5.15.2-cfc61697.tar.gz 2779382 BLAKE2B cd75575741b05cb1ec1b206d1d338c011c718923339d1cb169f0f537f21931e32042f10574e70b5c64d4fc352dfa56adc8b852dafa5131198630afe6bb806580 SHA512 1f8b52c713b4c6d4974af46ebe6519ea597f72ac0c4b80e061f714ff30449e6fdae94eb9705f3c1b857c5ad0647e5875260ee40051cec78321caf7b944fd3d70 -DIST qtsvg-everywhere-src-5.15.2.tar.xz 1886268 BLAKE2B fee60a9d769e4c8962d084e98cd4c1a958ba926c8b4482f5b60b596a34944576cddfb46c4e04bd4a67cba7dfbdc7e29e61d8b5025cc7d2a1ae063f81eb31a114 SHA512 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730 -EBUILD qtsvg-5.15.2-r10.ebuild 537 BLAKE2B f94dbeb0c65d7fec400a5565096cac785d70206aca66dff3ea22a6e317822e60fa567c2585d48409b4d2fc116dd6af9c601a29b85c8e21218d7f57f79354e000 SHA512 70145de58764407eb7baa55a003264b6f67e49b428aeabcdceda380cf4a5ca6215c27a2fa23d0fcaa83427b73df8b6a3f71acc8fc0f0195ed6a677aee20126c9 -EBUILD qtsvg-5.15.2.ebuild 458 BLAKE2B 3fa6e46aac4007ea9782431d2d2e617c759dfad9f213547498491040aec9e02dea2950579a30cdc6dd11c4ecf7cf7917e2adde85cf5acf93ba2c1ab8d9340fcf SHA512 64a55df0f387cfdc90783c82b99de271fbf7daf8e26a6c41f083a0f222b6099c28d2341aee009568f985653fe656c462a0bca2e695bf27be13a8b4edbf74a6a0 +EBUILD qtsvg-5.15.2-r10.ebuild 535 BLAKE2B 142a81cf6475a721e6cc68a2a501acb796b396f09de5b536e792162dce25bea51673adbae48ebbd6c81e7a23d89277b7bb81e2a15b53e5fd924fedcf0e7d7c65 SHA512 e48177a7bfdff31871912304518a6547af3150741157283e040585002a585d9eb14413f3b8efe988d53f54fb869f377c14c81b637f194883c353e6ddd77094db MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild index 926ce9db4bc3..63798ecf7608 100644 --- a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild +++ b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild @@ -9,7 +9,7 @@ inherit qt5-build DESCRIPTION="SVG rendering library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="" diff --git a/dev-qt/qtsvg/qtsvg-5.15.2.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2.ebuild deleted file mode 100644 index a93ff6224076..000000000000 --- a/dev-qt/qtsvg/qtsvg-5.15.2.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="SVG rendering library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -RDEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtwidgets-${PV} - sys-libs/zlib:= -" -DEPEND="${RDEPEND} - test? ( ~dev-qt/qtxml-${PV} ) -" diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest index a385c4411a6b..3c3da4838072 100644 --- a/dev-qt/qttest/Manifest +++ b/dev-qt/qttest/Manifest @@ -1,6 +1,3 @@ DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qttest-5.15.2-r1.ebuild 691 BLAKE2B 3852d081c2279581918d42ca0642e73665b33614e8c5b77f779495c2699aad9f6ea433cc9fb7e5b6fc264f19df633d5dcb420c7d11d3a7712ad2c476be86d035 SHA512 ac8cb0afbbac1ebb7be0767d6dc298ae555d2ea4f8a4b7fc49035e7c6d935ce37ab29ad424e17280db95d55b285736210f2ff501cac8bef0458d2f5f338b8419 -EBUILD qttest-5.15.2-r10.ebuild 619 BLAKE2B d913c51170711f5e5c4970ea39fd98b480c7811ab509ca73cbebb496bfb9272c73992109af0c3bd82000c7561caa79a0d6059f53c1c7912fc5d83b9a502eb82f SHA512 1b8739892e13a4e5dcc53a462974381fc35ffbcd8c7f75cf1a08804e047c3ba656a8c8c4374a87407232b29d395c682343a95079e7c1231f9a3adaeb98b146d8 +EBUILD qttest-5.15.2-r10.ebuild 617 BLAKE2B a79896ed74c27f62a712e16c2f8b30af3a3f4aa7c3cfadb019961ae60f0e38d902f822a1d3efb25b891e42e95d46252b199903605f976773b5ad30744b650df2 SHA512 3c377225f31f8873583f49386441723282c8968d1fc1742098bdc96b6ef061940c84ff4f318f233bb4dc9365136de14f01fa54f3876a080b00f3405cf8729dff MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qttest/qttest-5.15.2-r1.ebuild b/dev-qt/qttest/qttest-5.15.2-r1.ebuild deleted file mode 100644 index dc827fd108a5..000000000000 --- a/dev-qt/qttest/qttest-5.15.2-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -VIRTUALX_REQUIRED="test" -inherit qt5-build - -DESCRIPTION="Unit testing library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -RDEPEND=" - ~dev-qt/qtcore-${PV}:5= -" -DEPEND="${RDEPEND} - test? ( - ~dev-qt/qtgui-${PV} - ~dev-qt/qtxml-${PV} - ) -" - -QT5_TARGET_SUBDIRS=( - src/testlib -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :testlib -) - -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 diff --git a/dev-qt/qttest/qttest-5.15.2-r10.ebuild b/dev-qt/qttest/qttest-5.15.2-r10.ebuild index 4aedbfe45bbb..8489fbe36c74 100644 --- a/dev-qt/qttest/qttest-5.15.2-r10.ebuild +++ b/dev-qt/qttest/qttest-5.15.2-r10.ebuild @@ -11,7 +11,7 @@ inherit qt5-build DESCRIPTION="Unit testing library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="" diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest index c952857f0d21..2ff962b81e8b 100644 --- a/dev-qt/qttranslations/Manifest +++ b/dev-qt/qttranslations/Manifest @@ -1,5 +1,3 @@ DIST qttranslations-5.15.2-68f420eb.tar.gz 2994506 BLAKE2B a0cdc69f6fc9b455b98658ee386d15346c1c23eeedeb4b7ca9d7cd7b60e7ee06a537a68530d017797683d60485dc38b02144f35f3e3e94c280a00b65a690bf97 SHA512 012e83971a8064d87d0d7ea50e6a9579916974fdaef195f1eea1639673085512bd421ced7abc2550c5b07dad264c861a75cd8ae6d48ac1c5e78f5359ceaa61b4 -DIST qttranslations-everywhere-src-5.15.2.tar.xz 1419504 BLAKE2B 3dd5a007bb42492e8a0e81004c99aaf10d97d3c7a77e952240d1d15c607cf34a246271776ff3bf01ad77fcbfb3966366131f23cba162414b02bbfd6da85505b1 SHA512 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe -EBUILD qttranslations-5.15.2-r10.ebuild 443 BLAKE2B 89dad765b4e783f91faf89295f5bc9ea0ab5362ed731427e5e2e7a69ca3b46d71e6f669fdb5863892f8c22dab28831ef65a547bbdd838b3d847be13f069218b9 SHA512 17ba8d9cca9b5a74d9b72271db5f9e7c5f738ab62543b7f43b6a69510f4aa1a9ae73db39ee5e344873d0a69c4e6dda1d1773577be2a6e3cf30629d9c08fd65b3 -EBUILD qttranslations-5.15.2.ebuild 379 BLAKE2B 7f9bc811a3f5669b63609c8ad81039049ac860a79f27378e176a8206e67bdf118754d6ff27a09621a2c951ca9b634234dcd1a8ee13508f1bffd8aa6278d8d6fe SHA512 b1e2c9b0af9d09683b6ffa9e4cafa8b13fb55ed2c14316aa2e8de5836ee8ae1007c23455c8f6a39474668ccb02b788e184184276fc565612415e8b37e47d7db3 +EBUILD qttranslations-5.15.2-r10.ebuild 441 BLAKE2B aa97439b4b527c2d7f8eeb3241ecc1649ce73012cbc6878de3f4af14b0e9c8bed736a7a493610f3e36d2706bb6ef05b62b2c91637eada4c39cb4d89a7aff018e SHA512 86658b6e379b3c1e1fc588629cceda4e77e196cf9b36a12a092e1f3f9872d8d6b607628113405a9aa809d800485f88077291ca2f02171ec3dbb7f71833ccc1e3 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild index 5cde6f916d9d..95a06c5982b4 100644 --- a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild +++ b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild @@ -9,7 +9,7 @@ inherit qt5-build DESCRIPTION="Translation files for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="" diff --git a/dev-qt/qttranslations/qttranslations-5.15.2.ebuild b/dev-qt/qttranslations/qttranslations-5.15.2.ebuild deleted file mode 100644 index f7dd842fe29d..000000000000 --- a/dev-qt/qttranslations/qttranslations-5.15.2.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Translation files for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/linguist-tools-${PV} - ~dev-qt/qtcore-${PV} -" -RDEPEND="" diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest index 21c632cc0c99..be1b27c76da1 100644 --- a/dev-qt/qtvirtualkeyboard/Manifest +++ b/dev-qt/qtvirtualkeyboard/Manifest @@ -1,5 +1,3 @@ DIST qtvirtualkeyboard-5.15.2-353b75b2.tar.gz 13693438 BLAKE2B fc803496c2b56967e6b5d192805fa577072561cc55a891957e47985cec6d4971aa055e2d9d9b2e585d182426ec835f604279f7bf9882fd50ead9c65d29f91e5b SHA512 0152ad3848dd856ca4d3551e4296a68ed3bc7cd8d8dd45655232ca64586c1ce936ee819dff0dc3e2f6779a70f1faf5ae3d3fd2183a69f9313d943c506391b167 -DIST qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz 10955076 BLAKE2B 629068b92f58e825060410c84906edbcb9d83f942f1d4acfc1aab9404eb69e0ffeca0b5ca69a3d4b07033efb80ef161f23474e0a19ae6d9c4efb7698ba0a0d75 SHA512 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016 EBUILD qtvirtualkeyboard-5.15.2-r11.ebuild 1277 BLAKE2B b07b01567cc68de87595489556fd2ab46a37ecf9f9c7235f742d40c7124bab595dabfe1b981bd165b04bdfabbcc0e6af6f2f7037ea59f7ecfa99fcaa9858ac7b SHA512 dd1787e5a12752a83be8822baa9c5072292f1d51b723ec21201d183e429f3c28c04bc6bd2d186565a5c78a18e0e4e41f453816c492fb2b89514ec1200b86c38f -EBUILD qtvirtualkeyboard-5.15.2.ebuild 1208 BLAKE2B 9dd8f4af6e11c38e20eed246826c773dc39627d1c94841586124a89002a1fbe89aa948806b1462c0c283d6bdd46d472200ddf87e701da58fb5537bda67cafc22 SHA512 1551e08535a9e02bbd7beac31f6c73ff153f68dba53e4681432962d6a7e4cc2114e3515757fe34f209c1cb14337415ea80acf131751c585d575a5550a7d68723 MISC metadata.xml 580 BLAKE2B 18223136bcc07b46ab272ff282bcdce54dad6e6d97fe39b5431850a8960992a16eed32a580980748368ff120ea50ada55be823ba1e16950856462979835562fb SHA512 e865c0a030aeffbf270300806f99d1b2ff4ca148b3e1a3a901df25d1193e84d63a99b643da033a469dfbdbc99e559f71addc7671487c92d94e9019e742977020 diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2.ebuild deleted file mode 100644 index ae8a6eafc7ea..000000000000 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qt5-build - -DESCRIPTION="Customizable input framework and virtual keyboard for Qt" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -fi - -# TODO: unbudle libraries for more layouts -IUSE="handwriting +spell +X" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtsvg-${PV} - spell? ( app-text/hunspell:= ) - X? ( x11-libs/libxcb:= ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local myqmakeargs=( - $(usex handwriting CONFIG+=lipi-toolkit '') - $(usex spell '' CONFIG+=disable-hunspell) - $(usex X '' CONFIG+=disable-desktop) - CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \ - lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \ - lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \ - lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \ - lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \ - lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \ - lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \ - lang-uk_UA lang-vi_VN" - ) - - qt5-build_src_configure -} diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 1ba8c0b9ab16..210b16fc1ac5 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1,6 +1,3 @@ -AUX qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch 1650 BLAKE2B 37091d2be8194d023af6463130879d6d4649f802539d77b897bca222bfae13761f82213118d41d8dbaef91b63c05ca4ab140cd071e749baf78852287ff522508 SHA512 5a4f287731231fe11e755648aff54bc99f25e3d4bc274eac94511497af9d2d0e287760d52a5f103554e505450ad304f378a5f53ebde9bbf742c8bbc2beab1f09 DIST qtwayland-5.15.2-efe6edca.tar.gz 829293 BLAKE2B 6ccc5a4e111818cc65855eb4570727f30932bec9a749069550d07332df719eaeec0baf472c025150a32c9c380294f5e9496ad3babd181887a02fc37d1bfd5f2a SHA512 87190cd1ade57c98da972a2f5d48aa0376ccc4bfa589f5832b8a62a63b3eafa6acf88d812ae98c484d4b02878ae2c1986c3759c0ba3f46894c76af713d7b8346 -DIST qtwayland-everywhere-src-5.15.2.tar.xz 564884 BLAKE2B 472effd3e9f3fd5470e0449703a52d45f2fd823770880b5ad15d8bf99196eee5d8511ca2bc9e23df6e27c933551d1853928ba79b4b1e5fa6e53334c54c04a463 SHA512 e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c -EBUILD qtwayland-5.15.2-r1.ebuild 916 BLAKE2B c319d05e9293595a50613e687f2242da18a8b49af854f9c4f46356642472762cd7659d6ec0f3b3c41eedc5d40a631001c88dd6435aae9eb94c32d7ee4233d322 SHA512 ed27a404fe9fa2a9d2ca5216cd017c9fcd2ba40f7d55758a5337ddc9040d3df9d5cc0c3610561551e0b640cd5902cefd2cb978f7e2003fa77aab4e0b57ae59e8 -EBUILD qtwayland-5.15.2-r14.ebuild 949 BLAKE2B c4703e9203a697ae698596120581a8257328ff482b1c667db8d411b92cc4d5d0f1d0f0c6ca2e61d3bec3dcba25c04056d7e1e58e4b11019dc9f5000113e3af4d SHA512 0a0497d18b97a9bd275f1a8dfb66ba9f4c90d5bac83fb386332a67972854c9b8d25dd9ea4eb33608c1ec06cac9953f82f9b07036698d4f0d96620d9ec2298c18 +EBUILD qtwayland-5.15.2-r14.ebuild 947 BLAKE2B 070d7d6ca6b8dde6e64bb8c582b3a946b04a3e308dd63befced14f781fb6b9c0d372ba052ca95451f3ebf9287c238f22302e9e8c254eaeb0044e950721835d78 SHA512 5d688eab3936bf5e83c42343ec0e80b01c390c78026752c53edb3352d5904cd691908748d7a1555e6c5e87aed9d419c4e13bc8e974f4f93441a53f86542c5cbf MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2 diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch deleted file mode 100644 index 0799cb1a2023..000000000000 --- a/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 735164b5c2a2637a8d53a8803a2401e4ef477ff0 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> -Date: Fri, 30 Oct 2020 16:55:30 +0200 -Subject: [PATCH] Scanner: Avoid accessing dangling pointers in destroy_func() - -Usually, the object associated with the resource gets destroyed in the -destroy_resource() function. - -Therefore, we need to double-check that the object is still alive before -trying to reset its m_resource. - -Pick-to: 5.15 -Change-Id: I26408228f58919db17eb29584a1cbd4a9427d25c -Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> ---- - src/qtwaylandscanner/qtwaylandscanner.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp -index 1a1f8bf16..450ef519d 100644 ---- a/src/qtwaylandscanner/qtwaylandscanner.cpp -+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp -@@ -814,7 +814,9 @@ bool Scanner::process() - printf(" if (Q_LIKELY(that)) {\n"); - printf(" that->m_resource_map.remove(resource->client(), resource);\n"); - printf(" that->%s_destroy_resource(resource);\n", interfaceNameStripped); -- printf(" if (that->m_resource == resource)\n"); -+ printf("\n"); -+ printf(" that = resource->%s_object;\n", interfaceNameStripped); -+ printf(" if (that && that->m_resource == resource)\n"); - printf(" that->m_resource = nullptr;\n"); - printf(" }\n"); - printf(" delete resource;\n"); --- -2.16.3 diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild deleted file mode 100644 index d042284d7177..000000000000 --- a/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Wayland platform plugin for Qt" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="vulkan X" - -DEPEND=" - >=dev-libs/wayland-1.6.0 - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=] - media-libs/mesa[egl] - >=x11-libs/libxkbcommon-0.2.0 - vulkan? ( dev-util/vulkan-headers ) - X? ( - ~dev-qt/qtgui-${PV}[-gles2-only] - x11-libs/libX11 - x11-libs/libXcomposite - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-qtwaylandscanner-avoid-dangling-pointers.patch ) - -src_configure() { - local myqmakeargs=( - -- - $(qt_use vulkan feature-wayland-vulkan-server-buffer) - $(qt_use X feature-xcomposite-egl) - $(qt_use X feature-xcomposite-glx) - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild index 013c7c42593d..3fa36666cf6f 100644 --- a/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Wayland platform plugin for Qt" SLOT=5/${QT5_PV} # bug 815646 if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="vulkan X" diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 0508bdd0437b..9866b3de6757 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -7,7 +7,11 @@ AUX qtwebengine-5.15.2_p20210406-glibc-2.33.patch 5361 BLAKE2B 92ead1bfe2be883e7 AUX qtwebengine-5.15.2_p20210521-gcc11.patch 3642 BLAKE2B 9b5085dbb201b12c3476bb9fb340a65021718802da545bb34a3bc03a02d11e95cf677497588711ff7f3f297ea4a6b4a882c865f87158e69582f8875bba0b0931 SHA512 fdd8da9d4353ce78f6b2c789422a3deee80e74feed5fcce4c8929b0814a9f21734e31fdbb0388a3f152d380b2eb14508be6f4f9ffeaee5913d299873a94135c2 AUX qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch 7642 BLAKE2B 3650865736f4fdaa3fcb6146da8607710612a7652053f314ddf21e6a1f9c9acfd48bc26e048091ecb3096705c91529b264198812ceca774754c19911ccbef23e SHA512 f2168d125f5c4e3cb7e1c33924cbef687291e0f172b0f079fb8f8ecf8790247437bdedbb58c3f916ef93e8b991485cc3a14611500212b7b7f5d56c7b55e83941 AUX qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch 8346 BLAKE2B d305461d127bd95b7bd3be58cb1488212f9af8d934f2519b82416f8a4237238b02f4ed2a7cb9cba7145ae44e48725a28f6f41f9250d052e2a58670724050e825 SHA512 1e99d95459509c58fe185d3b39f9b46b19d5052ea5927254f283de1dacb02cd94a208a72f4bd85517254c933c9990b570fe40e23b4e6ed2067f16be3bc30996c +AUX qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch 1862 BLAKE2B 023f267ce14a8bbf06faeabd3a1a0b3381a4c5ef823f149d8d4c66e042c5505866f2a22a53e52bea9ccc95b61bbc5080a4743bd6c1c46122d03dda89eedb7088 SHA512 e2f8a516b1db982e7e6b26d52fed94d04b16ab4ce8a3f9dd924790a51ca282cb8d3487c08e47ac3af940581444fe37798420a6c2f8ac65a9ab252d9186a4e7d1 +AUX qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch 2182 BLAKE2B cc19cc0c1242f7193f62a550ceb6358e43fcbdf6f95ddee373a3a775448908d6d0a661c6406e6c7578013a32ae280198263a94804e76c87e99db064dc972db7c SHA512 8890ab95300c148e21315a201ac56d04aca1ccc402e464b6ec1b90a69127a4fa02398893007f98eb40ea78d0abe56d459c34eba3c5cdd1521d4ab567225bced1 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654 DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6 -EBUILD qtwebengine-5.15.2_p20210824-r1.ebuild 7329 BLAKE2B 195c450f0a1fb24cc9ccda3d527944866e5507d9b9eeedb0f5d7d27e477eb1283be4254d931de133b1763704fee5d100d1ec8680ebdcf70425c47e13615374f5 SHA512 2793f9052fc3eb4a8a278486efb5219f50efd615965b6b25cec9656936cfc90e2e37e82df5ac3299981e22d1ec3be7342048834d5df74360d88f5eb94d01fb36 +DIST qtwebengine-5.15.2_p20211015.tar.xz 319006520 BLAKE2B 12224fdbbfbf45bae795bea1b3f1aef51ce016f08cdcd022cb96264de4ee438146d5ad19dbed668abd24ceddfca9f57f6af5ac76c7d81dd867142d3691e8f992 SHA512 b41022d1bc60729b035c8ffde55b3e1d3535b8639f0752749b05625fd1ceb640c4c610722e81f82313237c2b7fa7105a5624da15ef5d88058f8d5b9a642faa67 +EBUILD qtwebengine-5.15.2_p20210824-r1.ebuild 7611 BLAKE2B 6185eeec3020bd8840a3de41b4ac3355e36fac7179c94c0d3bd00af3e858ad0a80fb178e8910c42734fb7977153cb0e93f36826c3f276db2884d9a4abc0c8fa2 SHA512 76b5e299f01ffd7330698137bca10206161f6935b471e7e6149bc5e45d2f26ad39fdae07ca18ebd4a33d978a9af8690ee867e385c06f982b706b0e7aa516eedf +EBUILD qtwebengine-5.15.2_p20211015.ebuild 7372 BLAKE2B 2cfc948705455426f61e93b8fb4b99952f0534001c2350cd6f17eb2e540fb68161acb7b3a0ad54150d856c02df3b657bd79d0705b219b8180f2cf5678b39de51 SHA512 e1978bf4a50ae2550e2880585ac7727f4ffd1a524f510a3c8d586039bb9e7c4620e2cf0412932085f026ff09b2097c66a505f18a7fbb2af6eeadd165b0d1fe9b MISC metadata.xml 1270 BLAKE2B 6ac8693b4a994904a8d7dd5728a0f47679b2b7553750a17fa64a7b8fd8cd74abd54ffbcb7da00d5b43622a67dedb3e3bcc93029bef2872e921e333a24892ca47 SHA512 4675ec29c3d6ac329b177f10b920dcf75ea5ed18a21aee1c500ee28430d85fcaaeac6df28a942c4bdcdf8692196017b1ea456e9f66d129afd1254d7931083eda diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch new file mode 100644 index 000000000000..61e56d5ae4f5 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch @@ -0,0 +1,32 @@ +https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/rawhide/f/qtwebengine-harfbuzz.patch +--- a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc ++++ b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc +@@ -71,9 +71,9 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) { + hb_set_t* glyphs = + hb_subset_input_glyph_set(input.get()); // Owned by |input|. + usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs))); +- hb_subset_input_set_retain_gids(input.get(), true); ++ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS); + +- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get())); ++ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get())); + HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get())); + if (!subset_blob) + return nullptr; +--- a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp ++++ b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp +@@ -71,11 +71,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData, + hb_set_t* glyphs = hb_subset_input_glyph_set(input.get()); + glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);}); + +- hb_subset_input_set_retain_gids(input.get(), true); + // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. + // If it isn't known if a font is 'tricky', retain the hints. +- hb_subset_input_set_drop_hints(input.get(), false); +- HBFace subset(hb_subset(face.get(), input.get())); ++ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS | HB_SUBSET_FLAGS_NO_HINTING); ++ HBFace subset(hb_subset_or_fail(face.get(), input.get())); + HBBlob result(hb_face_reference_blob(subset.get())); + return to_data(std::move(result)); + } + diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch new file mode 100644 index 000000000000..b3c2ffb315a5 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch @@ -0,0 +1,79 @@ +Description: Use system lcms2 +Author: Sandro Knauß <hefee@debian.org> +Origin: Debian +Forwarded: https://bugreports.qt.io/browse/QTBUG-61746 +Reviewed-by: Sandro Knauß <hefee@debian.org> +Last-Update: 2021-03-08 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn ++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn +@@ -239,58 +239,19 @@ if (!pdf_use_skia && !pdf_use_skia_paths + } + } + +-config("fx_lcms2_warnings") { +- visibility = [ ":*" ] +- if (is_clang) { +- cflags = [ +- # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this +- # library doesn't appear to have this problem. +- "-Wno-missing-braces", +- ] +- } ++import("//build/shim_headers.gni") ++ ++shim_headers("lcms2_shim") { ++ root_path = "lcms/include" ++ headers = [ ++ "lcms2.h", ++ "lcms2_plugin.h", ++ ] + } + + source_set("fx_lcms2") { +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ +- "//build/config/compiler:no_chromium_code", +- "//build/config/sanitizers:cfi_icall_generalize_pointers", +- ":pdfium_third_party_config", +- +- # Must be after no_chromium_code for warning flags to be ordered correctly. +- ":fx_lcms2_warnings", +- ] +- sources = [ +- "lcms/include/lcms2.h", +- "lcms/include/lcms2_plugin.h", +- "lcms/src/cmsalpha.c", +- "lcms/src/cmscam02.c", +- "lcms/src/cmscgats.c", +- "lcms/src/cmscnvrt.c", +- "lcms/src/cmserr.c", +- "lcms/src/cmsgamma.c", +- "lcms/src/cmsgmt.c", +- "lcms/src/cmshalf.c", +- "lcms/src/cmsintrp.c", +- "lcms/src/cmsio0.c", +- "lcms/src/cmsio1.c", +- "lcms/src/cmslut.c", +- "lcms/src/cmsmd5.c", +- "lcms/src/cmsmtrx.c", +- "lcms/src/cmsnamed.c", +- "lcms/src/cmsopt.c", +- "lcms/src/cmspack.c", +- "lcms/src/cmspcs.c", +- "lcms/src/cmsplugin.c", +- "lcms/src/cmsps2.c", +- "lcms/src/cmssamp.c", +- "lcms/src/cmssm.c", +- "lcms/src/cmstypes.c", +- "lcms/src/cmsvirt.c", +- "lcms/src/cmswtpnt.c", +- "lcms/src/cmsxform.c", +- ] +- deps = [ "../core/fxcrt" ] ++ deps = [ ":lcms2_shim" ] ++ libs = ["lcms2"] + } + + if (!build_with_chromium) { diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild index e3f9df28c79c..b06e54bda94f 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild @@ -169,6 +169,13 @@ src_prepare() { done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) fi + if has_version ">=media-libs/harfbuzz-3.0.0-r1"; then + # We can get away with conditionally applying this with has_version + # because we have a := dep on harfbuzz and the subslot changed + # at 3.0.0. + eapply "${FILESDIR}/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch" + fi + qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild new file mode 100644 index 000000000000..af29c22fe435 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild @@ -0,0 +1,227 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="xml(+)" +inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build + +DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" +HOMEPAGE="https://www.qt.io/" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then +# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + if [[ ${PV} == ${QT5_PV}_p* ]]; then + SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" + S="${WORKDIR}/${P}" + QT5_BUILD_DIR="${S}_build" + fi +else + EGIT_BRANCH="5.15" + EGIT_REPO_URI=( + "https://code.qt.io/qt/${QT5_MODULE}.git" + "https://github.com/qt/${QT5_MODULE}.git" + ) + inherit git-r3 +fi + +# patchset based on https://github.com/chromium-ppc64le releases +SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )" + +IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets" +REQUIRED_USE="designer? ( widgets )" + +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/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}* + =dev-qt/qtprintsupport-${QT5_PV}* + =dev-qt/qtwebchannel-${QT5_PV}*[qml] + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/libpng:0= + >=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/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxkbfile + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + alsa? ( media-libs/alsa-lib ) + designer? ( =dev-qt/designer-${QT5_PV}* ) + geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* ) + kerberos? ( virtual/krb5 ) + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( media-video/ffmpeg:0= ) + system-icu? ( >=dev-libs/icu-69.1:= ) + widgets? ( + =dev-qt/qtdeclarative-${QT5_PV}*[widgets] + =dev-qt/qtwidgets-${QT5_PV}* + ) +" +DEPEND="${RDEPEND} + media-libs/libglvnd +" +BDEPEND="${PYTHON_DEPS} + dev-util/gperf + dev-util/ninja + dev-util/re2c + net-libs/nodejs[ssl] + sys-devel/bison + sys-devel/flex + ppc64? ( >=dev-util/gn-0.1807 ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446 + "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186 + "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606 + "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix + "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746 + "${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312 + "${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312 +) + +pkg_preinst() { + elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with" + elog "additional security fixes from newer versions. 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 ${QT5_BUILD_TYPE} in + live) git-r3_src_unpack ;& + release) default ;; + esac +} + +src_prepare() { + if [[ ${PV} == ${QT5_PV}_p* ]]; then + # This is made from git, and for some reason will fail w/o .git directories. + mkdir -p .git src/3rdparty/chromium/.git || die + fi + # We need to make sure this integrates well into Qt 5.15.2 installation. + # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. + # See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions + sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die + + # QTBUG-88657 - jumbo-build could still make trouble + if ! use jumbo-build; then + sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ + src/buildtools/config/common.pri || die + fi + + # bug 620444 - ensure local headers are used + find "${S}" -type f -name "*.pr[fio]" | \ + xargs 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 + + qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri + qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri + + qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro + + qt_use_disable_mod widgets widgets src/src.pro + + qt5-build_src_prepare + + # we need to generate ppc64 stuff because upstream does not ship it yet + if use ppc64; then + einfo "Patching for ppc64le and generating build files" + eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" + pushd src/3rdparty/chromium > /dev/null || die + eapply -p0 "${WORKDIR}/${PN}-ppc64le" + popd > /dev/null || die + pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die + mkdir -vp source/config/linux/ppc64 || die + mkdir -p source/libvpx/test || die + touch source/libvpx/test/test.mk || die + ./generate_gni.sh || die + popd >/dev/null || die + fi +} + +src_configure() { + export NINJA_PATH=/usr/bin/ninja + export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + + local myqmakeargs=( + -- + -no-build-qtpdf + -printing-and-pdf + -system-opus + -system-webp + $(qt_use alsa) + $(qt_use !bindist proprietary-codecs) + $(qt_use geolocation webengine-geolocation) + $(qt_use kerberos webengine-kerberos) + $(qt_use pulseaudio) + $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg) + $(qt_use system-icu webengine-icu) + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # bug 601472 + if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then + die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" + fi +} diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest index c7ea449014a8..eef60c0627ad 100644 --- a/dev-qt/qtwebsockets/Manifest +++ b/dev-qt/qtwebsockets/Manifest @@ -1,5 +1,3 @@ DIST qtwebsockets-5.15.2-e7883bc6.tar.gz 434705 BLAKE2B f8c8fbb0e369ad5ceed40ca62c2a7d6d2cdb3cb74037e9ecb487b0ec31757aae10ed6f61790c566e4431b59585fee423047c4687b41cdfc08e96dd46c2f964b6 SHA512 35b1caed6462083014bbb83c6aa81b441f67da7f0e3813fc47997ca4fecfe5423eaef5dd4ed3c37f42dd311eded0e6b36cce6725c7028047ca21b454ded9257f -DIST qtwebsockets-everywhere-src-5.15.2.tar.xz 259000 BLAKE2B 1bbc4d5451e70a94b6fb8377a60e43e2fa1aeb0d1224dd04486fcafd7821c3918a887297860e7cfcd18f3afd8dd02a903cf16fb69aeb48a52557af539c79458e SHA512 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4 -EBUILD qtwebsockets-5.15.2-r10.ebuild 618 BLAKE2B 993d2330acd21c8b20739e8a1fabe5ed419387f9605ad125d73b34020fa544fb68bced4b39e82a2d3ba57d0aa294a8243537fc53b175c37df03ca7bc4cd1a4c6 SHA512 8bee6a4053591699486b1c71806389f319ad81eb139107f4b4f8348d804c7ef84b21cff3e24615be976d2398b7bf8de95dca5848aa0a5cb68af83125d85e0058 -EBUILD qtwebsockets-5.15.2.ebuild 545 BLAKE2B 048aa5d3965f2b03d73cfc0dac6d183419c2dc422f3cc6f8f7e88ce9d916a0995b0aefa1606c3876ee12fc74721fb7bbb60b6e81858042df7fa176c6177ac9d7 SHA512 bf768df2dafbdfe3b866596c5e12d3ab47da1248413e92cd46f032499f5bd2af4911f5d6b2ff8aa7a6fe338304d165a31cc4b27035d925747a85f4002995ee67 +EBUILD qtwebsockets-5.15.2-r10.ebuild 617 BLAKE2B 05ab06a8995f01708e58edbed2cbc158363e226bc04810423bd39fe9538760617da2385d446be907dd98f3a1297a651219259627ecc3667e72183e5a0e9b2918 SHA512 829ca1981fc2b589fc3ea5f9efed6a13fcfcbe0e34d2bfe3bb82246c0d25d24a0113bd9fbe8907657ef9ae656313f88bef761c871077862d54fb76f885250b1b MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1 diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild index 5b6000dbc97c..3430a52d80fd 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild @@ -9,7 +9,7 @@ inherit qt5-build DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86" fi IUSE="qml +ssl" diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild deleted file mode 100644 index c47cd625b4a2..000000000000 --- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="qml +ssl" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtnetwork-${PV}[ssl=] - qml? ( ~dev-qt/qtdeclarative-${PV} ) - -" -RDEPEND="${DEPEND}" - -src_prepare() { - qt_use_disable_mod qml quick src/src.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest index 671cf8148247..948d58659159 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -1,6 +1,3 @@ DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtwidgets-5.15.2-r1.ebuild 1188 BLAKE2B 9c2992011433a9f903dc6380f012f07ae16359e6eeb8b765ca2023c8fe46cf7c4e7d83a9959d0e652c8e75555e76abd17a8e1fe3fbc26a5562ff821fce0ec1b9 SHA512 fb7d0ef11ae6a8a1306c1ff86f47946049280a0de772eca84aab5c003eb5adfba9fd1a65881c2645bcf6ced24910646e67fe8ba199d1020b7964ec6e06e75fc9 -EBUILD qtwidgets-5.15.2-r11.ebuild 1231 BLAKE2B 1d24a8a4455c67fd1e26f5941b0bb3fed9213a0e01b51545e6aade9cfdde40a3de8b213842c7221409cf5c7881de257e1cd7e7d3c2c9d1d0e69cc803eadbeed9 SHA512 0d450aebc38408781387c4094e1dbd36bf4e1b1508f9d043e020a249ee0c062342fc0a6f5e8219e1e5b7af70d6aefae4336d8820fb73ea7201bcd5bb521a90b3 +EBUILD qtwidgets-5.15.2-r11.ebuild 1229 BLAKE2B db15e8e2fc22312f35cd0d0fb6645b19fddaaf34f7ad1cc5ce2931e7af8048034da1a58c6942d8a4657fe593b37472478914f92d25557fcab109385d36b8c3da SHA512 5e871f057f18ac4731c7a07033ed6620ae720de346657933b3617275276ad5b65c996560370907993e27775b74cc252b1c9a0e195fe8df22ee5dea223049d0c6 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1 diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild deleted file mode 100644 index 3332a278e385..000000000000 --- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -# keep IUSE defaults in sync with qtgui -IUSE="gles2-only gtk +png +X" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}[gles2-only=,png=,X?] - gtk? ( - ~dev-qt/qtgui-${PV}[dbus] - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - ) -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" - -QT5_TARGET_SUBDIRS=( - src/tools/uic - src/widgets - src/plugins/platformthemes -) - -QT5_GENTOO_CONFIG=( - gtk:gtk3: - ::widgets - !:no-widgets: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :widgets -) - -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 - -src_configure() { - local myconf=( - -opengl $(usex gles2-only es2 desktop) - $(qt_use gtk) - -gui - $(qt_use png libpng system) - -widgets - $(qt_use X xcb) - $(usex X '-xcb-xlib -xkbcommon' '') - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild index c7862b854eb7..90eb44f61245 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi # keep IUSE defaults in sync with qtgui diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest index 643c9b79c282..ee100975d8e3 100644 --- a/dev-qt/qtxml/Manifest +++ b/dev-qt/qtxml/Manifest @@ -1,6 +1,3 @@ DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -EBUILD qtxml-5.15.2-r1.ebuild 646 BLAKE2B 97826addb6a8226423dffb1e2cbbb9ee05e8f036e5969f122cf451f7642822609974d9478106a1e338672658473c746699f5f52ccd3ff6c979b618ecfba3c916 SHA512 bde3c112a69299b9e5f0588f6909b0364b34940b31ef2104d2ee4187f0cc7f7d999724108170d2fc705cabf631eae00145547081c28eefc425a69d992934de91 -EBUILD qtxml-5.15.2-r10.ebuild 569 BLAKE2B a6e6bc471e73d20603a276824a08f6dcac8454a10fd9de2240b2644eee46f632dd4aa7eb91dae3abe6cde0b1e44529f1792985b352aa8462fcd0722af1203470 SHA512 311d2107abad7de950fc17d74fea64989888e3529033fbb16945634ffcc0cd4012242c14fea13b6b855f1caa9c74e35737aab6a19de3f522b79f2d01e4806735 +EBUILD qtxml-5.15.2-r10.ebuild 567 BLAKE2B 72c6b122c77c7fb5e02125cdcdf6e8820b6813cbc6c096afcc52d819b0141a4a8b2238e151209a360931740746bebcbeb75109a36eca04cd579bb9785db48f12 SHA512 c0a87047c69cc6d11a66792697dd3487054882440f08c063c44f474a626e5304ead7adaca096b4ba45b5935d8c2df7a8c250de5d9c1f02094513d2e66415a82f MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtxml/qtxml-5.15.2-r1.ebuild b/dev-qt/qtxml/qtxml-5.15.2-r1.ebuild deleted file mode 100644 index 16d360c85c55..000000000000 --- a/dev-qt/qtxml/qtxml-5.15.2-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -RDEPEND=" - ~dev-qt/qtcore-${PV}:5= -" -DEPEND="${RDEPEND} - test? ( ~dev-qt/qtnetwork-${PV} ) -" - -QT5_TARGET_SUBDIRS=( - src/xml -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :xml -) - -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 diff --git a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild index 268662f96c95..23f2c1e9e280 100644 --- a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild +++ b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="" |