Date: Thursday, January 12, 2023 @ 22:59:05
  Author: arojas
Revision: 466424

upgpkg: xsd 4.0.0-5: Fix FTBFS (FS#77083)

Added:
  xsd/trunk/gcc-11.patch
Modified:
  xsd/trunk/PKGBUILD

--------------+
 PKGBUILD     |   36 +++++++++++++++++++-----------------
 gcc-11.patch |   24 ++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-01-12 22:52:16 UTC (rev 466423)
+++ PKGBUILD    2023-01-12 22:59:05 UTC (rev 466424)
@@ -4,32 +4,34 @@
 pkgname=xsd
 pkgver=4.0.0
 _pkgver=4.0.0+dep
-pkgrel=4
-pkgdesc="An open-source, cross-platform W3C XML Schema to C++ data binding 
compiler"
-arch=('x86_64')
-url="https://www.codesynthesis.com/products/xsd";
-license=('GPL2')
-depends=('xerces-c')
-source=("https://www.codesynthesis.com/download/${pkgname}/4.0/${pkgname}-${_pkgver}.tar.bz2";
-        "xsdcxx.patch")
+pkgrel=5
+pkgdesc='An open-source, cross-platform W3C XML Schema to C++ data binding 
compiler'
+arch=(x86_64)
+url='https://www.codesynthesis.com/products/xsd'
+license=(GPL2)
+depends=(xerces-c)
+source=(https://www.codesynthesis.com/download/${pkgname}/4.0/${pkgname}-${_pkgver}.tar.bz2
+        xsdcxx.patch
+        gcc-11.patch)
 sha256sums=('eca52a9c8f52cdbe2ae4e364e4a909503493a0d51ea388fc6c9734565a859817'
-            '93f2e6a9dc942cf1fcab7edbe9c38fc102cbaf86f8b667b70aad4e8e2d1e2fd3')
+            '93f2e6a9dc942cf1fcab7edbe9c38fc102cbaf86f8b667b70aad4e8e2d1e2fd3'
+            'd57e0aed8784d2b947983209b6513c81ac593c9936c3d7b809b4cd60d4c28607')
 
 prepare() {
-  cd ${pkgname}-${_pkgver}
-  patch -p1 -i "${srcdir}/xsdcxx.patch"
+  patch -d $pkgname-$_pkgver -p1 < xsdcxx.patch
+  patch -d $pkgname-$_pkgver/libxsd-frontend -p1 < gcc-11.patch # Fix build 
with GCC 11
 }
 
 build() {
-  cd ${pkgname}-${_pkgver}
-  make CXXFLAGS="${CXXFLAGS}"
+  cd $pkgname-$_pkgver
+  make CXXFLAGS="${CXXFLAGS} -std=c++14"
 }
 
 package() {
-  cd ${pkgname}-${_pkgver}
-  make install_prefix="${pkgdir}/usr" install
+  cd $pkgname-$_pkgver
+  make install_prefix="$pkgdir/usr" install
 
   # Fix conflicts with mono
-  mv "${pkgdir}"/usr/bin/xsd{,cxx}
-  mv "${pkgdir}"/usr/share/man/man1/xsd{,cxx}.1
+  mv "$pkgdir"/usr/bin/xsd{,cxx}
+  mv "$pkgdir"/usr/share/man/man1/xsd{,cxx}.1
 }

Added: gcc-11.patch
===================================================================
--- gcc-11.patch                                (rev 0)
+++ gcc-11.patch        2023-01-12 22:59:05 UTC (rev 466424)
@@ -0,0 +1,24 @@
+From 5029f8665190879285787a9dcdaf5f997cadd2e2 Mon Sep 17 00:00:00 2001
+From: Boris Kolpackov <[email protected]>
+Date: Fri, 23 Oct 2015 15:40:35 +0200
+Subject: Add missing #include
+
+---
+ xsd-frontend/semantic-graph/elements.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/xsd-frontend/semantic-graph/elements.cxx 
b/xsd-frontend/semantic-graph/elements.cxx
+index fa48a9a..3159906 100644
+--- a/xsd-frontend/semantic-graph/elements.cxx
++++ b/xsd-frontend/semantic-graph/elements.cxx
+@@ -3,6 +3,7 @@
+ // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+ 
+ #include <algorithm>
++#include <iostream>
+ 
+ #include <cutl/compiler/type-info.hxx>
+ 
+-- 
+cgit v1.1
+

Reply via email to