ports/180091: [patch] deskutils/cairo-dock 3.2.1 fixes playback of sounds

[Ivan Klymenko]

>Number:         180091
>Category:       ports
>Synopsis:       [patch] deskutils/cairo-dock 3.2.1 fixes playback of sounds
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 29 14:30:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Ivan Klymenko
>Release:        FreeBSD 10.0-CURRENT
>Organization:
individual
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/cairo-dock.old/Makefile b/cairo-dock/Makefile
index 3ea8bf3..094ef2e 100644
--- a/cairo-dock.old/Makefile
+++ b/cairo-dock/Makefile
@@ -13,7 +13,8 @@ LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
 		curl:${PORTSDIR}/ftp/curl \
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		gtkglext-x11-1:${PORTSDIR}/x11-toolkits/gtkglext
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		sox:${PORTSDIR}/audio/sox
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3.2.1
 
@@ -30,11 +31,10 @@ MAN1=		cairo-dock.1
 MANCOMPRESSED=	yes
 
 post-patch:
-	@${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -i.orig -e \
+	@${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -e \
 	    's|/usr/share/pixmaps/|${LOCALBASE}/share/pixmaps/|g; \
 	     s|/usr/bin/cairo-dock|${LOCALBASE}/bin/cairo-dock|g; \
 	     s|/bin/bash|${LOCALBASE}/bin/bash|g; \
-	     s|/usr/bin/*lay|${LOCALBASE}/bin/*lay|g; \
 	     s|/usr/share/applications|${LOCALBASE}/share/applications|g; \
 	     s|/usr/share/icons|${LOCALBASE}/share/icons|g'
 
diff --git a/cairo-dock/files/patch-cairo-dock-applet-facility.c b/cairo-dock/files/patch-cairo-dock-applet-facility.c
new file mode 100644
index 0000000..0396e09
--- /dev/null
+++ b/cairo-dock/files/patch-cairo-dock-applet-facility.c
@@ -0,0 +1,23 @@
+--- ./src/gldit/cairo-dock-applet-facility.c.orig	2013-06-29 16:54:06.000000000 +0300
++++ ./src/gldit/cairo-dock-applet-facility.c	2013-06-29 16:55:44.000000000 +0300
+@@ -225,14 +225,14 @@
+ 	}
+ 	
+ 	gchar *cSoundCommand = NULL;
+-	if (g_file_test ("/usr/bin/paplay", G_FILE_TEST_EXISTS))
+-		cSoundCommand = g_strdup_printf("paplay --client-name=cairo-dock \"%s\"", cSoundPath);
++	if (g_file_test ("/usr/local/bin/play", G_FILE_TEST_EXISTS))
++		cSoundCommand = g_strdup_printf("play \"%s\"", cSoundPath);
+ 
+-	else if (g_file_test ("/usr/bin/aplay", G_FILE_TEST_EXISTS))
++	else if (g_file_test ("/usr/local/bin/paplay", G_FILE_TEST_EXISTS))
++		cSoundCommand = g_strdup_printf("paplay --client-name=cairo-dock \"%s\"", cSoundPath);
++	
++	else if (g_file_test ("/usr/local/bin/aplay", G_FILE_TEST_EXISTS))
+ 		cSoundCommand = g_strdup_printf("aplay \"%s\"", cSoundPath);
+-
+-	else if (g_file_test ("/usr/bin/play", G_FILE_TEST_EXISTS))
+-		cSoundCommand = g_strdup_printf("play \"%s\"", cSoundPath);
+ 	
+ 	
+ 	cairo_dock_launch_command (cSoundCommand);


>Release-Note:
>Audit-Trail:
>Unformatted: