[X2Go-Commits] [nx-libs] 04/17: nx-X11: Prevent underlinking by linking to libNX_X{11, damage, fixes).

[git-admin at x2go.org]

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 ef24d64900d444f93d86e35d1723e082ed8ee2c1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 27 00:33:52 2015 +0200

    nx-X11: Prevent underlinking by linking to libNX_X{11,damage,fixes).
    
    Adds:
        - 0640_nx-X11_fix-underlinking-libNX_Xcomposite_damage_fixes.full.patch
---
 debian/changelog                                   |    3 +++
 ...inking-libNX_Xcomposite_damage_fixes.full.patch |   15 +++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 09dca43..925ad86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -123,6 +123,9 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
   * Security fixes:
     - X.Org CVE-2013-7439:
       1200-CVE-2013-7439-MakeBigReq-don-t-move-the-last-wo.full.patch
+  * nx-X11: Prevent underlinking by linking to libNX_X{11,damage,fixes).
+    Adds:
+    - 0640_nx-X11_fix-underlinking-libNX_Xcomposite_damage_fixes.full.patch
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 17 Mar 2015 19:19:32 +0100
 
diff --git a/debian/patches/0640_nx-X11_fix-underlinking-libNX_Xcomposite_damage_fixes.full.patch b/debian/patches/0640_nx-X11_fix-underlinking-libNX_Xcomposite_damage_fixes.full.patch
new file mode 100644
index 0000000..736104f
--- /dev/null
+++ b/debian/patches/0640_nx-X11_fix-underlinking-libNX_Xcomposite_damage_fixes.full.patch
@@ -0,0 +1,15 @@
+Description: Prevent underlinking by linking to libNX_X{11,damage,fixes).
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/nx-X11/config/cf/lnxLib.tmpl
++++ b/nx-X11/config/cf/lnxLib.tmpl
+@@ -61,6 +61,9 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
+ #define SharedXxf86vmReqs	$(LDPRELIB) $(XLIB)
+ #define SharedxkbfileReqs	$(LDPRELIB) $(XONLYLIB)
+ #define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
++#define SharedXfixesReqs	$(LDPRELIB) $(XLIB)
++#define SharedXdamageReqs	$(LDPRELIB) $(XLIB)
++#define SharedXcompositeReqs	$(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB)
+ 
+ #else	/* UseElfFormat */
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 80a0e5e..f28170f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -79,6 +79,7 @@
 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch
 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
 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