Fix compilation with gcc 4.4 and glibc 2.10, bug #276505

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 20 insertions, 126 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 50a85403038b..cfe33b916471 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.43 2009/05/29 13:58:44 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.44 2009/07/06 10:48:04 voyageur Exp $
+
+  06 Jul 2009; Bernard Cafarelli <voyageur@gentoo.org> -nx-3.3.0-r3.ebuild,
+  nx-3.3.0-r4.ebuild, +files/nx-3.3.0-nxcomp-glibc2.10.patch:
+  Fix compilation with gcc 4.4 and glibc 2.10, bug #276505
 
   29 May 2009; Bernard Cafarelli <voyageur@gentoo.org> -nx-3.2.0-r2.ebuild,
   -nx-3.2.0-r5.ebuild:
diff --git a/net-misc/nx/files/nx-3.3.0-nxcomp-glibc2.10.patch b/net-misc/nx/files/nx-3.3.0-nxcomp-glibc2.10.patch
new file mode 100644
index 000000000000..12267c71e003
--- /dev/null
+++ b/net-misc/nx/files/nx-3.3.0-nxcomp-glibc2.10.patch
@@ -0,0 +1,11 @@
+--- Loop.cpp.orig	2009-07-06 12:38:10.000000000 +0200
++++ Loop.cpp	2009-07-06 12:38:14.000000000 +0200
+@@ -10979,7 +10979,7 @@
+                                       packMethod == PACK_LOSSLESS ||
+                                           packMethod == PACK_ADAPTIVE)
+   {
+-    char *dash = rindex(opt, '-');
++    const char *dash = rindex(opt, '-');
+ 
+     if (dash != NULL && strlen(dash) == 2 &&
+             *(dash + 1) >= '0' && *(dash + 1) <= '9')
diff --git a/net-misc/nx/nx-3.3.0-r3.ebuild b/net-misc/nx/nx-3.3.0-r3.ebuild
deleted file mode 100644
index 034a2177bb90..000000000000
--- a/net-misc/nx/nx-3.3.0-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.3.0-r3.ebuild,v 1.3 2009/03/21 20:21:08 voyageur Exp $
-
-EAPI=2
-inherit autotools eutils multilib
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.nomachine.com/developers.php"
-
-URI_BASE="http://web04.nomachine.com/download/${PV}/sources"
-SRC_NX_X11="nx-X11-$PV-5.tar.gz"
-SRC_NXAGENT="nxagent-$PV-10.tar.gz"
-SRC_NXAUTH="nxauth-$PV-1.tar.gz"
-SRC_NXCOMP="nxcomp-$PV-3.tar.gz"
-SRC_NXCOMPEXT="nxcompext-$PV-3.tar.gz"
-SRC_NXCOMPSHAD="nxcompshad-$PV-3.tar.gz"
-SRC_NXPROXY="nxproxy-$PV-2.tar.gz"
-
-SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY $URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXCOMPSHAD $URI_BASE/$SRC_NXCOMP"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	>=media-libs/jpeg-6b-r4
-	>=media-libs/libpng-1.2.8
-	>=sys-libs/zlib-1.2.3"
-
-DEPEND="${RDEPEND}
-		x11-misc/gccmakedep
-		x11-misc/imake
-		x11-proto/inputproto"
-
-S=${WORKDIR}/${PN}-X11
-
-src_unpack() {
-	unpack ${A}
-
-	# For nxcl/qtnx
-	cd "${WORKDIR}"/nxproxy
-	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
-
-	# Quiet some warnings
-	cd "${WORKDIR}"/nxcomp
-	epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch
-
-	cd "${WORKDIR}"
-	# Fix sandbox violation
-	epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch
-	# -fPIC
-	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
-	# Respect CFLAGS/CXXFLAGS
-	epatch "${FILESDIR}"/${PN}-3.3.0-cflags.patch
-	# Run autoreconf in all neeed folders
-	for i in nxcomp nxcompext nxcompshad nxproxy; do
-		cd "${WORKDIR}"/${i}
-		eautoreconf ${i}
-		cd "${WORKDIR}"
-	done
-
-	# From xorg-x11-6.9.0-r3.ebuild
-	cd "${S}"
-	HOSTCONF="config/cf/host.def"
-	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-}
-
-src_compile() {
-	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
-	econf || die "nxcomp econf failed"
-	emake || die "nxcomp emake failed"
-
-	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
-
-	econf || die "nxcompshad econf failed"
-	emake || die "nxcompshad emake failed"
-
-	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
-	econf || die "nxproxy econf failed"
-	emake || die "nxproxy emake failed"
-
-	cd "${S}" || die "No nx-X11 directory found"
-	# Again, from xorg-x11-6.9.0-r3.ebuild
-	unset MAKE_OPTS
-	FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "nx-X11 emake failed"
-
-	cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found"
-	econf || die "nxcompext econf failed"
-	emake || die "nxcompext emake failed"
-}
-
-src_install() {
-	NX_ROOT=/usr/$(get_libdir)/NX
-
-	for x in nxagent nxauth nxproxy; do
-		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
-			die " $x wrapper creation failed"
-	done
-
-	into ${NX_ROOT}
-	dobin "${S}"/programs/Xserver/nxagent
-	dobin "${S}"/programs/nxauth/nxauth
-	dobin "${WORKDIR}"/nxproxy/nxproxy
-
-	dolib.so "${S}"/lib/X11/libX11.so*
-	dolib.so "${S}"/lib/Xext/libXext.so*
-	dolib.so "${S}"/lib/Xrender/libXrender.so*
-	dolib.so "${WORKDIR}"/nxcomp/libXcomp.so*
-	dolib.so "${WORKDIR}"/nxcompext/libXcompext.so*
-	dolib.so "${WORKDIR}"/nxcompshad/libXcompshad.so*
-}
diff --git a/net-misc/nx/nx-3.3.0-r4.ebuild b/net-misc/nx/nx-3.3.0-r4.ebuild
index 1aa9b37278cf..6fbaa53de226 100644
--- a/net-misc/nx/nx-3.3.0-r4.ebuild
+++ b/net-misc/nx/nx-3.3.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.3.0-r4.ebuild,v 1.1 2009/03/25 23:00:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.3.0-r4.ebuild,v 1.2 2009/07/06 10:48:04 voyageur Exp $
 
 EAPI=2
 inherit autotools eutils multilib
@@ -42,9 +42,7 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-X11
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	# For nxcl/qtnx
 	cd "${WORKDIR}"/nxproxy
 	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
@@ -52,6 +50,8 @@ src_unpack() {
 	# Quiet some warnings
 	cd "${WORKDIR}"/nxcomp
 	epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch
+	# GCC 4.4 + glibc 2.10
+	epatch "${FILESDIR}"/${P}-nxcomp-glibc2.10.patch
 
 	cd "${WORKDIR}"
 	# Fix sandbox violation