[arch-commits] Commit in wvstreams/trunk (PKGBUILD wvstreams-4.6.1-gcc10.patch)

[Antonio Rojas]

    Date: Friday, April 23, 2021 @ 17:21:37
  Author: arojas
Revision: 923205

libxcrypt rebuild, fix build with GCC 10, fix LDFLAGS

Added:
  wvstreams/trunk/wvstreams-4.6.1-gcc10.patch
Modified:
  wvstreams/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |    9 ++++++---
 wvstreams-4.6.1-gcc10.patch |   25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-23 17:19:23 UTC (rev 923204)
+++ PKGBUILD	2021-04-23 17:21:37 UTC (rev 923205)
@@ -4,7 +4,7 @@
 
 pkgname=wvstreams
 pkgver=4.6.1
-pkgrel=16
+pkgrel=17
 pkgdesc="A network programming library written in C++"
 arch=('x86_64')
 url="https://web.archive.org/web/20110504183753/http://alumnit.ca:80/wiki/index.php?page=WvDial"
@@ -13,11 +13,13 @@
 source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/wvstreams-$pkgver.tar.gz
         wvstreams-4.6.1-glibc212.patch
         wvstreams-4.6.1-gcc47.patch
+        wvstreams-4.6.1-gcc10.patch
         openssl-buildfix.patch
         gcc-6.patch)
 md5sums=('2760dac31a43d452a19a3147bfde571c'
          '5f6e24864209055239cb4e7c9bbd4a41'
          '217e5dedd7f1d50588a5a67d637fc8a1'
+         '9aa32c56494e82a84d92acdd6ef49d2b'
          'df423c68134a09439b3961c34635e0b4'
          'bc728af9421e04d0c1f358415b6c1421')
 options=('!makeflags')
@@ -29,13 +31,14 @@
   patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch"
   patch -p1 -i "$srcdir/openssl-buildfix.patch"
   patch -p1 -i "$srcdir/gcc-6.patch"
+  patch -p1 -i "$srcdir/wvstreams-4.6.1-gcc10.patch" # Gentoo patch
 }
 
 build() {
   cd ${pkgname}-${pkgver}
 
-  CPPFLAGS=-I/usr/include/openssl-1.0 \
-  LDFLAGS=-L/usr/lib/openssl-1.0 \
+  CPPFLAGS+=" -I/usr/include/openssl-1.0" \
+  LDFLAGS+=" -L/usr/lib/openssl-1.0" \
   ./configure --prefix=/usr \
      --sbin=/usr/bin \
      --sysconfdir=/etc \

Added: wvstreams-4.6.1-gcc10.patch
===================================================================
--- wvstreams-4.6.1-gcc10.patch	                        (rev 0)
+++ wvstreams-4.6.1-gcc10.patch	2021-04-23 17:21:37 UTC (rev 923205)
@@ -0,0 +1,25 @@
+--- a/include/xplc/module.h
++++ b/include/xplc/module.h
+@@ -100,19 +100,19 @@
+    * XPLC module magic number. This is to ensure that it is in fact a
+    * valid XPLC module that has been loaded.
+    */
+-  unsigned long magic;
++  signed long magic;
+   /**
+    * The XPLC module ABI version that this module conforms to. This
+    * should always be the first member of the XPLC_ModuleInfo
+    * structure, as the meaning of the following members depend on it.
+    */
+-  unsigned int version_major;
++  signed int version_major;
+   /**
+    * The XPLC module ABI sub-version that this module conforms
+    * to. This is used for optional and backward-compatible changes in
+    * the module ABI.
+    */
+-  unsigned int version_minor;
++  signed int version_minor;
+ 
+   /**
+    * Description string for the module.