From eaea74c6564fa56927330cf4c70158f2c7acc325 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Sat, 4 Jun 2022 18:24:53 -0400 Subject: dev-qt/qtgui: upgrade to 5.15.4, remove old patches --- dev-qt/qtgui/Manifest | 3 +- .../qtgui-5.14.1-cmake-macro-backward-compat.patch | 50 ------ .../files/qtgui-5.15.2-bogus-xcb-util-dep.patch | 72 -------- dev-qt/qtgui/qtgui-5.15.3.ebuild | 182 --------------------- dev-qt/qtgui/qtgui-5.15.4.ebuild | 182 +++++++++++++++++++++ 5 files changed, 184 insertions(+), 305 deletions(-) delete mode 100644 dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch delete mode 100644 dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch delete mode 100644 dev-qt/qtgui/qtgui-5.15.3.ebuild create mode 100644 dev-qt/qtgui/qtgui-5.15.4.ebuild (limited to 'dev-qt') diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index c5696e6..29133ab 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1 +1,2 @@ -DIST qtbase-5.15.2-c9fde86b.tar.gz 67960262 BLAKE2B d1a6a7dac78abce189a753c0a00185fbe03f9de97b226790535af73a9bc009b353fe1edeb754d2098a7beeb7cd1c6e7efb949797658269ef0d0f200f11909820 SHA512 99026537dd4da678bcb04214ebb717907422e373b44fd3b3716798565c330f8d492ec1fc67d936c5125292b30e44f23abe4bf6434b58b9fa76bada3680dfc9f8 +DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373 +DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3 diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch deleted file mode 100644 index 30b5abc..0000000 --- a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Andreas Sturmlechner -Date: Sun, 9 Feb 2020 11:45:00 +0100 -Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from =Qt-5.14, as a consequence of slot upgrade rebuilds, some -reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their -cmake files regenerated, leading to cmake errors like: - -https://bugs.gentoo.org/703306 -https://bugs.gentoo.org/705198 - -From mkspecs/features/create_cmake.prf: - -# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties -# functions whether a Configuration specific generator expression needs to be added to the values -# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need -# configuration specific values. For singular builds (only release or only debug), we want the -# values to be applied regardless of the configuration. -# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to -# build a Debug configuration of an application, even if Qt was built in a Release configuration. - -qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease -optional and default to FALSE. - ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100 -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100 -@@ -538,8 +538,14 @@ - - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - -- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION -- IsDebugAndRelease) -+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) -+ set(IsDebugAndRelease FALSE) -+ set (list_var ${ARGN}) -+ list(LENGTH list_var num_extra_arg) -+ if (${num_extra_arg} GREATER 0) -+ list(GET list_var 0 IsDebugAndRelease) -+ endif() -+ - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) 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 b7f6548..0000000 --- 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 -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 -Reviewed-by: Tor Arne Vestbø -(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.3.ebuild b/dev-qt/qtgui/qtgui-5.15.3.ebuild deleted file mode 100644 index 441add6..0000000 --- a/dev-qt/qtgui/qtgui-5.15.3.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QT5_KDEPATCHSET_REV=1 -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=" - 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 -) - -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 -} diff --git a/dev-qt/qtgui/qtgui-5.15.4.ebuild b/dev-qt/qtgui/qtgui-5.15.4.ebuild new file mode 100644 index 0000000..38a3521 --- /dev/null +++ b/dev-qt/qtgui/qtgui-5.15.4.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QT5_KDEPATCHSET_REV=1 +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=" + 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 +} -- cgit v1.2.3-70-g09d2