[X2Go-Commits] [nx-libs] 05/17: nxcompshad: Prevent underlinking by linking to libNX_Xext.

git-admin at x2go.org git-admin at x2go.org
Mon Apr 27 02:50:40 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.5.0.x
in repository nx-libs.

commit 9525d07396ba8ba30effc234354d6142b5e67895
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 27 01:14:23 2015 +0200

    nxcompshad: Prevent underlinking by linking to libNX_Xext.
    
    Adds:
        - 0650_nxcompshad_link-to-NX_Xext.full.patch
---
 debian/changelog                                   |    3 +++
 .../0650_nxcompshad_link-to-NX_Xext.full.patch     |   14 ++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 925ad86..feea311 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 at 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 0000000..c147f15
--- /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 at 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 f28170f..2c7d970 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

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list