From 3b08f674e3f771b49370edb144dab0958c8cf721 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Aug 2021 08:59:54 +0100 Subject: gentoo resync : 31.08.2021 --- dev-qt/Manifest.gz | Bin 10381 -> 10383 bytes dev-qt/qt3d/Manifest | 2 +- dev-qt/qt3d/qt3d-5.15.2-r10.ebuild | 8 + dev-qt/qtgui/Manifest | 2 +- dev-qt/qtgui/qtgui-5.15.2-r10.ebuild | 184 --------------------- dev-qt/qtgui/qtgui-5.15.2-r11.ebuild | 184 +++++++++++++++++++++ dev-qt/qtlocation/Manifest | 3 +- dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild | 9 + dev-qt/qtwayland/Manifest | 2 +- dev-qt/qtwayland/qtwayland-5.15.2-r10.ebuild | 41 ----- dev-qt/qtwayland/qtwayland-5.15.2-r11.ebuild | 41 +++++ dev-qt/qtwebengine/Manifest | 2 +- .../qtwebengine-5.15.2_p20210625.ebuild | 1 + 13 files changed, 249 insertions(+), 230 deletions(-) delete mode 100644 dev-qt/qtgui/qtgui-5.15.2-r10.ebuild create mode 100644 dev-qt/qtgui/qtgui-5.15.2-r11.ebuild delete mode 100644 dev-qt/qtwayland/qtwayland-5.15.2-r10.ebuild create mode 100644 dev-qt/qtwayland/qtwayland-5.15.2-r11.ebuild (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index 965fa6dadb3e..06c835d75b97 100644 Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest index 0579daf387fb..e7996e4bda66 100644 --- a/dev-qt/qt3d/Manifest +++ b/dev-qt/qt3d/Manifest @@ -1,5 +1,5 @@ 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 881 BLAKE2B a7e98ce905f5055640fc797d71d8d33159079975783b5a58408cdccfc52620d42c20d1a318c00cf073f9d0143882fe7905c7a45753faac28d3eff1b37ce7da1e SHA512 2eeaa8e7243aee5298410c77e56f3e466483f35989d8ec188a50dc84c6d21ab7a15378d72a1fd03b7f0dd09f41f2238a76cf910020e3de34df3a59261771c500 +EBUILD qt3d-5.15.2-r10.ebuild 973 BLAKE2B 0175ae6e02e3c2950e39a7776eb017cd24f8d3cf824d72b0569fff5557b438cb25e0e8b0727fd7d5921dc60f745cf8599e0e5f68d56a0478a11a6b53056d1cce SHA512 8418a29631ff6b381cced37e1a14384aa2c1c941d827943f96e4a69f9b4bbb6c7d33662afc8cd2dd336031064a19920cae68bfb9541685913053e0c09c81cb38 EBUILD qt3d-5.15.2.ebuild 880 BLAKE2B bcd097060dbb5e6673b7f5c4fd314a58c0f4d3412ece2b8542f83565d9ee0a0ad0df189e7af927bf836f8c200ccdfa689c366408720c069e21d093ab33fdf4ca SHA512 77f8a1f095598e798479a1e7d62e6b40188bbcc662da7948898364b0b5cd61bbf8b560a271969ae15e7a9f4fa4c49edc064a85cea1e1ae04a0a2778b7bd43d4b MISC metadata.xml 699 BLAKE2B 45b5458bd903a90a1da6277922d4e0077dbdbede5e4bdfed523d5926abd59147a3085ce007075afe7c50c5256f37d827d3ec6c5287fb7910031198f14c6dbc4e SHA512 c055619fd9c01e39f707dc13bfc5f805b4e3777e3ef0841d1cb52f2fa0f58eafd684a9e911ad7aa8e938f4f42a1cbad205f9cd854c4eaeaa08918db6d64e174b diff --git a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild b/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild index b8fd6b8313f6..5d0cb68569d8 100644 --- a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild +++ b/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild @@ -28,6 +28,14 @@ DEPEND="${RDEPEND} vulkan? ( dev-util/vulkan-headers ) " +src_configure() { + local myqmakeargs=( + -- + -system-assimp + ) + qt5-build_src_configure +} + src_prepare() { rm -r src/3rdparty/assimp/{code,contrib,include} || die diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 1a471b66f668..3b15f758afd1 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -4,6 +4,6 @@ AUX qtgui-5.15.2-bogus-xcb-util-dep.patch 2685 BLAKE2B d281ae95f88f853cf90243868 DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17 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-r10.ebuild 4058 BLAKE2B 2468327e66a462fc65698d17ad62e2a9f44d9ee371721ebe91342dcfef470df007bfacc7c1fb31daf46ff61f69fddcbe4bc8ec4b92c795fa068e088315e0613c SHA512 ccc0621ed188e2621defbe2209e5354d887b3a9fd8f30034f292496d6aada2dc7af91748fec727532e9a6db8d388458c4953db85276860cd8a30fa1d066e1ea5 +EBUILD qtgui-5.15.2-r11.ebuild 4068 BLAKE2B 38d193e6d467324cc3e5429ff9523d414a657f1a3d63aff9cd7968ad881ce51f877f281f146311a47d553f5802b12ba1c580e19fe8316766a8d5a47f001cd187 SHA512 1cc1208ff2668eda04c7f6aee90e9b14aef3b0bd70ff101e99c81b2b0c62a0372461beec59ee43c9d0adb4306bad8265369e406971af8c4aaecc0a30c1478297 EBUILD qtgui-5.15.2-r2.ebuild 4248 BLAKE2B 245ccc465ffa0a68ef3e0811072052511b28ec7b864567545f3bf2c35437a680d260c3f7fc9e44cb770186937fcb9e7641516efa3f485f4c18d486295b6afb56 SHA512 b3ec9c89421bbe6605c1f0b9f97706879274e675306d218975dd24352044850cd543df73c15e85f2e50462bd5c4205fddf45dc2a3bb265c53f4272a0b3521101 MISC metadata.xml 1386 BLAKE2B 5665c961dab9a1f53b848454ecba47f9fb3e62b4f903495522cdf0c6fcb848b5a279038bd2961d7dff39742145612b19d6fd274a367fe29c12bf6b8218556d37 SHA512 f37e88e0869d7048f6faa841f85402a38a03131ba8f1a08dbf308954b76fb4c0a07fe1f8c032ae1aa3d08f97b07af7340562457abfd8966f9ec21a1e86cb743d diff --git a/dev-qt/qtgui/qtgui-5.15.2-r10.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r10.ebuild deleted file mode 100644 index 010d71704eb4..000000000000 --- a/dev-qt/qtgui/qtgui-5.15.2-r10.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" -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 - -IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg - +libinput linuxfb +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 ) ) -" - -RDEPEND=" - 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="${RDEPEND} - evdev? ( sys-kernel/linux-headers ) - udev? ( sys-kernel/linux-headers ) -" -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 -) - -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) - $(qt_use linuxfb) - -opengl $(usex gles2-only es2 desktop) - $(qt_use png libpng system) - $(qt_use tslib) - $(qt_use udev libudev) - $(qt_use vulkan) - $(qt_use X xcb) - $(usex X '-xcb-xlib' '') - ) - if use libinput || use X; then - myconf+=( -xkbcommon ) - fi - qt5-build_src_configure -} diff --git a/dev-qt/qtgui/qtgui-5.15.2-r11.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r11.ebuild new file mode 100644 index 000000000000..73a502c8255a --- /dev/null +++ b/dev-qt/qtgui/qtgui-5.15.2-r11.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" +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 + +IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg + +libinput linuxfb +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 ) ) +" + +RDEPEND=" + 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="${RDEPEND} + evdev? ( sys-kernel/linux-headers ) + udev? ( sys-kernel/linux-headers ) +" +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 +) + +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) + $(qt_use linuxfb) + -opengl $(usex gles2-only es2 desktop) + $(qt_use png libpng system) + $(qt_use tslib) + $(qt_use udev libudev) + $(qt_use vulkan) + $(qt_use X xcb) + $(usex X '-xcb-xlib -DUSE_X11' '') + ) + if use libinput || use X; then + myconf+=( -xkbcommon ) + fi + qt5-build_src_configure +} diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest index 05f633477881..68fd566206f9 100644 --- a/dev-qt/qtlocation/Manifest +++ b/dev-qt/qtlocation/Manifest @@ -2,6 +2,7 @@ AUX qtlocation-5.15.2-qsg-render-thread-crash-1.patch 2445 BLAKE2B 17e043da1710e 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 1155 BLAKE2B 61311b4344ca62a5bd7ac784a01292d7106bd16494a84233fe2b2a4b5eeb779ed4e61b958b9c7e31cb1ba0b97cf3e91d6adac34e4f0ebee9c9455fb210118251 SHA512 0a5551862d2e52f1ca2cf76412932564708d3a787e93b824ec94194e9112a92468f797c2f3050ee379d9246d633c1c1f9bc95610c72111c28049cfc35a11eba6 +EBUILD qtlocation-5.15.2-r10.ebuild 1573 BLAKE2B 54a4b5d1f273ec2203c9b905279e5c506aec22c4b2e8fb171209b327409b6ed5ac521842e03da390d03123d616a42de5e3623bf8d6a73765b65435c8bd2f7123 SHA512 15ae7d623ab42a2ef8022c811eb095d837f6c714f975eba66575ef08c0ea5474182d048952bc7b504c0eed2cb3f49d3024e987547f2834ee3f4b66f1139290d1 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild b/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild index f5324144a067..bd4507627705 100644 --- a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild +++ b/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild @@ -9,6 +9,8 @@ inherit qt5-build DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then + MAPBOXGL_COMMIT=d3101bbc22edd41c9036ea487d4a71eabd97823d + SRC_URI+=" https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi @@ -39,6 +41,13 @@ QT5_TARGET_SUBDIRS=( src/plugins/geoservices ) +if [[ ${QT5_BUILD_TYPE} == release ]]; then +src_prepare() { + mv "${WORKDIR}"/${PN}-mapboxgl-${MAPBOXGL_COMMIT}/* src/3rdparty/mapbox-gl-native || die + qt5-build_src_prepare +} +fi + src_configure() { # src/plugins/geoservices requires files that are only generated when # qmake is run in the root directory. Bug 633776. diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 683bd45b1b3a..5fe1b1614db3 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -2,5 +2,5 @@ AUX qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch 1650 BLAKE2B DIST qtwayland-5.15.2-d4c41797.tar.gz 829183 BLAKE2B 2a185e724dc4bb409d588664adf956fc16ab2115f5f2a5217c7654312f320402ef5b247aae44ec021c274b2a070698b2e6771135d604baf8308d8d33deffc55f SHA512 2e8e6149f6ffd5379075c235ea334aac0663e1c888291a564467c46f8073503d6b6c3c0cf9080cfa98c1d8742a6295c9b9aff877afcf06e8efccd0b54b1b9389 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-r10.ebuild 901 BLAKE2B 50e9082ee8e1e252cb8ae783434f11c875ecc5f92fb691e608332e5571b4582d0bb11cb24f45a2d6126da21567ebc7f43c40139d1e2602a63c2797a17af57140 SHA512 411065fc4ff4a86ce1e0a57beeb91f52060fdb06c62ca168200fb1b4b118dfc3937ddf7dcf14be048be574aee55fec80adf2e03bd635434dc7112c2438c303b0 +EBUILD qtwayland-5.15.2-r11.ebuild 904 BLAKE2B 86d9a2e59de0cc333067749f4661e3b213ce871d0ef43b5bb2f21286bca51970fcdcd72e27aa992364288b6da97d3e31522e29dd61a69e6ca8a9de85b36730aa SHA512 e52bec1c27a07c11db93fb47f4d4e1782558adf37d9858b771640a2156e1bd41fdec7c432935abb5d3a1c5f1ff10d19b29cc377a1413d07ad4dd2b726cd39a52 MISC metadata.xml 583 BLAKE2B 2f04d6e39831120e7a38de5172b26f29bdb19e4677588595e5281000b14dc5ebcc0984fde5e99330807f8c400b7abb3c0cfbdaa7f131c815d60680259532cd3a SHA512 3b76305c692c7e9b2f0d82862ced25a4a306fc23611f7c22dfed3b19d55072373cca7bf2d4e6bfc14276986082cebfe19e7637c780acde1f421bb1baaf95f27a diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r10.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r10.ebuild deleted file mode 100644 index a93d716f58e2..000000000000 --- a/dev-qt/qtwayland/qtwayland-5.15.2-r10.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_COMMIT=d4c41797b61a5a8da47c5821711aca72e756dcbf -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 - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtdeclarative-${PV}:5= - ~dev-qt/qtgui-${PV}:5=[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}" - -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-r11.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r11.ebuild new file mode 100644 index 000000000000..61945b0b2d0d --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-5.15.2-r11.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_COMMIT=d4c41797b61a5a8da47c5821711aca72e756dcbf +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 + ~dev-qt/qtcore-${PV}:5= + ~dev-qt/qtdeclarative-${PV}:5= + ~dev-qt/qtgui-${PV}:5=[egl,libinput,vulkan=,X?] + 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}" + +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/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 130daacc06c0..547196aedf62 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -6,5 +6,5 @@ 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 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654 DIST qtwebengine-5.15.2_p20210625.tar.xz 320144708 BLAKE2B cd11e69a34ff0fa07d26262906a12304c39a12575024d61db18bc696284e9c5700090e5bfed217c89d2c8eac49b0ccb7d7ee0ba716ec3a81878de1301566884d SHA512 517a8cdaff684894456db8cfb5cfca412b8764e7035623d8190d9a06f6995742097a53eb67329d12bf8dc0a56372f7d09a54532ba804a5bff245ca8ef042a4e1 -EBUILD qtwebengine-5.15.2_p20210625.ebuild 7217 BLAKE2B 1f7e39942d90132b50ac828d1bdb6f3f8131eeaa2ee684e40729b013bf71cac2db0ba88ca8457dbef46be567ea44ca77f054cc8e58fb63ff5931c8e0cccafd45 SHA512 701b4ef911ab70825e22f9b7ee7b571070147e074f845d3eab91d7ef7a3311bb84ddf67d4b2b48f8a5855412888c5bbcb192184b94e00369ddc8252d66da3939 +EBUILD qtwebengine-5.15.2_p20210625.ebuild 7233 BLAKE2B bf4cd6335662386076828df5f5f323d9c3ae0943074ac46e8ca684433a003e72caabea226f6de5f7f8dafcb86d8c56a23881f92ae1ffbcb9e328c5d672220f3a SHA512 aaadc7463ce4236f0f0bc810ce10e10094fcd8c0ff01476c8a6f43761aae1d4dff9e0216d94a2d6f263c054cdcf1aa3215771663a30bf4ffcc44e04c252a3bb9 MISC metadata.xml 1269 BLAKE2B f95392929bcecbce9334108e3446d631e2a91d1aceb0fa6347496d2d0eeaff8cff55e08b7c3bb39fb8b51667988a6cc2b8e500143f2ebe0d78e6985a6f7af3c1 SHA512 7949854cf55f26750ded6787ce295762af7fd16600f8b251b25e1c9dd4d643338ed4c3b2a8a3405a2c427ed8b5a9ad13a8566a640161768d4dbf6db7e54811a3 diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild index 96ad0847cb28..3b18dfa1b720 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild @@ -94,6 +94,7 @@ BDEPEND="${PYTHON_DEPS} dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison + sys-devel/flex ppc64? ( >=dev-util/gn-0.1807 ) " -- cgit v1.2.3