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

[Evangelos Foutras]

    Date: Wednesday, May 27, 2020 @ 11:40:30
  Author: foutrelis
Revision: 387707

upgpkg: libgadu 1.12.2-13: adopt; enable tests

Added:
  libgadu/trunk/gcc10.patch
Modified:
  libgadu/trunk/PKGBUILD

-------------+
 PKGBUILD    |   36 ++++++++++++++++++++++++------------
 gcc10.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-27 08:35:27 UTC (rev 387706)
+++ PKGBUILD	2020-05-27 11:40:30 UTC (rev 387707)
@@ -1,28 +1,40 @@
-# Maintainer:
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Mateusz Herych <heniekk at gmail.com>
 
 pkgname=libgadu
 pkgver=1.12.2
-pkgrel=12
-pkgdesc="This library implements the client side of the Gadu-Gadu protocol"
+pkgrel=13
+pkgdesc="Client-side library for the Gadu-Gadu protocol"
 arch=('x86_64')
 url="https://libgadu.net/"
 license=('LGPL2.1')
 depends=('gnutls' 'protobuf-c')
-source=($pkgname-$pkgver.tar.gz::"https://github.com/wojtekka/libgadu/archive/$pkgver.tar.gz")
-md5sums=('1eecae8245d696adfbcfd40a2b36f0ca')
+source=($pkgname-$pkgver.tar.gz::https://github.com/wojtekka/libgadu/archive/$pkgver.tar.gz
+        gcc10.patch)
+sha256sums=('f53e703d7ad93ce222dbf7fc0cec77f62813af38817a3678e799e91f1c69c94d'
+            '2dae59d29aa2eb0905cc3c220041d5cfd95183276d684f36c9dc955c24080382')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../gcc10.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
+
 build() {
-  cd "${pkgname}-${pkgver}"
-
-  ./autogen.sh
-  ./protobufgen.sh
-  ./configure --prefix=/usr --disable-tests --disable-static
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:

Added: gcc10.patch
===================================================================
--- gcc10.patch	                        (rev 0)
+++ gcc10.patch	2020-05-27 11:40:30 UTC (rev 387707)
@@ -0,0 +1,42 @@
+From b6453a73f2651621fc2be591acf12952dfd3b15e Mon Sep 17 00:00:00 2001
+From: Maciej Mrozowski <reavertm at gmail.com>
+Date: Sun, 9 Feb 2020 03:33:09 +0100
+Subject: [PATCH] Fix compilation with -fno-common
+
+Fix compilation with -fno-common, default in upcoming gcc-10
+Also see https://bugs.gentoo.org/708686
+---
+ test/manual/userconfig.h | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/test/manual/userconfig.h b/test/manual/userconfig.h
+index 70043e32..5be80c6f 100644
+--- a/test/manual/userconfig.h
++++ b/test/manual/userconfig.h
+@@ -19,16 +19,16 @@
+ #ifndef USERCONFIG_H
+ #define USERCONFIG_H
+ 
+-unsigned int config_uin;
+-char *config_password;
+-unsigned int config_peer;
+-char *config_file;
+-char *config_dir;
+-unsigned int config_size;
+-unsigned long config_ip;
+-unsigned int config_port;
+-char *config_server;
+-char *config_proxy;
++extern unsigned int config_uin;
++extern char *config_password;
++extern unsigned int config_peer;
++extern char *config_file;
++extern char *config_dir;
++extern unsigned int config_size;
++extern unsigned long config_ip;
++extern unsigned int config_port;
++extern char *config_server;
++extern char *config_proxy;
+ 
+ int config_read(void);
+ void config_free(void);