aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-11 23:06:58 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-11 23:06:58 +0100
commitec72377982314efccbc8597a65ec364b8b75d251 (patch)
tree1cd9b4796132fa92dbfc31ce04d5ca37931b34cc /debian
parent4eae840bd56bda22b7bf6c9a55f1118ed62461e4 (diff)
downloadnx-libs-ec72377982314efccbc8597a65ec364b8b75d251.tar.gz
nx-libs-ec72377982314efccbc8597a65ec364b8b75d251.tar.bz2
nx-libs-ec72377982314efccbc8597a65ec364b8b75d251.zip
Revert "Add patch: 111_nxcomp_byerace.full+lite.patch. Work around race condition in qtnx and libnxcl."
This reverts commit 4eae840bd56bda22b7bf6c9a55f1118ed62461e4. It does not fix qtnx failures that occur with this version of nxagent.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/111_nxcomp_byerace.full+lite.patch21
-rw-r--r--debian/patches/series1
3 files changed, 0 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog
index 0c2c3caf3..012c7bd95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,6 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
* Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories,
make build stanza work for nx-libs-full and nx-libs-lite.
- * Add patch: 111_nxcomp_byerace.full+lite.patch. Work around race condition in
- qtnx and libnxcl.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100
diff --git a/debian/patches/111_nxcomp_byerace.full+lite.patch b/debian/patches/111_nxcomp_byerace.full+lite.patch
deleted file mode 100644
index ff0f41c13..000000000
--- a/debian/patches/111_nxcomp_byerace.full+lite.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -7321,6 +7321,18 @@
- << logofs_flush;
- #endif
-
-+ // Henning Heinold
-+ // fix up error from libnxcl where bye can be in front of NXPROXY
-+ if (strncmp(options, "bye", strlen("bye")) == 0)
-+ {
-+ int bye_length = strlen("bye");
-+ char *moo = &options[bye_length+1];
-+
-+ memmove(options, moo, DEFAULT_REMOTE_OPTIONS_LENGTH-bye_length-1);
-+ *logofs << "Loop: Cleanded the bye in options, options now looks '"
-+ << options << "'.\n" << logofs_flush;
-+ }
-+
- if (strncmp(options, "NXPROXY-", strlen("NXPROXY-")) != 0)
- {
- #ifdef PANIC
diff --git a/debian/patches/series b/debian/patches/series
index 434e86aac..9133bf604 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,7 +33,6 @@
108_nxagent_wine-close-delay.full.patch
109_nxagent_locale-utf8-compound-text.full.patch
110_nxagent_createpixmap-bounds-check.full.patch
-111_nxcomp_byerace.full+lite.patch
200_nxagent_check-binary-x2go-flavour.full.patch
201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
202_nx-x11_enable-xinerama.full.patch