CVS commit: pkgsrc/misc/calibre

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sun Jul  5 12:09:08 UTC 2020

Modified Files:
        pkgsrc/misc/calibre: Makefile distinfo
Added Files:
        pkgsrc/misc/calibre/patches:
            patch-src_calibre_headless_fontconfig_database.cpp

Log Message:
misc/calibre: fix build with Qt 5.15.0.


To generate a diff of this commit:
cvs rdiff -u -r1.239 -r1.240 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.104 -r1.105 pkgsrc/misc/calibre/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/calibre/patches/patch-src_calibre_headless_fontconfig_database.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/calibre/Makefile
diff -u pkgsrc/misc/calibre/Makefile:1.239 pkgsrc/misc/calibre/Makefile:1.240
--- pkgsrc/misc/calibre/Makefile:1.239  Mon Jun 22 11:13:18 2020
+++ pkgsrc/misc/calibre/Makefile        Sun Jul  5 12:09:08 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.239 2020/06/22 11:13:18 nia Exp $
+# $NetBSD: Makefile,v 1.240 2020/07/05 12:09:08 rhialto Exp $
 
 DISTNAME=      calibre-3.40.1
-PKGREVISION=   17
+PKGREVISION=   18
 CATEGORIES=    misc
 #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=  http://download.calibre-ebook.com/${PKGVERSION_NOREV}/

Index: pkgsrc/misc/calibre/distinfo
diff -u pkgsrc/misc/calibre/distinfo:1.104 pkgsrc/misc/calibre/distinfo:1.105
--- pkgsrc/misc/calibre/distinfo:1.104  Tue Sep 24 16:39:50 2019
+++ pkgsrc/misc/calibre/distinfo        Sun Jul  5 12:09:08 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.104 2019/09/24 16:39:50 kamil Exp $
+$NetBSD: distinfo,v 1.105 2020/07/05 12:09:08 rhialto Exp $
 
 SHA1 (calibre-3.40.1.tar.xz) = 12cea0bed963dde2b58c9cdd4c3c25c735d6d15a
 RMD160 (calibre-3.40.1.tar.xz) = 72bf801e4164dcebec22ba36162fe034c9edad54
@@ -6,5 +6,6 @@ SHA512 (calibre-3.40.1.tar.xz) = 1333c24
 Size (calibre-3.40.1.tar.xz) = 38365300 bytes
 SHA1 (patch-setup_build.py) = f309c8f01af375fce1d09bf5c4bac9610cf4e0c5
 SHA1 (patch-setup_build__environment.py) = dd6160233c717e935205649ee685e71df3f1858e
+SHA1 (patch-src_calibre_headless_fontconfig_database.cpp) = d794a9f1c94c85d3406384bf25ade4be8d2f8a1c
 SHA1 (patch-src_calibre_headless_headless__integration.cpp) = 62ab6f5aaf6bd8bcbb875ab56eac1a474d8b446b
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662

Added files:

Index: pkgsrc/misc/calibre/patches/patch-src_calibre_headless_fontconfig_database.cpp
diff -u /dev/null pkgsrc/misc/calibre/patches/patch-src_calibre_headless_fontconfig_database.cpp:1.1
--- /dev/null   Sun Jul  5 12:09:08 2020
+++ pkgsrc/misc/calibre/patches/patch-src_calibre_headless_fontconfig_database.cpp      Sun Jul  5 12:09:08 2020
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_calibre_headless_fontconfig_database.cpp,v 1.1 2020/07/05 12:09:08 rhialto Exp $
+
+Qt 5.15.0 has more languages in an array that Calibre tries to match,
+and it checks with a STATIC_ASSERT.
+
+--- src/calibre/headless/fontconfig_database.cpp.orig  2020-07-02 17:32:43.809996191 +0000
++++ src/calibre/headless/fontconfig_database.cpp
+@@ -295,7 +295,27 @@ static const char specialLanguages[][6] 
+     "", // MasaramGondi
+     "", // Nushu
+     "", // Soyombo
+-    "" // ZanabazarSquare
++    "", // ZanabazarSquare
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
++        // Unicode 12.1 additions
++    "", //    Script_Dogra,
++    "", //    Script_GunjalaGondi,
++    "", //    Script_HanifiRohingya,
++    "", //    Script_Makasar,
++    "", //    Script_Medefaidrin,
++    "", //    Script_OldSogdian,
++    "", //    Script_Sogdian,
++    "", //    Script_Elymaic,
++    "", //    Script_Nandinagari,
++    "", //    Script_NyiakengPuachueHmong,
++    "", //    Script_Wancho,
++
++        // Unicode 13.0 additions
++    "", //    Script_Chorasmian,
++    "", //    Script_DivesAkuru,
++    "", //    Script_KhitanSmallScript,
++    "", //    Script_Yezidi,
++#endif // Qt >= 5.15
+ #else
+     ""  // SignWriting
+ #endif // Qt >= 5.11