diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2009-01-07 09:02:40 +0000 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-01-07 09:02:40 +0000 |
commit | 31353f7f89c24b720357f81c9bf2915ed94b9563 (patch) | |
tree | 07c8d8f3cbfafa1c53f708668d8f5b27b843d252 /net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch | |
parent | Add ldap depends to x2goserver, some cleanups (diff) | |
download | nx-31353f7f89c24b720357f81c9bf2915ed94b9563.tar.gz nx-31353f7f89c24b720357f81c9bf2915ed94b9563.tar.bz2 nx-31353f7f89c24b720357f81c9bf2915ed94b9563.zip |
Add net-misc/nxclient-2xterminalserver and net-misc/nxserver-2xterminalserver, now that they're removed from portage
svn path=/testing/; revision=220
Diffstat (limited to 'net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch')
-rw-r--r-- | net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch | 123 |
1 files changed, 123 insertions, 0 deletions
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch new file mode 100644 index 0000000..86ab44d --- /dev/null +++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch @@ -0,0 +1,123 @@ +diff -uBb --recursive common.orig/nxcompext/Makefile.in common/nxcompext/Makefile.in +--- common.orig/nxcompext/Makefile.in 2006-11-22 22:30:10.000000000 +0000 ++++ common/nxcompext/Makefile.in 2006-11-22 22:34:08.000000000 +0000 +@@ -19,7 +19,7 @@ + + CC = @CC@ + CCFLAGS = $(CXXFLAGS) +-CCINCLUDES = -I. -I../nxcomp ++CCINCLUDES = -I. -I../nxcomp -I../nx-X11/lib/X11 -I../nx-X11/include -I../nx-X11/programs/Xserver/include + CCDEFINES = + + LDFLAGS = @LDFLAGS@ -L../nx-X11/lib/X11 -L../nxcomp +diff -uBb --recursive client.orig/nxdesktop/Makefile client/nxdesktop/Makefile +--- client.orig/nxdesktop/Makefile 2006-11-23 07:49:51.000000000 +0000 ++++ client/nxdesktop/Makefile 2006-11-23 07:52:17.000000000 +0000 +@@ -30,8 +30,8 @@ + mandir = $(prefix)/man + datadir = $(prefix)/share + +-INCLUDES = -I../nxcomp -I../nxcompext +-LDLIBS = -lXpm -L../nxcompext -lXcompext -L../nxcomp -lXcomp -lX11 -lXext ++INCLUDES = -I../../common/nxcomp -I../../common/nxcompext ++LDLIBS = -L../../common/nx-X11 -lXpm -L../../common/nxcompext -lXcompext -L../../common/nxcomp -lXcomp -lX11 -lXext + VERSION = 1.5.0-2 + KEYMAP_PATH = $(datadir)/keymaps-windows/ + +diff -uBb --recursive server.orig/nxnode/src/configure server/nxnode/src/configure +--- server.orig/nxnode/src/configure 2006-11-23 22:07:58.000000000 +0000 ++++ server/nxnode/src/configure 2006-11-23 22:08:43.000000000 +0000 +@@ -78,9 +78,7 @@ + fi + + echo "Checking perl path" +-out=`../../perl/bin/perl -V:bin` +-eval $out +-perlbin="$bin/perl" ++perlbin="/usr/bin/perl" + + echo "Created Makefile" + cp -f Makefile.in Makefile +diff -uBb --recursive server.orig/nxsensor/server/Makefile server/nxsensor/server/Makefile +--- server.orig/nxsensor/server/Makefile 2006-11-23 21:46:17.000000000 +0000 ++++ server/nxsensor/server/Makefile 2006-11-23 21:48:48.000000000 +0000 +@@ -35,20 +35,20 @@ + endif + PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0` + +-#GLIB12_INCLUDE = `glib-config --cflags` +-#GLIB12_LIB = `glib-config --libs glib gmodule` ++GLIB12_INCLUDE = `glib-config --cflags` ++GLIB12_LIB = `glib-config --libs glib gmodule` + +-GLIB12_INCLUDE = -I../../glib-1.2.8/ -I../../glib-1.2.8/gmodule/ -I../../glib-1.2.8/gthread/ +-GLIB12_LIB = -L../../glib-1.2.8/.libs -L../../glib-1.2.8/gmodule/.libs -L../../glib-1.2.8/gthread/.libs -lglib -lgmodule -lgthread -ldl ++#GLIB12_INCLUDE = -I../../glib-1.2.8/ -I../../glib-1.2.8/gmodule/ -I../../glib-1.2.8/gthread/ ++#GLIB12_LIB = -L../../glib-1.2.8/.libs -L../../glib-1.2.8/gmodule/.libs -L../../glib-1.2.8/gthread/.libs -lglib -lgmodule -lgthread -ldl + + LD_RUN_PATH = /usr/NX/lib + +-FLAGS = -O3 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) ++FLAGS = $(CFLAGS) -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) + ifeq ($(glib12),1) +-FLAGS = -O3 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE) ++FLAGS = $(CFLAGS) -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE) + endif + ifeq ($(glib12),yes) +-FLAGS = -O3 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE) ++FLAGS = $(CFLAGS) -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE) + endif + + FLAGS+= $(PTHREAD_INC) +diff -ubB --recursive server.orig/nxviewer/nxviewer/Imakefile server/nxviewer/nxviewer/Imakefile +--- server.orig/nxviewer/nxviewer/Imakefile 2006-11-23 20:23:37.000000000 +0000 ++++ server/nxviewer/nxviewer/Imakefile 2006-11-23 20:25:41.000000000 +0000 +@@ -15,42 +15,24 @@ + /* */ + /***************************************************************************/ + +-#ifdef SunArchitecture +-EXTRA_DEFINES = -D__EXTENSIONS__ +-#endif +- + XCOMM Shared memory support works OK on x86 linux, not tested elsewhere but + XCOMM seems to cause problems on Digital Unix. + + #if defined(i386Architecture) && defined(LinuxArchitecture) + DEFINES = -DMITSHM +-ZLIB_INC = -I../../zlib-1-2.1 +-JPEG_INC = -I../../jpeg-6b + #endif + +-NX_INC = -I../../nxcomp -I../../nxcompext -I../../nx-X11/exports/include +-NX_LIB = -L../../nxcomp -lXcomp -L../../nxcompext -lXcompext +- +-#ifdef SunArchitecture +-NX_INC += -I/usr/sfw/include -I/usr/include +-NX_LIB += ../../nx-X11/exports/lib/libXpm.a -L../../nx-X11/exports/lib +-ZLIB_INC = -I/usr/local/include +-JPEG_INC = -I/usr/local/include +-#endif ++NX_INC = -I../../../common/nxcomp -I../../../common/nxcompext -I../../../common/nx-X11/exports/include ++NX_LIB = -L../../../common/nxcomp -lXcomp -L../../../common/nxcompext -lXcompext + + +-INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include/X11 $(NX_INC) ++INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I../../../common/nx-X11/lib/X11 -I../../../common/nx-X11/include -I../../../common/nx-X11/programs/Xserver/include $(NX_INC) + VNCAUTH_LIB = ./libvncauth.a +-ZLIB_LIB = -L../../zlib-1.2.1 -lz +-JPEG_LIB = -L../../jpeg-6b/.libs -ljpeg ++ZLIB_LIB = -lz ++JPEG_LIB = -ljpeg + +-USRLIBDIR = ../../nx-X11/exports/lib ++USRLIBDIR = ../../../common/nx-X11/lib/X11 + +-#ifdef SunArchitecture +-USRLIBDIR = /usr/NX/lib +-SUN_LIB = -lX11 -lXext -L/usr/openwin/lib +-JPEG_LIB = ../../jpeg-6b/.libs/libjpeg.a +-#endif + + DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) + |