diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2016-01-29 16:53:28 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-01-29 16:55:27 +0100 |
| commit | b3fb052ef05dc1f25302999ae739b188cf0f70a0 (patch) | |
| tree | 7fe3ef08ea61a32aca23ff2f54796a5f180027bf /net-misc | |
| parent | net-misc/tigervnc: Avoid building unnecessary parts of xorg-server (diff) | |
| download | gentoo-b3fb052ef05dc1f25302999ae739b188cf0f70a0.tar.gz gentoo-b3fb052ef05dc1f25302999ae739b188cf0f70a0.tar.bz2 gentoo-b3fb052ef05dc1f25302999ae739b188cf0f70a0.zip | |
net-misc/tigervnc: Support xorg-server-1.18.0
Support xorg-1.18.0 thanks to LFS patch. Found by Jan Psota.
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/tigervnc/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch | 38 | ||||
| -rw-r--r-- | net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild (renamed from net-misc/tigervnc/tigervnc-1.6.0.ebuild) | 5 |
3 files changed, 42 insertions, 3 deletions
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 7f4e2f92fff8..c0c900e22a0c 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -9,4 +9,4 @@ DIST xorg-server-1.15.0.tar.bz2 5546579 SHA256 613b2f2e7ee2a06d2f8e862c836dc70d3 DIST xorg-server-1.16.0.tar.bz2 5832944 SHA256 38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b SHA512 eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662 WHIRLPOOL bd9817cf93587e2b33d63438942c75d49b04f4fc2a4544654dfcc116deaf88abcccd0fa2496fb58848d5a007d2e32177cdbcd3f44237efd8b7882a0abc5b8d56 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33 DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776 -DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab +DIST xorg-server-1.18.0.tar.bz2 5818703 SHA256 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768 WHIRLPOOL 439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9 diff --git a/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch b/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch new file mode 100644 index 000000000000..ac92e54d0c2b --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch @@ -0,0 +1,38 @@ +Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br> +Date: 2015-12-25 +Initial Package Version: xorg-server-1.18.0 (for tigervnc-1.6.0) +Upstream Status: Not Submitted +Origin: ArchLinux +Description: Allow using Xorg-server-1.18.0 +================================================================================ + + +================================================================================ + +diff -wbBur tigervnc-1.5.0/unix/xserver/hw/vnc/Input.c tigervnc-1.5.0.q/unix/xserver/hw/vnc/Input.c +--- tigervnc-1.5.0/unix/xserver/hw/vnc/Input.c 2015-07-11 16:00:36.000000000 +0300 ++++ tigervnc-1.5.0.q/unix/xserver/hw/vnc/Input.c 2015-11-25 19:04:24.278747038 +0300 +@@ -300,6 +300,8 @@ + #if XORG < 111 + n = GetKeyboardEvents(eventq, dev, action, kc); + enqueueEvents(dev, n); ++#elif XORG > 117 ++ QueueKeyboardEvents(dev, action, kc); + #else + QueueKeyboardEvents(dev, action, kc, NULL); + #endif +diff -wbBur tigervnc-1.5.0/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.5.0.q/unix/xserver/hw/vnc/xorg-version.h +--- tigervnc-1.5.0/unix/xserver/hw/vnc/xorg-version.h 2015-07-11 16:00:36.000000000 +0300 ++++ tigervnc-1.5.0.q/unix/xserver/hw/vnc/xorg-version.h 2015-11-25 19:02:47.688751421 +0300 +@@ -48,8 +48,10 @@ + #define XORG 116 + #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000)) + #define XORG 117 ++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000)) ++#define XORG 118 + #else +-#error "X.Org newer than 1.17 is not supported" ++#error "X.Org newer than 1.18 is not supported" + #endif + + #endif diff --git a/net-misc/tigervnc/tigervnc-1.6.0.ebuild b/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild index 6d9e1a655581..fae96b21d663 100644 --- a/net-misc/tigervnc/tigervnc-1.6.0.ebuild +++ b/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=6 inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 -XSERVER_VERSION="1.17.4" +XSERVER_VERSION="1.18.0" DESCRIPTION="Remote desktop viewer display system" HOMEPAGE="http://www.tigervnc.org" @@ -82,6 +82,7 @@ src_prepare() { eapply "${WORKDIR}"/patches/010_libvnc-os.patch eapply "${WORKDIR}"/patches/030_manpages.patch eapply "${WORKDIR}"/patches/055_xstartup.patch + eapply "${FILESDIR}"/${P}-xorg118-1.patch default |