Attachment #65407 for bug #101715

View | Details | Raw Unified | Return to bug 101715
Collapse All | Expand All

Lines 10-16 Link Here

(-)nxproxy-1.5.0.ebuild.orig (-1 / +1 lines)
10	SLOT="0"	10	SLOT="0"
11	KEYWORDS="~x86 ~ppc"	11	KEYWORDS="~x86 ~ppc"
12	IUSE=""	12	IUSE=""
13	DEPEND="=net-misc/nx-x11-1.5*	13	DEPEND=">=net-misc/nxcomp-1.5.0
14	sys-devel/patch"	14	sys-devel/patch"
15		15
16	# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:	16	# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:

Lines 18-24 Link Here

(-)nxssh-1.5.0.ebuild.orgi (-1 / +7 lines)
18	# only required openssl-0.9.7d-r1, that should work with nx-ssh-1.5.0 as well,	18	# only required openssl-0.9.7d-r1, that should work with nx-ssh-1.5.0 as well,
19	# but this isn't tested upstream. Please don't mark this package stable until	19	# but this isn't tested upstream. Please don't mark this package stable until
20	# openssl-0.9.8 is stable and the deps on this package is updated.	20	# openssl-0.9.8 is stable and the deps on this package is updated.
21	DEPEND="=net-misc/nx-x11-1.5*	21	DEPEND=">=net-misc/nxcomp-1.5.0
22	>=dev-libs/openssl-0.9.7d-r1	22	>=dev-libs/openssl-0.9.7d-r1
23	>=sys-libs/glibc-2.3.3.20040420-r1	23	>=sys-libs/glibc-2.3.3.20040420-r1
24	>=sys-libs/zlib-1.2.1-r2	24	>=sys-libs/zlib-1.2.1-r2
Lines 33-38 Link Here
33	unpack ${SRC_NXSSH}	33	unpack ${SRC_NXSSH}
34	unpack ${SRC_NXCOMP}	34	unpack ${SRC_NXCOMP}
35		35
		36	cd ${WORKDIR}/nxcomp
		37	cp -L /usr/NX/lib/libXcomp.so libXcomp.so.1.5.0
		38	ln -s libXcomp.so.1.5.0 libXcomp.so.1
		39	ln -s libXcomp.so.1.5.0 libXcomp.so
		40	touch depend.status
		41
36	cd ${S}	42	cd ${S}
37	}	43	}
38		44

Lines 22-32 Link Here

(-)nx-x11-1.5.0.ebuild.orig (-16 / +7 lines)
22	IUSE=""	22	IUSE=""
23	#RESTRICT="nostrip"	23	#RESTRICT="nostrip"
24	DEPEND="virtual/x11	24	DEPEND="virtual/x11
25	>=media-libs/jpeg-6b-r3	25	>=net-misc/nxcomp-1.5.0"
26	>=media-libs/libpng-1.2.8
27	>=sys-libs/zlib-1.2.1-r2
28	>=sys-devel/gcc-3.2.3-r2
29	>=sys-libs/glibc-2.3.2-r3"
30	#RDEPEND=""	26	#RDEPEND=""
31	S=${WORKDIR}/${MY_PN}	27	S=${WORKDIR}/${MY_PN}
32		28
Lines 40-45 Link Here
40	unpack ${SRC_NXVIEWER}	36	unpack ${SRC_NXVIEWER}
41	unpack ${SRC_NXDESKTOP}	37	unpack ${SRC_NXDESKTOP}
42		38
		39	cd ${WORKDIR}/nxcomp
		40	ln -s /usr/NX/lib/libXcomp.so libXcomp.so.1.5.0
		41	ln -s libXcomp.so.1.5.0 libXcomp.so.1
		42	ln -s libXcomp.so.1.5.0 libXcomp.so
		43	touch depend.status
		44
43	cd ${S}	45	cd ${S}
44	epatch ${FILESDIR}/${PN}-1.4.0.xprint.patch	46	epatch ${FILESDIR}/${PN}-1.4.0.xprint.patch
45	}	47	}
Lines 81-101 Link Here
81	dolib libXrender.so	83	dolib libXrender.so
82	popd	84	popd
83		85
84	pushd ../nxcomp/
85	dolib libXcomp.so.1.4.0
86	dolib libXcomp.so
87	popd
88
89	pushd ../nxcompext/	86	pushd ../nxcompext/
90	dolib libXcompext.so.1.5.0	87	dolib libXcompext.so.1.5.0
91	dolib libXcompext.so	88	dolib libXcompext.so
92	popd	89	popd
93		90
94	preplib /usr/NX	91	preplib /usr/NX
95
96	insinto /usr/X11R6/include
97	doins ../nxcomp/NX.h
98
99	dodir /var/lib/nxserver
100
101	}	92	}

Return to bug 101715