[arch-commits] Commit in libcanberra/trunk (PKGBUILD libcanberra.xinit)

Jan Steffens heftig at archlinux.org
Sat Jan 28 00:13:32 UTC 2017


    Date: Saturday, January 28, 2017 @ 00:13:31
  Author: heftig
Revision: 287589

0.30-8

Modified:
  libcanberra/trunk/PKGBUILD
  libcanberra/trunk/libcanberra.xinit

-------------------+
 PKGBUILD          |    7 ++++---
 libcanberra.xinit |   12 ++++--------
 2 files changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-27 23:16:30 UTC (rev 287588)
+++ PKGBUILD	2017-01-28 00:13:31 UTC (rev 287589)
@@ -4,7 +4,7 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30
-pkgrel=7
+pkgrel=8
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
 arch=(i686 x86_64)
 license=(LGPL)
@@ -12,9 +12,10 @@
 makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3 git)
 options=(!emptydirs libtool)
 url="http://0pointer.de/lennart/projects/libcanberra"
-source=("git://git.0pointer.de/libcanberra.git#commit=c0620e4" libcanberra.xinit)
+_commit=c0620e432650e81062c1967cc669829dbd29b310  # master
+source=("git://git.0pointer.de/libcanberra.git#commit=$_commit" libcanberra.xinit)
 sha256sums=('SKIP'
-            '2158708f594ab1688d6207eb1659190b3e3a1f711191de1f8e45dd42be8ceb76')
+            'a0d0b135d3fea5c703a5f84208b79d66f671b082ae85f67b629ee2568a7ddc30')
 
 _plugindir=usr/lib/$pkgbase-$pkgver
 

Modified: libcanberra.xinit
===================================================================
--- libcanberra.xinit	2017-01-27 23:16:30 UTC (rev 287588)
+++ libcanberra.xinit	2017-01-28 00:13:31 UTC (rev 287589)
@@ -1,16 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 
 case "${DESKTOP_SESSION-}" in
-  gnome) # Done by gnome-settings-daemon
+  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
+    if [ -z "${GNOME_DESKTOP_SESSION_ID-}" ]; then
+      GTK_MODULES="${GTK_MODULES:+$GTK_MODULES:}canberra-gtk-module"
       export GTK_MODULES
     fi
   ;;



More information about the arch-commits mailing list