[arch-commits] Commit in libwpd/trunk (PKGBUILD libwpd-gcc11.patch)

[Andreas Radke]

    Date: Saturday, May 22, 2021 @ 19:33:00
  Author: andyrtr
Revision: 415858

upgpkg: libwpd 0.10.3-3: fix FTBS - FS#70986; avoid overlinking

Added:
  libwpd/trunk/libwpd-gcc11.patch
Modified:
  libwpd/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   14 +++++++++++---
 libwpd-gcc11.patch |   25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-22 14:35:06 UTC (rev 415857)
+++ PKGBUILD	2021-05-22 19:33:00 UTC (rev 415858)
@@ -2,7 +2,7 @@
 
 pkgname=libwpd
 pkgver=0.10.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for importing WordPerfect (tm) documents"
 arch=('x86_64')
 url="https://libwpd.sourceforge.net/"
@@ -10,12 +10,20 @@
 depends=('gcc-libs' 'zlib' 'librevenge')
 makedepends=('libgsf>=1.14.26' 'doxygen' 'boost')
 options=('!emptydirs')
-source=(https://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('c1254f05b2318c160d836e5583c221386db50dd2')
+source=(https://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz
+        libwpd-gcc11.patch)
+sha1sums=('c1254f05b2318c160d836e5583c221386db50dd2'
+          '9a91b8cd6252b610e72769efd1dd26f8a0b81285')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../libwpd-gcc11.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-static
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 

Added: libwpd-gcc11.patch
===================================================================
--- libwpd-gcc11.patch	                        (rev 0)
+++ libwpd-gcc11.patch	2021-05-22 19:33:00 UTC (rev 415858)
@@ -0,0 +1,25 @@
+diff --git a/src/lib/WPXContentListener.cpp b/src/lib/WPXContentListener.cpp
+index ab0f9b1..0b559e6 100644
+--- a/src/lib/WPXContentListener.cpp
++++ b/src/lib/WPXContentListener.cpp
+@@ -23,6 +23,7 @@
+  * Corel Corporation or Corel Corporation Limited."
+  */
+ 
++#include <cstddef>
+ #include "WPXContentListener.h"
+ #include "WPXPageSpan.h"
+ #include "libwpd_internal.h"
+diff --git a/src/lib/WPXTable.cpp b/src/lib/WPXTable.cpp
+index 0ad202a..3ff35e1 100644
+--- a/src/lib/WPXTable.cpp
++++ b/src/lib/WPXTable.cpp
+@@ -25,6 +25,8 @@
+  * Corel Corporation or Corel Corporation Limited."
+  */
+ 
++#include <cstddef>
++
+ #include "WPXTable.h"
+ 
+ #include "libwpd_internal.h"