Skip to contentSkip to conversation

x11vnc-0.9.8 fix xshm header

PATCH In review Ed Swarthout 2 participants 2 messages Nov 23, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x11vnc-0.9.8 fix xshm header

Backport X_ShmAttach fix from 0.9.9

---
 .../vnc/files/x11vnc-0.9.8-xshm-header-fix.patch   |   15 +++++++++++++++
 recipes/vnc/x11vnc_0.9.8.bb                        |    3 ++-
 2 files changed, 17 insertions(+), 1 deletions(-)
 create mode 100644 recipes/vnc/files/x11vnc-0.9.8-xshm-header-fix.patch
recipes/vnc/files/x11vnc-0.9.8-xshm-header-fix.patch new file +15 -0
new file mode 100644
index 0000000..3383f63
@@ -0,0 +1,15 @@
+Looks like X_ShmAttach is considered private to the library and has been removed from its headers.
+Just hardcode the value, it's only usd to print some help in case of an shm attach error.
+--- x11vnc-0.9.8/x11vnc/cleanup.c
++++ x11vnc-0.9.8/x11vnc/cleanup.c
+@@ -276,6 +276,10 @@
+	return 0;
+ }
+
++#ifndef X_ShmAttach
++#define X_ShmAttach 1
++#endif
++
+ static int Xerror(Display *d, XErrorEvent *error) {
+	X_UNLOCK;
+
recipes/vnc/x11vnc_0.9.8.bb +2 -1
index f3d706b..8c807f2 100644
@@ -5,6 +5,7 @@ SECTION = "x11/utils"
 LICENSE = "GPL"
 DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz \
+	   file://x11vnc-0.9.8-xshm-header-fix.patch;patch=1"
 
 inherit autotools
Signature · 1 line
1.5.6.5
#1 lore raw

Am Montag, den 23.11.2009, 01:56 -0600 schrieb Ed Swarthout:

[…]

recipes/vnc/files/x11vnc-0.9.8-xshm-header-fix.patch line 2

Quoted 8 lines
recipes/vnc/files/x11vnc-0.9.8-xshm-header-fix.patch new file +2 -0
new file mode 100644
index 0000000..3383f63
@@ -0,0 +1,15 @@
+Looks like X_ShmAttach is considered private to the library and has been removed from its headers.
+Just hardcode the value, it's only usd to print some help in case of an shm attach error.

s/usd/used/

Thanks,

Paul