[arch-commits] Commit in skype/trunk (PKGBUILD skype-wrapper)

[Florian Pritz]

    Date: Tuesday, March 5, 2013 @ 11:13:12
  Author: bluewind
Revision: 85709

upgpkg: skype 4.1.0.20-5

fix FS#34106

Modified:
  skype/trunk/PKGBUILD
  skype/trunk/skype-wrapper

---------------+
 PKGBUILD      |    4 ++--
 skype-wrapper |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-05 10:10:33 UTC (rev 85708)
+++ PKGBUILD	2013-03-05 10:13:12 UTC (rev 85709)
@@ -3,7 +3,7 @@
 
 pkgname=skype
 pkgver=4.1.0.20
-pkgrel=4
+pkgrel=5
 arch=(i686 x86_64)
 pkgdesc="P2P software for high-quality voice communication"
 url="http://www.skype.com/"
@@ -30,7 +30,7 @@
         ftp://ftp.archlinux.org/other/$pkgname/qtwebkit-2.2.2-i686.tar.xz)
 md5sums=('fe41f6b36e96730161c0f9332b001575'
          '26e1772379d4d4df9471b6ed660a6d97'
-         '0425cfc9c0bffd8bb740a0ee21d4f9fd'
+         'd86064fb13ae69d3761532fed914f0a2'
          '42c01ffa98e32b59605403efb42c8821')
 
 package() {

Modified: skype-wrapper
===================================================================
--- skype-wrapper	2013-03-05 10:10:33 UTC (rev 85708)
+++ skype-wrapper	2013-03-05 10:13:12 UTC (rev 85709)
@@ -3,9 +3,9 @@
 LIBDIR="@LIBDIR@"
 
 if [[ -e "$LIBDIR/libv4l/v4l2convert.so" ]]; then
-	export LD_PRELOAD="$LIBDIR/libv4l/v4l2convert.so"
+	export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}$LIBDIR/libv4l/v4l2convert.so"
 fi
 
-export LD_PRELOAD="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/share/skype/lib/libQtWebKit.so.4"
+export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/share/skype/lib/libQtWebKit.so.4"
 
 exec "$LIBDIR/skype/skype" "$@"