[arch-commits] Commit in libwpd/repos/extra-x86_64 (3 files)

[Andreas Radke]

    Date: Saturday, May 22, 2021 @ 19:33:12
  Author: andyrtr
Revision: 415859

archrelease: copy trunk to extra-x86_64

Added:
  libwpd/repos/extra-x86_64/PKGBUILD
    (from rev 415858, libwpd/trunk/PKGBUILD)
  libwpd/repos/extra-x86_64/libwpd-gcc11.patch
    (from rev 415858, libwpd/trunk/libwpd-gcc11.patch)
Deleted:
  libwpd/repos/extra-x86_64/PKGBUILD

--------------------+
 PKGBUILD           |   68 ++++++++++++++++++++++++++++-----------------------
 libwpd-gcc11.patch |   25 ++++++++++++++++++
 2 files changed, 63 insertions(+), 30 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-22 19:33:00 UTC (rev 415858)
+++ PKGBUILD	2021-05-22 19:33:12 UTC (rev 415859)
@@ -1,30 +0,0 @@
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-
-pkgname=libwpd
-pkgver=0.10.3
-pkgrel=2
-pkgdesc="Library for importing WordPerfect (tm) documents"
-arch=('x86_64')
-url="https://libwpd.sourceforge.net/"
-license=('LGPL')
-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')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}

Copied: libwpd/repos/extra-x86_64/PKGBUILD (from rev 415858, libwpd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-22 19:33:12 UTC (rev 415859)
@@ -0,0 +1,38 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+
+pkgname=libwpd
+pkgver=0.10.3
+pkgrel=3
+pkgdesc="Library for importing WordPerfect (tm) documents"
+arch=('x86_64')
+url="https://libwpd.sourceforge.net/"
+license=('LGPL')
+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
+        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
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Copied: libwpd/repos/extra-x86_64/libwpd-gcc11.patch (from rev 415858, libwpd/trunk/libwpd-gcc11.patch)
===================================================================
--- libwpd-gcc11.patch	                        (rev 0)
+++ libwpd-gcc11.patch	2021-05-22 19:33:12 UTC (rev 415859)
@@ -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"