[arch-commits] Commit in libpagemaker/trunk (2 files)

[Andreas Radke]

    Date: Sunday, January 19, 2020 @ 12:34:30
  Author: andyrtr
Revision: 373706

upgpkg: libpagemaker 0.0.4-2: fix build - FS#62165

Added:
  libpagemaker/trunk/libpagemaker-0.0.4-const-ref-exception.patch
Modified:
  libpagemaker/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |   14 +++++++++++---
 libpagemaker-0.0.4-const-ref-exception.patch |   22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-19 12:25:25 UTC (rev 373705)
+++ PKGBUILD	2020-01-19 12:34:30 UTC (rev 373706)
@@ -2,16 +2,24 @@
 
 pkgname=libpagemaker
 pkgver=0.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="a library that parses the file format of Aldus/Adobe PageMaker documents"
 arch=('x86_64')
 url="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
 license=('MPL')
-source=(https://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+source=(https://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${pkgver}.tar.xz
+        libpagemaker-0.0.4-const-ref-exception.patch)
 depends=('librevenge')
 makedepends=('boost' 'doxygen')
-sha256sums=('66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d')
+sha256sums=('66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d'
+            '91d9ce17b04e2fb5009967bb38da3405cb231b05c2cb29e204aaab328a58f7e2')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # fix build - https://bugs.archlinux.org/task/62165
+  patch -Np1 -i ../libpagemaker-0.0.4-const-ref-exception.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr

Added: libpagemaker-0.0.4-const-ref-exception.patch
===================================================================
--- libpagemaker-0.0.4-const-ref-exception.patch	                        (rev 0)
+++ libpagemaker-0.0.4-const-ref-exception.patch	2020-01-19 12:34:30 UTC (rev 373706)
@@ -0,0 +1,22 @@
+diff -rauN libpagemaker-0.0.4/src/lib/PMDParser.cpp libpagemaker-0.0.4-const-ref-exception-patch/src/lib/PMDParser.cpp
+--- libpagemaker-0.0.4/src/lib/PMDParser.cpp	2018-01-08 13:27:29.000000000 +0100
++++ libpagemaker-0.0.4-const-ref-exception-patch/src/lib/PMDParser.cpp	2019-12-10 20:32:26.167629754 +0100
+@@ -852,7 +852,7 @@
+     *tocLength = readU16(m_input, m_bigEndian);
+     PMD_DEBUG_MSG(("[Header] TOC length is %d\n", *tocLength));
+   }
+-  catch (PMDStreamException)
++  catch (const PMDStreamException&)
+   {
+     throw PMDParseException("Can't find the table of contents length in the header.");
+   }
+@@ -862,7 +862,7 @@
+     *tocOffset = readU32(m_input, m_bigEndian);
+     PMD_DEBUG_MSG(("[Header] TOC offset is 0x%x\n", *tocOffset));
+   }
+-  catch (PMDStreamException)
++  catch (const PMDStreamException&)
+   {
+     throw PMDParseException("Can't find the table of contents offset in the header.");
+   }
+