diff options
author | Eric Hameleers <alien@slackware.com> | 2015-01-09 00:06:49 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-01-09 00:06:49 +0100 |
commit | da1be5a21ba06235b67a999f696ec66e35dc17a1 (patch) | |
tree | 6df637d821a6ac0ad65f8caaf967ea2a6956a862 /deps/qt5/patches/qt5.mysql.h.diff | |
parent | b1b35d20ce6b70330b23a9d056dcb44b58795bd6 (diff) | |
download | ktown-da1be5a21ba06235b67a999f696ec66e35dc17a1.tar.gz ktown-da1be5a21ba06235b67a999f696ec66e35dc17a1.tar.xz |
Prepare for new KDE 5: Frameworks 5.6.0, Plasma 5.1.2, Applications 14.12.0.
KDE 5_1501
==========
This is going to be KDE 5 for Slackware-current, composed of Frameworks 5.6.0,
Plasma 5.1.2 and Applications 14.12.0.
Note that there is still a lot of KDE 4 stuff in here, which is necessary to
support all the Applications that have not yet been ported to KDE Frameworks 5.
The Applications 15.04 (march 2015) release should offer a lot more KF5 ports.
Preliminary build procedure (not verified 100% yet):
----------------------------------------------------
- (crude) get rid of Slackware's KDE: removepkg /var/log/packages/*-4.10.5-*
- build all the deps using "updates.SlackBuild" script in the "deps/" directory
- note that extra-cmake-modules is required here as well as when building the
frameworks, so I just copied it from frameworks to deps.
- logoff/login to activate Qt5 profile script.
- removepkg akonadi-qt5 or else kdepimlibs-4.14.3 picks up Qt5 dependencies and
its compilation will fail as a result
- build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde
libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdebase:kde-workspace k
depim extragear"
- installpkg akonadi-qt5
- build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui
ld frameworks plasma plasma-extra polkit-kde applications"
- build kdei
==============================================================================
Eric Hameleers / alien at slackware dot com / 09-jan-2015
Diffstat (limited to 'deps/qt5/patches/qt5.mysql.h.diff')
-rw-r--r-- | deps/qt5/patches/qt5.mysql.h.diff | 12 |
1 files changed, 12 insertions, 0 deletions
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 |