summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2013-06-06 21:02:12 +0200
committerSlávek Banko <[email protected]>2013-06-06 21:22:30 +0200
commitb6474af74efbea10a20cf597145ba517c8447233 (patch)
tree5c571c94b3db58ee49256b95ffdd5f1e248790b4
parentffb88b27a13c612c595377cd753ffe930ad576ea (diff)
downloadkoffice-b6474af74efbea10a20cf597145ba517c8447233.tar.gz
koffice-b6474af74efbea10a20cf597145ba517c8447233.zip
Fix FTBFS due to missing flags for libxml
Fix FTBFS due to 'signals' definition conflict
-rw-r--r--filters/kword/msword/Makefile.am4
-rw-r--r--filters/kword/msword/graphicshandler.cpp1
2 files changed, 3 insertions, 2 deletions
diff --git a/filters/kword/msword/Makefile.am b/filters/kword/msword/Makefile.am
index 02a9736d..13da17c2 100644
--- a/filters/kword/msword/Makefile.am
+++ b/filters/kword/msword/Makefile.am
@@ -1,6 +1,6 @@
####### General stuff
-INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(LIBWV2_CFLAGS) $(all_includes) -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(LIBWV2_CFLAGS) $(LIBXML_CFLAGS) $(all_includes) -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
####### Files
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libmswordimport.la
libmswordimport_la_SOURCES = mswordimport.cpp document.cpp conversion.cpp \
texthandler.cpp tablehandler.cpp graphicshandler.cpp
libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
-libmswordimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWV2_LIBS)
+libmswordimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWV2_LIBS) $(LIBXML_LIBS)
METASOURCES = AUTO
diff --git a/filters/kword/msword/graphicshandler.cpp b/filters/kword/msword/graphicshandler.cpp
index efcef0e7..43793d8d 100644
--- a/filters/kword/msword/graphicshandler.cpp
+++ b/filters/kword/msword/graphicshandler.cpp
@@ -20,6 +20,7 @@
#include "graphicshandler.h"
#include "document.h"
+#undef signals // Collides with GTK symbols
#include <wv2/olestream.h>
#include <KoStoreDevice.h>