diff options
Diffstat (limited to 'net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-external-nxcomp.patch')
| -rw-r--r-- | net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-external-nxcomp.patch | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-external-nxcomp.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-external-nxcomp.patch deleted file mode 100644 index eb7f9d2..0000000 --- a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-external-nxcomp.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- common/nx-X11/lib/X11/Imakefile.orig 2007-03-08 16:53:42.000000000 +0100 -+++ common/nx-X11/lib/X11/Imakefile 2007-03-08 16:56:58.000000000 +0100 -@@ -58,9 +58,10 @@ - # -DNX_CLEAN_FLUSH \ - # -DNX_CLEAN_SEND \ - --NX_XCOMPLIBTARGET = ../../../nxcomp/libXcomp.so -+NX_PREFIX = /usr/NX -+NX_XCOMPLIBTARGET = $(NX_PREFIX)/lib/libXcomp.so - --NX_REQUIREDLIBS = -L../../../nxcomp -lXcomp -+NX_REQUIREDLIBS = -L$(NX_PREFIX)/lib -lXcomp - - #endif - -@@ -1132,18 +1133,6 @@ - - #if NXLibraries - --#ifdef SunArchitecture --$(NX_XCOMPLIBTARGET): -- cd ../../../nxcomp && \ -- ./configure && \ -- gmake --#else --$(NX_XCOMPLIBTARGET): -- cd ../../../nxcomp && \ -- ./configure && \ -- make --#endif -- - depend:: $(NX_XCOMPLIBTARGET) ks_tables.h - - #else ---- common/nx-X11/programs/Xserver/Imakefile.orig 2007-03-08 18:57:58.000000000 +0100 -+++ common/nx-X11/programs/Xserver/Imakefile 2007-03-08 18:58:20.000000000 +0100 -@@ -1368,11 +1368,7 @@ - * We need this as the linker will try to locate dependencies of X11 and Xext. - */ - --#if defined(SunArchitecture) --NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -lXcomp -lXcompext -lrt -L/usr/sfw/lib -lXrender --#else --NXAGENTNXLIBS = -Wl,-rpath-link,../../../nxcomp -Wl,-rpath-link,../../../nxcompext,-lXrender --#endif -+NXAGENTNXLIBS = -Wl,-rpath-link,/usr/NX/lib -Wl,-rpath-link,../../../nxcompext,-lXrender - - #endif - ServerTarget(nxagent,$(NXAGENTDIRS),$(NXAGENTOBJS), \ ---- common/nx-X11/lib/Xext/Imakefile.orig 2007-03-09 10:26:20.000000000 +0100 -+++ common/nx-X11/lib/Xext/Imakefile 2007-03-09 10:26:42.000000000 +0100 -@@ -60,14 +60,7 @@ - LINTLIBS = $(LINTXLIB) - - #if NXLibraries -- --$(NX_XCOMPLIBEXTTARGET): -- cd ../../../nxcompext && \ -- ./configure && \ -- make -- - all:: $(NX_XCOMPLIBEXTTARGET) -- - #endif - - #include <Library.tmpl> ---- client/nxdesktop/configure.orig 2007-03-09 11:16:59.000000000 +0100 -+++ client/nxdesktop/configure 2007-03-09 11:23:41.000000000 +0100 -@@ -162,7 +162,7 @@ - - # Find X installation - --xdirs="$extraxdir ../nx-X11/exports /usr/X11R6 /usr/X11 /usr/openwin /usr /usr/local/X11R6 /usr/local/X11 /usr/local" -+xdirs="$extraxdir ../../common/nx-X11/exports /usr/X11R6 /usr/X11 /usr/openwin /usr /usr/local/X11R6 /usr/local/X11 /usr/local" - - for dir in $xdirs; do - if [ -f $dir/include/X11/Xlib.h ]; then -@@ -195,7 +195,7 @@ - rpath="$rpath:$xdir/lib" - fi - --ldflags="$ldflags" -+ldflags="$ldflags -L/usr/NX/lib" - targets="$targets nxdesktop" - - #withoutopenssl not currently supported ---- server/nxviewer/nxviewer/Imakefile.orig 2007-03-09 11:35:58.000000000 +0100 -+++ server/nxviewer/nxviewer/Imakefile 2007-03-09 11:36:50.000000000 +0100 -@@ -54,7 +54,7 @@ - - DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) - --LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) $(NX_LIB) -+LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) $(NX_LIB) -L/usr/NX/lib - - #ifdef SunArchitecture - LOCAL_LIBRARIES = $(NX_LIB) $(SUN_LIB) XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) |