summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-07-08 15:44:28 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2023-07-08 18:03:32 +0200
commitc44bb4e0e29f22b8d65f07a69fa6eb813143577a (patch)
treea6b216797d6080a808754225894d93d29d3718f6 /dev-qt/qtdeclarative
parentdev-qt/qtnetwork: drop 5.15.10-r1 (diff)
downloadgentoo-c44bb4e0e29f22b8d65f07a69fa6eb813143577a.tar.gz
gentoo-c44bb4e0e29f22b8d65f07a69fa6eb813143577a.tar.bz2
gentoo-c44bb4e0e29f22b8d65f07a69fa6eb813143577a.zip
dev-qt/qtdeclarative: Bump to QT5_KDEPATCHSET_REV=3
- QQmlJs::MemoryPool: fix potential UB (pointer overflow) - QRecyclePool: fix potential UB Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtdeclarative')
-rw-r--r--dev-qt/qtdeclarative/Manifest1
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.15.10-r2.ebuild67
2 files changed, 68 insertions, 0 deletions
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 99ad5e311e75..e2e858cb2007 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,5 +1,6 @@
DIST qtdeclarative-5.15.10-gentoo-kde-1.tar.xz 24808 BLAKE2B fda6c707cc576187b959ae0b3eb4fca8aeca711db1fdd9533dcd9f090f0c9e889bd4056f26cd91b841bc3729193f7e6e999c2c503c26ba786f195db80f4dab33 SHA512 7facbfb12237a6abd84289dc2b4e448772e274f2800fe50654058f7f6d58d1c1576a071abf31c66f3a2d138dddc1679cb1f57b521ec8a8ce0667bfb9dc126925
DIST qtdeclarative-5.15.10-gentoo-kde-2.tar.xz 25376 BLAKE2B 90978286216648900b2d0654d0b5ef5c0c2e05d94bcadedbda58b03861b6ac0aea7bfe34c55c90bbdfe0f088e35a5ebbb3284523ffce04d1a0a93cdac5cc9312 SHA512 d34761a994977b8b3be43f71377441362c9075b970d83b7af9625a9c51dd588ea47637bb30fd50ff4d215ce97ed15f49607f958b5f18dd2281640c031dce01e8
+DIST qtdeclarative-5.15.10-gentoo-kde-3.tar.xz 26396 BLAKE2B 07ad0b115316e8eeaa1b9348cb6e742684b11d4d45087e763679938d43d77f90261a905037b07429d78933d7b7c487d3c1f7f1caedfdb5f6b512f4e20f55d946 SHA512 4d44ffaee5a3b1b01e5959f9c94a3daeda1528e4b7c0f267b11efac5a686c257b1f742ef38040a3ebad167faba0f61ffa2afc03d943770a9a9a005bd52ef99f6
DIST qtdeclarative-5.15.9-gentoo-kde-1.tar.xz 21808 BLAKE2B fdf3205fed515bb43e72424673def7d3e1e0a7374e20f9f403e906403bcb3febf2c0decee08241bdc7e634cc1771f2e5326d698ff81fa46b931780eda3ea34d8 SHA512 2fe0230de76ed87247b288fdc34ceb5ab459ad4607968f656a73f0d6e4e8c854f6538b7eb0199a432b44b0bcec443a2f21633b46991a27b733b61d66f7f24422
DIST qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz 21596352 BLAKE2B 4259b55b1406694cf10d5ff1c4bc2501b47a7a7ea4a09eeb77c08fa1417d5f8d028df1a0753af0d1ef52d7aa1331343c56b6c72adf462a6d1a1d5097c288ad8f SHA512 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8
DIST qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz 21587820 BLAKE2B 530ff86b43ae0cbc427d0b35c64fc9cb7aad62536686486344ef6a224b609ab2eed72fe5aa761e8bcbd920cc5f4329e44cdffa87afa17b0847b57b6a2ffa4c3b SHA512 ada3e32f42270899d92c46f0c0b8cd78028cf2e658ac60b3745c804ec494fb1fc6f31a670668074433b3e702f81524415ef132a757ca80151eb13d0a19352af7
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r2.ebuild
new file mode 100644
index 000000000000..1fb7272a0e85
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2009-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=3
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit flag-o-matic python-any-r1 qt5-build
+
+DESCRIPTION="The QML and Quick modules for the Qt5 framework"
+
+IUSE="gles2-only +jit localstorage vulkan +widgets"
+
+# qtgui[gles2-only=] is needed because of bug 504322
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
+ =dev-qt/qtnetwork-${QT5_PV}*
+ =dev-qt/qttest-${QT5_PV}*
+ media-libs/libglvnd
+ localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
+ widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
+)
+
+src_prepare() {
+ qt_use_disable_mod localstorage sql \
+ src/imports/imports.pro
+
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ src/qmltest/qmltest.pro \
+ tests/auto/auto.pro \
+ tools/tools.pro \
+ tools/qmlscene/qmlscene.pro \
+ tools/qml/qml.pro
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ replace-flags "-Os" "-O2" # bug 840861
+
+ local myqmakeargs=(
+ --
+ -qml-debug
+ $(qt_use jit feature-qml-jit)
+ )
+ qt5-build_src_configure
+}
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path qml 5
+ qt5_symlink_binary_to_path qmleasing 5
+ qt5_symlink_binary_to_path qmlpreview 5
+ qt5_symlink_binary_to_path qmlscene 5
+}