summaryrefslogtreecommitdiffstats
path: root/calibre/build
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2018-08-26 15:37:03 +0000
committer Eric Hameleers <alien@slackware.com>2018-08-26 15:37:03 +0000
commitf9ce35e05594e7d5f6d96ab2293e29499f10124a (patch)
treeda661c53fec1fb2000b035f39f7f9d77e54f99ed /calibre/build
parent5f20d9d31d94c5381ef9a6df52facb5a18c9f4cf (diff)
downloadasb-f9ce35e05594e7d5f6d96ab2293e29499f10124a.tar.gz
asb-f9ce35e05594e7d5f6d96ab2293e29499f10124a.tar.xz
calibre: patches required to make calibre compile internal qt 5.9.x libraries
Diffstat (limited to 'calibre/build')
-rw-r--r--calibre/build/patches/qt5.mysql.h.diff7
1 files changed, 3 insertions, 4 deletions
diff --git a/calibre/build/patches/qt5.mysql.h.diff b/calibre/build/patches/qt5.mysql.h.diff
index 41dc9d34..f1cf11b9 100644
--- a/calibre/build/patches/qt5.mysql.h.diff
+++ b/calibre/build/patches/qt5.mysql.h.diff
@@ -1,7 +1,6 @@
-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 @@
+--- qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.orig 2017-05-26 14:43:31.000000000 +0200
++++ qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2017-06-17 22:11:34.211899826 +0200
+@@ -57,7 +57,7 @@
#include <QtCore/qt_windows.h>
#endif