diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-06-06 21:02:12 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-06-06 21:25:06 +0200 |
| commit | 6db6fb8d7c15b86a908099a09197e953cb737288 (patch) | |
| tree | 580bc607d2a7885ec3756b3f77d8a26f2b3c68e6 | |
| parent | 1181c18070dbedd3513e435e824e1ef04c32f3e9 (diff) | |
| download | koffice-6db6fb8d7c15b86a908099a09197e953cb737288.tar.gz koffice-6db6fb8d7c15b86a908099a09197e953cb737288.zip | |
Fix FTBFS due to missing flags for libxmlv3.5.13.2
Fix FTBFS due to 'signals' definition conflict
(cherry picked from commit b6474af74efbea10a20cf597145ba517c8447233)
| -rw-r--r-- | filters/kword/msword/Makefile.am | 4 | ||||
| -rw-r--r-- | filters/kword/msword/graphicshandler.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/filters/kword/msword/Makefile.am b/filters/kword/msword/Makefile.am index 61a0f348..480da6e5 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) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -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> |