From 30f491533785a455cdfbd05bb57f1f869a8e41bb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 10 Jan 2023 06:19:57 +0000 Subject: gentoo auto-resync : 10:01:2023 - 06:19:57 --- dev-qt/qtgui/Manifest | 4 +- dev-qt/qtgui/qtgui-5.15.8-r1.ebuild | 177 +++++++++++++++++++++++++++++++++++ dev-qt/qtgui/qtgui-5.15.8.ebuild | 182 ------------------------------------ 3 files changed, 179 insertions(+), 184 deletions(-) create mode 100644 dev-qt/qtgui/qtgui-5.15.8-r1.ebuild delete mode 100644 dev-qt/qtgui/qtgui-5.15.8.ebuild (limited to 'dev-qt/qtgui') diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 2f91fff6f638..f702ec0a1c6d 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -4,10 +4,10 @@ AUX qtgui-5.15.7-xcb-correctly-disconnect-xsettings-callbacks.patch 2463 BLAKE2B DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064 -DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016 +DIST qtbase-5.15.8-gentoo-kde-2.tar.xz 784544 BLAKE2B d4f16e14d940660ec28b138e17ac9342657775e31797013e6ad59de51c9ebfec2effe03375581eea5666648a1de7b38219adc34062c7d3f339a3cce1347ad2d7 SHA512 3d8693ecaf98aff084dc9a2af6dce4566d272aa223b2bbd1c9f348a8a0d03055ac1129e9f39054f0d58b738dad482e1aacb1c3016bc86807f2238297e7d61cef DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce EBUILD qtgui-5.15.7-r1.ebuild 4201 BLAKE2B 755f2eabe8e26b6df401f0606600275082af68ee546c730805ac953de7bc0ac982d6413eca144574f8fccb526ef84f44b3fcd13144548e99f60cc6939618e377 SHA512 f2c80c7d048bc404f584e554c4425e861cc14bc25d4b04f6a64911746dcf3ad89fbd26bdd6a09b1320ad64c2543371b6249ca52706234b774ad67d7851941116 EBUILD qtgui-5.15.7.ebuild 4127 BLAKE2B a2c2ef7b2974ca40d3488f66431e0d71492528fc0cf11bc72b8f454e6a9e6d27ed63511e8ab080376e06833611a0a76779fc82dd1446f6c390dbdf93cb162272 SHA512 cdf03610b8ef78a8d57d8352399aab0d1f5567cd76c742c1fc4a84e7642fa2d3256e1337696a328dc76c5f25670b8366a299e2577b7bf12bf80a2cbe738d6623 -EBUILD qtgui-5.15.8.ebuild 3994 BLAKE2B 0c3336e6e5c5f1f8d368b740b41c569c003d97b0cd4e0c8da1377e1e234de1c2f73d4722c73b9b55fb1556024d23bb7fd12a7dbb90d45cb7057abe72b66a7495 SHA512 29245014c169e4d7cc74e7a01b3dde8a993bd36bdf7fcdd8dd7ae724cfc416280e64a86351825c204901f2c14f5218d1db9e015834c8745fb1de11eb8cc9cecc +EBUILD qtgui-5.15.8-r1.ebuild 3842 BLAKE2B 465e30982748404332584290577efff358269f5766708289e614592c4555ff6da03f3b0fbbbf2c133ef8af58c590125f95696a9ebf7f41a3c373e4cf11ace35d SHA512 32f91d3210f42fa88f93cd228de44a100f752e1cda77fff26f4663948ade6346ee34717499f780bc1d3f24e3517330e57fa158c93f4e256c01177eca347f4b8a MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5 diff --git a/dev-qt/qtgui/qtgui-5.15.8-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r1.ebuild new file mode 100644 index 000000000000..25fa750d0afa --- /dev/null +++ b/dev-qt/qtgui/qtgui-5.15.8-r1.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=2 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" + +SLOT=5/${QT5_PV} # bug 707658 +IUSE="accessibility dbus egl eglfs evdev 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:= + 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: + 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 + -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.8.ebuild b/dev-qt/qtgui/qtgui-5.15.8.ebuild deleted file mode 100644 index aaf752f67476..000000000000 --- a/dev-qt/qtgui/qtgui-5.15.8.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=1 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" - -SLOT=5/${QT5_PV} # bug 707658 -IUSE="accessibility dbus egl eglfs evdev 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:= - 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: - 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=( - # https://invent.kde.org/qt/qt/qtbase/-/merge_requests/211 - "${FILESDIR}/${PN}-5.15.7-xcb-correctly-disconnect-xsettings-callbacks.patch" -) - -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 - -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