diff options
| author | root <root@rshg054.dnsready.net> | 2011-10-02 23:14:32 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-10-02 23:14:32 +0000 |
| commit | ad84169d66d20378d28533c216b73c9a6646d6d7 (patch) | |
| tree | 2746e102687e113dd81d632b51933b62ff458934 /extra/libcanberra | |
| parent | 0f78806d775c4d46c649425fcb67964d53531db8 (diff) | |
Sun Oct 2 23:14:32 UTC 2011
Diffstat (limited to 'extra/libcanberra')
| -rw-r--r-- | extra/libcanberra/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/libcanberra/libcanberra.xinit | 17 |
2 files changed, 23 insertions, 6 deletions
diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD index 93145cbcd..92f2b3084 100644 --- a/extra/libcanberra/PKGBUILD +++ b/extra/libcanberra/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122251 2011-05-03 10:40:20Z heftig $ +# $Id: PKGBUILD 139194 2011-10-01 13:46:12Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) pkgver=0.28 -pkgrel=1 +pkgrel=2 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64) license=('LGPL') @@ -13,9 +13,9 @@ makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3') options=(!emptydirs) url=http://0pointer.de/lennart/projects/libcanberra source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz - libcanberra-gtk-module.sh) -md5sums=('c198b4811598c4c161ff505e4531b02c' - '21141257a1be80f3bc329829ff13b314') + libcanberra.xinit) +sha256sums=('eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c' + '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -39,7 +39,7 @@ package_libcanberra() { install -d "${pkgdir}/usr/share/gconf" mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/" - install -D "${srcdir}/libcanberra-gtk-module.sh" \ + install -D "${srcdir}/libcanberra.xinit" \ "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module" # Split plugins diff --git a/extra/libcanberra/libcanberra.xinit b/extra/libcanberra/libcanberra.xinit new file mode 100644 index 000000000..2511e9f8a --- /dev/null +++ b/extra/libcanberra/libcanberra.xinit @@ -0,0 +1,17 @@ +#!/bin/bash + +case "$DESKTOP_SESSION" in + gnome) # Done by gnome-settings-daemon + ;; + *) + # Extra check in case DESKTOP_SESSION is not set correctly + if [[ -z $GNOME_DESKTOP_SESSION_ID ]]; then + if [[ -z $GTK_MODULES ]]; then + GTK_MODULES="canberra-gtk-module" + else + GTK_MODULES="$GTK_MODULES:canberra-gtk-module" + fi + export GTK_MODULES + fi + ;; +esac |