Gentoo Archives: gentoo-commits

From: "Bernard Cafarelli (voyageur)" <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/nxserver-freenx/files: nxserver-freenx-0.7.1-nxloadconfig.patch
Date: Wed, 09 Jan 2008 14:50:57
Message-Id: E1JCcGQ-0000co-W2@stork.gentoo.org
1 voyageur 08/01/09 14:50:42
2
3 Modified: nxserver-freenx-0.7.1-nxloadconfig.patch
4 Log:
5 Update nxloadconfig patch for nx 3.1.0 detection
6 (Portage version: 2.1.4_rc14)
7
8 Revision Changes Path
9 1.3 net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch?r1=1.2&r2=1.3
14
15 Index: nxserver-freenx-0.7.1-nxloadconfig.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- nxserver-freenx-0.7.1-nxloadconfig.patch 26 Nov 2007 12:50:25 -0000 1.2
22 +++ nxserver-freenx-0.7.1-nxloadconfig.patch 9 Jan 2008 14:50:42 -0000 1.3
23 @@ -33,7 +33,7 @@
24 then
25 ENABLE_2_0_0_BACKEND="1"
26 - [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && ENABLE_2_0_0_BACKEND="0"
27 -+ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && ENABLE_2_0_0_BACKEND="0"
28 ++ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
29 fi
30
31 if [ "$ENABLE_KDE_CUPS" = "1" ]
32 @@ -51,7 +51,7 @@
33 ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
34
35 - [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \
36 -+ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \
37 ++ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[01].0')" ] && \
38 ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.0.0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.0.0 backend is needed for this version of FreeNX."
39
40 [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
41
42
43
44 --
45 gentoo-commits@l.g.o mailing list