From 42d3f03d158978695bde7a5bafb10c9305d2d9c8 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Sat, 23 Jul 2022 08:32:04 -0400 Subject: dev-qt/qtgui: sync ::gentoo --- dev-qt/qtgui/Manifest | 5 +- dev-qt/qtgui/qtgui-5.15.5-r1.ebuild | 178 ++++++++++++++++++++++++++++++++++++ dev-qt/qtgui/qtgui-5.15.5.ebuild | 178 ------------------------------------ 3 files changed, 181 insertions(+), 180 deletions(-) create mode 100644 dev-qt/qtgui/qtgui-5.15.5-r1.ebuild delete mode 100644 dev-qt/qtgui/qtgui-5.15.5.ebuild (limited to 'dev-qt') diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 7305269..88d6a49 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.4-gentoo-kde-4.tar.xz 569140 BLAKE2B e33a39cc409a6378febec4b675f3473bde939c42235d7b9ffd671221745c05d9d8db427f5ceab9b856f84e293f09bea7c327649a4578f44344e56e978b414942 SHA512 cf67a9654c833910cd4f25d4b742f4750a90e10c682b93e9fdd905590b6c6eb5dd53d0d56d0700b022a3dc85d9202e2971391cfd9158713a12971107a56a0e62 -DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3 +DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f +DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf +DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87 diff --git a/dev-qt/qtgui/qtgui-5.15.5-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.5-r1.ebuild new file mode 100644 index 0000000..c5beb7e --- /dev/null +++ b/dev-qt/qtgui/qtgui-5.15.5-r1.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QT5_KDEPATCHSET_REV=2 +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 +) + +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.5.ebuild b/dev-qt/qtgui/qtgui-5.15.5.ebuild deleted file mode 100644 index 8f7dac8..0000000 --- a/dev-qt/qtgui/qtgui-5.15.5.ebuild +++ /dev/null @@ -1,178 +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 ~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 -) - -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