diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2015-04-24 13:55:21 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2015-04-24 13:55:21 +0000 |
| commit | dd78217314d526aa88ba73a903aec20f5c369532 (patch) | |
| tree | 8f860d56b681b0718e3350890f3ba3c80530c756 /net-misc | |
| parent | Version bump (diff) | |
| download | gentoo-2-dd78217314d526aa88ba73a903aec20f5c369532.tar.gz gentoo-2-dd78217314d526aa88ba73a903aec20f5c369532.tar.bz2 gentoo-2-dd78217314d526aa88ba73a903aec20f5c369532.zip | |
Fix libX11 underlinking, bug #546868 by Erik Zeek <zeekec@mad.scientist.com>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 00F7AB331B0F097F)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/nx/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch | 11 | ||||
| -rw-r--r-- | net-misc/nx/nx-3.5.0.30.ebuild | 9 |
3 files changed, 22 insertions, 4 deletions
diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog index f303cf2aa36c..6060cfeaeb23 100644 --- a/net-misc/nx/ChangeLog +++ b/net-misc/nx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/nx # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.94 2015/04/19 09:58:18 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.95 2015/04/24 13:55:21 voyageur Exp $ + + 24 Apr 2015; Bernard Cafarelli <voyageur@gentoo.org> nx-3.5.0.30.ebuild, + +files/nx-3.5.0.30-fix_X11_underlinking.patch: + Fix libX11 underlinking, bug #546868 by Erik Zeek <zeekec@mad.scientist.com> 19 Apr 2015; Agostino Sarubbo <ago@gentoo.org> nx-3.5.0.30.ebuild: Stable for x86, wrt bug #546624 diff --git a/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch b/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch new file mode 100644 index 000000000000..87d73c5a8d37 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch @@ -0,0 +1,11 @@ +--- nx-X11/lib/X11/Imakefile.orig 2015-04-24 15:24:36.171666957 +0200 ++++ nx-X11/lib/X11/Imakefile 2015-04-24 15:25:17.516179627 +0200 +@@ -107,7 +107,7 @@ + EXCLUDE_SYMBOL = -Wl,--exclude-symbol,XdmcpWrap:_XdmcpWrapperToOddParity + #endif + +-REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL) $(NX_REQUIREDLIBS) ++REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL) $(NX_REQUIREDLIBS) -ldl + + #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture) + XBSDLIB = /**/ diff --git a/net-misc/nx/nx-3.5.0.30.ebuild b/net-misc/nx/nx-3.5.0.30.ebuild index a4390444d553..ae106fd350af 100644 --- a/net-misc/nx/nx-3.5.0.30.ebuild +++ b/net-misc/nx/nx-3.5.0.30.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.30.ebuild,v 1.4 2015/04/19 09:58:18 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.30.ebuild,v 1.5 2015/04/24 13:55:21 voyageur Exp $ EAPI=5 inherit autotools eutils multilib readme.gentoo @@ -39,9 +39,12 @@ src_prepare() { cd "${S}" # -fPIC epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch - # Drop force -O3, set AR/RANLIB and - # run autoreconf in all neeed folders + # Drop force -O3, set AR/RANLIB epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch + # Fix libX11 underlinking, #546868 + epatch "${FILESDIR}"/${P}-fix_X11_underlinking.patch + + # run autoreconf in all neeed folders for i in nxcomp nxcompext nxcompshad nxproxy; do cd "${S}"/${i} eautoreconf ${i} |