From 4fbfc3293bee8811ed825f09a893d8946a593acf Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 6 Mar 2020 13:16:31 +0000
Subject: calibre: update to 4.11.2

---
 calibre/build/calibre.SlackBuild | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 638a8708..2d017771 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -127,6 +127,8 @@
 #             * New major release 4.x. No more qt-webkit.
 # 4.7.0-1:    30/dec/2019 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 4.11.2-1:   05/mar/2020 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh calibre.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -136,7 +138,7 @@
 
 PRGNAM=calibre
 SRCNAM=calibre
-VERSION=${VERSION:-4.7.0}
+VERSION=${VERSION:-4.11.2}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
@@ -173,7 +175,7 @@ INT_PYTHON=2.7.17
 # netifaces.c error you need to add code for your platform
 INT_SETUPTOOLS=42.0.2
 # The rest of the internal Python deps:
-INT_APSW=3.27.2-r1
+INT_APSW=3.30.1-r1
 INT_BEAUTIFULSOUP=4.8.0
 INT_BFLC=1.5
 INT_CHARDET=3.0.4
@@ -202,7 +204,7 @@ INT_REGEX=2019.04.14
 INT_SIP=4.19.20
 INT_SIX=1.12.0
 INT_SOUPSIEVE=1.9.1
-INT_SQLITE=3280000
+INT_SQLITE=3310100
 INT_UNRARDLL=0.1.3
 INT_WEBENC=0.5.1
 INT_XKB=0.9.1
@@ -211,7 +213,7 @@ INT_XKB=0.9.1
 INT_HUNSPELL=1.7.0
 INT_OPTIPNG=0.7.7
 INT_PODOFO=0.9.6
-INT_UNRARSRC=5.5.6
+INT_UNRARSRC=5.9.1
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -356,7 +358,7 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   SRCURL[25]="https://pypi.io/packages/source/M/Markdown/Markdown-${INT_MARKDOWN}.tar.gz"
 
   SOURCE[26]="$SRCDIR/sources/sqlite-amalgamation-${INT_SQLITE}.zip"
-  SRCURL[26]="https://www.sqlite.org/2019/sqlite-amalgamation-${INT_SQLITE}.zip"
+  SRCURL[26]="https://www.sqlite.org/2020/sqlite-amalgamation-${INT_SQLITE}.zip"
 
   SOURCE[27]="$SRCDIR/sources/beautifulsoup4-${INT_BEAUTIFULSOUP}.tar.gz"
   SRCURL[27]="https://pypi.io/packages/source/b/beautifulsoup4/beautifulsoup4-${INT_BEAUTIFULSOUP}.tar.gz"
@@ -1857,13 +1859,13 @@ make_calibre () {
   # Cut out the DOS crap:
   sed -i -e 's/\r//' src/calibre/web/feeds/recipes/*
 
-  if [ "$P1" != "--oldbuild" ]; then
-    # Prevent "qfontengine_ft.cpp undefined reference to `FT_Get_Char_Index'":
-    #sed -i -e 's/QMAKE_LIBS_PRIVATE += {glib} {fontconfig}/& {freetype}/' \
-    #  setup/extensions.py
-    cat $SRCDIR/patches/calibre_freetype.patch | patch -p1 --verbose \
-      2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-  fi
+  #if [ "$P1" != "--oldbuild" ]; then
+  #  # Prevent "qfontengine_ft.cpp undefined reference to `FT_Get_Char_Index'":
+  #  #sed -i -e 's/QMAKE_LIBS_PRIVATE += {glib} {fontconfig}/& {freetype}/' \
+  #  #  setup/extensions.py
+  #  cat $SRCDIR/patches/calibre_freetype.patch | patch -p1 --verbose \
+  #    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+  #fi
 
   export HUNSPELL_INC_DIR="/usr/lib${LIBDIRSUFFIX}/calibre/include/hunspell" \
   export HUNSPELL_LIB_DIR="/usr/lib${LIBDIRSUFFIX}/calibre/lib" \
-- 
cgit v1.2.3