Date: Tue, 2 Jul 2013 20:10:38 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322200 - in head/deskutils/cairo-dock: . files Message-ID: <201307022010.r62KAc7k071774@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Tue Jul 2 20:10:38 2013 New Revision: 322200 URL: http://svnweb.freebsd.org/changeset/ports/322200 Log: - Fix sound playback - Bump PORTREVISION - Whitespace fixes PR: ports/180091 Submitted by: maintainer Added: head/deskutils/cairo-dock/files/patch-cairo-dock-applet-facility.c (contents, props changed) Modified: head/deskutils/cairo-dock/Makefile Modified: head/deskutils/cairo-dock/Makefile ============================================================================== --- head/deskutils/cairo-dock/Makefile Tue Jul 2 20:06:01 2013 (r322199) +++ head/deskutils/cairo-dock/Makefile Tue Jul 2 20:10:38 2013 (r322200) @@ -2,6 +2,7 @@ PORTNAME= cairo-dock DISTVERSION= 3.2.1 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= https://launchpadlibrarian.net/137290048/ \ http://pazzle.otdux.com.ua/ @@ -13,7 +14,8 @@ LIB_DEPENDS= cairo:${PORTSDIR}/graphics/ 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 @@ -24,18 +26,18 @@ USE_XORG= xrender xtst USES= cmake gettext pkgconfig MAKE_JOBS_SAFE= yes LDFLAGS+= -L${LOCALBASE}/lib -CMAKE_ARGS+= -Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig" +CMAKE_ARGS+= -Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig" 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' + s|/usr/share/icons|${LOCALBASE}/share/icons|g; \ + s|%%LOCALBASE%%|${LOCALBASE}|g;' .include <bsd.port.mk> Added: head/deskutils/cairo-dock/files/patch-cairo-dock-applet-facility.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/cairo-dock/files/patch-cairo-dock-applet-facility.c Tue Jul 2 20:10:38 2013 (r322200) @@ -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 ("%%LOCALBASE%%/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 ("%%LOCALBASE%%/bin/paplay", G_FILE_TEST_EXISTS)) ++ cSoundCommand = g_strdup_printf("paplay --client-name=cairo-dock \"%s\"", cSoundPath); ++ ++ else if (g_file_test ("%%LOCALBASE%%/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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307022010.r62KAc7k071774>