[Pkg-kde-commits] rev 791 - branches/kde-3.4.0/packages/kdelibs/debian/patches

Christopher Martin chrsmrtn-guest@costa.debian.org
Sat, 12 Mar 2005 15:13:25 +0100


Author: chrsmrtn-guest
Date: 2005-03-12 15:13:25 +0100 (Sat, 12 Mar 2005)
New Revision: 791

Added:
   branches/kde-3.4.0/packages/kdelibs/debian/patches/15_dcopidlng_jfs-patch.diff
Log:
Add dcopidlng patch to 3.4 as well (this incorporates the changes from my last commit as well).


Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/15_dcopidlng_jfs-patch.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/15_dcopidlng_jfs-patch.diff	2005-03-12 14:09:44 UTC (rev 790)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/15_dcopidlng_jfs-patch.diff	2005-03-12 14:13:25 UTC (rev 791)
@@ -0,0 +1,22 @@
+--- kdelibs.orig/dcop/dcopidlng/dcopidlng
++++ kdelibs/dcop/dcopidlng/dcopidlng
+@@ -1,15 +1,16 @@
+ #!/bin/sh
+ 
+-trap "rm -f dcopidlng.stderr.$$" 0 1 2 15
++tmpfile=`mktemp -t dcopidlng.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
++trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
+ 
+ if test -z "$KDECONFIG"; then
+     KDECONFIG=kde-config
+ fi
+ LIBDIR="`$KDECONFIG --install data --expandvars`/dcopidlng"
+-perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2> dcopidlng.stderr.$$
++perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2> $tmpfile
+ RET=$?
+ if [ $RET -ne 0 ]
+ then
+-   cat dcopidlng.stderr.$$ >&2
++   cat $tmpfile >&2
+ fi
+ exit $RET