[arch-commits] Commit in libcanberra/trunk (3 files)

[Jan Steffens]

    Date: Saturday, October 1, 2011 @ 09:41:13
  Author: heftig
Revision: 139192

fix xinit

Added:
  libcanberra/trunk/libcanberra.xinit
    (from rev 139190, libcanberra/trunk/libcanberra-gtk-module.sh)
Modified:
  libcanberra/trunk/PKGBUILD
Deleted:
  libcanberra/trunk/libcanberra-gtk-module.sh

---------------------------+
 PKGBUILD                  |   10 +++++-----
 libcanberra-gtk-module.sh |   15 ---------------
 libcanberra.xinit         |   17 +++++++++++++++++
 3 files changed, 22 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-01 13:37:56 UTC (rev 139191)
+++ PKGBUILD	2011-10-01 13:41:13 UTC (rev 139192)
@@ -4,7 +4,7 @@
 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 @@
 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 @@
   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

Deleted: libcanberra-gtk-module.sh
===================================================================
--- libcanberra-gtk-module.sh	2011-10-01 13:37:56 UTC (rev 139191)
+++ libcanberra-gtk-module.sh	2011-10-01 13:41:13 UTC (rev 139192)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$DESKTOP_SESSION" in
-  gnome)
-    # Done by gnome-settings-daemon
-    ;;
-  *)
-    if [ -z "$GTK_MODULES" ]; then
-      GTK_MODULES="canberra-gtk-module"
-    else
-      GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
-    fi
-    export GTK_MODULES
-    ;;
-esac

Copied: libcanberra/trunk/libcanberra.xinit (from rev 139190, libcanberra/trunk/libcanberra-gtk-module.sh)
===================================================================
--- libcanberra.xinit	                        (rev 0)
+++ libcanberra.xinit	2011-10-01 13:41:13 UTC (rev 139192)
@@ -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