From unknown Sat Sep 20 12:59:48 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#27404 <27404@debbugs.gnu.org> To: bug#27404 <27404@debbugs.gnu.org> Subject: Status: [PATCH] gnu: calibre: Fix build with Qt >5.8. Reply-To: bug#27404 <27404@debbugs.gnu.org> Date: Sat, 20 Sep 2025 19:59:48 +0000 retitle 27404 [PATCH] gnu: calibre: Fix build with Qt >5.8. reassign 27404 guix-patches submitter 27404 Roel Janssen severity 27404 normal tag 27404 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 17 03:11:16 2017 Received: (at submit) by debbugs.gnu.org; 17 Jun 2017 07:11:16 +0000 Received: from localhost ([127.0.0.1]:52013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dM7t6-0000Tg-0C for submit@debbugs.gnu.org; Sat, 17 Jun 2017 03:11:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dM7t1-0000TO-UM for submit@debbugs.gnu.org; Sat, 17 Jun 2017 03:11:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dM7sv-0008F8-B2 for submit@debbugs.gnu.org; Sat, 17 Jun 2017 03:11:06 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:54877) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dM7sv-0008Ex-6c for submit@debbugs.gnu.org; Sat, 17 Jun 2017 03:11:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dM7st-00042O-IC for guix-patches@gnu.org; Sat, 17 Jun 2017 03:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dM7sp-0008CZ-O2 for guix-patches@gnu.org; Sat, 17 Jun 2017 03:11:03 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:38927) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dM7sp-0008CV-Jq for guix-patches@gnu.org; Sat, 17 Jun 2017 03:10:59 -0400 Received: from ip112-245-209-87.adsl2.static.versatel.nl ([87.209.245.112]:61919 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dM7so-0005eL-P6 for guix-patches@gnu.org; Sat, 17 Jun 2017 03:10:59 -0400 User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen To: guix-patches@gnu.org Subject: [PATCH] gnu: calibre: Fix build with Qt >5.8. Date: Sat, 17 Jun 2017 09:10:47 +0200 Message-ID: <87h8zfks20.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.4 (---) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.4 (---) --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-calibre-Fix-build-with-Qt-5.8.patch >From c499f6fa84ce78bc568a0b553cc41d17d0724e2d Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Sat, 17 Jun 2017 08:56:36 +0200 Subject: [PATCH] gnu: calibre: Fix build with Qt >5.8. * gnu/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch: New file. * gnu/local.mk: Add patch. * gnu/packages/ebook.scm: Add patch. --- gnu/local.mk | 1 + gnu/packages/ebook.scm | 3 +- .../calibre-fix-missing-qbasicfontdatabase_p.patch | 85 ++++++++++++++++++++++ 3 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch diff --git a/gnu/local.mk b/gnu/local.mk index 148ba12d6..216853570 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -526,6 +526,7 @@ dist_patch_DATA = \ %D%/packages/patches/calibre-dont-load-remote-icons.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-use-packaged-feedparser.patch \ + %D%/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 1d64e9b69..ad7a03185 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -91,7 +91,8 @@ (patches (search-patches "calibre-drop-unrar.patch" "calibre-use-packaged-feedparser.patch" "calibre-dont-load-remote-icons.patch" - "calibre-no-updates-dialog.patch")))) + "calibre-no-updates-dialog.patch" + "calibre-fix-missing-qbasicfontdatabase_p.patch")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch b/gnu/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch new file mode 100644 index 000000000..25cea0818 --- /dev/null +++ b/gnu/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch @@ -0,0 +1,85 @@ +From 82bd2e1a51df0650cb40894c5dc2b958f601a91d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 16 May 2017 14:20:51 -0400 +Subject: [PATCH] Compatibility with qt5-5.9.0 + +--- + src/calibre/headless/fontconfig_database.cpp | 16 ++++++++++------ + src/calibre/headless/fontconfig_database.h | 12 ++++++++---- + 2 files changed, 18 insertions(+), 10 deletions(-) + +diff --git a/src/calibre/headless/fontconfig_database.cpp b/src/calibre/headless/fontconfig_database.cpp +index 4e87b8f81b..33defd0b48 100644 +--- a/src/calibre/headless/fontconfig_database.cpp ++++ b/src/calibre/headless/fontconfig_database.cpp +@@ -48,14 +48,18 @@ + #include + + #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) +-#include ++# include + #else +-#include ++# include ++#endif ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) ++# include ++#else ++# include + #endif +-#include + #include + #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) +-#include ++# include + #endif + + #include +@@ -763,7 +767,7 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFontDef &f, void *usrPtr) + + QFontEngine *QFontconfigDatabase::fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) + { +- QFontEngineFT *engine = static_cast(QBasicFontDatabase::fontEngine(fontData, pixelSize, hintingPreference)); ++ QFontEngineFT *engine = static_cast(QFreeTypeFontDatabase::fontEngine(fontData, pixelSize, hintingPreference)); + if (engine == 0) + return 0; + +@@ -915,7 +919,7 @@ QStringList QFontconfigDatabase::addApplicationFont(const QByteArray &fontData, + + QString QFontconfigDatabase::resolveFontFamilyAlias(const QString &family) const + { +- QString resolved = QBasicFontDatabase::resolveFontFamilyAlias(family); ++ QString resolved = QFreeTypeFontDatabase::resolveFontFamilyAlias(family); + if (!resolved.isEmpty() && resolved != family) + return resolved; + FcPattern *pattern = FcPatternCreate(); +diff --git a/src/calibre/headless/fontconfig_database.h b/src/calibre/headless/fontconfig_database.h +index e2fecff724..62afc129cf 100644 +--- a/src/calibre/headless/fontconfig_database.h ++++ b/src/calibre/headless/fontconfig_database.h +@@ -7,17 +7,21 @@ + #pragma once + + #include +-#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) +-#include ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) ++# include ++#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) ++# include ++# define QFreeTypeFontDatabase QBasicFontDatabase + #else +-#include ++# include ++# define QFreeTypeFontDatabase QBasicFontDatabase + #endif + + QT_BEGIN_NAMESPACE + + class QFontEngineFT; + +-class QFontconfigDatabase : public QBasicFontDatabase ++class QFontconfigDatabase : public QFreeTypeFontDatabase + { + public: + #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) -- 2.13.0 --=-=-= Content-Type: text/plain Dear Guix, This patch fixes the build for Calibre (see http://hydra.gnu.org/build/2092277). The patch is already committed to the Calibre repository, and there has been a new release where this problem has been dealt with (3.0.0), however, building 3.0.0 requires more changes (the current patches do not apply, so we have to investigate whether we need to do more work to remove non-free stuff). So, therefore, I would like to fix this version first with this patch. The added patch file can be removed when we get 3.0.0 to build. Kind regards, Roel Janssen --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 21 18:13:46 2017 Received: (at 27404-done) by debbugs.gnu.org; 21 Jun 2017 22:13:46 +0000 Received: from localhost ([127.0.0.1]:60345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNnsg-0007wm-7Z for submit@debbugs.gnu.org; Wed, 21 Jun 2017 18:13:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNnsc-0007wX-RV for 27404-done@debbugs.gnu.org; Wed, 21 Jun 2017 18:13:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNnsU-0000G0-Gk for 27404-done@debbugs.gnu.org; Wed, 21 Jun 2017 18:13:37 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35106) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNnsU-0000Ft-Dl for 27404-done@debbugs.gnu.org; Wed, 21 Jun 2017 18:13:34 -0400 Received: from ip112-245-209-87.adsl2.static.versatel.nl ([87.209.245.112]:64409 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dNnsT-0002UF-Pi for 27404-done@debbugs.gnu.org; Wed, 21 Jun 2017 18:13:34 -0400 References: <87h8zfks20.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen To: 27404-done@debbugs.gnu.org Subject: Re: [bug#27404] [PATCH] gnu: calibre: Fix build with Qt >5.8. In-reply-to: <87h8zfks20.fsf@gnu.org> Date: Thu, 22 Jun 2017 00:13:31 +0200 Message-ID: <878tklvvjo.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 27404-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Roel Janssen writes: >>>From c499f6fa84ce78bc568a0b553cc41d17d0724e2d Mon Sep 17 00:00:00 2001 > From: Roel Janssen > Date: Sat, 17 Jun 2017 08:56:36 +0200 > Subject: [PATCH] gnu: calibre: Fix build with Qt >5.8. > > * gnu/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch: New file. > * gnu/local.mk: Add patch. > * gnu/packages/ebook.scm: Add patch. > --- > gnu/local.mk | 1 + > gnu/packages/ebook.scm | 3 +- > .../calibre-fix-missing-qbasicfontdatabase_p.patch | 85 ++++++++++++++++++++++ > 3 files changed, 88 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 148ba12d6..216853570 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -526,6 +526,7 @@ dist_patch_DATA = \ > %D%/packages/patches/calibre-dont-load-remote-icons.patch \ > %D%/packages/patches/calibre-no-updates-dialog.patch \ > %D%/packages/patches/calibre-use-packaged-feedparser.patch \ > + %D%/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch \ > %D%/packages/patches/cdparanoia-fpic.patch \ > %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ > %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ > diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm > index 1d64e9b69..ad7a03185 100644 > --- a/gnu/packages/ebook.scm > +++ b/gnu/packages/ebook.scm > @@ -91,7 +91,8 @@ > (patches (search-patches "calibre-drop-unrar.patch" > "calibre-use-packaged-feedparser.patch" > "calibre-dont-load-remote-icons.patch" > - "calibre-no-updates-dialog.patch")))) > + "calibre-no-updates-dialog.patch" > + "calibre-fix-missing-qbasicfontdatabase_p.patch")))) > (build-system python-build-system) > (native-inputs > `(("pkg-config" ,pkg-config) > diff --git a/gnu/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch b/gnu/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch > new file mode 100644 > index 000000000..25cea0818 > --- /dev/null > +++ b/gnu/packages/patches/calibre-fix-missing-qbasicfontdatabase_p.patch > @@ -0,0 +1,85 @@ > +From 82bd2e1a51df0650cb40894c5dc2b958f601a91d Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= > +Date: Tue, 16 May 2017 14:20:51 -0400 > +Subject: [PATCH] Compatibility with qt5-5.9.0 > + > +--- > + src/calibre/headless/fontconfig_database.cpp | 16 ++++++++++------ > + src/calibre/headless/fontconfig_database.h | 12 ++++++++---- > + 2 files changed, 18 insertions(+), 10 deletions(-) > + > +diff --git a/src/calibre/headless/fontconfig_database.cpp b/src/calibre/headless/fontconfig_database.cpp > +index 4e87b8f81b..33defd0b48 100644 > +--- a/src/calibre/headless/fontconfig_database.cpp > ++++ b/src/calibre/headless/fontconfig_database.cpp > +@@ -48,14 +48,18 @@ > + #include > + > + #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) > +-#include > ++# include > + #else > +-#include > ++# include > ++#endif > ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) > ++# include > ++#else > ++# include > + #endif > +-#include > + #include > + #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) > +-#include > ++# include > + #endif > + > + #include > +@@ -763,7 +767,7 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFontDef &f, void *usrPtr) > + > + QFontEngine *QFontconfigDatabase::fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) > + { > +- QFontEngineFT *engine = static_cast(QBasicFontDatabase::fontEngine(fontData, pixelSize, hintingPreference)); > ++ QFontEngineFT *engine = static_cast(QFreeTypeFontDatabase::fontEngine(fontData, pixelSize, hintingPreference)); > + if (engine == 0) > + return 0; > + > +@@ -915,7 +919,7 @@ QStringList QFontconfigDatabase::addApplicationFont(const QByteArray &fontData, > + > + QString QFontconfigDatabase::resolveFontFamilyAlias(const QString &family) const > + { > +- QString resolved = QBasicFontDatabase::resolveFontFamilyAlias(family); > ++ QString resolved = QFreeTypeFontDatabase::resolveFontFamilyAlias(family); > + if (!resolved.isEmpty() && resolved != family) > + return resolved; > + FcPattern *pattern = FcPatternCreate(); > +diff --git a/src/calibre/headless/fontconfig_database.h b/src/calibre/headless/fontconfig_database.h > +index e2fecff724..62afc129cf 100644 > +--- a/src/calibre/headless/fontconfig_database.h > ++++ b/src/calibre/headless/fontconfig_database.h > +@@ -7,17 +7,21 @@ > + #pragma once > + > + #include > +-#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) > +-#include > ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) > ++# include > ++#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) > ++# include > ++# define QFreeTypeFontDatabase QBasicFontDatabase > + #else > +-#include > ++# include > ++# define QFreeTypeFontDatabase QBasicFontDatabase > + #endif > + > + QT_BEGIN_NAMESPACE > + > + class QFontEngineFT; > + > +-class QFontconfigDatabase : public QBasicFontDatabase > ++class QFontconfigDatabase : public QFreeTypeFontDatabase > + { > + public: > + #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) This patch is no longer relevant because version 3.0.0 is now in upstream. Kind regards, Roel Janssen From unknown Sat Sep 20 12:59:48 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 20 Jul 2017 11:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator