aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-27 01:14:23 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-27 01:14:23 +0200
commit9525d07396ba8ba30effc234354d6142b5e67895 (patch)
treead0e54e66cc14b8609189243a7b9829414fad34a /debian
parentef24d64900d444f93d86e35d1723e082ed8ee2c1 (diff)
downloadnx-libs-9525d07396ba8ba30effc234354d6142b5e67895.tar.gz
nx-libs-9525d07396ba8ba30effc234354d6142b5e67895.tar.bz2
nx-libs-9525d07396ba8ba30effc234354d6142b5e67895.zip
nxcompshad: Prevent underlinking by linking to libNX_Xext.
Adds: - 0650_nxcompshad_link-to-NX_Xext.full.patch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/0650_nxcompshad_link-to-NX_Xext.full.patch14
-rw-r--r--debian/patches/series1
3 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 925ad86a0..feea31110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -126,6 +126,9 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
* nx-X11: Prevent underlinking by linking to libNX_X{11,damage,fixes).
Adds:
- 0640_nx-X11_fix-underlinking-libNX_Xcomposite_damage_fixes.full.patch
+ * nxcompshad: Prevent underlinking by linking to libNX_Xext.
+ Adds:
+ - 0650_nxcompshad_link-to-NX_Xext.full.patch
-- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100
diff --git a/debian/patches/0650_nxcompshad_link-to-NX_Xext.full.patch b/debian/patches/0650_nxcompshad_link-to-NX_Xext.full.patch
new file mode 100644
index 000000000..c147f15b7
--- /dev/null
+++ b/debian/patches/0650_nxcompshad_link-to-NX_Xext.full.patch
@@ -0,0 +1,14 @@
+Description: Prevent underlinking by linking to libNX_Xext.
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/nxcompshad/Makefile.in
++++ b/nxcompshad/Makefile.in
+@@ -148,7 +148,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL)
+
+ else
+
+-EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage
++EXTRALIBS = -lNX_Xext -lNX_Xtst -lNX_Xrandr -lNX_Xdamage
+
+ all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
+
diff --git a/debian/patches/series b/debian/patches/series
index f28170f05..2c7d970c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -80,6 +80,7 @@
0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch
0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch
0640_nx-X11_fix-underlinking-libNX_Xcomposite_damage_fixes.full.patch
+0650_nxcompshad_link-to-NX_Xext.full.patch
0990_fix-DEBUG-and-TEST-builds.full.patch
0991_fix-hr-typos.full+lite.patch
0991_fix-hr-typos.full.patch