commit ee09dfcfa6167731c20e07c7f4990292494e9ff4 Author: Danny Rawlins <monster.romster@gmail.com> Date: Tue Oct 7 19:33:36 2014 +1100 skype: 4.2.0.11 -> 4.3.0.37, new dependency apulse-32 diff --git a/skype/.footprint b/skype/.footprint index bf3a006..0da9e95 100644 --- a/skype/.footprint +++ b/skype/.footprint @@ -1,6 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/skype +-rwxrwxr-x root/root usr/bin/skype +-rwxr-xr-x root/root usr/bin/skype-bin drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ -rw-r--r-- root/root usr/share/applications/skype.desktop @@ -9,12 +10,26 @@ drwxr-xr-x root/root usr/share/icons/hicolor/ drwxr-xr-x root/root usr/share/icons/hicolor/16x16/ drwxr-xr-x root/root usr/share/icons/hicolor/16x16/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/skype.png +drwxr-xr-x root/root usr/share/icons/hicolor/24x24/ +drwxr-xr-x root/root usr/share/icons/hicolor/24x24/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/24x24/apps/skype.png +drwxr-xr-x root/root usr/share/icons/hicolor/256x256/ +drwxr-xr-x root/root usr/share/icons/hicolor/256x256/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/256x256/apps/skype.png drwxr-xr-x root/root usr/share/icons/hicolor/32x32/ drwxr-xr-x root/root usr/share/icons/hicolor/32x32/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/skype.png drwxr-xr-x root/root usr/share/icons/hicolor/48x48/ drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/skype.png +drwxr-xr-x root/root usr/share/icons/hicolor/64x64/ +drwxr-xr-x root/root usr/share/icons/hicolor/64x64/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/64x64/apps/skype.png +drwxr-xr-x root/root usr/share/icons/hicolor/96x96/ +drwxr-xr-x root/root usr/share/icons/hicolor/96x96/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/96x96/apps/skype.png +drwxr-xr-x root/root usr/share/pixmaps/ +-rw-r--r-- root/root usr/share/pixmaps/skype.png drwxr-xr-x root/root usr/share/skype/ drwxr-xr-x root/root usr/share/skype/avatars/ -rw-r--r-- root/root usr/share/skype/avatars/Angel Skype.png diff --git a/skype/.md5sum b/skype/.md5sum index 6fec663..2982618 100644 --- a/skype/.md5sum +++ b/skype/.md5sum @@ -1,2 +1 @@ -a4ca31e258273c3761e3de2edd607661 glib-2.34.3.tar.xz -6e9553a6368853c647b1c5ad7f3cc99b skype-4.2.0.11.tar.bz2 +95db8f2072b9acd6f79ed42da3d6db79 skype-4.3.0.37.tar.bz2 diff --git a/skype/Pkgfile b/skype/Pkgfile index 24134e7..e2905dd 100644 --- a/skype/Pkgfile +++ b/skype/Pkgfile @@ -2,25 +2,36 @@ # URL: http://www.skype.com/intl/en/get-skype/on-your-computer/linux/ # Maintainer: Danny Rawlins, monster dot romster at gmail dot com # Packager: sten, nick dot steeves at shaw dot ca -# Depends on: qt4-32 alsa-lib-32 xorg-libxscrnsaver-32 xorg-libxv-32 +# Depends on: qt4-32 alsa-lib-32 xorg-libxscrnsaver-32 xorg-libxv-32 apulse-32 name=skype -version=4.2.0.11 +version=4.3.0.37 release=1 -source=(http://download.skype.com/linux/$name-$version.tar.bz2 - http://ftp.gnome.org/pub/GNOME/sources/glib/2.34/glib-2.34.3.tar.xz) +source=(http://download.skype.com/linux/$name-$version.tar.bz2) build() { cd $name-$version + + install -D -m 0755 skype $PKG/usr/bin/skype-bin + install -d $PKG/usr/share/skype/{avatars,lang,sounds} - install -D -m 0755 skype $PKG/usr/bin/skype install -m 0644 avatars/* $PKG/usr/share/skype/avatars install -m 0644 lang/* $PKG/usr/share/skype/lang install -m 0644 sounds/* $PKG/usr/share/skype/sounds - install -D -m 0644 icons/SkypeBlue_16x16.png $PKG/usr/share/icons/hicolor/16x16/apps/skype.png - install -D -m 0644 icons/SkypeBlue_32x32.png $PKG/usr/share/icons/hicolor/32x32/apps/skype.png - install -D -m 0644 icons/SkypeBlue_48x48.png $PKG/usr/share/icons/hicolor/48x48/apps/skype.png + for i in 16 24 32 48 64 96 256; do + install -m 0644 -D icons/SkypeBlue_${i}x$i.png \ + $PKG/usr/share/icons/hicolor/${i}x$i/apps/skype.png + done + + install -m 0644 -D icons/SkypeBlue_48x48.png $PKG/usr/share/pixmaps/skype.png + install -D -m 0644 skype.desktop $PKG/usr/share/applications/skype.desktop #install -D -m 0644 skype.conf $PKG/etc/dbus-1/system.d/skype.conf + +cat <<- EOF > $PKG/usr/bin/skype + #!/bin/bash + exec apulse-32 skype-bin "$@" +EOF + chmod 0775 $PKG/usr/bin/skype } diff --git a/skype/README b/skype/README index e3c89af..7b0d766 100644 --- a/skype/README +++ b/skype/README @@ -1,16 +1,28 @@ -Note that skype is a 32bit binary and as such requires compat-32 -ports tree to be enabled to work. +INSTALL: -You enable compat-32 by. + Note that skype is a 32bit binary and as such requires compat-32 + ports tree to be enabled to work. -mv /etc/ports/compat-32.rsync.inactive /etc/ports/compat-32.rsync + You enable compat-32 by. -$EDITOR /etc/prt-get.conf + mv /etc/ports/compat-32.rsync.inactive /etc/ports/compat-32.rsync -And add: + $EDITOR /etc/prt-get.conf -prtdir /usr/ports/compat-32 + And add: -Also be sure to enable: + prtdir /usr/ports/compat-32 -runscripts yes + Also be sure to enable: + + runscripts yes + + In /etc/prt-get.conf or use prt-get --install-scripts + +NOTES: + + /usr/bin/skype is now a wrapper script to run + + apulse-32 skype-bin + + As this allows us to avoid packaging pulseaudio-32