[gnome-boxes/backport-to-the-future: 4/7] flatpak: Fix build of libtirpc with new gcc

[Felipe Borges <felipeborges src gnome org>]

commit 6a0a376eb892560290ccf61abff05ac0e1189cea
Author: Felipe Borges <felipeborges gnome org>
Date:   Wed Jun 3 12:45:14 2020 +0200

    flatpak: Fix build of libtirpc with new gcc
    
    Bump to 1.2.5 and carry patch to avoid multiple definitons with gcc
    -fno-common.
    
    gcc 10 enables -fno-common by default.
    
    See https://bugs.gentoo.org/705896

 .../libtirpc-1.2.5-avoid-multiple-definition.patch | 44 ++++++++++++++++++++++
 build-aux/flatpak/org.gnome.Boxes.json             |  6 ++-
 2 files changed, 49 insertions(+), 1 deletion(-)
---
diff --git a/build-aux/flatpak/libtirpc-1.2.5-avoid-multiple-definition.patch 
b/build-aux/flatpak/libtirpc-1.2.5-avoid-multiple-definition.patch
new file mode 100644
index 00000000..a5fecc54
--- /dev/null
+++ b/build-aux/flatpak/libtirpc-1.2.5-avoid-multiple-definition.patch
@@ -0,0 +1,44 @@
+From 69682de06816de9b9014441d23bda1918ee2e2fb Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym gentoo org>
+Date: Sun, 19 Jan 2020 16:57:45 -0500
+Subject: [PATCH] Avoid multiple-definiton with gcc -fno-common
+
+GCC 10 enables -fno-common by default.
+
+Bug: https://bugs.gentoo.org/705896
+---
+ src/rpc_com.h | 3 +--
+ src/svc.c     | 3 +++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/rpc_com.h b/src/rpc_com.h
+index 10bec79..76badef 100644
+--- a/src/rpc_com.h
++++ b/src/rpc_com.h
+@@ -61,8 +61,7 @@ void __xprt_unregister_unlocked(SVCXPRT *);
+ void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *);
+ 
+ 
+-SVCXPRT **__svc_xports;
+-int __svc_maxrec;
++extern int __svc_maxrec;
+ 
+ #ifdef __cplusplus
+ }
+diff --git a/src/svc.c b/src/svc.c
+index b59467b..6db164b 100644
+--- a/src/svc.c
++++ b/src/svc.c
+@@ -57,6 +57,9 @@
+ 
+ #define max(a, b) (a > b ? a : b)
+ 
++static SVCXPRT **__svc_xports;
++int __svc_maxrec;
++
+ /*
+  * The services list
+  * Each entry represents a set of procedures (an rpc program).
+-- 
+2.25.0
+
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index f459d1d9..6f8a8fa7 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -120,8 +120,12 @@
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : "https://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-1.2.5.tar.bz2";,
+                    "url" : "http://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-1.2.5.tar.bz2";,
                     "sha256" : "f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca"
+                },
+                {
+                    "type" : "patch",
+                    "path" : "libtirpc-1.2.5-avoid-multiple-definition.patch"
                 }
             ]
         },