all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 1db5b26da295568f13de0a39f788f6ed7b4e35a1 1069 bytes (raw)
name: gnu/packages/patches/x11vnc-gcc10-fix.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
 
From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <alexander@tsoy.me>
Date: Tue, 28 Jan 2020 22:21:01 +0300
Subject: [PATCH] Fix build with -fno-common

GCC 10 defaults to -fno-common
---
 src/util.c | 3 +++
 src/util.h | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/util.c b/src/util.c
index a82a1a42..6a52ebf4 100644
--- a/src/util.c
+++ b/src/util.c
@@ -47,6 +47,9 @@ int hxl = 0;
 #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
 MUTEX(x11Mutex);
 MUTEX(scrollMutex);
+MUTEX(clientMutex);
+MUTEX(inputMutex);
+MUTEX(pointerMutex);
 #endif

 int nfix(int i, int n);
diff --git a/src/util.h b/src/util.h
index 35c1afd2..99b5dd1d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
 #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
 extern MUTEX(x11Mutex);
 extern MUTEX(scrollMutex);
-MUTEX(clientMutex);
-MUTEX(inputMutex);
-MUTEX(pointerMutex);
+extern MUTEX(clientMutex);
+extern MUTEX(inputMutex);
+extern MUTEX(pointerMutex);
 #endif

 #define X_INIT INIT_MUTEX(x11Mutex)

debug log:

solving a32d5785d9 ...
found a32d5785d9 in https://yhetil.org/guix/CAHHeYzKfQA4qN6ZRGjYaHWC6isS6nr1OSttri+_TdZcibO0eMw@mail.gmail.com/

applying [1/1] https://yhetil.org/guix/CAHHeYzKfQA4qN6ZRGjYaHWC6isS6nr1OSttri+_TdZcibO0eMw@mail.gmail.com/
index 0000000000..a32d5785d9

Checking patch gnu/packages/patches/x11vnc-gcc10-fix.patch...
Applied patch gnu/packages/patches/x11vnc-gcc10-fix.patch cleanly.

index at:
100644 1db5b26da295568f13de0a39f788f6ed7b4e35a1	gnu/packages/patches/x11vnc-gcc10-fix.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.