summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-26 23:03:13 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-28 23:43:29 +0200
commit1e726e1db0eff98905d71131a26ca8b34b7f0bc1 (patch)
tree7d20f5879d0dc02d5fa361bcf3e9d993bb756122
parentfa988ac6f64162fab66d3932043f737c3b21a9bc (diff)
downloadoffice-1e726e1db0eff98905d71131a26ca8b34b7f0bc1.tar.gz
office-1e726e1db0eff98905d71131a26ca8b34b7f0bc1.tar.xz
libwpd: Version bump to 0.10.2
Change-Id: I70a9271d0c9c34ec9a4d715cd344d77d57c2d19c Reviewed-on: https://galileo.mailstation.de/gerrit/10152 Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-rw-r--r--packages/office-libs/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch46
-rw-r--r--packages/office-libs/libwpd/libwpd-0.10.2.exheres-0 (renamed from packages/office-libs/libwpd/libwpd-0.10.1-r1.exheres-0)6
2 files changed, 2 insertions, 50 deletions
diff --git a/packages/office-libs/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch b/packages/office-libs/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch
deleted file mode 100644
index aacedb0..0000000
--- a/packages/office-libs/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Source: https://gerrit.libreoffice.org/#/c/42054/
-Upstream: Fixed in git master
-Reason: CVE-2017-14226
-
---- libwpd/src/lib/WP5StylesListener.cpp
-+++ libwpd/src/lib/WP5StylesListener.cpp
-@@ -85,8 +85,9 @@
- m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
- m_currentPage.setPageSpan(1);
-
-- for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
-- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
-+ std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
-+ for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
-+ HFiter != headerFooterList.end(); ++HFiter)
- {
- if ((*HFiter).getOccurrence() != NEVER)
- {
---- libwpd/src/lib/WP42StylesListener.cpp
-+++ libwpd/src/lib/WP42StylesListener.cpp
-@@ -84,8 +84,9 @@
- m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
- m_currentPage.setPageSpan(1);
-
-- for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
-- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
-+ std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
-+ for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
-+ HFiter != headerFooterList.end(); ++HFiter)
- {
- if ((*HFiter).getOccurrence() != NEVER)
- {
---- libwpd/src/lib/WP1StylesListener.cpp
-+++ libwpd/src/lib/WP1StylesListener.cpp
-@@ -83,8 +83,9 @@
- m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
- m_currentPage.setPageSpan(1);
-
-- for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
-- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
-+ std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
-+ for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
-+ HFiter != headerFooterList.end(); ++HFiter)
- {
- if ((*HFiter).getOccurrence() != NEVER)
- {
diff --git a/packages/office-libs/libwpd/libwpd-0.10.1-r1.exheres-0 b/packages/office-libs/libwpd/libwpd-0.10.2.exheres-0
index 22481d9..8080107 100644
--- a/packages/office-libs/libwpd/libwpd-0.10.1-r1.exheres-0
+++ b/packages/office-libs/libwpd/libwpd-0.10.2.exheres-0
@@ -22,18 +22,16 @@ MYOPTIONS="doc"
DEPENDENCIES="
build:
+ dev-libs/boost [[ note = [ boost/spirit/include/qi.hpp ] ]]
virtual/pkg-config[>=0.9.0]
doc? ( app-doc/doxygen )
build+run:
office-libs/librevenge[>=0.0.1]
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/${PN}-0.10.1-CVE-2017-14226.patch
-)
-
DEFAULT_SRC_CONFIGURE_PARAMS=(
--enable-tools
+ --disable-fuzzers
--disable-werror
)
DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'doc docs' )