public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/, app-text/calibre/files/
Date: Sat, 07 Jun 2025 04:59:46 +0000 (UTC)	[thread overview]
Message-ID: <1749272319.b1822ea2cd608bd8daecd07a3eb145aeffa031d0.sam@gentoo> (raw)

commit:     b1822ea2cd608bd8daecd07a3eb145aeffa031d0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  7 04:58:39 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun  7 04:58:39 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1822ea2

app-text/calibre: fix build w/ qt-6.9

I'm leaving the PR to bump calibe to Eli, naturally, but doing this
now to get the build fixed (especially important to not hold up :=
builds which can be messy).

Closes: https://bugs.gentoo.org/957106
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/calibre/calibre-7.26.0.ebuild            |  2 ++
 app-text/calibre/files/calibre-7.26.0-qt6.9.patch | 44 +++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/app-text/calibre/calibre-7.26.0.ebuild b/app-text/calibre/calibre-7.26.0.ebuild
index f81f2ecbe6b4..b7de420a9299 100644
--- a/app-text/calibre/calibre-7.26.0.ebuild
+++ b/app-text/calibre/calibre-7.26.0.ebuild
@@ -126,6 +126,8 @@ PATCHES=(
 	# We don't (yet?) package libjxr and it seems to be dead upstream
 	# (last commit in 2017)
 	"${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
+	# Backport to fix build w/ qt-6.9 (bug #957106)
+	"${FILESDIR}/${P}-qt6.9.patch"
 )
 
 src_prepare() {

diff --git a/app-text/calibre/files/calibre-7.26.0-qt6.9.patch b/app-text/calibre/files/calibre-7.26.0-qt6.9.patch
new file mode 100644
index 000000000000..ff2f94d98213
--- /dev/null
+++ b/app-text/calibre/files/calibre-7.26.0-qt6.9.patch
@@ -0,0 +1,44 @@
+https://bugs.gentoo.org/957106
+https://github.com/kovidgoyal/calibre/commit/30b66dc452d3c08c7e10cc95498e131348d7bbfb
+
+From 30b66dc452d3c08c7e10cc95498e131348d7bbfb Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Sat, 5 Apr 2025 02:59:58 +0530
+Subject: [PATCH] Linux: Fix building with Qt 6.9
+
+---
+ src/calibre/headless/headless_integration.cpp | 6 ++++++
+ src/calibre/headless/headless_integration.h   | 1 -
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/calibre/headless/headless_integration.cpp b/src/calibre/headless/headless_integration.cpp
+index a5dfc869cc66..e96ddeef80fa 100644
+--- a/src/calibre/headless/headless_integration.cpp
++++ b/src/calibre/headless/headless_integration.cpp
+@@ -27,7 +27,13 @@ QT_BEGIN_NAMESPACE
+ 
+ 
+ #ifndef __APPLE__
++#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
++#include <QtGui/private/qgenericunixservices_p.h>
+ class GenericUnixServices : public QGenericUnixServices {
++#else
++#include <QtGui/private/qdesktopunixservices_p.h>
++class GenericUnixServices : public QDesktopUnixServices {
++#endif
+     /* We must return desktop environment as UNKNOWN otherwise other parts of
+      * Qt will try to query the nativeInterface() without checking if it exists
+      * leading to a segfault.  For example, defaultHintStyleFromMatch() queries
+diff --git a/src/calibre/headless/headless_integration.h b/src/calibre/headless/headless_integration.h
+index f8705facffe8..604669677da4 100644
+--- a/src/calibre/headless/headless_integration.h
++++ b/src/calibre/headless/headless_integration.h
+@@ -3,7 +3,6 @@
+ #include <qpa/qplatformintegration.h>
+ #include <qpa/qplatformscreen.h>
+ #include <qpa/qplatformservices.h>
+-#include <QtGui/private/qgenericunixservices_p.h>
+ #include <QScopedPointer>
+ 
+ QT_BEGIN_NAMESPACE
+


             reply	other threads:[~2025-06-07  4:59 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-07  4:59 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-08-14  5:09 [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/, app-text/calibre/files/ Eli Schwartz
2024-11-10 21:29 Eli Schwartz
2023-11-19  4:45 Zac Medico
2023-10-18  4:26 Zac Medico
2022-01-21  4:11 Zac Medico
2020-02-09 20:50 Zac Medico
2015-11-10 13:50 Justin Lecher

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=1749272319.b1822ea2cd608bd8daecd07a3eb145aeffa031d0.sam@gentoo \
    --to=sam@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