diff options
author | Michael Palimaka <kensington@gentoo.org> | 2017-07-06 22:46:08 +1000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2017-07-06 22:47:00 +1000 |
commit | 5d02f2c7cee655610658f046b378caf9b1fefe9e (patch) | |
tree | 041d20d5da567ce04d7ac8f56d38a840ba7021e7 /app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch | |
parent | app-office/calligra-l10n: import from main tree (diff) | |
download | kde-sunset-5d02f2c7cee655610658f046b378caf9b1fefe9e.tar.gz kde-sunset-5d02f2c7cee655610658f046b378caf9b1fefe9e.tar.bz2 kde-sunset-5d02f2c7cee655610658f046b378caf9b1fefe9e.zip |
app-office/calligra: import from main tree
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch')
-rw-r--r-- | app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch b/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch new file mode 100644 index 00000000..79595d9f --- /dev/null +++ b/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch @@ -0,0 +1,46 @@ +Last-Update: 2015-06-17 +Forwarded: no +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788969 +Origin: http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?id=124c28df44584e08b00d4dbb859362af73c41070 +From: David Tardon <dtardon@redhat.com> +Description: adapt to libwps 0.4 + +--- a/cmake/modules/FindLibWps.cmake ++++ b/cmake/modules/FindLibWps.cmake +@@ -9,18 +9,18 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + + include(LibFindMacros) + libfind_package(LIBWPS LibWpd) +-libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3) ++libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4) + + find_path(LIBWPS_INCLUDE_DIR + NAMES libwps/libwps.h + HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR} +- PATH_SUFFIXES libwps-0.3 ++ PATH_SUFFIXES libwps-0.4 + ) + + find_library(LIBWPS_LIBRARY +- NAMES wps wps-0.3 ++ NAMES wps wps-0.4 + HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR} + ) + + set(LIBWPS_PROCESS_LIBS LIBWPS_LIBRARY LIBWPD_LIBRARIES) +--- a/filters/words/works/import/WPSImport.cpp ++++ b/filters/words/works/import/WPSImport.cpp +@@ -90,9 +90,11 @@ + } + bool isSupportedFormat(librevenge::RVNGInputStream &input) + { + WPSKind kind = WPS_TEXT; +- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind); ++ WPSCreator creator = WPS_MSWORKS; ++ bool needsEncoding = false; ++ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind, creator, needsEncoding); + if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT) + return false; + return true; + } |