commit:     7e4a76e54cf01a86965b9ef3d237def64d4b71b9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  9 13:52:09 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 14:12:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4a76e5

dev-qt/qtgui: Add 5.15.4 QT5_KDEPATCHSET_REV=3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtgui/Manifest               |   1 +
 dev-qt/qtgui/qtgui-5.15.4-r1.ebuild | 183 ++++++++++++++++++++++++++++++++++++
 2 files changed, 184 insertions(+)

diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 876cb884f820..ae166618a90a 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,4 +1,5 @@
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B 
a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c
 SHA512 
042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B 
a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417
 SHA512 
a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-5.15.4-gentoo-kde-3.tar.xz 516480 BLAKE2B 
b7f94dd5315b9a16647c2d035fefc9021c4fcfe72a9010713ff6e47ebd1aca575778a02f96c81256fd38b6b58138a6ecd4ce046a6e4e3b0e0a4edfc64100c4f0
 SHA512 
f616fbd226390e8995008d22dbc35607f26eb5feaf436cd9b35d9ff0c2e428a4b75d0c91ba28660b488b03e1acccf8a2998dfdfc988335b3b37f6b6ae17106b3
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 
9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c
 SHA512 
01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 
3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b
 SHA512 
91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3

diff --git a/dev-qt/qtgui/qtgui-5.15.4-r1.ebuild 
b/dev-qt/qtgui/qtgui-5.15.4-r1.ebuild
new file mode 100644
index 000000000000..2a38f5ca381d
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.15.4-r1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=3
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+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 ~loong ~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 linuxfb vnc X )
+       accessibility? ( dbus X )
+       eglfs? ( egl )
+       ibus? ( dbus )
+       libinput? ( udev )
+       X? ( gles2-only? ( egl ) )
+"
+
+RDEPEND="
+       dev-libs/glib:2
+       =dev-qt/qtcore-${QT5_PV}*:5=
+       dev-util/gtk-update-icon-cache
+       media-libs/fontconfig
+       media-libs/freetype:2
+       media-libs/harfbuzz:=
+       sys-libs/zlib:=
+       dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
+       eglfs? (
+               media-libs/mesa[gbm(+)]
+               x11-libs/libdrm
+       )
+       evdev? ( sys-libs/mtdev )
+       jpeg? ( media-libs/libjpeg-turbo:= )
+       gles2-only? ( media-libs/libglvnd )
+       !gles2-only? ( media-libs/libglvnd[X] )
+       libinput? (
+               dev-libs/libinput:=
+               x11-libs/libxkbcommon
+       )
+       png? ( media-libs/libpng:= )
+       tslib? ( >=x11-libs/tslib-1.21 )
+       tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
+       udev? ( virtual/libudev:= )
+       vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
+       vulkan? ( dev-util/vulkan-headers )
+       X? (
+               x11-libs/libICE
+               x11-libs/libSM
+               x11-libs/libX11
+               x11-libs/libxcb:=[xkb]
+               x11-libs/libxkbcommon[X]
+               x11-libs/xcb-util-image
+               x11-libs/xcb-util-keysyms
+               x11-libs/xcb-util-renderutil
+               x11-libs/xcb-util-wm
+       )
+"
+DEPEND="${RDEPEND}
+       evdev? ( sys-kernel/linux-headers )
+       linuxfb? ( sys-kernel/linux-headers )
+       udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+       ibus? ( app-i18n/ibus )
+       wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
+"
+
+QT5_TARGET_SUBDIRS=(
+       src/tools/qvkgen
+       src/gui
+       src/openglextensions
+       src/platformheaders
+       src/platformsupport
+       src/plugins/generic
+       src/plugins/imageformats
+       src/plugins/platforms
+       src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+       accessibility:accessibility-atspi-bridge
+       egl:egl:
+       eglfs:eglfs:
+       eglfs:eglfs_egldevice:
+       eglfs:eglfs_gbm:
+       evdev:evdev:
+       evdev:mtdev:
+       :fontconfig:
+       :system-freetype:FREETYPE
+       !:no-freetype:
+       !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
+)
+
+src_prepare() {
+       # don't add -O3 to CXXFLAGS, bug 549140
+       sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
+
+       # egl_x11 is activated when both egl and X are enabled
+       use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || 
QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+
+       qt_use_disable_config dbus dbus \
+               src/platformsupport/themes/genericunix/genericunix.pri
+
+       qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
+
+       qt_use_disable_mod ibus dbus \
+               src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+       use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+               src/plugins/platforms/platforms.pro || die
+
+       qt5-build_src_prepare
+}
+
+src_configure() {
+       local myconf=(
+               $(usev dbus -dbus-linked)
+               $(qt_use egl)
+               $(qt_use eglfs)
+               $(usev eglfs '-gbm -kms')
+               $(qt_use evdev)
+               $(qt_use evdev mtdev)
+               -fontconfig
+               -system-freetype
+               $(usev !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)
+               $(usev X '-xcb-xlib')
+       )
+       if use libinput || use X; then
+               myconf+=( -xkbcommon )
+       fi
+       qt5-build_src_configure
+}

Reply via email to