20210109.1 global branch merge.current-20210109.1

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

3 files changed, 78 insertions, 6 deletions

diff --git a/office/calibre/patches/icu.patch b/office/calibre/patches/icu.patch
new file mode 100644
index 0000000000..498691e90a
--- /dev/null
+++ b/office/calibre/patches/icu.patch
@@ -0,0 +1,31 @@
+diff -Naur calibre-3.48.0.orig/src/calibre/utils/icu.c calibre-3.48.0/src/calibre/utils/icu.c
+--- calibre-3.48.0.orig/src/calibre/utils/icu.c	2019-09-13 04:46:46.000000000 +0200
++++ calibre-3.48.0/src/calibre/utils/icu.c	2020-12-05 09:20:59.063932000 +0100
+@@ -243,14 +243,14 @@
+ 
+     a = python_to_icu(a_, &asz);
+     if (a == NULL) goto end;
+-    if (asz == 0) { found = TRUE; goto end; }
++    if (asz == 0) { found = true; goto end; }
+     b = python_to_icu(b_, &bsz);
+     if (b == NULL) goto end;
+ 
+     search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status);
+     if (U_SUCCESS(status)) {
+         pos = usearch_first(search, &status);
+-        if (pos != USEARCH_DONE) found = TRUE;
++        if (pos != USEARCH_DONE) found = true;
+     }
+ end:
+     if (search != NULL) usearch_close(search);
+diff -Naur calibre-3.48.0.orig/src/calibre/utils/matcher.c calibre-3.48.0/src/calibre/utils/matcher.c
+--- calibre-3.48.0.orig/src/calibre/utils/matcher.c	2019-09-13 04:46:46.000000000 +0200
++++ calibre-3.48.0/src/calibre/utils/matcher.c	2020-12-05 09:26:57.800932000 +0100
+@@ -15,7 +15,6 @@
+ #define inline
+ #endif
+ 
+-typedef unsigned char bool;
+ #define TRUE 1
+ #define FALSE 0
+ #define MAX(x, y) ((x > y) ? x : y)
diff --git a/office/calibre/patches/qt-5.15.patch b/office/calibre/patches/qt-5.15.patch
new file mode 100644
index 0000000000..bfcb486e9b
--- /dev/null
+++ b/office/calibre/patches/qt-5.15.patch
@@ -0,0 +1,40 @@
+From db7007a25faefb0cc90e64dda1c0793393b9512d Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Tue, 26 May 2020 20:10:48 +0200
+Subject: [PATCH] Update fontconfig database for Qt 5.15
+
+---
+ src/calibre/headless/fontconfig_database.cpp | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/src/calibre/headless/fontconfig_database.cpp b/src/calibre/headless/fontconfig_database.cpp
+index d867f02948..96a6365ba2 100644
+--- a/src/calibre/headless/fontconfig_database.cpp
++++ b/src/calibre/headless/fontconfig_database.cpp
+@@ -295,7 +295,26 @@ static const char specialLanguages[][6] = {
+     "", // MasaramGondi
+     "", // Nushu
+     "", // Soyombo
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
++    "", // ZanabazarSquare
++    "", // Dogra
++    "", // GunjalaGondi
++    "", // HanifiRohingya
++    "", // Makasar
++    "", // Medefaidrin
++    "", // OldSogdian
++    "", // Sogdian
++    "", // Elymaic
++    "", // Nandinagari
++    "", // NyiakengPuachueHmong
++    "", // Wancho
++    "", // Chorasmian
++    "", // DivesAkuru
++    "", // KhitanSmallScript
++    "" // Yezidi
++#else
+     "" // ZanabazarSquare
++#endif // Qt >= 5.15
+ #else
+     ""  // SignWriting
+ #endif // Qt >= 5.11
diff --git a/office/calibre/patches/remove-desktop-integration.patch b/office/calibre/patches/remove-desktop-integration.patch
index dbf54d6cb0..0272a7c6eb 100644
--- a/office/calibre/patches/remove-desktop-integration.patch
+++ b/office/calibre/patches/remove-desktop-integration.patch
@@ -1,13 +1,14 @@
-diff -Naur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py
---- calibre.orig/src/calibre/linux.py	2012-06-29 04:53:39.000000000 +0000
-+++ calibre/src/calibre/linux.py	2012-07-03 02:57:13.834849391 +0000
-@@ -177,9 +177,6 @@
-         self.mime_resources = []
+diff -Naur calibre-3.48.0.orig/src/calibre/linux.py calibre-3.48.0/src/calibre/linux.py
+--- calibre-3.48.0.orig/src/calibre/linux.py	2019-09-13 04:46:46.000000000 +0200
++++ calibre-3.48.0/src/calibre/linux.py	2020-03-04 15:02:49.789055000 +0100
+@@ -725,10 +725,6 @@
+         self.appdata_resources = []
          if islinux or isbsd:
              self.setup_completion()
 -        if islinux or isbsd:
 -            self.setup_desktop_integration()
--        self.create_uninstaller()
+-        if not getattr(self.opts, 'staged_install', False):
+-            self.create_uninstaller()
  
          from calibre.utils.config import config_dir
          if os.path.exists(config_dir):