[arch-commits] CVS update of extra/network/freenx (PKGBUILD nxdialog-fix.patch)

[Tobias Powalowski]

    Date: Wednesday, October 31, 2007 @ 13:44:51
  Author: tpowa
    Path: /home/cvs-extra/extra/network/freenx

Modified: PKGBUILD (1.26 -> 1.27) nxdialog-fix.patch (1.1 -> 1.2)

'upgpkg: final fix for nxdialog'


--------------------+
 PKGBUILD           |    6 +++---
 nxdialog-fix.patch |   46 ++++++++++++++++++++++++++++------------------
 2 files changed, 31 insertions(+), 21 deletions(-)


Index: extra/network/freenx/PKGBUILD
diff -u extra/network/freenx/PKGBUILD:1.26 extra/network/freenx/PKGBUILD:1.27
--- extra/network/freenx/PKGBUILD:1.26	Mon Oct 22 01:22:29 2007
+++ extra/network/freenx/PKGBUILD	Wed Oct 31 13:44:51 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.26 2007/10/22 05:22:29 tpowa Exp $
+# $Id: PKGBUILD,v 1.27 2007/10/31 17:44:51 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 #Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org> 
 pkgname=freenx
 pkgver=0.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Free Software (GPL) Implementation of the NX Server"
 arch=(i686 x86_64)
 url="http://freenx.berlios.de"
@@ -58,5 +58,5 @@
 md5sums=('80e7a57f787daabd0f80dfe8f58e67d3'
          '70788a41f6c965ce117e9f5a8809df2a'
          'a8548982d5bfa2f528dcb1dd76e0234b'
-         '59e9822a3cf5af235393f6bd4e5b2ee9'
+         '70d9b62779ace1f4f876f7ca55100cf2'
          'bb999d23aa2005619385d0e8662e8967')
Index: extra/network/freenx/nxdialog-fix.patch
diff -u extra/network/freenx/nxdialog-fix.patch:1.1 extra/network/freenx/nxdialog-fix.patch:1.2
--- extra/network/freenx/nxdialog-fix.patch:1.1	Sat Oct 20 08:48:19 2007
+++ extra/network/freenx/nxdialog-fix.patch	Wed Oct 31 13:44:51 2007
@@ -1,29 +1,39 @@
---- nxdialog~	2007-10-15 00:25:14.000000000 +0200
-+++ nxdialog	2007-10-20 14:35:18.000000000 +0200
-@@ -28,11 +28,15 @@
+--- nxdialog.old	2007-10-15 00:25:14.000000000 +0200
++++ nxdialog	2007-10-31 18:38:57.000000000 +0100
+@@ -9,7 +9,7 @@
+ #       but we set it to a "good value" anyway in case 
+ #       it does check it someday.
+ #
+-# SVN: $Id: nxdialog-fix.patch,v 1.2 2007/10/31 17:44:51 tpowa Exp $
++# SVN: $Id: nxdialog-fix.patch,v 1.2 2007/10/31 17:44:51 tpowa Exp $
+ #
+ # ========================================================================
+ 
+@@ -26,6 +26,7 @@
+ 	done
+ }
  
++PARAMS=( "$@" )
  INPUTS=$(requote "$@")	#JJK: Save input parameter line...
  
-+NXCLIENT="/opt/NX/bin/nxclient-nomachine"
-+[ -x "$NXCLIENT" -a "$DIALOG_TYPE" != "printer" -a "$(file -bi $NXCLIENT)" != 'application/x-shellscript' ] \
-+	&& exec ${NXCLIENT} "$@"
-+
  TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display:,printer:,parent: -n $(basename $0) -- "$@"`
- 
- if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
- 
--# Note the quotes around `$TEMP': they are essential!
-+# Note the quotes around '$TEMP': they are essential!
- eval set -- "$TEMP"
- 
- DIALOG_TYPE="ok";
-@@ -72,9 +76,6 @@
+@@ -71,10 +72,13 @@
+ # client does not like large databases like used when ENABLE_FOOMATIC=1.
  #
  # This seems to be because the used sorting algorithm scales in O(n^2).
++#
++# This is now fixed in NXClient 3.0.0, but still people sometimes use
++# older clients.
  
--NXCLIENT="/usr/NX/bin/nxclient"
--[ -x "$NXCLIENT" -a "$DIALOG_TYPE" != "printer" -a "$(file -bi $NXCLIENT)" != 'application/x-shellscript' ] \
+ NXCLIENT="/usr/NX/bin/nxclient"
+ [ -x "$NXCLIENT" -a "$DIALOG_TYPE" != "printer" -a "$(file -bi $NXCLIENT)" != 'application/x-shellscript' ] \
 -	&& exec ${NXCLIENT} "$@"
++	&& exec ${NXCLIENT} "${PARAMS[@]}"
  
  # FIXME: This should be COMMAND_XDIALOG, ...
  if [ -x /usr/bin/Xdialog ] 
+@@ -444,3 +448,4 @@
+ 	[ $RC -eq 2 ] && kill -TERM $DIALOG_PARENT
+ 	[ $RC -eq 3 ] && kill -HUP $DIALOG_PARENT
+ exit 0
++