From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/
Date: Thu, 14 Sep 2023 20:15:38 +0000 (UTC) [thread overview]
Message-ID: <1694722449.4d490887059ff73ebd7ad9d76348c001d02c5ef5.ionen@gentoo> (raw)
commit: 4d490887059ff73ebd7ad9d76348c001d02c5ef5
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 20:08:52 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 20:14:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d490887
dev-qt/qtbase: skip build dir's symlink check
Closes: https://bugs.gentoo.org/914195
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/files/qtbase-6.5.2-no-symlink-check.patch | 5 +++++
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 1 +
dev-qt/qtbase/qtbase-6.5.9999.ebuild | 4 ++++
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 4 ++++
dev-qt/qtbase/qtbase-6.9999.ebuild | 4 ++++
5 files changed, 18 insertions(+)
diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-no-symlink-check.patch b/dev-qt/qtbase/files/qtbase-6.5.2-no-symlink-check.patch
new file mode 100644
index 000000000000..815fd3955420
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.5.2-no-symlink-check.patch
@@ -0,0 +1,5 @@
+https://bugs.gentoo.org/914195
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65 +64,0 @@
+-qt_internal_check_if_path_has_symlinks("${CMAKE_BINARY_DIR}")
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index fdddf8ec8f89..f0eca7d2ab6c 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -129,6 +129,7 @@ PDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${P}-CVE-2023-38197.patch
"${FILESDIR}"/${P}-tests-gcc13.patch
)
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index bf8d33b74e87..d7374a33f357 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -128,6 +128,10 @@ PDEPEND="
wayland? ( ~dev-qt/qtwayland-${PV}:6 )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+)
+
src_prepare() {
qt6-build_src_prepare
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 980755e275ba..8580c287a200 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -128,6 +128,10 @@ PDEPEND="
wayland? ( ~dev-qt/qtwayland-${PV}:6 )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+)
+
src_prepare() {
qt6-build_src_prepare
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index b5545709934f..b02ce128351b 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -130,6 +130,10 @@ PDEPEND="
wayland? ( ~dev-qt/qtwayland-${PV}:6 )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+)
+
src_prepare() {
qt6-build_src_prepare
next reply other threads:[~2023-09-14 20:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-14 20:15 Ionen Wolkens [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-18 2:25 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/ Ionen Wolkens
2025-01-20 8:28 Ionen Wolkens
2025-01-06 22:51 Ionen Wolkens
2024-10-01 18:10 Ionen Wolkens
2024-09-25 4:03 Ionen Wolkens
2024-07-16 23:52 Ionen Wolkens
2024-03-26 20:49 Ionen Wolkens
2024-02-22 15:13 Ionen Wolkens
2023-11-15 19:28 Ionen Wolkens
2023-10-21 6:22 Ionen Wolkens
2023-09-19 3:02 Ionen Wolkens
2023-07-26 13:31 Jimi Huotari
2023-04-15 18:39 Jimi Huotari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1694722449.4d490887059ff73ebd7ad9d76348c001d02c5ef5.ionen@gentoo \
--to=ionen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox