Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2015-08-25 07:19:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra (Old) and /work/SRC/openSUSE:Factory/.calligra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra" Changes: -------- --- /work/SRC/openSUSE:Factory/calligra/calligra.changes 2015-07-28 11:43:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra.changes 2015-08-25 08:46:25.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Aug 22 10:34:02 UTC 2015 - [email protected] + +- Add adapt-to-libwps-0.4.patch from Fedora to fix the build for + Tumbleweed (boo#942107) + +------------------------------------------------------------------- New: ---- adapt-to-libwps-0.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.pv6V7K/_old 2015-08-25 08:46:29.000000000 +0200 +++ /var/tmp/diff_new_pack.pv6V7K/_new 2015-08-25 08:46:29.000000000 +0200 @@ -24,6 +24,8 @@ Group: Productivity/Office/Suite Url: http://www.calligra.org/ Source0: http://download.kde.org/stable/%{name}-%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE adapt-to-libwps-0.4.patch boo#942107 -- makes it build against libwps 0.4 (taken from Fedora) +Patch: adapt-to-libwps-0.4.patch %if 0%{?suse_version} > 1230 BuildRequires: OpenColorIO-devel %endif @@ -70,7 +72,11 @@ BuildRequires: pkgconfig(libvisio-0.1) BuildRequires: pkgconfig(libwpd-0.10) BuildRequires: pkgconfig(libwpg-0.3) +%if 0%{?suse_version} > 1320 +BuildRequires: pkgconfig(libwps-0.4) +%else BuildRequires: pkgconfig(libwps-0.3) +%endif %else BuildRequires: libodfgen-devel BuildRequires: libvisio-devel @@ -425,6 +431,9 @@ %prep %setup -q +%if 0%{?suse_version} > 1320 +%patch -p1 +%endif # Remove build time references so build-compare can do its work FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') ++++++ adapt-to-libwps-0.4.patch ++++++ >From e81fe84405bc635dfa93e54fb8a3c8e6065dbf10 Mon Sep 17 00:00:00 2001 From: David Tardon <[email protected]> Date: Sat, 6 Jun 2015 18:27:24 +0200 Subject: [PATCH] adapt to libwps 0.4 --- cmake/modules/FindLibWps.cmake | 6 +++--- filters/words/works/import/WPSImport.cpp | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) 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; -- 2.4.2
