[arch-commits] Commit in freenx/trunk (PKGBUILD remove-dialog.patch)

[Tobias Powalowski]

    Date: Tuesday, February 1, 2011 @ 03:10:47
  Author: tpowa
Revision: 108550

upgpkg: freenx 0.7.3-8
fixed xdialog depend, added xmessage usage

Added:
  freenx/trunk/remove-dialog.patch
Modified:
  freenx/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   14 +++++++++-----
 remove-dialog.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-01 07:54:31 UTC (rev 108549)
+++ PKGBUILD	2011-02-01 08:10:47 UTC (rev 108550)
@@ -3,18 +3,19 @@
 #Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org> 
 pkgname=freenx
 pkgver=0.7.3
-pkgrel=7
+pkgrel=8
 pkgdesc="Free Software (GPL) Implementation of the NX Server"
 arch=(i686 x86_64)
 url="http://freenx.berlios.de"
 license=('GPL')
-depends=('nxserver' 'gnu-netcat' 'openssh' 'expect' 'xorg-xauth' 'xorg-apps' 'xorg-fonts-misc' 'coreutils' 'xdialog')
+depends=('nxserver' 'gnu-netcat' 'openssh' 'expect' 'xorg-xauth' 'xorg-apps' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage')
 backup=(opt/NX/etc/node.conf)
 install=freenx.install
 source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz
         keymap.patch
         nxagent-startup.patch
-        freenx-latest-svn.patch)
+        freenx-latest-svn.patch
+        remove-dialog.patch)
 
 
 build() {
@@ -27,7 +28,9 @@
   # patch broken keymap remapping
   patch -Np0 -i ${srcdir}/keymap.patch 
   # patch nxagent startup to avoid login issues
-  patch -Np0 -i ${srcdir}/nxagent-startup.patch 
+  patch -Np0 -i ${srcdir}/nxagent-startup.patch
+  # remove broken dialog function
+  patch -Np0 -i  ${srcdir}/remove-dialog.patch
   sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig
   sed -i -e 's,/usr/NX,/opt/NX,g' nxloadconfig
   sed -i -e 's,netcat,nc,g' nxloadconfig
@@ -70,4 +73,5 @@
 md5sums=('856f597e139018f7ed62713c9d6c9ed5'
          'f0867659c925f6363fb2b7661f349248'
          '30dc16d8e2093ff71d5834a169ad9d00'
-         '788f30322783cf2c2dc833e2e4d5e8ad')
+         '788f30322783cf2c2dc833e2e4d5e8ad'
+         'cae1773312506eeefe6a8de07c492bd8')

Added: remove-dialog.patch
===================================================================
--- remove-dialog.patch	                        (rev 0)
+++ remove-dialog.patch	2011-02-01 08:10:47 UTC (rev 108550)
@@ -0,0 +1,32 @@
+--- nxdialog~	2011-02-01 09:05:28.993333438 +0100
++++ nxdialog	2011-02-01 09:05:29.010000106 +0100
+@@ -85,29 +85,6 @@
+ then
+ 	dialog_interface="xdialog"
+ 	DIALOG=/usr/bin/Xdialog # just in case that we have no good path
+-elif [ -x /usr/bin/dialog ]
+-then
+-	#JJK: Added 'dialog_interface=dialog' option because Xdialog not standard
+-	#JJK: on some distros such as Fedora and xmessage won't handle long
+-	#JJK: lists of ppd files while the combination of 'dialog' and 'xterm'
+-	#JJK: should be present on most setups.
+-
+-	dialog_interface="dialog"
+-	DIALOG=/usr/bin/dialog
+-	if [ -z "$NXCLIENT_FIRST_TIME" ]
+-	then
+-		# Run only once in case of subdialogs. Capture result in tempfile
+-		TMPFILE=$(mktemp /tmp/nxclient.XXXXX)
+-		export NXCLIENT_FIRST_TIME=1
+-
+-		xterm -geometry 120x24+100+100 +sb -title "NXclient" -e \
+-		       /bin/bash -c "$DIALOG --infobox 'Please wait...' 3 25; $0 $INPUTS | tee $TMPFILE" || exit 1
+-
+-		#Need to recover the last line output (and not remove non-printing chars, because --stdout is used)
+-		tail -1 $TMPFILE 
+-		rm -f $TMPFILE
+-		exit 0
+-	fi
+ else
+ 	dialog_interface="xmessage"
+ 	xmessage=$(which xmessage 2>/dev/null)