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

net-misc/nxproxy: Initial checkin

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2261 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2010-06-14 21:51:50 +00:00
parent 849590076e
commit 9aa435438b
8 changed files with 223 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
net-misc/nxproxy/files/nxproxy-3.2.0-read_from_stdin.patch Normal file
View File

@@ -0,0 +1,70 @@
Index: nxproxy/Main.c
===================================================================
--- nxproxy.orig/Main.c 2007-01-19 14:34:34.000000000 -0200
+++ nxproxy/Main.c 2010-03-27 12:47:28.872040679 -0300
@@ -36,28 +36,48 @@
int result = -1;
char *options = NULL;
-
+
+ char *nx_commfd_str = NULL;
+
options = getenv("NX_DISPLAY");
-
- if (NXTransParseCommandLine(argc, argv) < 0)
+
+ if ((nx_commfd_str = getenv("NX_COMMFD")) != NULL)
{
- NXTransCleanup();
- }
+ int nx_commfd = atoi(nx_commfd_str);
- if (NXTransParseEnvironment(options, 0) < 0)
- {
- NXTransCleanup();
+ if (result)
+ result = NXTransCreate(nx_commfd, NX_MODE_SERVER, options);
+
+ // go into endless loop
+
+ if (result)
+ {
+ while (NXTransRunning(NX_FD_ANY))
+ result = NXTransContinue(NULL);
+ }
}
+ else
+ {
+ if (NXTransParseCommandLine(argc, argv) < 0)
+ {
+ NXTransCleanup();
+ }
+
+ if (NXTransParseEnvironment(options, 0) < 0)
+ {
+ NXTransCleanup();
+ }
+
+ /*
+ * This should not return...
+ */
+
+ #ifdef TEST
+ fprintf(stderr, "Main: Yielding control to NX entry point.\n");
+ #endif
- /*
- * This should not return...
- */
-
- #ifdef TEST
- fprintf(stderr, "Main: Yielding control to NX entry point.\n");
- #endif
-
- result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
+ result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
+ }
/*
* ...So these should not be called.

14
net-misc/nxproxy/files/nxproxy-3.3.0-cflags.patch Normal file
View File

@@ -0,0 +1,14 @@
--- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100
+++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100
@@ -5,11 +5,6 @@
AC_INIT(Main.c)
AC_PREREQ(2.13)
-dnl Reset default compilation flags.
-
-CXXFLAGS="-O3"
-CPPFLAGS="-O3"
-
dnl Prefer headers and libraries from nx-X11 if present.
if test -d "../nx-X11/exports/include" ; then

15
net-misc/nxproxy/files/nxproxy-3.4.0-build_destdir.patch Normal file
View File

@@ -0,0 +1,15 @@
Index: nxproxy/Makefile.in
===================================================================
--- nxproxy.orig/Makefile.in 2010-03-27 14:32:09.462039266 -0300
+++ nxproxy/Makefile.in 2010-03-27 15:18:00.842087362 -0300
@@ -87,8 +87,8 @@
install: install.bin install.man
install.bin: $(PROGRAM)
- $(srcdir)/mkinstalldirs $(bindir)
- $(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM)
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ $(INSTALL) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
install.man:
$(srcdir)/mkinstalldirs $(man1dir)

28
net-misc/nxproxy/files/nxproxy-3.4.0-no-local-nxcomp-1.patch Normal file
View File

@@ -0,0 +1,28 @@
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
Date: 2010-06-14
Initial Package Version: 3.4.0
Origin: me
Upstream Status: unknown
Description: search for the lib and the includes location
diff -Naur nxproxy.orig/Makefile.in nxproxy/Makefile.in
--- nxproxy.orig/Makefile.in 2010-06-14 19:25:40.832707544 +0000
+++ nxproxy/Makefile.in 2010-06-14 19:27:44.083957268 +0000
@@ -15,14 +15,14 @@
-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs
-CXXINCLUDES = -I. -I../nxcomp
+CXXINCLUDES = -I. -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1
CC = @CC@
CCFLAGS = $(CXXFLAGS)
-CCINCLUDES = -I. -I../nxcomp
+CCINCLUDES = -I. -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1
CCDEFINES =
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -L/usr/lib/nx/
LIBS = @LIBS@
#