diff --git a/libwpd-tdf112269.patch b/libwpd-tdf112269.patch new file mode 100644 index 0000000..8ba0bfc --- /dev/null +++ b/libwpd-tdf112269.patch @@ -0,0 +1,14 @@ +--- libwpd/src/lib/WP5StylesListener.cpp ++++ libwpd/src/lib/WP5StylesListener.cpp 2017-09-07 13:35:20.728165572 +0100 +@@ -85,8 +85,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { diff --git a/libwpd.spec b/libwpd.spec index 7a07096..6092ab2 100644 --- a/libwpd.spec +++ b/libwpd.spec @@ -3,7 +3,7 @@ Name: libwpd Summary: A library for import of WordPerfect documents Version: 0.10.1 -Release: 6%{?dist} +Release: 7%{?dist} Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz URL: http://libwpd.sf.net/ License: LGPLv2+ or MPLv2.0 @@ -13,6 +13,8 @@ BuildRequires: help2man BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(zlib) +Patch0: libwpd-tdf112269.patch + %description %{name} is a library for import of WordPerfect documents. @@ -40,6 +42,7 @@ The %{name}-doc package contains API documentation for %{name}. %prep %setup -q +%patch0 -p1 -b .gcc4.6.0 %build %configure --disable-static --disable-werror --disable-silent-rules @@ -90,6 +93,9 @@ install -m 0644 wpd2*.1 %{buildroot}/%{_mandir}/man1 %doc docs/%{name}.png %changelog +* Thu Sep 07 2017 Caolán McNamara - 0.10.1-7 +- Resolves: rhbz#1489337 crashing wpd + * Thu Aug 03 2017 Fedora Release Engineering - 0.10.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild