mirror of
git://slackware.nl/current.git
synced 2025-01-04 23:02:35 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
33 lines
1 KiB
Diff
33 lines
1 KiB
Diff
--- ./kexi/migration/mysql/mysqlmigrate.cpp.orig 2016-02-02 13:53:13.000000000 -0600
|
|
+++ ./kexi/migration/mysql/mysqlmigrate.cpp 2017-08-30 14:21:01.436709371 -0500
|
|
@@ -42,7 +42,7 @@
|
|
#ifdef Q_WS_WIN
|
|
# undef _WIN32_WINNT // avoid redef.
|
|
#endif
|
|
-#include <mysql_version.h>
|
|
+#include <mariadb_version.h>
|
|
#include <mysql.h>
|
|
#define BOOL bool
|
|
|
|
--- ./kexi/kexidb/drivers/mysql/mysqldriver.cpp.orig 2016-02-02 13:53:13.000000000 -0600
|
|
+++ ./kexi/kexidb/drivers/mysql/mysqldriver.cpp 2017-08-30 14:20:24.858710150 -0500
|
|
@@ -31,7 +31,7 @@
|
|
#include <QVariant>
|
|
#include <QFile>
|
|
|
|
-#include <mysql_version.h>
|
|
+#include <mariadb_version.h>
|
|
#include <mysql.h>
|
|
#define BOOL bool
|
|
|
|
--- ./kexi/kexidb/drivers/mysql/mysqlconnection_p.h.orig 2016-02-02 13:53:13.000000000 -0600
|
|
+++ ./kexi/kexidb/drivers/mysql/mysqlconnection_p.h 2017-08-30 14:20:24.861710150 -0500
|
|
@@ -30,7 +30,7 @@
|
|
# endif
|
|
# include <my_global.h>
|
|
#endif
|
|
-#include <mysql_version.h>
|
|
+#include <mariadb_version.h>
|
|
#include <mysql.h>
|
|
|
|
typedef struct st_mysql MYSQL;
|