[patch] Patch to use the nxcomp ebuild

patch-nxcomp-1.5.diff (text/plain), 2.09 KB, created by Jon Severinsson on 2005-08-08 02:47:33 UTC

--- nxproxy-1.5.0.ebuild.orig	2005-08-08 10:18:32.000000000 +0200
+++ nxproxy-1.5.0.ebuild	2005-08-08 10:57:17.000000000 +0200
@@ -10,7 +10,7 @@
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
-DEPEND="=net-misc/nx-x11-1.5*
+DEPEND=">=net-misc/nxcomp-1.5.0
 	sys-devel/patch"
 
 # Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
--- nxssh-1.5.0.ebuild.orgi	2005-08-08 10:02:07.000000000 +0200
+++ nxssh-1.5.0.ebuild	2005-08-08 10:56:54.000000000 +0200
@@ -18,7 +18,7 @@
 # only required openssl-0.9.7d-r1, that should work with nx-ssh-1.5.0 as well,
 # but this isn't tested upstream. Please don't mark this package stable until
 # openssl-0.9.8 is stable and the deps on this package is updated.
-DEPEND="=net-misc/nx-x11-1.5*
+DEPEND=">=net-misc/nxcomp-1.5.0
 	>=dev-libs/openssl-0.9.7d-r1
 	>=sys-libs/glibc-2.3.3.20040420-r1
 	>=sys-libs/zlib-1.2.1-r2
@@ -33,6 +33,12 @@
 	unpack ${SRC_NXSSH}
 	unpack ${SRC_NXCOMP}
 
+	cd ${WORKDIR}/nxcomp
+	cp -L /usr/NX/lib/libXcomp.so libXcomp.so.1.5.0
+	ln -s libXcomp.so.1.5.0 libXcomp.so.1
+	ln -s libXcomp.so.1.5.0 libXcomp.so
+	touch depend.status
+
 	cd ${S}
 }
 
--- nx-x11-1.5.0.ebuild.orig	2005-08-08 10:00:41.000000000 +0200
+++ nx-x11-1.5.0.ebuild	2005-08-08 10:57:02.000000000 +0200
@@ -22,11 +22,7 @@
 IUSE=""
 #RESTRICT="nostrip"
 DEPEND="virtual/x11
-	>=media-libs/jpeg-6b-r3
-	>=media-libs/libpng-1.2.8
-	>=sys-libs/zlib-1.2.1-r2
-	>=sys-devel/gcc-3.2.3-r2
-	>=sys-libs/glibc-2.3.2-r3"
+	>=net-misc/nxcomp-1.5.0"
 #RDEPEND=""
 S=${WORKDIR}/${MY_PN}
 
@@ -40,6 +36,12 @@
 	unpack ${SRC_NXVIEWER}
 	unpack ${SRC_NXDESKTOP}
 
+	cd ${WORKDIR}/nxcomp
+	ln -s /usr/NX/lib/libXcomp.so libXcomp.so.1.5.0
+	ln -s libXcomp.so.1.5.0 libXcomp.so.1
+	ln -s libXcomp.so.1.5.0 libXcomp.so
+	touch depend.status
+
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.4.0.xprint.patch
 }
@@ -81,21 +83,10 @@
 	dolib libXrender.so
 	popd
 
-	pushd ../nxcomp/
-	dolib libXcomp.so.1.4.0
-	dolib libXcomp.so
-	popd
-
 	pushd ../nxcompext/
 	dolib libXcompext.so.1.5.0
 	dolib libXcompext.so
 	popd
 
 	preplib /usr/NX
-
-	insinto /usr/X11R6/include
-	doins ../nxcomp/NX.h
-
-	dodir /var/lib/nxserver
-
 }