diff --git a/mingw-w64-libwpd/PKGBUILD b/mingw-w64-libwpd/PKGBUILD index 0c798d9bf6..1a507efb4f 100644 --- a/mingw-w64-libwpd/PKGBUILD +++ b/mingw-w64-libwpd/PKGBUILD @@ -3,7 +3,7 @@ _realname=libwpd pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.10.2 +pkgver=0.10.3 pkgrel=1 pkgdesc="Library for Importing WordPerfect (tm) Documents (mingw-w64)" arch=('any') @@ -15,11 +15,17 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-xz" "${MINGW_PACKAGE_PREFIX}-zlib") options=(staticlibs strip !buildflags) -source=("https://downloads.sourceforge.net/project/${_realname}/${_realname}/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.xz") -sha256sums=('323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610') +source=("https://downloads.sourceforge.net/project/${_realname}/${_realname}/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.xz" + fix-condition.patch + fix-var-sizes.patch) +sha256sums=('2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09' + 'bc596c1982365d5ee5eb659521e9343fcb7caee103bd5673f181df9a42aa9970' + '125e7ea0b17b42bb41dbdc35c3072e40fa6a03e24f11f871620b261199d7cd4f') prepare() { cd ${srcdir}/${_realname}-${pkgver} + patch -p1 -i ${srcdir}/fix-condition.patch + patch -p1 -i ${srcdir}/fix-var-sizes.patch autoreconf -fiv } diff --git a/mingw-w64-libwpd/fix-condition.patch b/mingw-w64-libwpd/fix-condition.patch new file mode 100644 index 0000000000..c11a51b4be --- /dev/null +++ b/mingw-w64-libwpd/fix-condition.patch @@ -0,0 +1,15 @@ +--- libwpd-0.10.3/configure.ac.orig 2019-06-03 13:43:11.927185800 +0300 ++++ libwpd-0.10.3/configure.ac 2019-06-03 13:43:36.907220800 +0300 +@@ -96,10 +96,10 @@ + AC_MSG_RESULT([$have_visibility]) + CXXFLAGS="$saved_CXXFLAGS" + AX_GCC_FUNC_ATTRIBUTE([visibility]) +- AM_CONDITIONAL([HAVE_VISIBILITY], [ +- test "$have_visibility" = "yes" && test "$ax_cv_have_func_attribute_visibility" = "yes"]) + ] + ) ++AM_CONDITIONAL([HAVE_VISIBILITY], [ ++ test "$have_visibility" = "yes" && test "$ax_cv_have_func_attribute_visibility" = "yes"]) + + # ========================= + # Platform check for darwin diff --git a/mingw-w64-libwpd/fix-var-sizes.patch b/mingw-w64-libwpd/fix-var-sizes.patch new file mode 100644 index 0000000000..f842713264 --- /dev/null +++ b/mingw-w64-libwpd/fix-var-sizes.patch @@ -0,0 +1,72 @@ +diff -Naur libwpd-0.10.3-orig/src/lib/libwpd_internal.cpp libwpd-0.10.3/src/lib/libwpd_internal.cpp +--- libwpd-0.10.3-orig/src/lib/libwpd_internal.cpp 2017-12-28 12:15:09.000000000 +0300 ++++ libwpd-0.10.3/src/lib/libwpd_internal.cpp 2019-06-03 13:50:47.155048400 +0300 +@@ -243,7 +243,7 @@ + + *chars = complexMap[i].unicodeChars; + +- for (unsigned j = 0; j 1) + { +- unsigned i; ++ size_t i; + for (i=0; im_leaderCharacter = character; + m_parseState->m_leaderNumSpaces = numSpaces; +- for (unsigned int i=0; im_tabStops.size(); i++) ++ for (size_t i=0; im_tabStops.size(); i++) + { + // change the leader information for those tab stops that use pre-WP9 leader method + if (m_parseState->m_tempUsePreWP9LeaderMethod[i]) +@@ -939,7 +939,7 @@ + tmpColumnDefinition.clear(); + if (numColumns > 1) + { +- unsigned i; ++ size_t i; + for (i=0; i