diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
| commit | 0ee0392ee9301df31f6e3c601214bb250112fa75 (patch) | |
| tree | 3d91576bf751a8a45ddad77e0a37c2d8fd4fa91f /testing/freenx/remove-dialog.patch | |
| parent | a3ba265c32b1de731745e1abc812f5d21bcd6aaf (diff) | |
| parent | 5233daa5825f00ccf0722ef9733ea6b3bbd44bc8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dwdiff/PKGBUILD
community/ejabberd/PKGBUILD
community/gnome-settings-daemon-updates/PKGBUILD
community/gpicview/PKGBUILD
community/libgexiv2/PKGBUILD
community/mapnik/PKGBUILD
community/mplayer2/PKGBUILD
community/open-vm-tools/PKGBUILD
community/vdrift/PKGBUILD
community/xboard/PKGBUILD
core/openssh/PKGBUILD
extra/boost/PKGBUILD
extra/dconf/PKGBUILD
extra/elfutils/PKGBUILD
extra/gconf/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-disk-utility/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-themes-standard/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/icu/PKGBUILD
extra/libgsf/PKGBUILD
extra/libimobiledevice/PKGBUILD
extra/libplist/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/pango/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/telepathy-kde-accounts-kcm/PKGBUILD
extra/telepathy-kde-approver/PKGBUILD
extra/telepathy-kde-auth-handler/PKGBUILD
extra/telepathy-kde-contact-list/PKGBUILD
extra/telepathy-kde-filetransfer-handler/PKGBUILD
extra/telepathy-kde-integration-module/PKGBUILD
extra/telepathy-kde-send-file/PKGBUILD
extra/telepathy-kde-text-ui/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/virtuoso/PKGBUILD
extra/yelp/PKGBUILD
libre/unarchiver/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-pango/PKGBUILD
testing/binutils/PKGBUILD
Diffstat (limited to 'testing/freenx/remove-dialog.patch')
| -rw-r--r-- | testing/freenx/remove-dialog.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/testing/freenx/remove-dialog.patch b/testing/freenx/remove-dialog.patch deleted file mode 100644 index 054f1f6c4..000000000 --- a/testing/freenx/remove-dialog.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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) |