summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Herbert <stuart@gentoo.org>2006-11-05 01:24:39 +0000
committerStuart Herbert <stuart@gentoo.org>2006-11-05 01:24:39 +0000
commit9ea1f507515bb9df236e570ed334ecdcffe23e5d (patch)
tree8e3083da2345676c4a4d6b574697399c417cfb08 /net-misc/nxserver-freenx
parentAdded missing X11 DEPs (diff)
downloadnx-9ea1f507515bb9df236e570ed334ecdcffe23e5d.tar.gz
nx-9ea1f507515bb9df236e570ed334ecdcffe23e5d.tar.bz2
nx-9ea1f507515bb9df236e570ed334ecdcffe23e5d.zip
Added fix for GNOME/KDE startup
svn path=/testing/; revision=109
Diffstat (limited to 'net-misc/nxserver-freenx')
-rw-r--r--net-misc/nxserver-freenx/Manifest12
-rw-r--r--net-misc/nxserver-freenx/files/freenx-0.5.0-startup.patch13
-rw-r--r--net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild3
3 files changed, 24 insertions, 4 deletions
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index c3a87a2..4e3fb16 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -10,6 +10,10 @@ AUX freenx-0.4.4-adduser-fix.patch 562 RMD160 a6dcc853d73cf13cf395cc346fa5da86a0
MD5 925fd2cad3adceb556bf1de6cf866ed0 files/freenx-0.4.4-adduser-fix.patch 562
RMD160 a6dcc853d73cf13cf395cc346fa5da86a00ec4ec files/freenx-0.4.4-adduser-fix.patch 562
SHA256 f5cbff53a8fe403e7068b43bc4c3005132e578e14effcbd3063ccf5da112ed17 files/freenx-0.4.4-adduser-fix.patch 562
+AUX freenx-0.5.0-startup.patch 614 RMD160 77a71ec51e6cb781f927363dd21014b900a3247b SHA1 38fb745a86772c05654e8a12739ab242636a058a SHA256 31f4bc50e63fd03eb48b6e90fc17062c0f45073b9578c0514ae7c209a1714042
+MD5 24ec695b0851ee0a329a0a3af5b3849f files/freenx-0.5.0-startup.patch 614
+RMD160 77a71ec51e6cb781f927363dd21014b900a3247b files/freenx-0.5.0-startup.patch 614
+SHA256 31f4bc50e63fd03eb48b6e90fc17062c0f45073b9578c0514ae7c209a1714042 files/freenx-0.5.0-startup.patch 614
AUX nxserver-freenx-0.4.4-xorg7.patch 569 RMD160 b67f4245d974cc1ea632797832d68effd7a43c12 SHA1 89d6f214e91e5d0ae634309b283242c9613329b7 SHA256 2495be930c061b4389e5287979e78ada02c754d6252c33af5a2e6564d2df2dc5
MD5 0fcfdb1adc7a94eece68cfd65a522b7f files/nxserver-freenx-0.4.4-xorg7.patch 569
RMD160 b67f4245d974cc1ea632797832d68effd7a43c12 files/nxserver-freenx-0.4.4-xorg7.patch 569
@@ -23,10 +27,10 @@ MD5 f58cf7014a645ce96afd27989a893c2f files/nxserver-path.diff 718
RMD160 6ddec39e9005fefd475e208f369b231e9501c5c7 files/nxserver-path.diff 718
SHA256 7fd2616f3f9a3165fbd12a1a05ab1081d7da8c6efe139029b5d401b04bbe1985 files/nxserver-path.diff 718
DIST freenx-0.5.0-5.fc5.i386.rpm 62859 RMD160 1c7bef90d5610ab265d9a66253d2bda1663e6e1a SHA1 b8845b592ee3818f028b3201b17912ce1820d45b SHA256 8d5224e825191d330e85996815f1b2ecb8b733853c24e7704cf0ea7b52237016
-EBUILD nxserver-freenx-0.5.0-r1.ebuild 4255 RMD160 f8a7a1c1a217b0a0c3588a4d753c8efa1ba7b478 SHA1 87ac9740fe477aa7d90e271a15010856cf9e9419 SHA256 d303711472dadf33737ed6192fd6d6b90054fee7a5ceac2762dba51ce54447e1
-MD5 35dc3079a27204b8b75f6530631270e6 nxserver-freenx-0.5.0-r1.ebuild 4255
-RMD160 f8a7a1c1a217b0a0c3588a4d753c8efa1ba7b478 nxserver-freenx-0.5.0-r1.ebuild 4255
-SHA256 d303711472dadf33737ed6192fd6d6b90054fee7a5ceac2762dba51ce54447e1 nxserver-freenx-0.5.0-r1.ebuild 4255
+EBUILD nxserver-freenx-0.5.0-r1.ebuild 4329 RMD160 ab63e1b5648b87bf353c08d7848cf81924b55480 SHA1 7885182ab882ea5640121c9f0c84c886bb973871 SHA256 b61d997b63214436501f23ac542c2742388866d74eca0b03e7007d651810bea5
+MD5 13b1141167ad5a5013f3d33e8752287b nxserver-freenx-0.5.0-r1.ebuild 4329
+RMD160 ab63e1b5648b87bf353c08d7848cf81924b55480 nxserver-freenx-0.5.0-r1.ebuild 4329
+SHA256 b61d997b63214436501f23ac542c2742388866d74eca0b03e7007d651810bea5 nxserver-freenx-0.5.0-r1.ebuild 4329
MISC ChangeLog 4546 RMD160 f081e2d7f56201d4b35c27e5b23b9f22d5f0cf8f SHA1 7d607f526d861cb4c362bfc4424a512113f07a2c SHA256 0d07a96e80392326930e8338c311803cf40fe6224a22db3321f8037cf18937cd
MD5 b49057c3ec7febd008b3b4f81492ee5d ChangeLog 4546
RMD160 f081e2d7f56201d4b35c27e5b23b9f22d5f0cf8f ChangeLog 4546
diff --git a/net-misc/nxserver-freenx/files/freenx-0.5.0-startup.patch b/net-misc/nxserver-freenx/files/freenx-0.5.0-startup.patch
new file mode 100644
index 0000000..3cad866
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/freenx-0.5.0-startup.patch
@@ -0,0 +1,13 @@
+--- usr/bin/nxloadconfig.orig 2006-11-02 08:08:36.000000000 +0000
++++ usr/bin/nxloadconfig 2006-11-05 01:18:16.000000000 +0000
+@@ -157,8 +157,8 @@
+ KILL_DEFAULT_X_WM="1"
+ USER_X_STARTUP_SCRIPT=.Xclients
+ DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
+-COMMAND_START_KDE="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/startkde"
+-COMMAND_START_GNOME="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/gnome-session"
++COMMAND_START_KDE="startkde"
++COMMAND_START_GNOME="/etc/X11/Sessions/Gnome"
+ COMMAND_START_CDE=cdwm
+ COMMAND_XTERM=xterm
+ COMMAND_XAUTH=/usr/X11R6/bin/xauth
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild
index 6d6bb61..ca01e17 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild
@@ -43,6 +43,9 @@ src_unpack() {
rpm_unpack ${DISTDIR}/${A}
cd ${S}
+ # fix the start commands
+ epatch ${FILESDIR}/freenx-0.5.0-startup.patch
+
mv etc/nxserver/node.conf.sample etc/nxserver/node.conf || die
sed -e 's|^PATH_LIB=.*$|PATH_LIB=$NX_DIR/lib/NX/lib|;' -i usr/bin/nxloadconfig || die