summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-07-06 11:18:09 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-07-06 12:27:17 +0200
commit35faa9704b235ccf40188e59f79207de3f169fc2 (patch)
tree591ea8dcca8519433c7d40e99e3d1a6acf137a31 /dev-qt
parentdev-qt/qtgraphicaleffects: Drop 5.15.4 (diff)
downloadgentoo-35faa9704b235ccf40188e59f79207de3f169fc2.tar.gz
gentoo-35faa9704b235ccf40188e59f79207de3f169fc2.tar.bz2
gentoo-35faa9704b235ccf40188e59f79207de3f169fc2.zip
dev-qt/qtgui: Drop 5.15.4
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtgui/Manifest3
-rw-r--r--dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch29
-rw-r--r--dev-qt/qtgui/qtgui-5.15.4-r2.ebuild183
-rw-r--r--dev-qt/qtgui/qtgui-5.15.4.ebuild183
4 files changed, 0 insertions, 398 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 5cca428f9e37..9f98cfd5161e 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,6 +1,3 @@
DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
-DIST qtbase-5.15.4-gentoo-kde-4.tar.xz 569140 BLAKE2B e33a39cc409a6378febec4b675f3473bde939c42235d7b9ffd671221745c05d9d8db427f5ceab9b856f84e293f09bea7c327649a4578f44344e56e978b414942 SHA512 cf67a9654c833910cd4f25d4b742f4750a90e10c682b93e9fdd905590b6c6eb5dd53d0d56d0700b022a3dc85d9202e2971391cfd9158713a12971107a56a0e62
DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
diff --git a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
deleted file mode 100644
index 41814c061a46..000000000000
--- a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3f302cb16ebfefade17b3ea90c5ed258c9150f3a Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 1 Mar 2019 21:37:52 -0500
-Subject: [PATCH] gcc: pass -mavx2 instead of -march=core-avx2
-
-Resolves a build failure when QMAKE_CXXFLAGS contains -march=native
-and the compiler is running on a CPU which does not support AVX2.
-
-Bug: https://bugs.gentoo.org/672946
----
- mkspecs/common/gcc-base.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index c2669e4833..44aa96af38 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -109,7 +109,7 @@ QMAKE_CFLAGS_MIPS_DSP += -mdsp
- QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2
-
- # -march=haswell is supported as of GCC 4.9 and Clang 3.6
--QMAKE_CFLAGS_ARCH_HASWELL = -march=core-avx2
-+QMAKE_CFLAGS_ARCH_HASWELL = -mavx2
-
- # Wrapper tools that understand .o/.a files with GIMPLE instead of machine code
- QMAKE_AR_LTCG = gcc-ar cqs
---
-2.21.0.rc1
-
diff --git a/dev-qt/qtgui/qtgui-5.15.4-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.4-r2.ebuild
deleted file mode 100644
index 7d3c9b130f13..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.4-r2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=4
-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
-}
diff --git a/dev-qt/qtgui/qtgui-5.15.4.ebuild b/dev-qt/qtgui/qtgui-5.15.4.ebuild
deleted file mode 100644
index 97dfcd55689f..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.4.ebuild
+++ /dev/null
@@ -1,183 +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="
- || ( 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
-}