dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net-misc/nx-X11: Bump

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2335 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2010-08-28 08:18:00 +00:00
parent 0b2109cd1a
commit a1308417c0
20 changed files with 1398 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net-misc/nx-X11/ChangeLog
View File

@ -2,6 +2,19 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
28 Aug 2010; Mario Fetka <mario.fetka@gmail.com> -nx-X11-3.4.0_p3.ebuild,
files/01_build_nx-X11_without_nxcomp.dpatch,
files/02_dont_build_nxcompshad.dpatch, files/85_nx-X11_debian-ld.dpatch,
+files/86_set_rgb_path.dpatch, +files/87_set_securitypolicy_path.dpatch,
+files/90_set_X0-config_path.dpatch, +files/91_enable_debug.dpatch,
+files/93_export_remote_keyboard_config.dpatch,
+files/createpixmap_bounds_check.patch, +files/nx-X11-dimbor.patch,
+files/nx-X11-utf8_copy_clipboard.patch, +nx-X11-3.4.0_p4.ebuild,
+files/nxa_wine_close_delay.patch, +files/nxagent.1,
+files/nxagent.MotifWMHints_Utf8Names.dimbor.patch,
+files/nxagent.keyboard, +files/rgb, +files/unbranded.diff:
Bump
14 Jun 2010; Mario Fetka <mario.fetka@gmail.com> +nx-X11-3.4.0_p3.ebuild,
+files/02_dont_build_nxcompshad.dpatch,
+files/nx-X11-3.4.0-Imake-fix-1.patch,

28
net-misc/nx-X11/Manifest
View File

@ -1,12 +1,26 @@
AUX 01_build_nx-X11_without_nxcomp.dpatch 1315 RMD160 daa0ab00f804ba17684f0a710bd191de40548f30 SHA1 630a5f17d102ac8a0ef2d58fa3b60a7710cae6e9 SHA256 3d0668adb9bc5c9357decad0b903ab55e0303cbd3036ea5037d743b88c97e0b9
AUX 02_dont_build_nxcompshad.dpatch 1089 RMD160 6e420f3f84d379571498d523cfbc9ae79870af8c SHA1 24795cebcb410b5ede00d5181d1a6849215f32e5 SHA256 6f10a43addc058732a1910c6b161e808a25a6883d357cec5de58bd34237d3e27
AUX 85_nx-X11_debian-ld.dpatch 6101 RMD160 8fc71becadd6dbd963b31102c709f3af6ee89e9a SHA1 c7550d08d5a560a181564c94c35654cba684c25f SHA256 00820cb9deec7d0a90aeea3cb3ca0fc807eb9a6617465dc2c63cec4f9d0a16ee
AUX 01_build_nx-X11_without_nxcomp.dpatch 1107 RMD160 bcfd1890e897b9878b3db1891071d0ff3e2f76ed SHA1 3d4c9d05cb89ce66cf0b1f87cbee317659450733 SHA256 86e176ac2f89da8ea2eebe20f798f994c581ad3d2351358c3b7662d492cd7ad2
AUX 02_dont_build_nxcompshad.dpatch 872 RMD160 47144d0aa658f4136e2e7a7510f149a00503c8ac SHA1 b3ccfccad9ca295dc9c2a69e3503f7ee209520bf SHA256 35ff04cde0cf28b3245d936a3b5dbb937731ea229999375a7032cbdda3974f5c
AUX 85_nx-X11_debian-ld.dpatch 4629 RMD160 d9963e6aa37cd005ee95ce67723594fe31199335 SHA1 6a621a29736eee5987e5f931f876c0dd1b4efb63 SHA256 bffa666e7bfec0cc44e32745f53518bc2e9bf54d3bb8ee28bfb7bec01dabad84
AUX 86_set_rgb_path.dpatch 608 RMD160 692f4d693449c709e4cb866eca3e0c84e0e614c2 SHA1 0bf3595af7f93831b61d1fd2e6a7ae60a330b459 SHA256 1763b0997120c5e3fbcce53c4339713e7c69fe0cb4660e1acde601cf93872de3
AUX 87_set_securitypolicy_path.dpatch 492 RMD160 3b6a8677e001f5b25c3869841196dff80df66283 SHA1 bcc9566c5b9a317e8105120041e5206e4713b764 SHA256 9763f4180c3089a2273062fa2cf7e6532dab4afa7787a509e61dd53515b050dd
AUX 90_set_X0-config_path.dpatch 1238 RMD160 4aab645bb56ba825d6762f2cfdbd29de1e2bb03c SHA1 bdb89e9085bdf96fd85adfe2e6e6ef21436d1727 SHA256 e9054622e2400e6311378c18c2e137b154d9aa3d6ac9220977d916b307f86f28
AUX 91_enable_debug.dpatch 757 RMD160 6b23809a2c26b18c8a372dd4927a359e8707d482 SHA1 55d1aadff504e8185fb51c1c3572f6cd16505bbb SHA256 e1ca117a64b5504b96c7e5b44b3c44aa5cfcf11baf266ef6cb5140f03498d58c
AUX 93_export_remote_keyboard_config.dpatch 3161 RMD160 3e635d6391e7ed040702794360d109ec856853ed SHA1 f4ff6dddce716bdfd0311764a9b138b970406317 SHA256 bb46ac2d0f54cc5047e1f3d81abff27ab20c5475b4a7c6acd65b416187c485d1
AUX 95_fix_Imakefile.dpatch 1844 RMD160 50e692ad2f12a1551c1e4619bb7d32a3653f68c9 SHA1 777a8a3fb535d9ab30d0b6ac7beadc4a8b9095d7 SHA256 bd2f28fdf0026fc02aca04403592b48b18b73acd7b40374af057c03600fb5022
AUX createpixmap_bounds_check.patch 1205 RMD160 753525dbf9364afc5289494c9bec065e76fb3440 SHA1 5d45cc8d1efa7a0f5ac25e333c6ebc016a7f4baf SHA256 afc37d4828a6bcd100ae706189962db1239e74061f4576edd0c017df73e72f71
AUX nx-X11-3.4.0-Imake-fix-1.patch 1313 RMD160 a2b1a6981ab4a6deb7097ac3812c908060a97640 SHA1 73f33188591e4d159ad6aa6714a3581d9bc6c105 SHA256 91a3e675e200e1e2245e8ad4636e089dacc1302c7e309d929dc5021db160a48f
AUX nx-X11-dimbor.patch 1942 RMD160 180e0142effaa50ac33f75eb3be7e0c5e809033c SHA1 c475d7a5efe3dd23a51e978b892be38574180636 SHA256 73fb482e21592103d39380788fe4d7fa1e04389b9178026bcd4d264db363c27b
AUX nx-X11-utf8_copy_clipboard.patch 1685 RMD160 0745fc3dbb2b7b5ccba007cef2a7867a5c86be83 SHA1 55d13fd62e4080c0602962b793522ee9207ae00f SHA256 8b51793e6209ba287a97b1206537110de9f4cde646994bdd6a9fde68b2acaeb6
AUX nx-x11-1.5.0-tmp-exec.patch 349 RMD160 083862e5563962764e9d78f50a37576bac9913cc SHA1 97402172c1039e4f86b977f27a4571a8a77d1c6b SHA256 bbaeeb4e04c04da96f37dfb7ab5e494094d61a390ef2ae24813a5f49b3c44971
DIST nx-X11-3.4.0-3.tar.gz 20245244 RMD160 98f0a39ce7dd0ba2ddfe6f1e7db0c8a2384b78e4 SHA1 74dbc9cfea6d93361e362298421cdac82f5d910d SHA256 7819ffb49859277ae5003574b683410c6ff03e80dfb523da7c32dbf70774a903
DIST nxagent-3.4.0-8.tar.gz 1563583 RMD160 3277111c9b3529d53921e50c916e096d6c861131 SHA1 c8f3f191fe67ca2678925d73f45a0204dcaeb9f9 SHA256 e6bb0b66a5f858e6383961b300ee39c748bdb05a9876dec3491cfc2374b0c973
AUX nxa_wine_close_delay.patch 1446 RMD160 9c14bef45d83d314e6663ea1c05c0508e16b6855 SHA1 54addd219da3b7379e04bf51a5afbd84b468b9eb SHA256 ad7f18882c3973d83cd2751a49d99f3a27e726960cb250c206ff8de9da80acbb
AUX nxagent.1 662 RMD160 720c9f1d9bbacdf6b1a8b20356692ef4e93a87be SHA1 1a6160c99668f97ad38478e25d31e4dccbea074b SHA256 9a3a6ba81c444ef008db42168065d3ed6062bed1d55b3186b6b465a9da27f7d4
AUX nxagent.MotifWMHints_Utf8Names.dimbor.patch 3384 RMD160 34f0c67186c03dfcf447fc168d2b79cea7971b45 SHA1 42e4a573136df74fd821806ef8358c8fb6f8bc94 SHA256 0ebf1f6fe4a45791e8f05ba2dbe89fc525f653341e8ab76d182dd16616898e49
AUX nxagent.keyboard 14 RMD160 3992c473d54d23b2bcc2b5950cfd467693d76358 SHA1 4b9af0cb5668849c83c65a4dc3f1eb438d2ebc20 SHA256 de210be92e7e41921b67d6509caf61b3c931b78b4ff72bde152791a1c55aee45
AUX rgb 17394 RMD160 2fd3b9b45207fd8893b06e0d6a3f62d4b12f8450 SHA1 2a3c7ba23dbc3195a203a4cd744c5ce492b0358c SHA256 2c8ab5acc9eb072f4cc88696834188100d05e50af5d1425501d993700aaa3164
AUX unbranded.diff 1854 RMD160 94c86b982560339a9b35d93d80a34480dce4f746 SHA1 c88d8e5b75f2313ac81e44ab3e6fa77970aa1023 SHA256 cea9536e13fd7e6ae095feca394613db1d32bbc3c9fa0fca7afa6fc88f438d67
DIST nx-X11-3.4.0-4.tar.gz 20244510 RMD160 1aa91290acd01b52203d36543b5bb57d29506547 SHA1 2d6e7eab23a627e705e93389c5e2b1a5d9c65a94 SHA256 c8654b5a5d607ace755a3a44831335af9f65a45bcb6501d92d94e81af338b1da
DIST nxagent-3.4.0-11.tar.gz 1558371 RMD160 cf9eacae4fcd76cd4dee895ec47d1c3867c99201 SHA1 25d0090c99df7513b0979773c22fe75084404683 SHA256 0fc1a4b0888a51047d9771031668ab1e8d7a02aa0d733597e8a820098b924026
DIST nxauth-3.4.0-3.tar.gz 30637 RMD160 4c88ada185ea8d326a00e67d6c5d6993afbb6274 SHA1 da99b2c85ed81c1ddc5dca7b2105d435d6897e6b SHA256 6ac8238852b1b3754ed1ed917ede5cd7473c482c0d847f2fb2c8c9a1334e3516
EBUILD nx-X11-3.4.0_p3.ebuild 2470 RMD160 b2a94bfd3e97828c69a375c519de39b4952ddb1a SHA1 44db6053ec6f40422effe2fed65cdf84b86082dd SHA256 5ee91b7cee2d9502357c17d4cc7b662839e778c8e131d6ea6f789f8bac5f6f7f
MISC ChangeLog 464 RMD160 46aa36f816ad423bbc228e861299b1e622ebfbb1 SHA1 70d8400f0114b4c1f9d83cef385892498271f1e0 SHA256 8d787822b781741476012af81fc7ce83affb9c5442098b60c8608928b5ef92dd
EBUILD nx-X11-3.4.0_p4.ebuild 3725 RMD160 78c14f003138781374e2b66bd295ceffe45f7ef2 SHA1 e0d33a39a8764f90733e701a8624932e171c40df SHA256 9fe8774009934682227efa7765d2913062dabf077a09c40b4778f8060b76fe24
MISC ChangeLog 1174 RMD160 1bd7a57054063f4cbd0373da82f5f299b2fc86f7 SHA1 e1b5fbea81e82218e27b94627f8a366c7df64936 SHA256 18e8ebd5ad6c2c4bece543201e3ce3e61abadc08f92ba9db892218cbd997208b
MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5

6
net-misc/nx-X11/files/01_build_nx-X11_without_nxcomp.dpatch
View File

@ -5,10 +5,8 @@
## DP: Correct build without nxcomp and nxcompext
@DPATCH@
Index: nx-x11-ubuntu/lib/X11/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/X11/Imakefile 2010-03-18 17:43:37.333686996 -0300
+++ nx-x11-ubuntu/lib/X11/Imakefile 2010-03-18 17:52:15.493687076 -0300
--- a/lib/X11/Imakefile
+++ b/lib/X11/Imakefile
@@ -1150,30 +1150,30 @@
#if NXLibraries

6
net-misc/nx-X11/files/02_dont_build_nxcompshad.dpatch
View File

@ -5,10 +5,8 @@
## DP: Correct build without nxcompext
@DPATCH@
Index: nx-x11-ubuntu/programs/Xserver/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/programs/Xserver/Imakefile 2010-03-18 17:43:37.233685038 -0300
+++ nx-x11-ubuntu/programs/Xserver/Imakefile 2010-03-18 17:52:15.423684745 -0300
--- a/programs/Xserver/Imakefile
+++ b/programs/Xserver/Imakefile
@@ -1037,17 +1037,17 @@
NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status

42
net-misc/nx-X11/files/85_nx-X11_debian-ld.dpatch
View File

@ -5,10 +5,8 @@
## DP: Change the library filename to not conflict with Xorg ones.
@DPATCH@
Index: nx-x11-ubuntu/config/cf/X11.tmpl
===================================================================
--- nx-x11-ubuntu.orig/config/cf/X11.tmpl 2010-03-18 17:43:37.113684797 -0300
+++ nx-x11-ubuntu/config/cf/X11.tmpl 2010-03-18 17:46:07.532435434 -0300
--- a/config/cf/X11.tmpl
+++ b/config/cf/X11.tmpl
@@ -2665,9 +2665,9 @@
#ifndef SharedXrenderRev
#define SharedXrenderRev 1.2.2
@ -21,10 +19,8 @@ Index: nx-x11-ubuntu/config/cf/X11.tmpl
#endif
XRANDRLIBSRC = $(LIBSRC)/Xrandr
Index: nx-x11-ubuntu/lib/X11/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/X11/Imakefile 2010-03-18 17:46:05.702437552 -0300
+++ nx-x11-ubuntu/lib/X11/Imakefile 2010-03-18 17:46:07.532435434 -0300
--- a/lib/X11/Imakefile
+++ b/lib/X11/Imakefile
@@ -83,7 +83,7 @@
#define DoExtraLib SharedLibX11
#define DoDebugLib DebugLibX11
@ -34,10 +30,8 @@ Index: nx-x11-ubuntu/lib/X11/Imakefile
#define SoRev SOXLIBREV
#define HugeLibrary YES
#define IncSubdir X11
Index: nx-x11-ubuntu/lib/Xext/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/Xext/Imakefile 2010-03-18 17:43:37.033687480 -0300
+++ nx-x11-ubuntu/lib/Xext/Imakefile 2010-03-18 17:46:07.532435434 -0300
--- a/lib/Xext/Imakefile
+++ b/lib/Xext/Imakefile
@@ -10,14 +10,15 @@
#define DoExtraLib SharedLibXext
#define DoDebugLib DebugLibXext
@ -56,10 +50,8 @@ Index: nx-x11-ubuntu/lib/Xext/Imakefile
#endif
#if HasShm
Index: nx-x11-ubuntu/lib/Xft/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/Xft/Imakefile 2010-03-18 17:43:37.053695190 -0300
+++ nx-x11-ubuntu/lib/Xft/Imakefile 2010-03-18 17:46:07.532435434 -0300
--- a/lib/Xft/Imakefile
+++ b/lib/Xft/Imakefile
@@ -94,8 +94,7 @@
FONTCONFIG_CFLAGS="$(FONTCONFIG_CFLAGS)" \
FONTCONFIG_LIBS="$(FONTCONFIG_LIBS)"
@ -70,10 +62,8 @@ Index: nx-x11-ubuntu/lib/Xft/Imakefile
HEADERS = Xft.h XftCompat.h
SRCS = xftcolor.c xftdbg.c xftdpy.c \
Index: nx-x11-ubuntu/lib/Xft1/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/Xft1/Imakefile 2010-03-18 17:43:37.073687814 -0300
+++ nx-x11-ubuntu/lib/Xft1/Imakefile 2010-03-18 17:46:07.532435434 -0300
--- a/lib/Xft1/Imakefile
+++ b/lib/Xft1/Imakefile
@@ -92,7 +92,7 @@
FREETYPE2REQLIB = $(FREETYPE2LIB)
#endif
@ -83,10 +73,8 @@ Index: nx-x11-ubuntu/lib/Xft1/Imakefile
#if UseFreetype2
FT_OLD = xftcache.c
Index: nx-x11-ubuntu/lib/Xrender/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/Xrender/Imakefile 2010-03-18 17:43:37.093686165 -0300
+++ nx-x11-ubuntu/lib/Xrender/Imakefile 2010-03-18 17:46:07.532435434 -0300
--- a/lib/Xrender/Imakefile
+++ b/lib/Xrender/Imakefile
@@ -74,7 +74,7 @@
#define DoSharedLib SharedLibXrender
#define DoDebugLib DebugLibXrender
@ -106,10 +94,8 @@ Index: nx-x11-ubuntu/lib/Xrender/Imakefile
#endif
#if Malloc0ReturnsNull
Index: nx-x11-ubuntu/programs/Xserver/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/programs/Xserver/Imakefile 2010-03-18 17:46:06.573684670 -0300
+++ nx-x11-ubuntu/programs/Xserver/Imakefile 2010-03-18 17:46:07.542462477 -0300
--- a/programs/Xserver/Imakefile
+++ b/programs/Xserver/Imakefile
@@ -997,7 +997,7 @@
XPMLIB = -lXpm
NXAGENT = hw/nxagent/LibraryTargetName(nxagent)

18
net-misc/nx-X11/files/86_set_rgb_path.dpatch Normal file
View File

@ -0,0 +1,18 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## dpatch by <marceloshima@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Change the path to the keyboard configuration file
@DPATCH@
--- a/programs/Xserver/os/oscolor.c
+++ b/programs/Xserver/os/oscolor.c
@@ -53,7 +53,7 @@
#include <sys/stat.h>
#include <unistd.h>
-static char* nxAltRgbPaths[] = {"/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"};
+static char* nxAltRgbPaths[] = {"/usr/share/nxagent/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"};
static char _NXRgbPath[1024];
#endif

18
net-misc/nx-X11/files/87_set_securitypolicy_path.dpatch Normal file
View File

@ -0,0 +1,18 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## dpatch by <marceloshima@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Change the path to the keyboard configuration file
@DPATCH@
--- a/programs/Xserver/Xext/security.c
+++ b/programs/Xserver/Xext/security.c
@@ -86,7 +86,7 @@
#ifdef NXAGENT_SERVER
-#define NX_ALTERNATIVEPOLICYFILE "/usr/lib/xserver/SecurityPolicy"
+#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nxagent/SecurityPolicy"
#endif

32
net-misc/nx-X11/files/90_set_X0-config_path.dpatch Normal file
View File

@ -0,0 +1,32 @@
--- a/nxagent/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nxagent/programs/Xserver/hw/nxagent/Keyboard.c
@@ -136,7 +136,7 @@
#define XKB_ALTERNATE_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb"
#endif
#ifndef XKB_CONFIG_FILE
-#define XKB_CONFIG_FILE "X0-config.keyboard"
+#define XKB_CONFIG_FILE "/etc/nxagent/nxagent.keyboard"
#endif
#ifndef XKB_DFLT_RULES_FILE
#define XKB_DFLT_RULES_FILE "xfree86"
@@ -978,8 +978,7 @@
XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb);
- nxagentXkbConfigFilePathSize = strlen(XkbBaseDirectory) +
- strlen(XKB_CONFIG_FILE) + 1;
+ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE);
nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char));
@@ -988,9 +987,7 @@
FatalError("nxagentKeyboardProc: malloc failed.");
}
- strcpy(nxagentXkbConfigFilePath, XkbBaseDirectory);
- strcat(nxagentXkbConfigFilePath, "/");
- strcat(nxagentXkbConfigFilePath, XKB_CONFIG_FILE);
+ strcpy(nxagentXkbConfigFilePath, XKB_CONFIG_FILE);
#ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n",

20
net-misc/nx-X11/files/91_enable_debug.dpatch Executable file
View File

@ -0,0 +1,20 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 90_enable_debug.dpatch by <marceloshima@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad nx-3.3.0-3-6~/nx-X11/programs/Xserver/hw/nxagent/Imakefile nx-3.3.0-3-6/nx-X11/programs/Xserver/hw/nxagent/Imakefile
--- nx-3.3.0-3-6~/nx-X11/programs/Xserver/hw/nxagent/Imakefile 2008-11-05 12:47:49.000000000 -0200
+++ nx-3.3.0-3-6/nx-X11/programs/Xserver/hw/nxagent/Imakefile 2008-11-21 11:04:10.000000000 -0200
@@ -205,7 +205,8 @@
-DNXAGENT_ONSTART \
-DNXAGENT_SPLASH \
-DNXAGENT_ARTSD \
- -UNX_DEBUG_INPUT \
+ -DNX_DEBUG_INPUT \
+ -DDEBUG \
-UPANORAMIX
all:: $(OBJS)

86
net-misc/nx-X11/files/93_export_remote_keyboard_config.dpatch Normal file
View File

@ -0,0 +1,86 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 93_export_remote_keyboar_config.dpatch by <marceloshima@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Export the client keyboard configurations to a file
@DPATCH@
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Error.c
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Error.c 2010-03-18 17:43:36.783686923 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Error.c 2010-03-18 17:46:09.832447167 -0300
@@ -497,7 +497,7 @@
return rootPath;
}
-char *nxagentGetSessionPath()
+char *nxagentGetSessionPath(void)
{
char *rootPath;
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Error.h
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Error.h 2010-03-18 17:43:36.813686477 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Error.h 2010-03-18 17:46:09.832447167 -0300
@@ -34,4 +34,6 @@
void nxagentEndRedirectToClientsLog(void);
+char *nxagentGetSessionPath(void);
+
#endif /* __Error_H__ */
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Keyboard.c
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Keyboard.c 2010-03-18 17:46:09.153703849 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Keyboard.c 2010-03-18 17:46:09.832447167 -0300
@@ -52,6 +52,7 @@
#include "Keyboard.h"
#include "Events.h"
#include "Options.h"
+#include "Error.h"
#include "NXlib.h"
@@ -1770,6 +1771,42 @@
}
#endif
+ if (drulesLen != 0)
+ {
+ char *sessionpath = nxagentGetSessionPath();
+ if (sessionpath != NULL){
+ int keyboard_file_path_size = strlen(sessionpath) + strlen("/keyboard");
+ char *keyboard_file_path = malloc((keyboard_file_path_size + 1) * sizeof(char));
+ FILE *keyboard_file;
+ if ( keyboard_file_path == NULL)
+ {
+ FatalError("nxagentKeyboardProc: malloc failed.");
+ }
+ strcpy(keyboard_file_path, sessionpath);
+ strcat(keyboard_file_path, "/keyboard");
+ if ((keyboard_file = fopen(keyboard_file_path, "w")) != NULL) {
+ if ( drules != NULL )
+ fprintf(keyboard_file, "rules=%s\n", drules);
+ if ( dmodel != NULL )
+ fprintf(keyboard_file, "model=%s\n", dmodel);
+ if ( dlayout != NULL )
+ fprintf(keyboard_file, "layout=%s\n", dlayout);
+ if ( dvariant != NULL )
+ fprintf(keyboard_file, "variant=%s\n", dvariant);
+ if ( doptions != NULL )
+ fprintf(keyboard_file, "options=%s\n", doptions);
+ fclose(keyboard_file);
+ }
+ free(keyboard_file_path);
+ fprintf(stderr, "keyboard file created\n");
+ }
+ fprintf(stderr, "SessionPath not defined\n");
+ }
+ else
+ {
+ fprintf(stderr, "Failed to create the keyboard file\n");
+ }
+
if (nxagentOption(ClientOs) == ClientOsLinux &&
drules != NULL && dmodel != NULL &&
(strcmp(drules, "evdev") == 0 ||

28
net-misc/nx-X11/files/createpixmap_bounds_check.patch Normal file
View File

@ -0,0 +1,28 @@
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/NXdispatch.c
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/NXdispatch.c 2007-06-02 18:49:57.000000000 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/NXdispatch.c 2010-03-18 17:51:32.963686193 -0300
@@ -1973,6 +1973,23 @@
client->errorValue = 0;
return BadValue;
}
+ if (stuff->width > 32767 || stuff->height > 32767)
+ {
+ /* It is allowed to try and allocate a pixmap which is larger than
+ * 32767 in either dimension. However, all of the framebuffer code
+ * is buggy and does not reliably draw to such big pixmaps, basically
+ * because the Region data structure operates with signed shorts
+ * for the rectangles in it.
+ *
+ * Furthermore, several places in the X server computes the
+ * size in bytes of the pixmap and tries to store it in an
+ * integer. This integer can overflow and cause the allocated size
+ * to be much smaller.
+ *
+ * So, such big pixmaps are rejected here with a BadAlloc
+ */
+ return BadAlloc;
+ }
if (stuff->depth != 1)
{
pDepth = pDraw->pScreen->allowedDepths;

44
net-misc/nx-X11/files/nx-X11-dimbor.patch Normal file
View File

@ -0,0 +1,44 @@
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Clipboard.c
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Clipboard.c 2010-03-18 17:51:26.552437837 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Clipboard.c 2010-03-18 17:51:28.412436733 -0300
@@ -1226,10 +1226,11 @@
Atom xa_STRING[4];
xEvent x;
+ /* --- Order changed by dimbor (prevent sending COMPOUND_TEXT to client --- */
xa_STRING[0] = XA_STRING;
- xa_STRING[1] = clientTEXT;
- xa_STRING[2] = clientCOMPOUND_TEXT;
- xa_STRING[3] = clientUTF8_STRING;
+ xa_STRING[1] = clientUTF8_STRING;
+ xa_STRING[2] = clientTEXT;
+ xa_STRING[3] = clientCOMPOUND_TEXT;
ChangeWindowProperty(pWin,
property,
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Image.c
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Image.c 2008-06-09 08:08:16.000000000 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Image.c 2010-03-18 17:51:28.412436733 -0300
@@ -644,6 +644,10 @@
pDrawable -> depth != 1 &&
nxagentOption(DeferLevel) >= 1)
{
+ /* -- changed by dimbor (small "bed-sheets" never need be prevented - always put) --*/
+ if (dstHeight > 16)
+ {
+ /* -------------------------------------------------------------------------------- */
#ifdef TEST
fprintf(stderr, "nxagentPutImage: WARNING! Prevented operation on region [%d,%d,%d,%d] "
"for drawable at [%p] with drawable pixmap.\n", pRegion -> extents.x1,
@@ -654,6 +658,9 @@
nxagentMarkCorruptedRegion(pDrawable, pRegion);
goto nxagentPutImageEnd;
+ /* --- changed by dimbor ---*/
+ }
+ /* ------------------------- */
}
if (pDrawable -> type == DRAWABLE_WINDOW &&

47
net-misc/nx-X11/files/nx-X11-utf8_copy_clipboard.patch Normal file
View File

@ -0,0 +1,47 @@
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Clipboard.c
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Clipboard.c 2010-03-18 17:48:50.052435459 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Clipboard.c 2010-03-18 17:52:04.012445465 -0300
@@ -166,7 +166,9 @@
if (target == XA_STRING) return True;
if (target == serverTEXT) return True;
-
+ /* by dimbor */
+ if (target == serverUTF8_STRING) return True;
+
return False;
}
@@ -402,7 +404,12 @@
lastServerProperty = X->xselectionrequest.property;
lastServerRequestor = X->xselectionrequest.requestor;
lastServerTarget = X->xselectionrequest.target;
- lastServerTime = X->xselectionrequest.time;
+
+ /* by dimbor */
+ if (lastServerTarget != XA_STRING)
+ lastServerTarget = serverUTF8_STRING;
+
+ lastServerTime = X->xselectionrequest.time;
x.u.u.type = SelectionRequest;
x.u.selectionRequest.time = GetTimeInMillis();
@@ -424,11 +431,12 @@
x.u.selectionRequest.selection = CurrentSelections[i].selection;
- /*
- * x.u.selectionRequest.target = X->xselectionrequest.target;
- */
-
- x.u.selectionRequest.target = XA_STRING;
+ /* by dimbor (idea from zahvatov) */
+ if (X->xselectionrequest.target != XA_STRING)
+ x.u.selectionRequest.target = clientUTF8_STRING;
+ else
+ x.u.selectionRequest.target = XA_STRING;
+
x.u.selectionRequest.property = clientCutProperty;
(void) TryClientEvents(lastSelectionOwner[i].client, &x, 1,

53
net-misc/nx-X11/files/nxa_wine_close_delay.patch Normal file
View File

@ -0,0 +1,53 @@
--- a/nxagent/programs/Xserver/hw/nxagent/Window.c
+++ b/nxagent/programs/Xserver/hw/nxagent/Window.c
@@ -176,6 +176,14 @@
static int nxagentForceExposure(WindowPtr pWin, pointer ptr);
+/* by dimbor */
+typedef struct
+{
+ CARD32 state;
+ Window icon;
+}
+nxagentWMStateRec;
+
/*
* This is currently unused.
*/
@@ -1640,6 +1648,17 @@
nxagentAddConfiguredWindow(pWin, CWStackingOrder);
nxagentAddConfiguredWindow(pWin, CW_Shape);
+ /* add by dimbor */
+ if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin))
+ {
+ Atom prop = MakeAtom("WM_STATE", strlen("WM_STATE"), True);
+ nxagentWMStateRec wmState;
+ wmState.state = 1; /* NormalState */
+ wmState.icon = None;
+ if (ChangeWindowProperty(pWin, prop, prop, 32, 0, 2, &wmState, 1) != Success)
+ fprintf(stderr, "nxagentRealizeWindow: Additing WM_STATE fail.\n");
+ }
+
#ifdef SHAPE
/*
@@ -1686,6 +1705,17 @@
return True;
}
+ /* add by dimbor */
+ if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin))
+ {
+ Atom prop = MakeAtom("WM_STATE", strlen("WM_STATE"), True);
+ nxagentWMStateRec wmState;
+ wmState.state = 3; /* WithdrawnState */
+ wmState.icon = None;
+ if (ChangeWindowProperty(pWin, prop, prop, 32, 0, 2, &wmState, 1) != Success)
+ fprintf(stderr, "nxagentUnRealizeWindow: Changing WM_STATE failed.\n");
+ }
+
XUnmapWindow(nxagentDisplay, nxagentWindow(pWin));
return True;

24
net-misc/nx-X11/files/nxagent.1 Normal file
View File

@ -0,0 +1,24 @@
.TH NXAGENT 1
.SH NAME
nxagent \- A helper application for NoMachine NX.
.SH SYNOPSIS
.B nxagent
.I "[options]"
.SH DESCRIPTION
.B nxagent
nxagent is a X server for remote access. It implements a very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, providing a near local experience.
.
nxagent should not be used alone. Look for qtnx and FreeNX.
.SH OPTIONS
.TP
.B \--help
Lists all options
.SH CONTACT
Informations can be found on http://freenx.berlios.de/.
.SH AUTHOR
This manual page was written by Per Hansen <spamhans@yahoo.de>,
and modified by Marcelo Boveto Shima <marceloshima@gmail.com>

122
net-misc/nx-X11/files/nxagent.MotifWMHints_Utf8Names.dimbor.patch Normal file
View File

@ -0,0 +1,122 @@
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Init.c
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Init.c 2010-02-02 13:25:57.000000000 -0200
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Init.c 2010-03-18 17:51:31.283686781 -0300
@@ -64,6 +64,9 @@
#include "NX.h"
#include "NXlib.h"
+/* by dimbor */
+#include <X11/Xlocale.h>
+
/*
* Set here the required log level.
*/
@@ -339,6 +342,20 @@
*/
blackRoot = TRUE;
+
+ /* by dimbor */
+ char *locale = setlocale(LC_ALL, "");
+ if (!locale)
+ fprintf(stderr, "InitOutput: failed to set locale, reverting to \"C\"\n");
+ else
+ {
+ if (!XSupportsLocale())
+ fprintf(stderr, "InitOutput: Locale %s not supported by X\n",locale);
+ else
+ fprintf(stderr, "InitOutput: Set %s locale\n",locale);
+ }
+ if (!XSetLocaleModifiers(""))
+ fprintf(stderr,"InitOutput: cannot set locale modifiers.\n");
}
void InitInput(argc, argv)
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Rootless.c
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Rootless.c 2009-08-20 10:02:39.000000000 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Rootless.c 2010-03-18 17:51:31.283686781 -0300
@@ -32,6 +32,10 @@
#include "NXlib.h"
+/* by dimbor */
+#include "Xatom.h"
+#include <X11/Xlocale.h>
+
/*
* Set here the required log level.
*/
@@ -100,6 +104,10 @@
static void nxagentRemovePropertyFromList(void);
+/* by dimbor */
+static char szAgentUTF8_STRING[] = "UTF8_STRING";
+static Atom agentUTF8_STRING;
+
/*
* This is currently unused.
*/
@@ -419,6 +427,28 @@
}
}
+/* by dimbor */
+char *textToUTF8String(char *text, int nitems)
+{
+ XTextProperty t_prop;
+ char *ret=NULL;
+ t_prop.value=((unsigned char *)text);
+ t_prop.nitems=nitems;
+ if (!t_prop.nitems)
+ return ret;
+ t_prop.format=8;
+ t_prop.encoding=XInternAtom(nxagentDisplay, "COMPOUND_TEXT", 0);
+ char **list;
+ int num;
+ int r = XmbTextPropertyToTextList(nxagentDisplay, &t_prop,&list, &num);
+ if ((r == Success || r > 0) && num > 0 && *list)
+ {
+ ret=(char *)strdup (*list);
+ XFreeStringList(list);
+ }
+ return ret;
+}
+
int nxagentExportAllProperty(pWin)
WindowPtr pWin;
{
@@ -464,6 +494,7 @@
if (strncmp(propertyS, "WM_", 3) != 0 &&
strncmp(propertyS, "_NET_", 5) != 0 &&
+ strncmp(propertyS, "_MOTIF_", 7) != 0 &&
strcmp(propertyS, "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR") != 0)
{
#ifdef TEST
@@ -474,6 +505,7 @@
#endif
}
else if (strcmp(typeS, "STRING") == 0 ||
+ strcmp(typeS, "_MOTIF_WM_HINTS") == 0 ||
#ifndef _XSERVER64
strcmp(typeS, "CARDINAL") == 0 ||
strcmp(typeS, "WM_SIZE_HINTS") == 0 ||
@@ -483,6 +515,15 @@
output = value;
export = True;
}
+ /* add by dimbor */
+ else if (strcmp(typeS, "COMPOUND_TEXT") == 0)
+ {
+ output = textToUTF8String(value, nUnits);
+ nUnits = strlen((char *) output);
+ type = MakeAtom(szAgentUTF8_STRING, strlen(szAgentUTF8_STRING), True);
+ freeMem = True;
+ export = True;
+ }
#ifdef _XSERVER64
else if (strcmp(typeS, "CARDINAL") == 0 || strcmp(typeS, "WM_SIZE_HINTS") == 0)
{

1
net-misc/nx-X11/files/nxagent.keyboard Normal file
View File

@ -0,0 +1 @@
rules=xfree86

754
net-misc/nx-X11/files/rgb Normal file
View File

@ -0,0 +1,754 @@
! $Xorg: rgb.txt,v 1.3 2000/08/17 19:54:00 cpqbld Exp $
255 250 250 snow
248 248 255 ghost white
248 248 255 GhostWhite
245 245 245 white smoke
245 245 245 WhiteSmoke
220 220 220 gainsboro
255 250 240 floral white
255 250 240 FloralWhite
253 245 230 old lace
253 245 230 OldLace
250 240 230 linen
250 235 215 antique white
250 235 215 AntiqueWhite
255 239 213 papaya whip
255 239 213 PapayaWhip
255 235 205 blanched almond
255 235 205 BlanchedAlmond
255 228 196 bisque
255 218 185 peach puff
255 218 185 PeachPuff
255 222 173 navajo white
255 222 173 NavajoWhite
255 228 181 moccasin
255 248 220 cornsilk
255 255 240 ivory
255 250 205 lemon chiffon
255 250 205 LemonChiffon
255 245 238 seashell
240 255 240 honeydew
245 255 250 mint cream
245 255 250 MintCream
240 255 255 azure
240 248 255 alice blue
240 248 255 AliceBlue
230 230 250 lavender
255 240 245 lavender blush
255 240 245 LavenderBlush
255 228 225 misty rose
255 228 225 MistyRose
255 255 255 white
0 0 0 black
47 79 79 dark slate gray
47 79 79 DarkSlateGray
47 79 79 dark slate grey
47 79 79 DarkSlateGrey
105 105 105 dim gray
105 105 105 DimGray
105 105 105 dim grey
105 105 105 DimGrey
112 128 144 slate gray
112 128 144 SlateGray
112 128 144 slate grey
112 128 144 SlateGrey
119 136 153 light slate gray
119 136 153 LightSlateGray
119 136 153 light slate grey
119 136 153 LightSlateGrey
190 190 190 gray
190 190 190 grey
211 211 211 light grey
211 211 211 LightGrey
211 211 211 light gray
211 211 211 LightGray
25 25 112 midnight blue
25 25 112 MidnightBlue
0 0 128 navy
0 0 128 navy blue
0 0 128 NavyBlue
100 149 237 cornflower blue
100 149 237 CornflowerBlue
72 61 139 dark slate blue
72 61 139 DarkSlateBlue
106 90 205 slate blue
106 90 205 SlateBlue
123 104 238 medium slate blue
123 104 238 MediumSlateBlue
132 112 255 light slate blue
132 112 255 LightSlateBlue
0 0 205 medium blue
0 0 205 MediumBlue
65 105 225 royal blue
65 105 225 RoyalBlue
0 0 255 blue
30 144 255 dodger blue
30 144 255 DodgerBlue
0 191 255 deep sky blue
0 191 255 DeepSkyBlue
135 206 235 sky blue
135 206 235 SkyBlue
135 206 250 light sky blue
135 206 250 LightSkyBlue
70 130 180 steel blue
70 130 180 SteelBlue
176 196 222 light steel blue
176 196 222 LightSteelBlue
173 216 230 light blue
173 216 230 LightBlue
176 224 230 powder blue
176 224 230 PowderBlue
175 238 238 pale turquoise
175 238 238 PaleTurquoise
0 206 209 dark turquoise
0 206 209 DarkTurquoise
72 209 204 medium turquoise
72 209 204 MediumTurquoise
64 224 208 turquoise
0 255 255 cyan
224 255 255 light cyan
224 255 255 LightCyan
95 158 160 cadet blue
95 158 160 CadetBlue
102 205 170 medium aquamarine
102 205 170 MediumAquamarine
127 255 212 aquamarine
0 100 0 dark green
0 100 0 DarkGreen
85 107 47 dark olive green
85 107 47 DarkOliveGreen
143 188 143 dark sea green
143 188 143 DarkSeaGreen
46 139 87 sea green
46 139 87 SeaGreen
60 179 113 medium sea green
60 179 113 MediumSeaGreen
32 178 170 light sea green
32 178 170 LightSeaGreen
152 251 152 pale green
152 251 152 PaleGreen
0 255 127 spring green
0 255 127 SpringGreen
124 252 0 lawn green
124 252 0 LawnGreen
0 255 0 green
127 255 0 chartreuse
0 250 154 medium spring green
0 250 154 MediumSpringGreen
173 255 47 green yellow
173 255 47 GreenYellow
50 205 50 lime green
50 205 50 LimeGreen
154 205 50 yellow green
154 205 50 YellowGreen
34 139 34 forest green
34 139 34 ForestGreen
107 142 35 olive drab
107 142 35 OliveDrab
189 183 107 dark khaki
189 183 107 DarkKhaki
240 230 140 khaki
238 232 170 pale goldenrod
238 232 170 PaleGoldenrod
250 250 210 light goldenrod yellow
250 250 210 LightGoldenrodYellow
255 255 224 light yellow
255 255 224 LightYellow
255 255 0 yellow
255 215 0 gold
238 221 130 light goldenrod
238 221 130 LightGoldenrod
218 165 32 goldenrod
184 134 11 dark goldenrod
184 134 11 DarkGoldenrod
188 143 143 rosy brown
188 143 143 RosyBrown
205 92 92 indian red
205 92 92 IndianRed
139 69 19 saddle brown
139 69 19 SaddleBrown
160 82 45 sienna
205 133 63 peru
222 184 135 burlywood
245 245 220 beige
245 222 179 wheat
244 164 96 sandy brown
244 164 96 SandyBrown
210 180 140 tan
210 105 30 chocolate
178 34 34 firebrick
165 42 42 brown
233 150 122 dark salmon
233 150 122 DarkSalmon
250 128 114 salmon
255 160 122 light salmon
255 160 122 LightSalmon
255 165 0 orange
255 140 0 dark orange
255 140 0 DarkOrange
255 127 80 coral
240 128 128 light coral
240 128 128 LightCoral
255 99 71 tomato
255 69 0 orange red
255 69 0 OrangeRed
255 0 0 red
255 105 180 hot pink
255 105 180 HotPink
255 20 147 deep pink
255 20 147 DeepPink
255 192 203 pink
255 182 193 light pink
255 182 193 LightPink
219 112 147 pale violet red
219 112 147 PaleVioletRed
176 48 96 maroon
199 21 133 medium violet red
199 21 133 MediumVioletRed
208 32 144 violet red
208 32 144 VioletRed
255 0 255 magenta
238 130 238 violet
221 160 221 plum
218 112 214 orchid
186 85 211 medium orchid
186 85 211 MediumOrchid
153 50 204 dark orchid
153 50 204 DarkOrchid
148 0 211 dark violet
148 0 211 DarkViolet
138 43 226 blue violet
138 43 226 BlueViolet
160 32 240 purple
147 112 219 medium purple
147 112 219 MediumPurple
216 191 216 thistle
255 250 250 snow1
238 233 233 snow2
205 201 201 snow3
139 137 137 snow4
255 245 238 seashell1
238 229 222 seashell2
205 197 191 seashell3
139 134 130 seashell4
255 239 219 AntiqueWhite1
238 223 204 AntiqueWhite2
205 192 176 AntiqueWhite3
139 131 120 AntiqueWhite4
255 228 196 bisque1
238 213 183 bisque2
205 183 158 bisque3
139 125 107 bisque4
255 218 185 PeachPuff1
238 203 173 PeachPuff2
205 175 149 PeachPuff3
139 119 101 PeachPuff4
255 222 173 NavajoWhite1
238 207 161 NavajoWhite2
205 179 139 NavajoWhite3
139 121 94 NavajoWhite4
255 250 205 LemonChiffon1
238 233 191 LemonChiffon2
205 201 165 LemonChiffon3
139 137 112 LemonChiffon4
255 248 220 cornsilk1
238 232 205 cornsilk2
205 200 177 cornsilk3
139 136 120 cornsilk4
255 255 240 ivory1
238 238 224 ivory2
205 205 193 ivory3
139 139 131 ivory4
240 255 240 honeydew1
224 238 224 honeydew2
193 205 193 honeydew3
131 139 131 honeydew4
255 240 245 LavenderBlush1
238 224 229 LavenderBlush2
205 193 197 LavenderBlush3
139 131 134 LavenderBlush4
255 228 225 MistyRose1
238 213 210 MistyRose2
205 183 181 MistyRose3
139 125 123 MistyRose4
240 255 255 azure1
224 238 238 azure2
193 205 205 azure3
131 139 139 azure4
131 111 255 SlateBlue1
122 103 238 SlateBlue2
105 89 205 SlateBlue3
71 60 139 SlateBlue4
72 118 255 RoyalBlue1
67 110 238 RoyalBlue2
58 95 205 RoyalBlue3
39 64 139 RoyalBlue4
0 0 255 blue1
0 0 238 blue2
0 0 205 blue3
0 0 139 blue4
30 144 255 DodgerBlue1
28 134 238 DodgerBlue2
24 116 205 DodgerBlue3
16 78 139 DodgerBlue4
99 184 255 SteelBlue1
92 172 238 SteelBlue2
79 148 205 SteelBlue3
54 100 139 SteelBlue4
0 191 255 DeepSkyBlue1
0 178 238 DeepSkyBlue2
0 154 205 DeepSkyBlue3
0 104 139 DeepSkyBlue4
135 206 255 SkyBlue1
126 192 238 SkyBlue2
108 166 205 SkyBlue3
74 112 139 SkyBlue4
176 226 255 LightSkyBlue1
164 211 238 LightSkyBlue2
141 182 205 LightSkyBlue3
96 123 139 LightSkyBlue4
198 226 255 SlateGray1
185 211 238 SlateGray2
159 182 205 SlateGray3
108 123 139 SlateGray4
202 225 255 LightSteelBlue1
188 210 238 LightSteelBlue2
162 181 205 LightSteelBlue3
110 123 139 LightSteelBlue4
191 239 255 LightBlue1
178 223 238 LightBlue2
154 192 205 LightBlue3
104 131 139 LightBlue4
224 255 255 LightCyan1
209 238 238 LightCyan2
180 205 205 LightCyan3
122 139 139 LightCyan4
187 255 255 PaleTurquoise1
174 238 238 PaleTurquoise2
150 205 205 PaleTurquoise3
102 139 139 PaleTurquoise4
152 245 255 CadetBlue1
142 229 238 CadetBlue2
122 197 205 CadetBlue3
83 134 139 CadetBlue4
0 245 255 turquoise1
0 229 238 turquoise2
0 197 205 turquoise3
0 134 139 turquoise4
0 255 255 cyan1
0 238 238 cyan2
0 205 205 cyan3
0 139 139 cyan4
151 255 255 DarkSlateGray1
141 238 238 DarkSlateGray2
121 205 205 DarkSlateGray3
82 139 139 DarkSlateGray4
127 255 212 aquamarine1
118 238 198 aquamarine2
102 205 170 aquamarine3
69 139 116 aquamarine4
193 255 193 DarkSeaGreen1
180 238 180 DarkSeaGreen2
155 205 155 DarkSeaGreen3
105 139 105 DarkSeaGreen4
84 255 159 SeaGreen1
78 238 148 SeaGreen2
67 205 128 SeaGreen3
46 139 87 SeaGreen4
154 255 154 PaleGreen1
144 238 144 PaleGreen2
124 205 124 PaleGreen3
84 139 84 PaleGreen4
0 255 127 SpringGreen1
0 238 118 SpringGreen2
0 205 102 SpringGreen3
0 139 69 SpringGreen4
0 255 0 green1
0 238 0 green2
0 205 0 green3
0 139 0 green4
127 255 0 chartreuse1
118 238 0 chartreuse2
102 205 0 chartreuse3
69 139 0 chartreuse4
192 255 62 OliveDrab1
179 238 58 OliveDrab2
154 205 50 OliveDrab3
105 139 34 OliveDrab4
202 255 112 DarkOliveGreen1
188 238 104 DarkOliveGreen2
162 205 90 DarkOliveGreen3
110 139 61 DarkOliveGreen4
255 246 143 khaki1
238 230 133 khaki2
205 198 115 khaki3
139 134 78 khaki4
255 236 139 LightGoldenrod1
238 220 130 LightGoldenrod2
205 190 112 LightGoldenrod3
139 129 76 LightGoldenrod4
255 255 224 LightYellow1
238 238 209 LightYellow2
205 205 180 LightYellow3
139 139 122 LightYellow4
255 255 0 yellow1
238 238 0 yellow2
205 205 0 yellow3
139 139 0 yellow4
255 215 0 gold1
238 201 0 gold2
205 173 0 gold3
139 117 0 gold4
255 193 37 goldenrod1
238 180 34 goldenrod2
205 155 29 goldenrod3
139 105 20 goldenrod4
255 185 15 DarkGoldenrod1
238 173 14 DarkGoldenrod2
205 149 12 DarkGoldenrod3
139 101 8 DarkGoldenrod4
255 193 193 RosyBrown1
238 180 180 RosyBrown2
205 155 155 RosyBrown3
139 105 105 RosyBrown4
255 106 106 IndianRed1
238 99 99 IndianRed2
205 85 85 IndianRed3
139 58 58 IndianRed4
255 130 71 sienna1
238 121 66 sienna2
205 104 57 sienna3
139 71 38 sienna4
255 211 155 burlywood1
238 197 145 burlywood2
205 170 125 burlywood3
139 115 85 burlywood4
255 231 186 wheat1
238 216 174 wheat2
205 186 150 wheat3
139 126 102 wheat4
255 165 79 tan1
238 154 73 tan2
205 133 63 tan3
139 90 43 tan4
255 127 36 chocolate1
238 118 33 chocolate2
205 102 29 chocolate3
139 69 19 chocolate4
255 48 48 firebrick1
238 44 44 firebrick2
205 38 38 firebrick3
139 26 26 firebrick4
255 64 64 brown1
238 59 59 brown2
205 51 51 brown3
139 35 35 brown4
255 140 105 salmon1
238 130 98 salmon2
205 112 84 salmon3
139 76 57 salmon4
255 160 122 LightSalmon1
238 149 114 LightSalmon2
205 129 98 LightSalmon3
139 87 66 LightSalmon4
255 165 0 orange1
238 154 0 orange2
205 133 0 orange3
139 90 0 orange4
255 127 0 DarkOrange1
238 118 0 DarkOrange2
205 102 0 DarkOrange3
139 69 0 DarkOrange4
255 114 86 coral1
238 106 80 coral2
205 91 69 coral3
139 62 47 coral4
255 99 71 tomato1
238 92 66 tomato2
205 79 57 tomato3
139 54 38 tomato4
255 69 0 OrangeRed1
238 64 0 OrangeRed2
205 55 0 OrangeRed3
139 37 0 OrangeRed4
255 0 0 red1
238 0 0 red2
205 0 0 red3
139 0 0 red4
215 7 81 DebianRed
255 20 147 DeepPink1
238 18 137 DeepPink2
205 16 118 DeepPink3
139 10 80 DeepPink4
255 110 180 HotPink1
238 106 167 HotPink2
205 96 144 HotPink3
139 58 98 HotPink4
255 181 197 pink1
238 169 184 pink2
205 145 158 pink3
139 99 108 pink4
255 174 185 LightPink1
238 162 173 LightPink2
205 140 149 LightPink3
139 95 101 LightPink4
255 130 171 PaleVioletRed1
238 121 159 PaleVioletRed2
205 104 137 PaleVioletRed3
139 71 93 PaleVioletRed4
255 52 179 maroon1
238 48 167 maroon2
205 41 144 maroon3
139 28 98 maroon4
255 62 150 VioletRed1
238 58 140 VioletRed2
205 50 120 VioletRed3
139 34 82 VioletRed4
255 0 255 magenta1
238 0 238 magenta2
205 0 205 magenta3
139 0 139 magenta4
255 131 250 orchid1
238 122 233 orchid2
205 105 201 orchid3
139 71 137 orchid4
255 187 255 plum1
238 174 238 plum2
205 150 205 plum3
139 102 139 plum4
224 102 255 MediumOrchid1
209 95 238 MediumOrchid2
180 82 205 MediumOrchid3
122 55 139 MediumOrchid4
191 62 255 DarkOrchid1
178 58 238 DarkOrchid2
154 50 205 DarkOrchid3
104 34 139 DarkOrchid4
155 48 255 purple1
145 44 238 purple2
125 38 205 purple3
85 26 139 purple4
171 130 255 MediumPurple1
159 121 238 MediumPurple2
137 104 205 MediumPurple3
93 71 139 MediumPurple4
255 225 255 thistle1
238 210 238 thistle2
205 181 205 thistle3
139 123 139 thistle4
0 0 0 gray0
0 0 0 grey0
3 3 3 gray1
3 3 3 grey1
5 5 5 gray2
5 5 5 grey2
8 8 8 gray3
8 8 8 grey3
10 10 10 gray4
10 10 10 grey4
13 13 13 gray5
13 13 13 grey5
15 15 15 gray6
15 15 15 grey6
18 18 18 gray7
18 18 18 grey7
20 20 20 gray8
20 20 20 grey8
23 23 23 gray9
23 23 23 grey9
26 26 26 gray10
26 26 26 grey10
28 28 28 gray11
28 28 28 grey11
31 31 31 gray12
31 31 31 grey12
33 33 33 gray13
33 33 33 grey13
36 36 36 gray14
36 36 36 grey14
38 38 38 gray15
38 38 38 grey15
41 41 41 gray16
41 41 41 grey16
43 43 43 gray17
43 43 43 grey17
46 46 46 gray18
46 46 46 grey18
48 48 48 gray19
48 48 48 grey19
51 51 51 gray20
51 51 51 grey20
54 54 54 gray21
54 54 54 grey21
56 56 56 gray22
56 56 56 grey22
59 59 59 gray23
59 59 59 grey23
61 61 61 gray24
61 61 61 grey24
64 64 64 gray25
64 64 64 grey25
66 66 66 gray26
66 66 66 grey26
69 69 69 gray27
69 69 69 grey27
71 71 71 gray28
71 71 71 grey28
74 74 74 gray29
74 74 74 grey29
77 77 77 gray30
77 77 77 grey30
79 79 79 gray31
79 79 79 grey31
82 82 82 gray32
82 82 82 grey32
84 84 84 gray33
84 84 84 grey33
87 87 87 gray34
87 87 87 grey34
89 89 89 gray35
89 89 89 grey35
92 92 92 gray36
92 92 92 grey36
94 94 94 gray37
94 94 94 grey37
97 97 97 gray38
97 97 97 grey38
99 99 99 gray39
99 99 99 grey39
102 102 102 gray40
102 102 102 grey40
105 105 105 gray41
105 105 105 grey41
107 107 107 gray42
107 107 107 grey42
110 110 110 gray43
110 110 110 grey43
112 112 112 gray44
112 112 112 grey44
115 115 115 gray45
115 115 115 grey45
117 117 117 gray46
117 117 117 grey46
120 120 120 gray47
120 120 120 grey47
122 122 122 gray48
122 122 122 grey48
125 125 125 gray49
125 125 125 grey49
127 127 127 gray50
127 127 127 grey50
130 130 130 gray51
130 130 130 grey51
133 133 133 gray52
133 133 133 grey52
135 135 135 gray53
135 135 135 grey53
138 138 138 gray54
138 138 138 grey54
140 140 140 gray55
140 140 140 grey55
143 143 143 gray56
143 143 143 grey56
145 145 145 gray57
145 145 145 grey57
148 148 148 gray58
148 148 148 grey58
150 150 150 gray59
150 150 150 grey59
153 153 153 gray60
153 153 153 grey60
156 156 156 gray61
156 156 156 grey61
158 158 158 gray62
158 158 158 grey62
161 161 161 gray63
161 161 161 grey63
163 163 163 gray64
163 163 163 grey64
166 166 166 gray65
166 166 166 grey65
168 168 168 gray66
168 168 168 grey66
171 171 171 gray67
171 171 171 grey67
173 173 173 gray68
173 173 173 grey68
176 176 176 gray69
176 176 176 grey69
179 179 179 gray70
179 179 179 grey70
181 181 181 gray71
181 181 181 grey71
184 184 184 gray72
184 184 184 grey72
186 186 186 gray73
186 186 186 grey73
189 189 189 gray74
189 189 189 grey74
191 191 191 gray75
191 191 191 grey75
194 194 194 gray76
194 194 194 grey76
196 196 196 gray77
196 196 196 grey77
199 199 199 gray78
199 199 199 grey78
201 201 201 gray79
201 201 201 grey79
204 204 204 gray80
204 204 204 grey80
207 207 207 gray81
207 207 207 grey81
209 209 209 gray82
209 209 209 grey82
212 212 212 gray83
212 212 212 grey83
214 214 214 gray84
214 214 214 grey84
217 217 217 gray85
217 217 217 grey85
219 219 219 gray86
219 219 219 grey86
222 222 222 gray87
222 222 222 grey87
224 224 224 gray88
224 224 224 grey88
227 227 227 gray89
227 227 227 grey89
229 229 229 gray90
229 229 229 grey90
232 232 232 gray91
232 232 232 grey91
235 235 235 gray92
235 235 235 grey92
237 237 237 gray93
237 237 237 grey93
240 240 240 gray94
240 240 240 grey94
242 242 242 gray95
242 242 242 grey95
245 245 245 gray96
245 245 245 grey96
247 247 247 gray97
247 247 247 grey97
250 250 250 gray98
250 250 250 grey98
252 252 252 gray99
252 252 252 grey99
255 255 255 gray100
255 255 255 grey100
169 169 169 dark grey
169 169 169 DarkGrey
169 169 169 dark gray
169 169 169 DarkGray
0 0 139 dark blue
0 0 139 DarkBlue
0 139 139 dark cyan
0 139 139 DarkCyan
139 0 139 dark magenta
139 0 139 DarkMagenta
139 0 0 dark red
139 0 0 DarkRed
144 238 144 light green
144 238 144 LightGreen

55
net-misc/nx-X11/files/unbranded.diff Normal file
View File

@ -0,0 +1,55 @@
--- a/nxagent/programs/Xserver/hw/nxagent/Screen.c
+++ b/nxagent/programs/Xserver/hw/nxagent/Screen.c
@@ -1539,7 +1539,20 @@
#ifdef TEST
fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n",
nxagentDefaultWindows[pScreen->myNum]);
+
+ fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n",
+ nxagentDefaultWindows[pScreen->myNum]);
#endif
+
+ XClassHint hint;
+ hint.res_name=malloc(strlen(HINT)+1);
+ hint.res_class=malloc(strlen(HINT)+1);
+ strcpy(hint.res_name,HINT);
+ strcpy(hint.res_class,HINT);
+ XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint);
+ free(hint.res_name);
+ free(hint.res_class);
+
if (nxagentOption(Fullscreen))
{
--- a/nxagent/programs/Xserver/hw/nxagent/Screen.h
+++ b/nxagent/programs/Xserver/hw/nxagent/Screen.h
@@ -36,6 +36,8 @@
#define MIN_NXAGENT_HEIGHT 60
#define NXAGENT_FRAME_WIDTH 2000
+#define HINT "NXAgent"
+
#define nxagentSetPrintGeometry(screen) \
nxagentPrintGeometryFlags = (1 << (screen));
--- a/nxagent/programs/Xserver/hw/nxagent/Display.c
+++ b/nxagent/programs/Xserver/hw/nxagent/Display.c
@@ -1861,7 +1861,7 @@
strncpy(default_path, "", 255);
strcat(icon_filename, NXAGENT_ICON_NAME);
- strcat(default_path,"/usr/NX/share/images/");
+ strcat(default_path,"/usr/share/pixmaps/");
strcat(default_path,icon_filename);
if ((icon_fp = fopen(default_path, "r")) == NULL)
--- a/nxagent/programs/Xserver/hw/nxagent/Splash.c
+++ b/nxagent/programs/Xserver/hw/nxagent/Splash.c
@@ -204,6 +204,7 @@
nxagentPixmapLogo = XCreatePixmap(nxagentDisplay, win, width, height, nxagentLogoDepth);
+ return;
if (!nxagentPixmapLogo)
{
return;

51
net-misc/nx-X11/nx-X11-3.4.0_p3.ebuild → net-misc/nx-X11/nx-X11-3.4.0_p4.ebuild
View File

@ -6,6 +6,9 @@ EAPI=2
MY_PVV=${PV/_p/-}
MY_PV=${PV/_p*/}
NXAGENT_VER="11"
NXAUTH_VER="3"
inherit autotools eutils multilib
@ -14,8 +17,8 @@ HOMEPAGE="http://www.nomachine.com/developers.php"
URI_BASE="http://web04.nomachine.com/download/${MY_PV}/sources"
SRC_NX_X11="nx-X11-${MY_PVV}.tar.gz"
SRC_NXAGENT="nxagent-${MY_PV}-8.tar.gz"
SRC_NXAUTH="nxauth-${MY_PVV}.tar.gz"
SRC_NXAGENT="nxagent-${MY_PV}-${NXAGENT_VER}.tar.gz"
SRC_NXAUTH="nxauth-${MY_PV}-${NXAUTH_VER}.tar.gz"
SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXAUTH"
@ -45,17 +48,39 @@ S=${WORKDIR}/${PN}
src_prepare() {
# Fix sandbox violation
epatch "${FILESDIR}"/nx-x11-1.5.0-tmp-exec.patch
# -fPIC
# Use System nxcomp
epatch "${FILESDIR}"/01_build_nx-X11_without_nxcomp.dpatch
# Respect CFLAGS/CXXFLAGS
# use System nxcompshad
epatch "${FILESDIR}"/02_dont_build_nxcompshad.dpatch
# Respect CFLAGS/CXXFLAGS
# Rename the nx patched x11 libs
epatch "${FILESDIR}"/85_nx-X11_debian-ld.dpatch
# Respect CFLAGS/CXXFLAGS
# search in system rgb path for the rgb file
epatch "${FILESDIR}"/86_set_rgb_path.dpatch
# Change system security policy path
epatch "${FILESDIR}"/87_set_securitypolicy_path.dpatch
# set location for the X0 keyboard file
epatch "${FILESDIR}"/90_set_X0-config_path.dpatch
# Export Keyboard config
epatch "${FILESDIR}"/93_export_remote_keyboard_config.dpatch
# Fix Makefiles for external libs
epatch "${FILESDIR}"/95_fix_Imakefile.dpatch
# Respect CFLAGS/CXXFLAGS
# Add utf8 support to the clipboard in nx session
epatch "${FILESDIR}"/nx-X11-utf8_copy_clipboard.patch
# prevent sending COMPOUND_TEXT to client
epatch "${FILESDIR}"/nx-X11-dimbor.patch
# add a timeout to closewindow for wine
epatch "${FILESDIR}"/nxa_wine_close_delay.patch
# add locale support to nxagent
epatch "${FILESDIR}"/nxagent.MotifWMHints_Utf8Names.dimbor.patch
# dont crash on to big pixmaps
epatch "${FILESDIR}"/createpixmap_bounds_check.patch
# remove nomachine branding
epatch "${FILESDIR}"/unbranded.diff
# find nx header
epatch "${FILESDIR}"/nx-X11-3.4.0-Imake-fix-1.patch
# From xorg-x11-6.9.0-r3.ebuild
cd "${S}"
[ -e programs/Xserver/hw/nxagent ] || cp -r nxagent/programs/Xserver/hw/nxagent programs/Xserver/hw/
@ -83,4 +108,16 @@ src_install() {
doins "${S}"/programs/Xserver/hw/nxagent/*.h
doins "${S}"/programs/Xserver/include/dix.h
doins -r "${S}"/exports/include/*
insinto /etc/nxagent
doins "${FILESDIR}"/nxagent.keyboard
insinto /usr/share/nxagent
doins "${FILESDIR}"/rgb
doins "${S}"/programs/Xserver/Xext/SecurityPolicy
insinto /usr/share/pixmaps
doins "${S}"/programs/Xserver/hw/nxagent/nxagent.xpm
doman "${FILESDIR}"/nxagent.1
}