commit:     ee9113be721c2c9eb6fec49edc9184dfb716240d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 12:57:41 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 16:12:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee9113be

dev-qt/qtgui: 5.15.2-r16 version bump at KDE 38ad2f39

Changes since 7c6c0030cf80ef7b9ace42996b0e0c3a72f76860:

Albert Astals Cid (1):
      Use block char format to render list item bullets and numbers

Liang Qi (1):
      xcb: avoid to use invalid pointers

Volker Hilsheimer (1):
      QXcb: don't dereference pointer before checking

Zhang Hao (1):
      Use qint64 to replace int while qt_transform_image_rasterize

Øystein Heskestad (1):
      Add missing macOS header file that was indirectly included before

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtgui/Manifest                |   1 +
 dev-qt/qtgui/qtgui-5.15.2-r16.ebuild | 184 +++++++++++++++++++++++++++++++++++
 2 files changed, 185 insertions(+)

diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 8f45ea5ec73a..4f0dd80dbe1f 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1 +1,2 @@
+DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 
9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370
 SHA512 
df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
 DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 
623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b
 SHA512 
eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc

diff --git a/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild 
b/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild
new file mode 100644
index 000000000000..3d8b468b1913
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
+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 ~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? ( virtual/jpeg )
+       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
+       "${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=(
+               $(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