[gnome-boxes/vte-without-fno-exception] flatpak: Fix build of freerdp with gcc 10



commit 70ffa9d3940bbb45c5ef35e9201589e23e87d465
Author: Felipe Borges <felipeborges gnome org>
Date:   Wed Jun 3 16:17:29 2020 +0200

    flatpak: Fix build of freerdp with gcc 10
    
    See https://gcc.gnu.org/gcc-10/porting_to.html

 .../flatpak/freerdp-fix-extern-declarations.patch  | 33 ++++++++++++++++++++++
 build-aux/flatpak/org.gnome.Boxes.json             |  4 +++
 2 files changed, 37 insertions(+)
---
diff --git a/build-aux/flatpak/freerdp-fix-extern-declarations.patch 
b/build-aux/flatpak/freerdp-fix-extern-declarations.patch
new file mode 100644
index 00000000..38f72bfc
--- /dev/null
+++ b/build-aux/flatpak/freerdp-fix-extern-declarations.patch
@@ -0,0 +1,33 @@
+From 9078b0deb9d30890b0320b29626abe2d7f241477 Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin novak thincast com>
+Date: Wed, 24 Oct 2018 15:46:18 +0200
+Subject: [PATCH] Fixed extern declaration of rpc_bind p_uuid_t variables.
+
+---
+ libfreerdp/core/gateway/rpc_bind.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libfreerdp/core/gateway/rpc_bind.h b/libfreerdp/core/gateway/rpc_bind.h
+index f52e38465..5b37ff512 100644
+--- a/libfreerdp/core/gateway/rpc_bind.h
++++ b/libfreerdp/core/gateway/rpc_bind.h
+@@ -25,13 +25,13 @@
+ #include <winpr/wtypes.h>
+ #include <freerdp/api.h>
+ 
+-FREERDP_LOCAL const p_uuid_t TSGU_UUID;
++FREERDP_LOCAL extern const p_uuid_t TSGU_UUID;
+ #define TSGU_SYNTAX_IF_VERSION        0x00030001
+ 
+-FREERDP_LOCAL const p_uuid_t NDR_UUID;
++FREERDP_LOCAL extern const p_uuid_t NDR_UUID;
+ #define NDR_SYNTAX_IF_VERSION 0x00000002
+ 
+-FREERDP_LOCAL const p_uuid_t BTFN_UUID;
++FREERDP_LOCAL extern const p_uuid_t BTFN_UUID;
+ #define BTFN_SYNTAX_IF_VERSION        0x00000001
+ 
+ FREERDP_LOCAL int rpc_send_bind_pdu(rdpRpc* rpc);
+-- 
+2.27.0.rc2
+
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index abf834ba..d059964e 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -384,6 +384,10 @@
                     "type" : "archive",
                     "url" : "http://pub.freerdp.com/releases/freerdp-2.0.0-rc2.tar.gz";,
                     "sha256" : "bf080f71655a4996942436d5aacd5ce4afe57e546d4282fc0dc42fb80bd9da0c"
+                },
+                {
+                    "type" : "patch",
+                    "path" : "freerdp-fix-extern-declarations.patch"
                 }
             ]
         },


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]