diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
| commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
| tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/kde/patch/calligra | |
| parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
| download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz | |
Mon May 28 19:12:29 UTC 201820180528191229
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.
Diffstat (limited to 'source/kde/patch/calligra')
| -rw-r--r-- | source/kde/patch/calligra/boost-1.65.0.patch | 24 | ||||
| -rw-r--r-- | source/kde/patch/calligra/calligra.mariadb.diff | 33 |
2 files changed, 57 insertions, 0 deletions
diff --git a/source/kde/patch/calligra/boost-1.65.0.patch b/source/kde/patch/calligra/boost-1.65.0.patch new file mode 100644 index 000000000..9f6a4066a --- /dev/null +++ b/source/kde/patch/calligra/boost-1.65.0.patch @@ -0,0 +1,24 @@ +diff -ru calligra-2.9.11.orig/gemini/desktopviewproxy.cpp calligra-2.9.11/gemini/desktopviewproxy.cpp +--- calligra-2.9.11.orig/gemini/desktopviewproxy.cpp 2016-02-02 20:53:13.000000000 +0100 ++++ calligra-2.9.11/gemini/desktopviewproxy.cpp 2017-08-27 17:54:48.900376022 +0200 +@@ -31,7 +31,7 @@ + #include <krecentfilesaction.h> + #include <kactioncollection.h> + +-#include <boost/config/posix_features.hpp> ++#include <boost/config/detail/posix_features.hpp> + #include <KConfigGroup> + + #include <KoMainWindow.h> +diff -ru calligra-2.9.11.orig/krita/gemini/desktopviewproxy.cpp calligra-2.9.11/krita/gemini/desktopviewproxy.cpp +--- calligra-2.9.11.orig/krita/gemini/desktopviewproxy.cpp 2016-02-02 20:53:14.000000000 +0100 ++++ calligra-2.9.11/krita/gemini/desktopviewproxy.cpp 2017-08-27 17:53:54.964372389 +0200 +@@ -31,7 +31,7 @@ + #include <krecentfilesaction.h> + #include <kactioncollection.h> + +-#include <boost/config/posix_features.hpp> ++#include <boost/config/detail/posix_features.hpp> + + #include <KisMainWindow.h> + #include <KisImportExportManager.h> diff --git a/source/kde/patch/calligra/calligra.mariadb.diff b/source/kde/patch/calligra/calligra.mariadb.diff new file mode 100644 index 000000000..96006998b --- /dev/null +++ b/source/kde/patch/calligra/calligra.mariadb.diff @@ -0,0 +1,33 @@ +--- ./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; |