summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-08-26 19:56:13 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-10-17 02:40:31 +0200
commit0d7d27c3c9303f3794dd78532da28d59f8e93962 (patch)
tree10cfdb697aab77fc16698fb88327aaaabf7817a3 /dev-qt/qtwayland
parentdev-qt/qtgui: Drop vulnerable 5.15.2-r2 (diff)
downloadgentoo-0d7d27c3c9303f3794dd78532da28d59f8e93962.tar.gz
gentoo-0d7d27c3c9303f3794dd78532da28d59f8e93962.tar.bz2
gentoo-0d7d27c3c9303f3794dd78532da28d59f8e93962.zip
dev-qt: Drop old
Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtwayland')
-rw-r--r--dev-qt/qtwayland/Manifest1
-rw-r--r--dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch35
-rw-r--r--dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild41
3 files changed, 0 insertions, 77 deletions
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index daf4a7de725a..3a2db5f35aa4 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,2 +1 @@
DIST qtwayland-5.15.2-efe6edca.tar.gz 829293 BLAKE2B 6ccc5a4e111818cc65855eb4570727f30932bec9a749069550d07332df719eaeec0baf472c025150a32c9c380294f5e9496ad3babd181887a02fc37d1bfd5f2a SHA512 87190cd1ade57c98da972a2f5d48aa0376ccc4bfa589f5832b8a62a63b3eafa6acf88d812ae98c484d4b02878ae2c1986c3759c0ba3f46894c76af713d7b8346
-DIST qtwayland-everywhere-src-5.15.2.tar.xz 564884 BLAKE2B 472effd3e9f3fd5470e0449703a52d45f2fd823770880b5ad15d8bf99196eee5d8511ca2bc9e23df6e27c933551d1853928ba79b4b1e5fa6e53334c54c04a463 SHA512 e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch
deleted file mode 100644
index 0799cb1a2023..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 735164b5c2a2637a8d53a8803a2401e4ef477ff0 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Fri, 30 Oct 2020 16:55:30 +0200
-Subject: [PATCH] Scanner: Avoid accessing dangling pointers in destroy_func()
-
-Usually, the object associated with the resource gets destroyed in the
-destroy_resource() function.
-
-Therefore, we need to double-check that the object is still alive before
-trying to reset its m_resource.
-
-Pick-to: 5.15
-Change-Id: I26408228f58919db17eb29584a1cbd4a9427d25c
-Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
----
- src/qtwaylandscanner/qtwaylandscanner.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp
-index 1a1f8bf16..450ef519d 100644
---- a/src/qtwaylandscanner/qtwaylandscanner.cpp
-+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp
-@@ -814,7 +814,9 @@ bool Scanner::process()
- printf(" if (Q_LIKELY(that)) {\n");
- printf(" that->m_resource_map.remove(resource->client(), resource);\n");
- printf(" that->%s_destroy_resource(resource);\n", interfaceNameStripped);
-- printf(" if (that->m_resource == resource)\n");
-+ printf("\n");
-+ printf(" that = resource->%s_object;\n", interfaceNameStripped);
-+ printf(" if (that && that->m_resource == resource)\n");
- printf(" that->m_resource = nullptr;\n");
- printf(" }\n");
- printf(" delete resource;\n");
---
-2.16.3
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild
deleted file mode 100644
index d042284d7177..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="vulkan X"
-
-DEPEND="
- >=dev-libs/wayland-1.6.0
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
- media-libs/mesa[egl]
- >=x11-libs/libxkbcommon-0.2.0
- vulkan? ( dev-util/vulkan-headers )
- X? (
- ~dev-qt/qtgui-${PV}[-gles2-only]
- x11-libs/libX11
- x11-libs/libXcomposite
- )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-qtwaylandscanner-avoid-dangling-pointers.patch )
-
-src_configure() {
- local myqmakeargs=(
- --
- $(qt_use vulkan feature-wayland-vulkan-server-buffer)
- $(qt_use X feature-xcomposite-egl)
- $(qt_use X feature-xcomposite-glx)
- )
- qt5-build_src_configure
-}