calibre: mass check-in of calibre 2.x patches

5 files changed, 62 insertions, 0 deletions

diff --git a/calibre/build/patches/calibre_freetype.patch b/calibre/build/patches/calibre_freetype.patch
new file mode 100644
index 00000000..344b3ab1
--- /dev/null
+++ b/calibre/build/patches/calibre_freetype.patch
@@ -0,0 +1,11 @@
+--- calibre-2.71.0/setup/build.py.orig	2016-10-31 04:57:22.000000000 +0100
++++ calibre-2.71.0/setup/build.py	2016-11-08 14:14:29.310536819 +0100
+@@ -368,7 +368,7 @@
+             INCLUDEPATH += {freetype}
+             DESTDIR = {destdir}
+             CONFIG -= create_cmake  # Prevent qmake from generating a cmake build file which it puts in the calibre src directory
+-            QMAKE_LIBS_PRIVATE += {glib} {fontconfig}
++            QMAKE_LIBS_PRIVATE += {glib} {fontconfig} -lfreetype
+             ''').format(
+                 headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d(
+                     target), glib=glib_flags, fontconfig=fontconfig_flags, freetype=' '.join(ft_inc_dirs))
diff --git a/calibre/build/patches/platformplugin-install-path-fix.patch b/calibre/build/patches/platformplugin-install-path-fix.patch
new file mode 100644
index 00000000..db9b33b9
--- /dev/null
+++ b/calibre/build/patches/platformplugin-install-path-fix.patch
@@ -0,0 +1,15 @@
+See https://bugs.webkit.org/show_bug.cgi?id=117077
+
+diff -Naur qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro
+--- qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro	2013-04-09 00:11:38.000000000 +0000
++++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro	2013-05-31 01:18:29.157175082 +0000
+@@ -20,7 +20,8 @@
+     }
+ }
+ 
+-DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit
++target.path = $$[QT_INSTALL_PLUGINS]/webkit
++INSTALLS += target
+ 
+ SOURCES += \
+     WebPlugin.cpp \
diff --git a/calibre/build/patches/python.readline.set_pre_input_hook.diff b/calibre/build/patches/python.readline.set_pre_input_hook.diff
new file mode 100644
index 00000000..8f5570c9
--- /dev/null
+++ b/calibre/build/patches/python.readline.set_pre_input_hook.diff
@@ -0,0 +1,12 @@
+--- ./Modules/readline.c.orig	2010-05-09 10:15:40.000000000 -0500
++++ ./Modules/readline.c	2010-11-27 17:08:38.000000000 -0600
+@@ -11,6 +11,9 @@
+ #include <errno.h>
+ #include <sys/time.h>
+ 
++/* This seems to be needed for set_pre_input_hook to work */
++#define HAVE_RL_PRE_INPUT_HOOK 1
++
+ #if defined(HAVE_SETLOCALE)
+ /* GNU readline() mistakenly sets the LC_CTYPE locale.
+  * This is evil.  Only the user or the app's main() should do this!
diff --git a/calibre/build/patches/qt5.mysql.h.diff b/calibre/build/patches/qt5.mysql.h.diff
new file mode 100644
index 00000000..41dc9d34
--- /dev/null
+++ b/calibre/build/patches/qt5.mysql.h.diff
@@ -0,0 +1,12 @@
+diff -Naur qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h qt-everywhere-opensource-src-5.1.0/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h
+--- qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h	2013-07-02 07:09:52.000000000 +0000
++++ qt-everywhere-opensource-src-5.1.0/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h	2013-07-21 21:21:01.190172379 +0000
+@@ -60,7 +60,7 @@
+ #include <QtCore/qt_windows.h>
+ #endif
+ 
+-#include <mysql.h>
++#include <mysql/mysql.h>
+ 
+ #ifdef QT_PLUGIN
+ #define Q_EXPORT_SQLDRIVER_MYSQL
diff --git a/calibre/build/patches/qt5.pulseaudio.diff b/calibre/build/patches/qt5.pulseaudio.diff
new file mode 100644
index 00000000..8d8f616d
--- /dev/null
+++ b/calibre/build/patches/qt5.pulseaudio.diff
@@ -0,0 +1,12 @@
+--- qt-everywhere-opensource-src-5.4.0/qtwebengine/src/3rdparty/chromium/media/media.gyp.orig     2014-12-05 17:26:44.000000000 +0100
++++ qt-everywhere-opensource-src-5.4.0/qtwebengine/src/3rdparty/chromium/media/media.gyp  2014-12-12 10:27:20.393735405 +0100
+@@ -29,7 +29,7 @@
+           ['use_cras==1', {
+             'use_pulseaudio%': 0,
+           }, {
+-            'use_pulseaudio%': 1,
++            'use_pulseaudio%': 0,
+           }],
+         ],
+       }, {
+