[pkgsrc/trunk]: pkgsrc/sysutils/gnome-settings-daemon If PREFIX/bin/esdcompat...

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2511e11b99b4
branches:  trunk
changeset: 551616:2511e11b99b4
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Thu Dec 18 15:56:13 2008 +0000

description:
If PREFIX/bin/esdcompat is found, prefer it over PREFIX/bin/esd.
Bump PKGREVISION.

diffstat:

 sysutils/gnome-settings-daemon/Makefile         |   3 +-
 sysutils/gnome-settings-daemon/distinfo         |   4 +-
 sysutils/gnome-settings-daemon/patches/patch-ab |  40 +++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 6 deletions(-)

diffs (81 lines):

diff -r 7b00ea5f40d1 -r 2511e11b99b4 sysutils/gnome-settings-daemon/Makefile
--- a/sysutils/gnome-settings-daemon/Makefile   Thu Dec 18 15:29:11 2008 +0000
+++ b/sysutils/gnome-settings-daemon/Makefile   Thu Dec 18 15:56:13 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2008/12/02 16:24:17 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/12/18 15:56:13 jmcneill Exp $
 #
 
 DISTNAME=      gnome-settings-daemon-2.24.1
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.24/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 7b00ea5f40d1 -r 2511e11b99b4 sysutils/gnome-settings-daemon/distinfo
--- a/sysutils/gnome-settings-daemon/distinfo   Thu Dec 18 15:29:11 2008 +0000
+++ b/sysutils/gnome-settings-daemon/distinfo   Thu Dec 18 15:56:13 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2008/12/02 16:24:17 wiz Exp $
+$NetBSD: distinfo,v 1.7 2008/12/18 15:56:13 jmcneill Exp $
 
 SHA1 (gnome-settings-daemon-2.24.1.tar.bz2) = d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3
 RMD160 (gnome-settings-daemon-2.24.1.tar.bz2) = 27d432cd217a836fcef0deac5f80f638a73cda7c
 Size (gnome-settings-daemon-2.24.1.tar.bz2) = 1131518 bytes
 SHA1 (patch-aa) = 66ed26db1eb571bdf6bc4640c989e6384d2f99db
-SHA1 (patch-ab) = 60620de4803cce1afb3276a061de2c833d8ef23b
+SHA1 (patch-ab) = 28315b12cb41d4c1072f6dd683c2e23eedc116b3
 SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23
 SHA1 (patch-ad) = dd3a45da76f0d9e728240adacc01aa5251db0342
diff -r 7b00ea5f40d1 -r 2511e11b99b4 sysutils/gnome-settings-daemon/patches/patch-ab
--- a/sysutils/gnome-settings-daemon/patches/patch-ab   Thu Dec 18 15:29:11 2008 +0000
+++ b/sysutils/gnome-settings-daemon/patches/patch-ab   Thu Dec 18 15:56:13 2008 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/04/11 19:12:09 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2008/12/18 15:56:13 jmcneill Exp $
 
---- plugins/sound/gsd-sound-manager.c.orig     2008-04-10 20:35:19.000000000 +0200
+--- plugins/sound/gsd-sound-manager.c.orig     2008-11-24 18:02:41.000000000 -0500
 +++ plugins/sound/gsd-sound-manager.c
-@@ -28,6 +28,7 @@
+@@ -21,6 +21,7 @@
+ 
+ #include "config.h"
+ 
++#include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <stdlib.h>
+@@ -28,6 +29,7 @@
  #include <unistd.h>
  #include <string.h>
  #include <errno.h>
@@ -10,3 +18,29 @@
  
  #include <locale.h>
  
+@@ -97,16 +99,24 @@ reset_esd_pid (GPid             pid,
+ static gboolean
+ start_gnome_sound (GsdSoundManager *manager)
+ {
+-        char    *argv[] = { ESD_LOCATION  "esd", "-nobeeps", NULL};
++        char    **argv;
++      char    *argv_esd[] = { ESD_LOCATION  "esd", "-nobeeps", NULL};
++      char    *argv_esdcompat[] = { ESD_LOCATION  "esdcompat", "-nobeeps", NULL};
+         GError  *error;
+         gboolean res;
+         time_t   starttime;
+         gboolean ret;
++      struct stat st;
+ 
+         ret = FALSE;
+ 
+         gnome_settings_profile_start (NULL);
+ 
++      if (stat (argv_esdcompat[0], &st) == 0)
++              argv = argv_esdcompat;
++      else
++              argv = argv_esd;
++
+         error = NULL;
+         res = g_spawn_async (NULL,
+                              argv,