From: guix-patches--- via <guix-patches@gnu.org>
To: 58249@debbugs.gnu.org
Subject: [bug#58249] [PATCH] gnu: packages: qt: Fix qtbase-5 not building on gcc 11 or later
Date: Sun, 02 Oct 2022 16:22:33 +0200 [thread overview]
Message-ID: <87fsg671au.fsf@disroot.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
This fixes a bug that makes qtbase-5 unbuildable with gcc 11 and later
The QT issue https://bugreports.qt.io/browse/QTBUG-91909
This patch is based on conversation from
https://github.com/RPCS3/rpcs3/issues/10349
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-packages-qt-Fix-qtbase-5-not-building-on-gcc-11.patch --]
[-- Type: text/x-patch, Size: 2364 bytes --]
From d7467ebe3169d45a5f9500e2c8a4a992cb108f20 Mon Sep 17 00:00:00 2001
From: Maya Tomasek <maya.omase@protonmail.com>
Date: Sun, 2 Oct 2022 16:12:57 +0200
Subject: [PATCH 1/1] gnu: packages: qt: Fix qtbase-5 not building on gcc >= 11
---
.../patches/qtbase-remove-template.patch | 18 ++++++++++++++++++
gnu/packages/qt.scm | 4 +++-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/qtbase-remove-template.patch
diff --git a/gnu/packages/patches/qtbase-remove-template.patch b/gnu/packages/patches/qtbase-remove-template.patch
new file mode 100644
index 0000000000..5686ebf4db
--- /dev/null
+++ b/gnu/packages/patches/qtbase-remove-template.patch
@@ -0,0 +1,18 @@
+Remove template <void> from ThreadEngineStarter, this causes gcc >= 11 to emit error,
+and not compile the header. See https://bugreports.qt.io/browse/QTBUG-91909
+
+Based on a conversation from https://github.com/RPCS3/rpcs3/issues/10349
+===============================================================
+--- a/src/concurrent/qtconcurrentthreadengine.h
++++ b/src/concurrent/qtconcurrentthreadengine.h
+@@ -247,7 +247,7 @@ template <>
+ class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void>
+ {
+ public:
+- ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
++ ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
+ :ThreadEngineStarterBase<void>(_threadEngine) {}
+
+ void startBlocking()
+--
+2.37.3
\ No newline at end of file
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6e30980505..6d29b6fd09 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -294,7 +294,9 @@ (define-public qtbase-5
;; Use TZDIR to avoid depending on package "tzdata".
(patches (search-patches "qtbase-use-TZDIR.patch"
"qtbase-moc-ignore-gcc-macro.patch"
- "qtbase-absolute-runpath.patch"))
+ "qtbase-absolute-runpath.patch"
+ ;; fix qtbase-5 not building on gcc >= 11
+ "qtbase-remove-template.patch"))
(modules '((guix build utils)))
(snippet
;; corelib uses bundled harfbuzz, md4, md5, sha3
--
2.37.3
next reply other threads:[~2022-10-02 14:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-02 14:22 guix-patches--- via [this message]
2023-01-03 22:18 ` [bug#58249] [PATCH] gnu: packages: qt: Fix qtbase-5 not building on gcc 11 or later Maxim Cournoyer
2023-01-08 22:49 ` guix-patches--- via
2023-01-10 15:07 ` Maxim Cournoyer
2023-01-25 21:03 ` guix-patches--- via
2023-01-26 16:40 ` bug#58249: " Maxim Cournoyer
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=87fsg671au.fsf@disroot.org \
--to=guix-patches@gnu.org \
--cc=58249@debbugs.gnu.org \
--cc=maya.tomasek@disroot.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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.