Date: Tuesday, February 17, 2015 @ 10:02:47 Author: jgc Revision: 231645
upgpkg: libcanberra 0.30-5 Do not remove needed .la files (change was not in a released package before), change xinit script extension (FS#41470), Fix errors when setting strict options (FS#37707) Modified: libcanberra/trunk/PKGBUILD libcanberra/trunk/libcanberra.xinit -------------------+ PKGBUILD | 8 ++++---- libcanberra.xinit | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-17 08:40:41 UTC (rev 231644) +++ PKGBUILD 2015-02-17 09:02:47 UTC (rev 231645) @@ -4,7 +4,7 @@ pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) pkgver=0.30 -pkgrel=4 +pkgrel=5 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64) license=(LGPL) @@ -14,7 +14,7 @@ url="http://0pointer.de/lennart/projects/libcanberra"; source=("git://git.0pointer.de/libcanberra.git#commit=c0620e4" libcanberra.xinit) sha256sums=('SKIP' - '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3') + '2158708f594ab1688d6207eb1659190b3e3a1f711191de1f8e45dd42be8ceb76') _plugindir=usr/lib/$pkgbase-$pkgver @@ -44,11 +44,11 @@ cd $pkgbase make -j1 DESTDIR="$pkgdir" install - rm "$pkgdir"/usr/lib/*.la + rm "$pkgdir"/usr/lib/libcanberra-gtk*.la rm "$pkgdir"/usr/lib/gtk-{2,3}.0/modules/*.la install -D "$srcdir/libcanberra.xinit" \ - "$pkgdir/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module" + "$pkgdir/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module.sh" # Split plugins for _p in pulse gstreamer; do Modified: libcanberra.xinit =================================================================== --- libcanberra.xinit 2015-02-17 08:40:41 UTC (rev 231644) +++ libcanberra.xinit 2015-02-17 09:02:47 UTC (rev 231645) @@ -1,12 +1,12 @@ #!/bin/bash -case "$DESKTOP_SESSION" in +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 + 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"
