[calligracommon] [Bug 346421] Calligra 2.9.2 build fails (fwd)

[C. Boemann]

It's in debian testing so okay with me


On Tuesday 08 September 2015 10:08:57 Boudewijn Rempt wrote:
> Is it okay to update to libwps 0.4? Or should we stay with 0.3 for now,
> or would it make sense to check the version and make the code conditional?
> 
> This is the patch they're talking about in the bug report:
> 
> diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake
> index f8c8225..58ef2b5 100644
> --- a/cmake/modules/FindLibWps.cmake
> +++ b/cmake/modules/FindLibWps.cmake
> @@ -10,16 +10,16 @@
> 
>   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}
>   )
> 
> diff --git a/filters/words/works/import/WPSImport.cpp
> b/filters/words/works/import/WPSImport.cpp index eea2cc9..94b859d 100644
> --- a/filters/words/works/import/WPSImport.cpp
> +++ b/filters/words/works/import/WPSImport.cpp
> @@ -91,7 +91,9 @@ public:
>       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;
> lines 1-39/39 (END)
> 
> 
> 
> ---------- Forwarded message ----------
> Date: Thu, 03 Sep 2015 14:51:25 +0000
> From: Timo Gurr <timo.gurr at gmail.com>
> Reply-To: bug-control at bugs.kde.org
> To: boud at valdyas.org
> Subject: [calligracommon] [Bug 346421] Calligra 2.9.2 build fails
> 
> https://bugs.kde.org/show_bug.cgi?id=346421
> 
> Timo Gurr <timo.gurr at gmail.com> changed:
> 
>             What    |Removed                     |Added
> ----------------------------------------------------------------------------
> CC|                            |timo.gurr at gmail.com
> 
> --- Comment #11 from Timo Gurr <timo.gurr at gmail.com> ---
> (In reply to var.spool.mail700 from comment #10)
> 
> > https://projects.archlinux.org/svntogit/packages.git/plain/trunk/libwps-0.
> > 4. patch?h=packages/calligra
> > 
> > krita requires libwps 0.3 while arch has libwps 0.4
> 
> Would be really nice to see this patch applied because LibreOffice now
> requires libwps[>=0.4.0] and Calligra still requires 0.3.