diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-03-18 22:53:51 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-03-19 08:59:44 +0100 |
| commit | d0ac7419a9ebbbcc934641909bca18f194ab1cb2 (patch) | |
| tree | 063081a912469eeca9908787c532cbc93eebc0c5 /source/kde/patch/calligra/0001-adapt-to-libwps-0.4.patch | |
| parent | 64c7dee8643c3a5a4fa6619c494e97ba435ade3f (diff) | |
| download | current-d0ac7419a9ebbbcc934641909bca18f194ab1cb2.tar.gz | |
Mon Mar 18 22:53:51 UTC 201920190318225351
ap/cups-filters-1.22.2-x86_64-1.txz: Upgraded.
kde/calligra-2.9.11-x86_64-28.txz: Rebuilt.
Patched to fix Calligra Plan crash. Thanks to Olek.
l/adwaita-icon-theme-3.32.0-noarch-1.txz: Upgraded.
l/giflib-5.1.8-x86_64-1.txz: Upgraded.
l/libssh2-1.8.1-x86_64-1.txz: Upgraded.
Fixed several security issues.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3855
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3856
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3857
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3858
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3859
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3860
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3861
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3862
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3863
(* Security fix *)
x/scim-1.4.18-x86_64-1.txz: Upgraded.
xap/mozilla-firefox-60.6.0esr-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.mozilla.org/en-US/firefox/60.6.0/releasenotes/
Diffstat (limited to 'source/kde/patch/calligra/0001-adapt-to-libwps-0.4.patch')
| -rw-r--r-- | source/kde/patch/calligra/0001-adapt-to-libwps-0.4.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/source/kde/patch/calligra/0001-adapt-to-libwps-0.4.patch b/source/kde/patch/calligra/0001-adapt-to-libwps-0.4.patch new file mode 100644 index 00000000..b4494b3e --- /dev/null +++ b/source/kde/patch/calligra/0001-adapt-to-libwps-0.4.patch @@ -0,0 +1,52 @@ +From e81fe84405bc635dfa93e54fb8a3c8e6065dbf10 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +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 + |