Attachment #135266 for bug #180091

View | Details | Raw Unified | Return to bug 180091
Collapse All | Expand All




		curl:${PORTSDIR}/ftp/curl \
		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
		gtkglext-x11-1:${PORTSDIR}/x11-toolkits/gtkglext
RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
		sox:${PORTSDIR}/audio/sox

WRKSRC=		${WRKDIR}/${PORTNAME}-3.2.1


MANCOMPRESSED=	yes

post-patch:
	@${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'





--- ./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);

Return to bug 180091

Lines 13-19 LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ Link Here

(-)b/cairo-dock/Makefile (-3 / +3 lines)
13	curl:${PORTSDIR}/ftp/curl \	13	curl:${PORTSDIR}/ftp/curl \
14	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \	14	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
15	gtkglext-x11-1:${PORTSDIR}/x11-toolkits/gtkglext	15	gtkglext-x11-1:${PORTSDIR}/x11-toolkits/gtkglext
16	RUN_DEPENDS= bash:${PORTSDIR}/shells/bash	16	RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
		17	sox:${PORTSDIR}/audio/sox
17		18
18	WRKSRC= ${WRKDIR}/${PORTNAME}-3.2.1	19	WRKSRC= ${WRKDIR}/${PORTNAME}-3.2.1
19		20
Lines 30-40 MAN1= cairo-dock.1 Link Here
30	MANCOMPRESSED= yes	31	MANCOMPRESSED= yes
31		32
32	post-patch:	33	post-patch:
33	@${FIND} ${WRKSRC} -type f -name "*" \| ${XARGS} ${REINPLACE_CMD} -i.orig -e \	34	@${FIND} ${WRKSRC} -type f -name "*" \| ${XARGS} ${REINPLACE_CMD} -e \
34	's\|/usr/share/pixmaps/\|${LOCALBASE}/share/pixmaps/\|g; \	35	's\|/usr/share/pixmaps/\|${LOCALBASE}/share/pixmaps/\|g; \
35	s\|/usr/bin/cairo-dock\|${LOCALBASE}/bin/cairo-dock\|g; \	36	s\|/usr/bin/cairo-dock\|${LOCALBASE}/bin/cairo-dock\|g; \
36	s\|/bin/bash\|${LOCALBASE}/bin/bash\|g; \	37	s\|/bin/bash\|${LOCALBASE}/bin/bash\|g; \
37	s\|/usr/bin/lay\|${LOCALBASE}/bin/lay\|g; \
38	s\|/usr/share/applications\|${LOCALBASE}/share/applications\|g; \	38	s\|/usr/share/applications\|${LOCALBASE}/share/applications\|g; \
39	s\|/usr/share/icons\|${LOCALBASE}/share/icons\|g'	39	s\|/usr/share/icons\|${LOCALBASE}/share/icons\|g'
40		40

Added Link Here

(-)b/cairo-dock/files/patch-cairo-dock-applet-facility.c (+23 lines)
1	--- ./src/gldit/cairo-dock-applet-facility.c.orig 2013-06-29 16:54:06.000000000 +0300
2	+++ ./src/gldit/cairo-dock-applet-facility.c 2013-06-29 16:55:44.000000000 +0300
3	@@ -225,14 +225,14 @@
4	}
5
6	gchar *cSoundCommand = NULL;
7	- if (g_file_test ("/usr/bin/paplay", G_FILE_TEST_EXISTS))
8	- cSoundCommand = g_strdup_printf("paplay --client-name=cairo-dock \"%s\"", cSoundPath);
9	+ if (g_file_test ("/usr/local/bin/play", G_FILE_TEST_EXISTS))
10	+ cSoundCommand = g_strdup_printf("play \"%s\"", cSoundPath);
11
12	- else if (g_file_test ("/usr/bin/aplay", G_FILE_TEST_EXISTS))
13	+ else if (g_file_test ("/usr/local/bin/paplay", G_FILE_TEST_EXISTS))
14	+ cSoundCommand = g_strdup_printf("paplay --client-name=cairo-dock \"%s\"", cSoundPath);
15	+
16	+ else if (g_file_test ("/usr/local/bin/aplay", G_FILE_TEST_EXISTS))
17	cSoundCommand = g_strdup_printf("aplay \"%s\"", cSoundPath);
18	-
19	- else if (g_file_test ("/usr/bin/play", G_FILE_TEST_EXISTS))
20	- cSoundCommand = g_strdup_printf("play \"%s\"", cSoundPath);
21
22
23	cairo_dock_launch_command (cSoundCommand);