summaryrefslogtreecommitdiffstats
path: root/deps/qt5/patches
diff options
context:
space:
mode:
Diffstat (limited to 'deps/qt5/patches')
-rw-r--r--deps/qt5/patches/platformplugin-install-path-fix.patch15
-rw-r--r--deps/qt5/patches/platformplugin-install-path-fix.patch.gzbin360 -> 0 bytes
-rw-r--r--deps/qt5/patches/qt5.mysql.h.diff12
-rw-r--r--deps/qt5/patches/qt5.mysql.h.diff.gzbin290 -> 0 bytes
-rw-r--r--deps/qt5/patches/qt5.pulseaudio.diff12
5 files changed, 39 insertions, 0 deletions
diff --git a/deps/qt5/patches/platformplugin-install-path-fix.patch b/deps/qt5/patches/platformplugin-install-path-fix.patch
new file mode 100644
index 0000000..db9b33b
--- /dev/null
+++ b/deps/qt5/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/deps/qt5/patches/platformplugin-install-path-fix.patch.gz b/deps/qt5/patches/platformplugin-install-path-fix.patch.gz
deleted file mode 100644
index b76f275..0000000
--- a/deps/qt5/patches/platformplugin-install-path-fix.patch.gz
+++ /dev/null
Binary files differ
diff --git a/deps/qt5/patches/qt5.mysql.h.diff b/deps/qt5/patches/qt5.mysql.h.diff
new file mode 100644
index 0000000..41dc9d3
--- /dev/null
+++ b/deps/qt5/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/deps/qt5/patches/qt5.mysql.h.diff.gz b/deps/qt5/patches/qt5.mysql.h.diff.gz
deleted file mode 100644
index 6088b7c..0000000
--- a/deps/qt5/patches/qt5.mysql.h.diff.gz
+++ /dev/null
Binary files differ
diff --git a/deps/qt5/patches/qt5.pulseaudio.diff b/deps/qt5/patches/qt5.pulseaudio.diff
new file mode 100644
index 0000000..8d8f616
--- /dev/null
+++ b/deps/qt5/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,
+ }],
+ ],
+ }, {
+