[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-82-g5862618
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Jul 13 09:31:14 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=5862618
The following commit has been merged in the master branch:
commit 586261886e635dce934149fee253bf92b41e28b7
Author: Maximiliano Curia <maxy at debian.org>
Date: Sat Jul 12 22:58:58 2014 +0200
Refresh switch-to-librevenge-based-import-libs.patch for 3.9.5.
---
.../switch-to-librevenge-based-import-libs.patch | 248 ++++++++++-----------
1 file changed, 122 insertions(+), 126 deletions(-)
diff --git a/debian/patches/switch-to-librevenge-based-import-libs.patch b/debian/patches/switch-to-librevenge-based-import-libs.patch
index 95a132b..de9c587 100644
--- a/debian/patches/switch-to-librevenge-based-import-libs.patch
+++ b/debian/patches/switch-to-librevenge-based-import-libs.patch
@@ -33,11 +33,11 @@ Subject: [PATCH] switch to librevenge-based import libs
26 files changed, 177 insertions(+), 134 deletions(-)
create mode 100644 cmake/modules/FindLibRevenge.cmake
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b6b764..c337864 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -697,6 +697,16 @@ macro_optional_find_package(Okular)
+Index: calligra/CMakeLists.txt
+===================================================================
+--- calligra.orig/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
++++ calligra/CMakeLists.txt 2014-07-12 22:58:04.965749343 +0200
+@@ -661,6 +661,16 @@
macro_log_feature(OKULAR_FOUND "Okular" "Okular ODP Plugin" "http://okular.kde.org/" FALSE "" "Required to build the Okular OpenDocument Presenter plugin")
##
@@ -54,10 +54,10 @@ index 5b6b764..c337864 100644
## Test for libodfgen
##
macro_optional_find_package(LibOdfGen)
-diff --git a/cmake/modules/FindLibEtonyek.cmake b/cmake/modules/FindLibEtonyek.cmake
-index 5b78964..ad10d79 100644
---- a/cmake/modules/FindLibEtonyek.cmake
-+++ b/cmake/modules/FindLibEtonyek.cmake
+Index: calligra/cmake/modules/FindLibEtonyek.cmake
+===================================================================
+--- calligra.orig/cmake/modules/FindLibEtonyek.cmake 2014-07-12 22:58:04.973749026 +0200
++++ calligra/cmake/modules/FindLibEtonyek.cmake 2014-07-12 22:58:04.965749343 +0200
@@ -10,16 +10,16 @@
include(LibFindMacros)
@@ -78,10 +78,10 @@ index 5b78964..ad10d79 100644
HINTS ${LIBETONYEK_PKGCONF_LIBRARY_DIRS} ${LIBETONYEK_PKGCONF_LIBDIR}
)
-diff --git a/cmake/modules/FindLibOdfGen.cmake b/cmake/modules/FindLibOdfGen.cmake
-index 9ab80d1..355c345 100644
---- a/cmake/modules/FindLibOdfGen.cmake
-+++ b/cmake/modules/FindLibOdfGen.cmake
+Index: calligra/cmake/modules/FindLibOdfGen.cmake
+===================================================================
+--- calligra.orig/cmake/modules/FindLibOdfGen.cmake 2014-07-12 22:58:04.973749026 +0200
++++ calligra/cmake/modules/FindLibOdfGen.cmake 2014-07-12 22:58:04.965749343 +0200
@@ -9,16 +9,16 @@
# Redistribution and use is allowed according to the terms of the BSD license.
@@ -102,11 +102,10 @@ index 9ab80d1..355c345 100644
HINTS ${LIBODFGEN_PKGCONF_LIBRARY_DIRS} ${LIBODFGEN_PKGCONF_LIBDIR}
)
-diff --git a/cmake/modules/FindLibRevenge.cmake b/cmake/modules/FindLibRevenge.cmake
-new file mode 100644
-index 0000000..8ed18b1
---- /dev/null
-+++ b/cmake/modules/FindLibRevenge.cmake
+Index: calligra/cmake/modules/FindLibRevenge.cmake
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ calligra/cmake/modules/FindLibRevenge.cmake 2014-07-12 22:58:04.965749343 +0200
@@ -0,0 +1,37 @@
+# - Try to find the librevenge
+# Once done this will define
@@ -145,10 +144,10 @@ index 0000000..8ed18b1
+set(LIBREVENGE_PROCESS_LIBS REVENGE_LIBRARY REVENGE_STREAM_LIBRARY)
+set(LIBREVENGE_PROCESS_INCLUDES REVENGE_INCLUDE_DIR REVENGE_STREAM_INCLUDE_DIR)
+libfind_process(LIBREVENGE)
-diff --git a/cmake/modules/FindLibVisio.cmake b/cmake/modules/FindLibVisio.cmake
-index a8533ee..49871b3 100644
---- a/cmake/modules/FindLibVisio.cmake
-+++ b/cmake/modules/FindLibVisio.cmake
+Index: calligra/cmake/modules/FindLibVisio.cmake
+===================================================================
+--- calligra.orig/cmake/modules/FindLibVisio.cmake 2014-07-12 22:58:04.973749026 +0200
++++ calligra/cmake/modules/FindLibVisio.cmake 2014-07-12 22:58:04.965749343 +0200
@@ -12,16 +12,16 @@
include(LibFindMacros)
libfind_package(LIBWPD LibWpd)
@@ -169,10 +168,10 @@ index a8533ee..49871b3 100644
HINTS ${LIBVISIO_PKGCONF_LIBRARY_DIRS} ${LIBVISIO_PKGCONF_LIBDIR}
)
-diff --git a/cmake/modules/FindLibWpd.cmake b/cmake/modules/FindLibWpd.cmake
-index 2a324cc..ed9bc26 100644
---- a/cmake/modules/FindLibWpd.cmake
-+++ b/cmake/modules/FindLibWpd.cmake
+Index: calligra/cmake/modules/FindLibWpd.cmake
+===================================================================
+--- calligra.orig/cmake/modules/FindLibWpd.cmake 2014-07-12 22:58:04.973749026 +0200
++++ calligra/cmake/modules/FindLibWpd.cmake 2014-07-12 22:58:04.965749343 +0200
@@ -8,31 +8,19 @@
#
@@ -210,10 +209,10 @@ index 2a324cc..ed9bc26 100644
+set(LIBWPD_PROCESS_LIBS WPD_LIBRARY)
+set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR)
libfind_process(LIBWPD)
-diff --git a/cmake/modules/FindLibWpg.cmake b/cmake/modules/FindLibWpg.cmake
-index 56d9302..16c2a1c 100644
---- a/cmake/modules/FindLibWpg.cmake
-+++ b/cmake/modules/FindLibWpg.cmake
+Index: calligra/cmake/modules/FindLibWpg.cmake
+===================================================================
+--- calligra.orig/cmake/modules/FindLibWpg.cmake 2014-07-12 22:58:04.973749026 +0200
++++ calligra/cmake/modules/FindLibWpg.cmake 2014-07-12 22:58:04.965749343 +0200
@@ -11,16 +11,16 @@
include(LibFindMacros)
@@ -234,10 +233,10 @@ index 56d9302..16c2a1c 100644
HINTS ${LIBWPG_PKGCONF_LIBRARY_DIRS} ${LIBWPG_PKGCONF_LIBDIR}
)
-diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake
-index 149f34c..f8c8225 100644
---- a/cmake/modules/FindLibWps.cmake
-+++ b/cmake/modules/FindLibWps.cmake
+Index: calligra/cmake/modules/FindLibWps.cmake
+===================================================================
+--- calligra.orig/cmake/modules/FindLibWps.cmake 2014-07-12 22:58:04.973749026 +0200
++++ calligra/cmake/modules/FindLibWps.cmake 2014-07-12 22:58:04.965749343 +0200
@@ -10,16 +10,16 @@
include(LibFindMacros)
@@ -258,10 +257,10 @@ index 149f34c..f8c8225 100644
HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
)
-diff --git a/filters/flow/visio/import/CMakeLists.txt b/filters/flow/visio/import/CMakeLists.txt
-index 1de4385..4c2a391 100644
---- a/filters/flow/visio/import/CMakeLists.txt
-+++ b/filters/flow/visio/import/CMakeLists.txt
+Index: calligra/filters/flow/visio/import/CMakeLists.txt
+===================================================================
+--- calligra.orig/filters/flow/visio/import/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/flow/visio/import/CMakeLists.txt 2014-07-12 22:58:04.965749343 +0200
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
@@ -270,7 +269,7 @@ index 1de4385..4c2a391 100644
${LIBVISIO_INCLUDE_DIRS}
${KOMAIN_INCLUDES}
)
-@@ -15,7 +16,7 @@ set(vsdx2odg_PART_SRCS
+@@ -15,7 +16,7 @@
kde4_add_plugin(calligra_filter_vsdx2odg ${vsdx2odg_PART_SRCS})
@@ -279,10 +278,10 @@ index 1de4385..4c2a391 100644
install(TARGETS calligra_filter_vsdx2odg DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_vsdx2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/flow/visio/import/VSDXImport.cpp b/filters/flow/visio/import/VSDXImport.cpp
-index 70a54d9..eb3a208 100644
---- a/filters/flow/visio/import/VSDXImport.cpp
-+++ b/filters/flow/visio/import/VSDXImport.cpp
+Index: calligra/filters/flow/visio/import/VSDXImport.cpp
+===================================================================
+--- calligra.orig/filters/flow/visio/import/VSDXImport.cpp 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/flow/visio/import/VSDXImport.cpp 2014-07-12 22:58:04.965749343 +0200
@@ -17,7 +17,7 @@
#include "VSDXImport.h"
@@ -292,7 +291,7 @@ index 70a54d9..eb3a208 100644
#include "OutputFileHelper.hxx"
#include <KoFilterChain.h>
-@@ -39,7 +39,7 @@ public:
+@@ -39,7 +39,7 @@
~OdgOutputFileHelper() {}
private:
@@ -301,7 +300,7 @@ index 70a54d9..eb3a208 100644
{
if (!libvisio::VisioDocument::isSupported(input))
{
-@@ -49,9 +49,10 @@ private:
+@@ -49,9 +49,10 @@
return true;
}
@@ -314,10 +313,10 @@ index 70a54d9..eb3a208 100644
return libvisio::VisioDocument::parse(input, &exporter);
}
};
-diff --git a/filters/flow/wpg/import/CMakeLists.txt b/filters/flow/wpg/import/CMakeLists.txt
-index 524d1b1..e2ee2a5 100644
---- a/filters/flow/wpg/import/CMakeLists.txt
-+++ b/filters/flow/wpg/import/CMakeLists.txt
+Index: calligra/filters/flow/wpg/import/CMakeLists.txt
+===================================================================
+--- calligra.orig/filters/flow/wpg/import/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/flow/wpg/import/CMakeLists.txt 2014-07-12 22:58:04.965749343 +0200
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
@@ -326,7 +325,7 @@ index 524d1b1..e2ee2a5 100644
${LIBVISIO_INCLUDE_DIRS}
${KOMAIN_INCLUDES}
)
-@@ -15,7 +16,7 @@ set(wpg2odg_PART_SRCS
+@@ -15,7 +16,7 @@
kde4_add_plugin(calligra_filter_wpg2odg ${wpg2odg_PART_SRCS})
@@ -335,10 +334,10 @@ index 524d1b1..e2ee2a5 100644
install(TARGETS calligra_filter_wpg2odg DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_wpg2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/flow/wpg/import/WPGImport.cpp b/filters/flow/wpg/import/WPGImport.cpp
-index b4e0fa7..563ae6e 100644
---- a/filters/flow/wpg/import/WPGImport.cpp
-+++ b/filters/flow/wpg/import/WPGImport.cpp
+Index: calligra/filters/flow/wpg/import/WPGImport.cpp
+===================================================================
+--- calligra.orig/filters/flow/wpg/import/WPGImport.cpp 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/flow/wpg/import/WPGImport.cpp 2014-07-12 22:58:04.965749343 +0200
@@ -17,7 +17,7 @@
#include "WPGImport.h"
@@ -348,7 +347,7 @@ index b4e0fa7..563ae6e 100644
#include "OutputFileHelper.hxx"
#include <KoFilterChain.h>
-@@ -39,7 +39,7 @@ public:
+@@ -39,7 +39,7 @@
~OdgOutputFileHelper() {}
private:
@@ -357,7 +356,7 @@ index b4e0fa7..563ae6e 100644
{
if (!libwpg::WPGraphics::isSupported(input))
{
-@@ -49,9 +49,10 @@ private:
+@@ -49,9 +49,10 @@
return true;
}
@@ -370,10 +369,10 @@ index b4e0fa7..563ae6e 100644
return libwpg::WPGraphics::parse(input, &exporter);
}
};
-diff --git a/filters/karbon/wpg/CMakeLists.txt b/filters/karbon/wpg/CMakeLists.txt
-index 5f578e9..ffa7742 100644
---- a/filters/karbon/wpg/CMakeLists.txt
-+++ b/filters/karbon/wpg/CMakeLists.txt
+Index: calligra/filters/karbon/wpg/CMakeLists.txt
+===================================================================
+--- calligra.orig/filters/karbon/wpg/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/karbon/wpg/CMakeLists.txt 2014-07-12 22:58:04.965749343 +0200
@@ -1,11 +1,11 @@
-include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBWPD_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
@@ -388,10 +387,10 @@ index 5f578e9..ffa7742 100644
install(TARGETS calligra_filter_wpg2svg DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_wpg2svg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/karbon/wpg/WPGImport.cpp b/filters/karbon/wpg/WPGImport.cpp
-index f1852ee..4457bec 100644
---- a/filters/karbon/wpg/WPGImport.cpp
-+++ b/filters/karbon/wpg/WPGImport.cpp
+Index: calligra/filters/karbon/wpg/WPGImport.cpp
+===================================================================
+--- calligra.orig/filters/karbon/wpg/WPGImport.cpp 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/karbon/wpg/WPGImport.cpp 2014-07-12 22:58:04.965749343 +0200
@@ -32,14 +32,12 @@
#include <QString>
#include <QFile>
@@ -411,7 +410,7 @@ index f1852ee..4457bec 100644
#include <iostream>
K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
-@@ -63,39 +61,29 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
+@@ -63,39 +61,29 @@
if (to != "image/svg+xml")
return KoFilter::NotImplemented;
@@ -459,7 +458,7 @@ index f1852ee..4457bec 100644
delete input;
-@@ -104,7 +92,8 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
+@@ -104,7 +92,8 @@
kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
return KoFilter::InternalError;
}
@@ -469,11 +468,11 @@ index f1852ee..4457bec 100644
outputFile.close();
return KoFilter::OK;
-diff --git a/filters/libodfhandler/DiskDocumentHandler.cxx b/filters/libodfhandler/DiskDocumentHandler.cxx
-index e035fdc..f8ca273 100644
---- a/filters/libodfhandler/DiskDocumentHandler.cxx
-+++ b/filters/libodfhandler/DiskDocumentHandler.cxx
-@@ -37,7 +37,7 @@ DiskOdfDocumentHandler::DiskOdfDocumentHandler(FemtoZip *pOutput) :
+Index: calligra/filters/libodfhandler/DiskDocumentHandler.cxx
+===================================================================
+--- calligra.orig/filters/libodfhandler/DiskDocumentHandler.cxx 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/libodfhandler/DiskDocumentHandler.cxx 2014-07-12 22:58:04.965749343 +0200
+@@ -37,7 +37,7 @@
{
}
@@ -482,7 +481,7 @@ index e035fdc..f8ca273 100644
{
if (mbIsTagOpened)
{
-@@ -46,11 +46,11 @@ void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyL
+@@ -46,11 +46,11 @@
}
PUTSTRING("<");
PUTSTRING(psName);
@@ -497,7 +496,7 @@ index e035fdc..f8ca273 100644
{
PUTSTRING(" ");
PUTSTRING(i.key());
-@@ -91,14 +91,15 @@ void DiskOdfDocumentHandler::endElement(const char *psName)
+@@ -91,14 +91,15 @@
}
}
@@ -515,10 +514,10 @@ index e035fdc..f8ca273 100644
if (sEscapedCharacters.len() > 0)
PUTSTRING(sEscapedCharacters.cstr());
}
-diff --git a/filters/libodfhandler/DiskDocumentHandler.hxx b/filters/libodfhandler/DiskDocumentHandler.hxx
-index 17f7eb7..d52a256 100644
---- a/filters/libodfhandler/DiskDocumentHandler.hxx
-+++ b/filters/libodfhandler/DiskDocumentHandler.hxx
+Index: calligra/filters/libodfhandler/DiskDocumentHandler.hxx
+===================================================================
+--- calligra.orig/filters/libodfhandler/DiskDocumentHandler.hxx 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/libodfhandler/DiskDocumentHandler.hxx 2014-07-12 22:58:04.969749185 +0200
@@ -23,7 +23,7 @@
#ifndef _DISKDOCUMENTHANDLER_H
#define _DISKDOCUMENTHANDLER_H
@@ -528,7 +527,7 @@ index 17f7eb7..d52a256 100644
#ifdef HAVE_CONFIG_H
#include "config.h"
-@@ -45,9 +45,9 @@ public:
+@@ -45,9 +45,9 @@
#endif
virtual void startDocument() {}
virtual void endDocument();
@@ -540,7 +539,7 @@ index 17f7eb7..d52a256 100644
private:
DiskOdfDocumentHandler(DiskOdfDocumentHandler const &);
-@@ -58,7 +58,7 @@ private:
+@@ -58,7 +58,7 @@
FemtoZip *mpOutput;
#endif
bool mbIsTagOpened;
@@ -549,10 +548,10 @@ index 17f7eb7..d52a256 100644
};
#endif
-diff --git a/filters/libodfhandler/OutputFileHelper.cxx b/filters/libodfhandler/OutputFileHelper.cxx
-index 8786d4c..61e48e9 100644
---- a/filters/libodfhandler/OutputFileHelper.cxx
-+++ b/filters/libodfhandler/OutputFileHelper.cxx
+Index: calligra/filters/libodfhandler/OutputFileHelper.cxx
+===================================================================
+--- calligra.orig/filters/libodfhandler/OutputFileHelper.cxx 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/libodfhandler/OutputFileHelper.cxx 2014-07-12 22:58:04.969749185 +0200
@@ -37,7 +37,7 @@
#include "DiskDocumentHandler.hxx"
@@ -562,7 +561,7 @@ index 8786d4c..61e48e9 100644
struct OutputFileHelperImpl
{
-@@ -197,12 +197,12 @@ bool OutputFileHelper::writeChildFile(const char *childFileName, const char *str
+@@ -197,12 +197,12 @@
bool OutputFileHelper::writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType)
{
@@ -577,10 +576,10 @@ index 8786d4c..61e48e9 100644
OdfDocumentHandler *pHandler;
#ifdef USE_GSF_OUTPUT
-diff --git a/filters/libodfhandler/OutputFileHelper.hxx b/filters/libodfhandler/OutputFileHelper.hxx
-index a61b9a0..d2632a9 100644
---- a/filters/libodfhandler/OutputFileHelper.hxx
-+++ b/filters/libodfhandler/OutputFileHelper.hxx
+Index: calligra/filters/libodfhandler/OutputFileHelper.hxx
+===================================================================
+--- calligra.orig/filters/libodfhandler/OutputFileHelper.hxx 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/libodfhandler/OutputFileHelper.hxx 2014-07-12 22:58:04.969749185 +0200
@@ -22,9 +22,10 @@
#ifndef _OUTPUTFILEHELPER_HXX
#define _OUTPUTFILEHELPER_HXX
@@ -594,7 +593,7 @@ index a61b9a0..d2632a9 100644
struct OutputFileHelperImpl;
class OutputFileHelper
-@@ -38,8 +39,8 @@ public:
+@@ -38,8 +39,8 @@
bool writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType);
private:
@@ -605,11 +604,11 @@ index a61b9a0..d2632a9 100644
OutputFileHelperImpl *m_impl;
private:
-diff --git a/filters/libodfhandler/StdOutHandler.cxx b/filters/libodfhandler/StdOutHandler.cxx
-index 6864266..16e19f0 100644
---- a/filters/libodfhandler/StdOutHandler.cxx
-+++ b/filters/libodfhandler/StdOutHandler.cxx
-@@ -31,7 +31,7 @@ StdOutHandler::StdOutHandler() :
+Index: calligra/filters/libodfhandler/StdOutHandler.cxx
+===================================================================
+--- calligra.orig/filters/libodfhandler/StdOutHandler.cxx 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/libodfhandler/StdOutHandler.cxx 2014-07-12 22:58:04.969749185 +0200
+@@ -31,7 +31,7 @@
printf("<?xml version=\"1.0\"?>
");
}
@@ -618,7 +617,7 @@ index 6864266..16e19f0 100644
{
if (mbIsTagOpened)
{
-@@ -39,11 +39,11 @@ void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPro
+@@ -39,11 +39,11 @@
mbIsTagOpened = false;
}
printf("<%s", psName);
@@ -633,7 +632,7 @@ index 6864266..16e19f0 100644
printf(" %s=\"%s\"", i.key(), i()->getStr().cstr());
}
mbIsTagOpened = true;
-@@ -73,15 +73,14 @@ void StdOutHandler::endElement(const char *psName)
+@@ -73,15 +73,14 @@
}
}
@@ -651,10 +650,10 @@ index 6864266..16e19f0 100644
}
void StdOutHandler::endDocument()
-diff --git a/filters/libodfhandler/StdOutHandler.hxx b/filters/libodfhandler/StdOutHandler.hxx
-index a18189a..44fa1e7 100644
---- a/filters/libodfhandler/StdOutHandler.hxx
-+++ b/filters/libodfhandler/StdOutHandler.hxx
+Index: calligra/filters/libodfhandler/StdOutHandler.hxx
+===================================================================
+--- calligra.orig/filters/libodfhandler/StdOutHandler.hxx 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/libodfhandler/StdOutHandler.hxx 2014-07-12 22:58:04.969749185 +0200
@@ -23,7 +23,7 @@
#ifndef _STDOUTHANDLER_H
#define _STDOUTHANDLER_H
@@ -664,7 +663,7 @@ index a18189a..44fa1e7 100644
class StdOutHandler : public OdfDocumentHandler
{
-@@ -31,12 +31,12 @@ public:
+@@ -31,12 +31,12 @@
StdOutHandler();
virtual void startDocument() {}
virtual void endDocument();
@@ -680,10 +679,10 @@ index a18189a..44fa1e7 100644
};
#endif
-diff --git a/filters/words/wordperfect/import/CMakeLists.txt b/filters/words/wordperfect/import/CMakeLists.txt
-index 6a0e2d7..ffb3c70 100644
---- a/filters/words/wordperfect/import/CMakeLists.txt
-+++ b/filters/words/wordperfect/import/CMakeLists.txt
+Index: calligra/filters/words/wordperfect/import/CMakeLists.txt
+===================================================================
+--- calligra.orig/filters/words/wordperfect/import/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/words/wordperfect/import/CMakeLists.txt 2014-07-12 22:58:04.969749185 +0200
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
@@ -692,7 +691,7 @@ index 6a0e2d7..ffb3c70 100644
${LIBWPD_INCLUDE_DIRS}
${LIBWPG_INCLUDE_DIRS}
${KOMAIN_INCLUDES}
-@@ -17,7 +18,7 @@ set(wpd2odt_PART_SRCS
+@@ -17,7 +18,7 @@
kde4_add_plugin(calligra_filter_wpd2odt ${wpd2odt_PART_SRCS})
target_link_libraries(calligra_filter_wpd2odt
@@ -701,10 +700,10 @@ index 6a0e2d7..ffb3c70 100644
install(TARGETS calligra_filter_wpd2odt DESTINATION ${PLUGIN_INSTALL_DIR})
-diff --git a/filters/words/wordperfect/import/WPDImport.cpp b/filters/words/wordperfect/import/WPDImport.cpp
-index af9d9b6..edf1c91 100644
---- a/filters/words/wordperfect/import/WPDImport.cpp
-+++ b/filters/words/wordperfect/import/WPDImport.cpp
+Index: calligra/filters/words/wordperfect/import/WPDImport.cpp
+===================================================================
+--- calligra.orig/filters/words/wordperfect/import/WPDImport.cpp 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/words/wordperfect/import/WPDImport.cpp 2014-07-12 22:58:04.969749185 +0200
@@ -18,8 +18,7 @@
#include <libwpd/libwpd.h>
@@ -723,7 +722,7 @@ index af9d9b6..edf1c91 100644
#include <stdio.h>
class OdtOutputFileHelper : public OutputFileHelper
-@@ -41,20 +41,20 @@ public:
+@@ -41,20 +41,20 @@
~OdtOutputFileHelper() {};
private:
@@ -749,7 +748,7 @@ index af9d9b6..edf1c91 100644
{
fprintf(stderr, "ERROR: The WordPerfect document is encrypted and we either
");
fprintf(stderr, "ERROR: don't know how to decrypt it or the given password is wrong.
");
-@@ -64,41 +64,47 @@ private:
+@@ -64,41 +64,47 @@
return true;
}
@@ -809,10 +808,10 @@ index af9d9b6..edf1c91 100644
return true;
return false;
}
-diff --git a/filters/words/works/import/CMakeLists.txt b/filters/words/works/import/CMakeLists.txt
-index 76317ae..2c51937 100644
---- a/filters/words/works/import/CMakeLists.txt
-+++ b/filters/words/works/import/CMakeLists.txt
+Index: calligra/filters/words/works/import/CMakeLists.txt
+===================================================================
+--- calligra.orig/filters/words/works/import/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/words/works/import/CMakeLists.txt 2014-07-12 22:58:04.969749185 +0200
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
@@ -821,7 +820,7 @@ index 76317ae..2c51937 100644
${LIBWPS_INCLUDE_DIRS}
${KOMAIN_INCLUDES}
)
-@@ -15,7 +16,7 @@ set(wps2odt_PART_SRCS
+@@ -15,7 +16,7 @@
kde4_add_plugin(calligra_filter_wps2odt ${wps2odt_PART_SRCS})
@@ -830,10 +829,10 @@ index 76317ae..2c51937 100644
install(TARGETS calligra_filter_wps2odt DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_wps2odt.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp
-index c2058e5..545daf3 100644
---- a/filters/words/works/import/WPSImport.cpp
-+++ b/filters/words/works/import/WPSImport.cpp
+Index: calligra/filters/words/works/import/WPSImport.cpp
+===================================================================
+--- calligra.orig/filters/words/works/import/WPSImport.cpp 2014-07-12 22:58:04.973749026 +0200
++++ calligra/filters/words/works/import/WPSImport.cpp 2014-07-12 22:58:04.969749185 +0200
@@ -16,9 +16,9 @@
#include "WPSImport.h"
@@ -846,7 +845,7 @@ index c2058e5..545daf3 100644
#include "OutputFileHelper.hxx"
#include <KoFilterChain.h>
-@@ -40,10 +40,11 @@ public:
+@@ -40,10 +40,11 @@
~OdtOutputFileHelper() {};
private:
@@ -861,7 +860,7 @@ index c2058e5..545daf3 100644
{
fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid Microsoft Works document.
");
return false;
-@@ -52,10 +53,11 @@ private:
+@@ -52,10 +53,11 @@
return true;
}
@@ -876,6 +875,3 @@ index c2058e5..545daf3 100644
return true;
return false;
}
---
-1.9.3
-
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list