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

[Sven-Hendrik Haase]

    Date: Saturday, June 21, 2014 @ 17:09:09
  Author: svenstaro
Revision: 113398

prepare 4.3

Modified:
  skype/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-21 15:00:26 UTC (rev 113397)
+++ PKGBUILD	2014-06-21 15:09:09 UTC (rev 113398)
@@ -2,9 +2,9 @@
 # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
 
 pkgname=skype
-pkgver=4.2.0.13
-pkgrel=4
-arch=(i686 x86_64)
+pkgver=4.3.0.37
+pkgrel=1
+arch=('i686' 'x86_64')
 pkgdesc="P2P software for high-quality voice communication"
 url="http://www.skype.com/"
 license=('custom')
@@ -11,24 +11,18 @@
 options=('!strip')
 install=skype.install
 depends=(xdg-utils hicolor-icon-theme)
-conflicts=('skype-staticqt')
 
-if [[ $CARCH == i686 ]]; then
-  depends+=(qt4 alsa-lib libxss libxv libxcursor v4l-utils gstreamer0.10-base)
-  optdepends=('libcanberra: XDG sound support'
-              'pulseaudio: PulseAudio support')
+if [[ $CARCH == 'i686' ]]; then
+  depends+=(pulseaudio qt4 libxss libxv libxcursor v4l-utils gstreamer0.10-base)
+  optdepends=('libcanberra: XDG sound support')
 else
-  depends+=(lib32-{qt4,alsa-lib,libxss,libxv,libxcursor,v4l-utils})
-  optdepends=('lib32-libcanberra: XDG sound support'
-              'lib32-libpulse: PulseAudio support')
-  conflicts+=(bin32-skype bin32-skype-staticqt)
-  provides=("bin32-skype=$pkgver")
-  replaces=(bin32-skype)
+  depends+=(lib32-{pulseaudio,qt4,libxss,libxv,libxcursor,v4l-utils})
+  optdepends=('lib32-libcanberra: XDG sound support')
 fi
 
 source=(http://download.skype.com/linux/$pkgname-$pkgver.tar.bz2 PERMISSION skype-wrapper
         ftp://ftp.archlinux.org/other/$pkgname/qtwebkit-2.2.2-i686.tar.xz)
-md5sums=('b4d1dcc5290be92225b400ea877db874'
+md5sums=('95db8f2072b9acd6f79ed42da3d6db79'
          '26e1772379d4d4df9471b6ed660a6d97'
          '66985be1d7b953fb9f73ba6ed749812b'
          '42c01ffa98e32b59605403efb42c8821')
@@ -40,7 +34,7 @@
 	  libdir="usr/lib"
   
       # FS#33417 - Skype wants qtwebkit 2.2.x
-      install -Dm755 "${srcdir}"/libQtWebKit.so.4 "${pkgdir}"/usr/share/skype/lib/libQtWebKit.so.4
+      #install -Dm755 "${srcdir}"/libQtWebKit.so.4 "${pkgdir}"/usr/share/skype/lib/libQtWebKit.so.4
   else
 	  libdir="usr/lib32"
   fi