diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2009-11-14 09:41:38 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2009-11-14 09:41:38 +0000 |
| commit | 24ca07b547c113262059daa38db4e2704550c839 (patch) | |
| tree | 251c95bfe60bd4804afbd2969072a532807af424 /x11-misc | |
| parent | Mask games-board/ggz-kde-client and games-board/ggz-kde-games. (diff) | |
| download | historical-24ca07b547c113262059daa38db4e2704550c839.tar.gz historical-24ca07b547c113262059daa38db4e2704550c839.tar.bz2 historical-24ca07b547c113262059daa38db4e2704550c839.zip | |
Fix xshm once more, just hardcode the value that we need from the headers, bug #292229.
Package-Manager: portage-2.2_rc49/cvs/Linux x86_64
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/x11vnc/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/x11vnc/Manifest | 10 | ||||
| -rw-r--r-- | x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch | 22 |
3 files changed, 23 insertions, 16 deletions
diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog index 21ccdbf57ac5..3c9c62b24ad8 100644 --- a/x11-misc/x11vnc/ChangeLog +++ b/x11-misc/x11vnc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/x11vnc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.72 2009/11/06 22:06:57 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.73 2009/11/14 09:41:38 swegener Exp $ + + 14 Nov 2009; Sven Wegener <swegener@gentoo.org> + files/x11vnc-0.9.8-xshm-header-fix.patch: + Fix xshm once more, just hardcode the value that we need from the headers, + bug #292229. 06 Nov 2009; Sven Wegener <swegener@gentoo.org> x11vnc-0.9.6.ebuild, x11vnc-0.9.7.ebuild, x11vnc-0.9.8.ebuild: diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest index 03ccab931dc8..ad2f364777c1 100644 --- a/x11-misc/x11vnc/Manifest +++ b/x11-misc/x11vnc/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX x11vnc-0.9.8-xshm-header-fix.patch 258 RMD160 90ec02bb1989cab342908ddcab355f5bea9f176d SHA1 0845d140433216ebbc4831129f37f0c4d943dfee SHA256 cecdf8e4b4de758a238c8fbf1fd5f9155be6b9ae7ddb6151bdffa9a1568fce05 +AUX x11vnc-0.9.8-xshm-header-fix.patch 416 RMD160 9306882e7b7a37c15a631852e4e5b4e37892086d SHA1 60e4dc73d5c01415bc223b4ee1e9437686c7f669 SHA256 8bd28c5d43bb85c0e6e1c508d5c933333b9aef9c6dbd0029350669103a85db8a DIST x11vnc-0.9.6.tar.gz 2461744 RMD160 5587d325fc9a3d735e653fefa2e4425c9e737477 SHA1 2cc67604a8a4bb0c40738f3bdf7295dee9637eb3 SHA256 35cf292b9f46142ddfb5ec5ae169d2ec33f2e4fa68cc7f49a0d98cac55727e1a DIST x11vnc-0.9.7.tar.gz 2528334 RMD160 e9eec21ca31b5ec215898624057edc6bd275edcb SHA1 0ce3a0dd83694fddd64d262320ab7d2edb5310cc SHA256 fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342 DIST x11vnc-0.9.8.tar.gz 2566632 RMD160 5f7b5ab835657c03b05b854720da5ad59b25a2b1 SHA1 0cdcd5ce05ea4c00bb7515a1949344c32a95dffc SHA256 235549a5dad84c20c6d4aba920d95e3b98999b91ca5347bdde22fa0326818342 @@ -9,12 +9,12 @@ EBUILD x11vnc-0.9.6.ebuild 1890 RMD160 d336ebbe60f013992d0d09cc9fbdf15e145b0778 EBUILD x11vnc-0.9.7.ebuild 1884 RMD160 e17753d0377e41f12961b5f7331e3e3d5f5b7fd2 SHA1 7a20ebea61b5b232c4ad44987fe159e3195de10e SHA256 f2e9b2d186eac440445d5c437b0b05270a266bf5a1f40506d125b5b1d308b183 EBUILD x11vnc-0.9.8-r1.ebuild 1802 RMD160 0a0a42b9f1ff486e3f02b2d310774e4be1b9bffd SHA1 df3d9260bb64ee65cf93718dd18c8f3ec748a20b SHA256 d93f29831f8880151d435f6eb806341265fe701c5bd12ec7b832f1f8ac999b9f EBUILD x11vnc-0.9.8.ebuild 1884 RMD160 8a0765ce57f845d79e56ab8ab0400e870a787783 SHA1 25681e358b7f55b9bf28efcd4afde0319ec20b81 SHA256 ba08683961efb1662f8d614fbb1eef174328bb7bb1ef6b0ce295e8acaa9ce649 -MISC ChangeLog 9579 RMD160 90d82bcd76bdfd5c34b9aa204fb03150f697a784 SHA1 fa5cfd4ff98bce6d3d6fcdfb69dae7ca65312ee4 SHA256 4ccbe151a50c3fd51c5f48d4a9ebf2267acb1e911108e1e198fa5f5df13ab6c6 +MISC ChangeLog 9766 RMD160 336db09749b30f030e40a0da71b27383b8b3ec23 SHA1 2a6c16dfe31a549089eb43394d6881087faea697 SHA256 5d02ff881d34e51dd6470624ba3cec2dd08f207ee5f5ac013a3b510af7567729 MISC metadata.xml 599 RMD160 42954f89865c12c5fd4707bc784037f2231c6db6 SHA1 4ce649d4717b45387cdfd9b82984194deb8fcfad SHA256 ba34dcd7e24d8434345f6657e4c2d6b14b4e935590de308f23375e436c94556d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkr0nggACgkQI1lqEGTUzySz2gCfS9pRkGN0dLsGWjCq4blgk5rU -SOIAn02PbRWNa/WfOrEiQwnsJeK47a6K -=koPy +iEYEARECAAYFAkr+e1cACgkQI1lqEGTUzyTTRQCfYr8uqZUqyFDnD2WSCbiKXRo8 +jDEAn0CSnfl050k5/jDR1eCkbrWW4+0f +=NsVj -----END PGP SIGNATURE----- diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch b/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch index b25f2ed2baca..6796d55beb05 100644 --- a/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch +++ b/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch @@ -1,13 +1,15 @@ ---- x11vnc-0.9.8/x11vnc/x11vnc.h -+++ x11vnc-0.9.8/x11vnc/x11vnc.h -@@ -76,6 +76,10 @@ - #include <X11/keysym.h> - #include <X11/Xatom.h> +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; + } -+#include <X11/Xmd.h> -+#include <X11/extensions/shm.h> -+#include <X11/extensions/shmproto.h> ++#ifndef X_ShmAttach ++#define X_ShmAttach 1 ++#endif + - #else + static int Xerror(Display *d, XErrorEvent *error) { + X_UNLOCK; - #define NO_X11 1 |