app-text/calibre : import from gentoo tree, fix compiling against qt5.9 (cherry pick https://github.com/kovidgoyal/calibre/commit/82bd2e1a51df0650cb40894c5dc2b958f601a91d.patch)

8 files changed, 308 insertions, 0 deletions

diff --git a/app-text/calibre/files/calibre-2.78.0-qt59-compat.patch b/app-text/calibre/files/calibre-2.78.0-qt59-compat.patch
new file mode 100644
index 00000000..25cea081
--- /dev/null
+++ b/app-text/calibre/files/calibre-2.78.0-qt59-compat.patch
@@ -0,0 +1,85 @@
+From 82bd2e1a51df0650cb40894c5dc2b958f601a91d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+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 <qpa/qplatformservices.h>
+ 
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+-#include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
++#  include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
+ #else
+-#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
++#  include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
++#endif
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
++#  include <QtFontDatabaseSupport/private/qfontengine_ft_p.h>
++#else
++#  include <QtGui/private/qfontengine_ft_p.h>
+ #endif
+-#include <QtGui/private/qfontengine_ft_p.h>
+ #include <QtGui/private/qguiapplication_p.h>
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+-#include <QtGui/private/qhighdpiscaling_p.h>
++#  include <QtGui/private/qhighdpiscaling_p.h>
+ #endif
+ 
+ #include <QtGui/qguiapplication.h>
+@@ -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<QFontEngineFT*>(QBasicFontDatabase::fontEngine(fontData, pixelSize, hintingPreference));
++    QFontEngineFT *engine = static_cast<QFontEngineFT*>(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 <qpa/qplatformfontdatabase.h>
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+-#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
++#  include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h>
++#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
++#  include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
++#  define QFreeTypeFontDatabase QBasicFontDatabase
+ #else
+-#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
++#  include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
++#  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))
diff --git a/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch b/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch
new file mode 100644
index 00000000..5f7d5a46
--- /dev/null
+++ b/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch
@@ -0,0 +1,37 @@
+From f335c8719b224d3ca7a967b6e91cebd5b26684fe Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gentoo.org>
+Date: Sun, 23 Apr 2017 16:13:00 -0700
+Subject: [PATCH] Fix bounds error in lzxd_static_init
+
+https://bugs.gentoo.org/show_bug.cgi?id=540596
+https://github.com/kovidgoyal/calibre/pull/650
+
+This includes the changes from the following upstream commits:
+
+https://github.com/kyz/libmspack/commit/6a42ddd1d472afeaf0f7da91e16b60ab2063fb92
+https://github.com/kyz/libmspack/commit/ce3cc03aa500dd9c0b6b820f9519f6b6b9dede05
+---
+ src/calibre/utils/lzx/lzxd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/calibre/utils/lzx/lzxd.c b/src/calibre/utils/lzx/lzxd.c
+index e683a9e..c531aaa 100644
+--- a/src/calibre/utils/lzx/lzxd.c
++++ b/src/calibre/utils/lzx/lzxd.c
+@@ -357,11 +357,12 @@ static unsigned char extra_bits[51];
+ static void lzxd_static_init(void) {
+   int i, j;
+ 
+-  for (i = 0, j = 0; i < 51; i += 2) {
++  for (i = 0, j = 0; i < 50; i += 2) {
+     extra_bits[i]   = j; /* 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7... */
+     extra_bits[i+1] = j;
+     if ((i != 0) && (j < 17)) j++; /* 0,0,1,2,3,4...15,16,17,17,17,17... */
+   }
++  extra_bits[50] = 17;
+ 
+   for (i = 0, j = 0; i < 51; i++) {
+     position_base[i] = j; /* 0,1,2,3,4,6,8,12,16,24,32,... */
+-- 
+2.10.2
+
diff --git a/app-text/calibre/files/calibre-2.9.0-no_updates_dialog.patch b/app-text/calibre/files/calibre-2.9.0-no_updates_dialog.patch
new file mode 100644
index 00000000..4d37c3b6
--- /dev/null
+++ b/app-text/calibre/files/calibre-2.9.0-no_updates_dialog.patch
@@ -0,0 +1,27 @@
+diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre/gui2/main.py
+--- calibre-2.9.0.orig/src/calibre/gui2/main.py	2014-11-09 20:09:54.081231882 +0800
++++ calibre-2.9.0/src/calibre/gui2/main.py	2014-11-09 20:15:48.193033844 +0800
+@@ -37,8 +37,9 @@
+                       help=_('Start minimized to system tray.'))
+     parser.add_option('-v', '--verbose', default=0, action='count',
+                       help=_('Ignored, do not use. Present only for legacy reasons'))
+-    parser.add_option('--no-update-check', default=False, action='store_true',
+-            help=_('Do not check for updates'))
++    parser.add_option('--update-check', dest='no_update_check', default=True,
++            action='store_false',
++            help=_('Check for updates'))
+     parser.add_option('--ignore-plugins', default=False, action='store_true',
+             help=_('Ignore custom plugins, useful if you installed a plugin'
+                 ' that is preventing calibre from starting'))
+diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py
+--- calibre-2.9.0.orig/src/calibre/gui2/update.py	2014-11-09 20:09:54.082231864 +0800
++++ calibre-2.9.0/src/calibre/gui2/update.py	2014-11-09 20:17:49.954767115 +0800
+@@ -154,6 +154,8 @@
+             self.update_checker.signal.update_found.connect(self.update_found,
+                     type=Qt.QueuedConnection)
+             self.update_checker.start()
++        else:
++            self.update_checker = None
+ 
+     def recalc_update_label(self, number_of_plugin_updates):
+         self.update_found(self.last_newest_calibre_version, number_of_plugin_updates)
diff --git a/app-text/calibre/files/calibre-disable_plugins.patch b/app-text/calibre/files/calibre-disable_plugins.patch
new file mode 100644
index 00000000..9ef1dd04
--- /dev/null
+++ b/app-text/calibre/files/calibre-disable_plugins.patch
@@ -0,0 +1,17 @@
+Description: Disable plugin dialog. It uses a totally non-authenticated and non-trusted way of installing arbitrary code.
+Author: Martin Pitt <mpitt@debian.org>
+Bug-Debian: http://bugs.debian.org/640026
+
+Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py
+===================================================================
+--- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py	2011-12-16 05:49:14.000000000 +0100
++++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py	2011-12-20 19:29:04.798468930 +0100
+@@ -28,8 +28,6 @@
+             pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config)
+         cm('welcome wizard', _('Run welcome wizard'),
+                 icon='wizard.png', triggered=self.gui.run_wizard)
+-        cm('plugin updater', _('Get plugins to enhance calibre'),
+-                icon='plugins/plugin_updater.png', triggered=self.get_plugins)
+         if not DEBUG:
+             pm.addSeparator()
+             cm('restart', _('Restart in debug mode'), icon='debug.png',
diff --git a/app-text/calibre/files/calibre-server-3.conf b/app-text/calibre/files/calibre-server-3.conf
new file mode 100644
index 00000000..bb456e85
--- /dev/null
+++ b/app-text/calibre/files/calibre-server-3.conf
@@ -0,0 +1,13 @@
+# /etc/conf.d/calibre-server
+# Change this to the user you want to run calibre-server as.
+# You may specify a group too, after a colon
+# NOTE:  This must be set and not to root!
+CALIBRE_USER=
+
+# Set the path of the library to serve.
+# Defaults to the default location for CALIBRE_USER.
+#CALIBRE_LIBRARY='<user home directory>/Calibre Library'
+
+# Extra options to pass to calibre-server.
+# See the calibre-server man page for more options.
+#CALIBRE_SERVER_OPTS="--userdb /srv/calibre/users.sqlite --enable-auth --worker-count 10 --port 8080"
diff --git a/app-text/calibre/files/calibre-server-3.init b/app-text/calibre/files/calibre-server-3.init
new file mode 100644
index 00000000..049d3e42
--- /dev/null
+++ b/app-text/calibre/files/calibre-server-3.init
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+	need localmount
+	after bootmisc
+}
+
+checkconfig() {
+	if [ "${CALIBRE_USER}" = "" -o "${CALIBRE_USER}" = "root" ] ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "You have to specify a user to run calibre-server as, as we will not run it as root!"
+		eerror "Modify CALIBRE_USER to your needs (you can also add a group, after a colon)"
+		return 1
+	fi
+	if ! getent passwd "${CALIBRE_USER%:*}" >/dev/null ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "Your user has to exist!"
+		return 1
+	fi
+	if [ "${CALIBRE_USER%:*}" != "${CALIBRE_USER}" ] ; then
+		if ! getent group "${CALIBRE_USER#*:}" >/dev/null ; then
+			eerror "Please edit /etc/conf.d/calibre-server"
+			eerror "Your group has to exist too!"
+			return 1
+		fi
+	fi
+	if [ "${CALIBRE_LIBRARY}" = "" ] ; then
+		CALIBRE_USER_HOME=$(getent passwd "${CALIBRE_USER%:*}" | cut -d ':' -f 6)
+		CALIBRE_LIBRARY="${CALIBRE_USER_HOME}/Calibre Library"
+	fi
+	if [ ! -d "${CALIBRE_LIBRARY}" ] ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "The Calibre library, '${CALIBRE_LIBRARY},' does not exist."
+		eerror "Please modify CALIBRE_LIBRARY to point to a valid library."
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	local pidfile=/var/run/calibre-server.pid
+	ebegin "Starting calibre-server"
+	start-stop-daemon --user "${CALIBRE_USER}" \
+		--pidfile "${pidfile}" --make-pidfile --background --exec /usr/bin/calibre-server \
+		-- ${CALIBRE_OPTS} "${CALIBRE_LIBRARY}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping calibre-server"
+	start-stop-daemon --stop --user "${CALIBRE_USER}" \
+		--pidfile /var/run/calibre-server.pid
+	eend $?
+}
diff --git a/app-text/calibre/files/calibre-server.conf b/app-text/calibre/files/calibre-server.conf
new file mode 100644
index 00000000..c1bed842
--- /dev/null
+++ b/app-text/calibre/files/calibre-server.conf
@@ -0,0 +1,13 @@
+# /etc/conf.d/calibre-server
+# Change this to the user you want to run calibre-server as.
+# You may specify a group too, after a colon
+# NOTE:  This must be set and not to root!
+CALIBRE_USER=
+
+# Set the path of the library to serve.
+# Defaults to the default location for CALIBRE_USER.
+#CALIBRE_LIBRARY='<user home directory>/Calibre Library'
+
+# Extra options to pass to calibre-server.
+# See the calibre-server man page for more options.
+#CALIBRE_OPTS="--username calibre --password password --thread-pool 10 --port 8080"
diff --git a/app-text/calibre/files/calibre-server.init b/app-text/calibre/files/calibre-server.init
new file mode 100644
index 00000000..2f905424
--- /dev/null
+++ b/app-text/calibre/files/calibre-server.init
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+	need localmount
+	after bootmisc
+}
+
+checkconfig() {
+	if [ "${CALIBRE_USER}" = "" -o "${CALIBRE_USER}" = "root" ] ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "You have to specify a user to run calibre-server as, as we will not run it as root!"
+		eerror "Modify CALIBRE_USER to your needs (you can also add a group, after a colon)"
+		return 1
+	fi
+	if ! getent passwd "${CALIBRE_USER%:*}" >/dev/null ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "Your user has to exist!"
+		return 1
+	fi
+	if [ "${CALIBRE_USER%:*}" != "${CALIBRE_USER}" ] ; then
+		if ! getent group "${CALIBRE_USER#*:}" >/dev/null ; then
+			eerror "Please edit /etc/conf.d/calibre-server"
+			eerror "Your group has to exist too!"
+			return 1
+		fi
+	fi
+	if [ "${CALIBRE_LIBRARY}" = "" ] ; then
+		CALIBRE_USER_HOME=$(getent passwd "${CALIBRE_USER%:*}" | cut -d ':' -f 6)
+		CALIBRE_LIBRARY="${CALIBRE_USER_HOME}/Calibre Library"
+	fi
+	if [ ! -d "${CALIBRE_LIBRARY}" ] ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "The Calibre library, '${CALIBRE_LIBRARY},' does not exist."
+		eerror "Please modify CALIBRE_LIBRARY to point to a valid library."
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	local pidfile=/var/run/calibre-server.pid
+	ebegin "Starting calibre-server"
+	start-stop-daemon --user "${CALIBRE_USER}" \
+		--pidfile "${pidfile}" --make-pidfile --background --exec /usr/bin/calibre-server \
+		-- --with-library "${CALIBRE_LIBRARY}" ${CALIBRE_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping calibre-server"
+	start-stop-daemon --stop --user "${CALIBRE_USER}" \
+		--pidfile /var/run/calibre-server.pid
+	eend $?
+}