summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-08-10 16:03:58 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-08-10 16:03:58 +0000
commit8a2f7841c0b3e95c05aa07c20075da1488b4c909 (patch)
tree28c3d29e6273ea639de5e4447248d8d67539ebf1 /net-misc/nxserver-freenx
parentMissing file from new freenx (diff)
downloadnx-8a2f7841c0b3e95c05aa07c20075da1488b4c909.tar.gz
nx-8a2f7841c0b3e95c05aa07c20075da1488b4c909.tar.bz2
nx-8a2f7841c0b3e95c05aa07c20075da1488b4c909.zip
Fix setup phase (KDE and CUPS detection)
Fix for XCB users svn path=/testing/; revision=185
Diffstat (limited to 'net-misc/nxserver-freenx')
-rw-r--r--net-misc/nxserver-freenx/Manifest3
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch32
-rw-r--r--net-misc/nxserver-freenx/nxserver-freenx-0.7.0.ebuild4
3 files changed, 38 insertions, 1 deletions
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 811f9cd..121d729 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,3 +1,4 @@
AUX nxserver-freenx-0.6.0-nxloadconfig.patch 2823 RMD160 e3f4a7f32e3962690ba2704c612220f8dc99cb44 SHA1 58ea968770e729a029e05ce6934eb16339d0955c SHA256 660f3bf731114f9ea9cf0129649d95a3b1ac0dd219541ddf6866ed2ede725179
+AUX nxserver-freenx-0.7.0-kdecups.patch 1373 RMD160 34227f429683b4d718321fb696faf5e05ed665dc SHA1 181797315f96fc9b2af32f975d6401deaa169023 SHA256 ad010a7b5d4f1874d9f4e60f18de370eb4a0b1e4ca78aff225918302b00d1ad2
DIST freenx-0.7.0.tar.gz 57614 RMD160 a051d4fcb96fd80b167c5fdc526cb5a789732057 SHA1 243f0c98f02b1c84c59e5b324a5a7e6d3d3d8db3 SHA256 61aedd3f8d3fae02b0e13de5f4ee1cb7bc1397dd7a379a67752a188d1f0119c9
-EBUILD nxserver-freenx-0.7.0.ebuild 3114 RMD160 fa050a9b90c731d99cd6e16ecd61142e56ccaf99 SHA1 8fb692140c69cb6b8fc534133406c4ebd94a8bdc SHA256 48687081bc973d17659efd716f3271014ef630ce9422d898aae563655c86d7b5
+EBUILD nxserver-freenx-0.7.0.ebuild 3213 RMD160 e1262cf4c3466504a6a0883513f3ceedfb9abcc7 SHA1 cf1df6cdde188ba84644f0d4a04e07797ea65cd7 SHA256 007af2b9c32730c7aeef65e61be3f26a606680b1a4fd7de41a215b500df56232
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch
new file mode 100644
index 0000000..c00a6eb
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch
@@ -0,0 +1,32 @@
+diff -Naur freenx-0.7.0.orig/node.conf freenx-0.7.0/node.conf
+--- freenx-0.7.0.orig/node.conf 2007-08-10 17:42:19.000000000 +0200
++++ freenx-0.7.0/node.conf 2007-08-10 17:42:41.000000000 +0200
+@@ -289,7 +289,7 @@
+ # CUPS_BACKEND and CUPS_ETC are the corresponding paths of your CUPS
+ # installation.
+
+-#CUPS_BACKEND="/usr/lib/cups/backend"
++#CUPS_BACKEND="/usr/libexec/cups/backend"
+ #CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
+ #CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
+ #CUPS_ETC="/etc/cups"
+diff -Naur freenx-0.7.0.orig/nxloadconfig freenx-0.7.0/nxloadconfig
+--- freenx-0.7.0.orig/nxloadconfig 2007-08-10 17:42:19.000000000 +0200
++++ freenx-0.7.0/nxloadconfig 2007-08-10 17:42:55.000000000 +0200
+@@ -152,7 +152,7 @@
+ ENABLE_FOOMATIC="1"
+ COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
+
+-CUPS_BACKEND="/usr/lib/cups/backend"
++CUPS_BACKEND="/usr/libexec/cups/backend"
+ CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
+ CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
+ CUPS_ETC="/etc/cups/"
+@@ -282,7 +282,6 @@
+ fi
+
+ [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
+-[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
+ [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
+
+ #########################################################################
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.0.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.0.ebuild
index 2f520d8..593f23b 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.0.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.0.ebuild
@@ -48,6 +48,10 @@ src_unpack() {
mv node.conf.sample node.conf || die
epatch ${FILESDIR}/${PN}-0.6.0-nxloadconfig.patch
+ epatch ${FILESDIR}/${P}-kdecups.patch
+
+ # Fix DISPLAY for XCB
+ sed -i "s/unix:/:/g" nxnode || die
# on amd64, get the correct path to NX 32bit libsA
if has_multilib_profile; then