summaryrefslogtreecommitdiff
path: root/net/nxserver/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/nxserver/files')
-rw-r--r--net/nxserver/files/extra-patch-nx-X11-programs-Xserver-hw-nxagent-Reconnect.c11
-rw-r--r--net/nxserver/files/extra-patch-nxcomp-types.h57
-rw-r--r--net/nxserver/files/patch-lib-xtrans-Xtranssock.c17
-rw-r--r--net/nxserver/files/patch-nx-x11-lib-x11-imakefile11
-rw-r--r--net/nxserver/files/patch-nx-x11-programs-xserver-hw-nxagent-imakefile11
-rw-r--r--net/nxserver/files/patch-nxcomp-makefile.in21
-rw-r--r--net/nxserver/files/patch-nxcompext-Clean.c11
-rw-r--r--net/nxserver/files/patch-nxdesktop-Makeconf10
-rw-r--r--net/nxserver/files/patch-nxdesktop-proto.h11
-rw-r--r--net/nxserver/files/patch-nxdesktop-rdesktop.h10
-rw-r--r--net/nxserver/files/patch-nxviewer-nxviewer-Imakefile21
11 files changed, 191 insertions, 0 deletions
diff --git a/net/nxserver/files/extra-patch-nx-X11-programs-Xserver-hw-nxagent-Reconnect.c b/net/nxserver/files/extra-patch-nx-X11-programs-Xserver-hw-nxagent-Reconnect.c
new file mode 100644
index 000000000000..6ab1d83c6aa1
--- /dev/null
+++ b/net/nxserver/files/extra-patch-nx-X11-programs-Xserver-hw-nxagent-Reconnect.c
@@ -0,0 +1,11 @@
+--- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c.orig Sat Sep 11 16:04:08 2004
++++ nx-X11/programs/Xserver/hw/nxagent/Reconnect.c Sat Sep 11 16:04:23 2004
+@@ -308,7 +308,7 @@
+ while (sessionState == SESSION_SLEEPING)
+ {
+ /* Blocking SIG_ALRM. */
+- pselect(0, NULL, NULL, NULL, NULL, &sleep_set);
++ select(0, NULL, NULL, NULL, &sleep_set);
+ }
+
+ if (sessionState == SESSION_TERM)
diff --git a/net/nxserver/files/extra-patch-nxcomp-types.h b/net/nxserver/files/extra-patch-nxcomp-types.h
new file mode 100644
index 000000000000..280c2c0ce86b
--- /dev/null
+++ b/net/nxserver/files/extra-patch-nxcomp-types.h
@@ -0,0 +1,57 @@
+--- nxcomp/Types.h.orig Sat Feb 5 15:56:14 2005
++++ nxcomp/Types.h Tue Mar 29 09:52:13 2005
+@@ -74,11 +74,11 @@
+
+ void clear()
+ {
+- #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
++ #if defined(__STL_USE_STD_ALLOCATORS) || defined(_VECTOR_H)
+
+- #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
++ #if defined(_VECTOR_H)
+
+- _Destroy(_M_start, _M_finish);
++ _Destroy(_M_impl._M_start, _M_impl._M_finish);
+
+ #else /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
+@@ -86,9 +86,9 @@
+
+ #endif /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
+- _M_deallocate(_M_start, _M_end_of_storage - _M_start);
++ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
+
+- _M_start = _M_finish = _M_end_of_storage = 0;
++ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
+
+ #else /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
+@@ -120,21 +120,21 @@
+
+ void clear()
+ {
+- #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
++ #if defined(__STL_USE_STD_ALLOCATORS) || defined(_VECTOR_H)
+
+- #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
++ #if defined(_VECTOR_H)
+
+- _Destroy(_M_start, _M_finish);
++ _Destroy(_M_impl._M_start, _M_impl._M_finish);
+
+ #else /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
+- destroy(_M_start, _M_finish);
++ destroy(_M_impl._M_start, _M_impl._M_finish);
+
+ #endif /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
+- _M_deallocate(_M_start, _M_end_of_storage - _M_start);
++ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
+
+- _M_start = _M_finish = _M_end_of_storage = 0;
++ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
+
+ #else /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
diff --git a/net/nxserver/files/patch-lib-xtrans-Xtranssock.c b/net/nxserver/files/patch-lib-xtrans-Xtranssock.c
new file mode 100644
index 000000000000..151f507a02d7
--- /dev/null
+++ b/net/nxserver/files/patch-lib-xtrans-Xtranssock.c
@@ -0,0 +1,17 @@
+--- nx-X11/lib/xtrans/Xtranssock.c.orig Wed Mar 3 19:47:29 2004
++++ nx-X11/lib/xtrans/Xtranssock.c Wed Sep 1 22:39:47 2004
+@@ -2118,11 +2118,11 @@
+ * platforms as well.
+ */
+
+- #ifndef __sun
++ /* #ifndef __sun */
+
+- sa.sa_restorer = NULL;
++ /* sa.sa_restorer = NULL; */
+
+- #endif
++ /* #endif */
+
+ sigemptyset(&(sa.sa_mask));
+
diff --git a/net/nxserver/files/patch-nx-x11-lib-x11-imakefile b/net/nxserver/files/patch-nx-x11-lib-x11-imakefile
new file mode 100644
index 000000000000..0c594f3e3cae
--- /dev/null
+++ b/net/nxserver/files/patch-nx-x11-lib-x11-imakefile
@@ -0,0 +1,11 @@
+--- nx-X11/lib/X11/Imakefile.orig Thu Sep 2 00:22:34 2004
++++ nx-X11/lib/X11/Imakefile Thu Sep 2 00:22:46 2004
+@@ -22,7 +22,7 @@
+ #ifdef SunArchitecture
+ NX_INCLUDES = -I../../../nxcomp -I../../../nxcompext -I/usr/sfw/include
+ #else
+-NX_INCLUDES = -I../../../nxcomp -I../../../nxcompext
++NX_INCLUDES = -I../../../nxcomp -I../../../nxcompext -I/usr/local/include
+ #endif
+
+ NX_DEFINES = -DNX_CLEAN_ALLOC \
diff --git a/net/nxserver/files/patch-nx-x11-programs-xserver-hw-nxagent-imakefile b/net/nxserver/files/patch-nx-x11-programs-xserver-hw-nxagent-imakefile
new file mode 100644
index 000000000000..5f545848a7c2
--- /dev/null
+++ b/net/nxserver/files/patch-nx-x11-programs-xserver-hw-nxagent-imakefile
@@ -0,0 +1,11 @@
+--- nx-X11/programs/Xserver/hw/nxagent/Imakefile.orig Sun Apr 18 11:57:27 2004
++++ nx-X11/programs/Xserver/hw/nxagent/Imakefile Thu Sep 2 01:46:12 2004
+@@ -102,7 +102,7 @@
+ -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
+ -I../../mi -I../../include -I../../os \
+ -I$(EXTINCSRC) -I$(XINCLUDESRC) \
+- $(VFBINCLUDES) $(NXFONTINCLUDES)
++ $(VFBINCLUDES) $(NXFONTINCLUDES) -I/usr/local/include
+ #ifdef SunArchitecture
+ INCLUDES = -I../../../../../nxcomp -I../../../../../nxcompext \
+ -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
diff --git a/net/nxserver/files/patch-nxcomp-makefile.in b/net/nxserver/files/patch-nxcomp-makefile.in
new file mode 100644
index 000000000000..31bbb48a329f
--- /dev/null
+++ b/net/nxserver/files/patch-nxcomp-makefile.in
@@ -0,0 +1,21 @@
+--- nxcomp/Makefile.in.orig Sun Nov 9 06:30:58 2003
++++ nxcomp/Makefile.in Thu Sep 2 00:41:27 2004
+@@ -11,14 +11,14 @@
+ #
+
+ CXX = @CXX@
+-CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
+- -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
+-CXXINCLUDES =
++CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ -fpermissive -fPIC
++# -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
++CXXINCLUDES = -I/usr/local/include
+ CXXDEFINES =
+
+ CC = @CC@
+ CCFLAGS = $(CXXFLAGS)
+-CCINCLUDES =
++CCINCLUDES = -I/usr/local/include
+ CCDEFINES =
+
+ LDFLAGS = @LDFLAGS@
diff --git a/net/nxserver/files/patch-nxcompext-Clean.c b/net/nxserver/files/patch-nxcompext-Clean.c
new file mode 100644
index 000000000000..17ef115d17da
--- /dev/null
+++ b/net/nxserver/files/patch-nxcompext-Clean.c
@@ -0,0 +1,11 @@
+--- nxcompext/Clean.c Thu Apr 29 03:00:45 2004
++++ nxcompext/Clean.c.new Sun Sep 5 17:41:01 2004
+@@ -672,7 +672,7 @@
+
+ sig_act.sa_handler = &SignalHandler;
+
+- #ifdef __sun
++ #if defined(__sun) || defined(__FreeBSD__)
+
+ sig_act.sa_flags = SA_SIGINFO | SA_NODEFER;
+
diff --git a/net/nxserver/files/patch-nxdesktop-Makeconf b/net/nxserver/files/patch-nxdesktop-Makeconf
new file mode 100644
index 000000000000..30b755d4b3a8
--- /dev/null
+++ b/net/nxserver/files/patch-nxdesktop-Makeconf
@@ -0,0 +1,10 @@
+--- nxdesktop/Makeconf.orig Sat Sep 11 14:23:17 2004
++++ nxdesktop/Makeconf Sat Sep 11 14:23:53 2004
+@@ -3,6 +3,6 @@
+ INSTALL = install
+ CRYPTOBJ =
+ SOUNDOBJ = rdpsnd.o rdpsnd_oss.o
+-CFLAGS = -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" -Wall -O2 -I../nx-X11/exports/include -DWITH_OPENSSL -DWITH_RDPSND -DL_ENDIAN
++CFLAGS = -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" -O2 -I../nx-X11/exports/include -I/usr/local/include -DWITH_OPENSSL -DWITH_RDPSND -DL_ENDIAN
+ LDFLAGS = -L../nx-X11/exports/lib -lcrypto
+ TARGETS = nxdesktop
diff --git a/net/nxserver/files/patch-nxdesktop-proto.h b/net/nxserver/files/patch-nxdesktop-proto.h
new file mode 100644
index 000000000000..d4861ca74772
--- /dev/null
+++ b/net/nxserver/files/patch-nxdesktop-proto.h
@@ -0,0 +1,11 @@
+--- nxdesktop/proto.h.orig Wed Sep 15 18:29:24 2004
++++ nxdesktop/proto.h Wed Apr 6 12:02:30 2005
+@@ -133,7 +133,7 @@
+ int get_device_index(HANDLE handle);
+ void convert_to_unix_filename(char *filename);
+ BOOL rdpdr_init(void);
+-void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout);
++/* void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout); */
+ struct async_iorequest *rdpdr_remove_iorequest(struct async_iorequest *prev,
+ struct async_iorequest *iorq);
+ void rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out);
diff --git a/net/nxserver/files/patch-nxdesktop-rdesktop.h b/net/nxserver/files/patch-nxdesktop-rdesktop.h
new file mode 100644
index 000000000000..faf56776ab61
--- /dev/null
+++ b/net/nxserver/files/patch-nxdesktop-rdesktop.h
@@ -0,0 +1,10 @@
+--- nxdesktop/rdesktop.h.orig Sat Sep 11 00:16:52 2004
++++ nxdesktop/rdesktop.h Sat Sep 11 00:17:06 2004
+@@ -39,6 +39,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <dirent.h>
++#include <sys/types.h>
+
+ #define VERSION "1.3.1"
+
diff --git a/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile b/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile
new file mode 100644
index 000000000000..507df6a03a06
--- /dev/null
+++ b/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile
@@ -0,0 +1,21 @@
+--- nxviewer/nxviewer/Imakefile.orig Thu Jun 17 11:44:40 2004
++++ nxviewer/nxviewer/Imakefile Mon Feb 7 02:22:45 2005
+@@ -37,7 +37,7 @@
+ #endif
+
+
+-INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include/X11 $(NX_INC)
++INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/local/include -I/usr/X11R6/include/X11 $(NX_INC)
+ VNCAUTH_LIB = ./libvncauth.a
+ ZLIB_LIB = -L/usr/local/lib -lz
+ JPEG_LIB = -L/usr/local/lib -ljpeg
+@@ -50,6 +50,9 @@
+ #endif
+
+ DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
++XPLIBSRC =
++XPLIB =
++
+
+ LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) $(NX_LIB)
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 16:16:07 +0000