kdelibs: fix build problems

This commit is contained in:
Jürgen Buchmüller 2017-12-17 22:37:49 +01:00
parent 1cd5b7b0d4
commit afdc25db3e
2 changed files with 27 additions and 0 deletions

View file

@ -0,0 +1,13 @@
--- kdeui/CMakeLists.txt 2014-11-06 23:33:50.000000000 +0100
+++ kdeui/CMakeLists.txt 2017-12-17 22:16:31.058116483 +0100
@@ -312,9 +312,7 @@
set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet_mac.cpp util/qosxkeychain.cpp)
add_definitions(-DMAC_USE_OSXKEYCHAIN)
else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
-else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
+ set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
endif(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
if(NOT WINCE)

View file

@ -0,0 +1,14 @@
--- kdoctools/xslt.h 2014-11-06 23:33:50.000000000 +0100
+++ kdoctools/xslt.h 2017-12-17 22:28:41.024101780 +0100
@@ -1,6 +1,11 @@
#ifndef _MEIN_XSLT_H_
#define _MEIN_XSLT_H_
+#if !defined(char16_t)
+#include <stdint.h>
+typedef uint16_t char16_t;
+#endif
+
#include <libxml/parser.h>
#include <QtCore/QString>
#include <QtCore/QVector>