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

(-)xfce4-genmon-plugin/Makefile (-9 / +6 lines)
Lines 6-15 Link Here
6
#
6
#
7
7
8
PORTNAME=	xfce4-genmon-plugin
8
PORTNAME=	xfce4-genmon-plugin
9
PORTVERSION=	3.2
9
PORTVERSION=	3.3.0
10
PORTREVISION=	11
11
CATEGORIES=	sysutils xfce
10
CATEGORIES=	sysutils xfce
12
MASTER_SITES=	CRITICAL/xfce4
11
MASTER_SITES=	${MASTER_SITE_XFCE}
12
MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
13
DIST_SUBDIR=	xfce4
13
DIST_SUBDIR=	xfce4
14
14
15
MAINTAINER=	miwi@FreeBSD.org
15
MAINTAINER=	miwi@FreeBSD.org
Lines 19-30 Link Here
19
USE_BZIP2=	yes
19
USE_BZIP2=	yes
20
USE_GETTEXT=	yes
20
USE_GETTEXT=	yes
21
USE_GMAKE=	yes
21
USE_GMAKE=	yes
22
USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
22
USE_GNOME=	gnomehack gtk20 intltool intlhack pkgconfig
23
USE_XFCE=	configenv libutil libgui panel
23
USE_XFCE=	configenv libgui panel
24
24
25
post-patch:
25
CONFIGURE_ENV+=	ac_cv_prog_AWK="${AWK}"
26
	@${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
27
		s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \
28
		${WRKSRC}/configure
29
26
30
.include <bsd.port.mk>
27
.include <bsd.port.mk>
(-)xfce4-genmon-plugin/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (xfce4/xfce4-genmon-plugin-3.2.tar.bz2) = b2c15d4745092321f4c502123dba58fded6d80f4c2ade4e819fd65eaa541c133
1
SHA256 (xfce4/xfce4-genmon-plugin-3.3.0.tar.bz2) = 56cf632c196cf988cef36c3965651e9fd9c838c21c133d643e3563e18f45e7c0
2
SIZE (xfce4/xfce4-genmon-plugin-3.2.tar.bz2) = 142540
2
SIZE (xfce4/xfce4-genmon-plugin-3.3.0.tar.bz2) = 125754
(-)xfce4-genmon-plugin/files/patch-panel-plugin__cmdspawn.c (-33 lines)
Lines 1-33 Link Here
1
--- ./panel-plugin/cmdspawn.c.orig	2007-11-23 16:32:40.000000000 +0100
2
+++ ./panel-plugin/cmdspawn.c	2010-11-07 11:29:03.000000000 +0100
3
@@ -184,6 +184,7 @@
4
             return (-1);
5
         case 0:
6
             /* Redirect stdout/stderr to associated pipe's write-ends */
7
+            close(0); /* stdin is not used in child */
8
             for (i = 0; i < OUT_ERR; i++) {
9
                 j = i + 1; // stdout/stderr file descriptor
10
                 close (j);
11
@@ -199,6 +200,9 @@
12
         exit (-1);
13
     }
14
 
15
+    for (i = 0; i < OUT_ERR; i++)
16
+        close (aaiPipe[i][WR]); /* close write end of pipes in parent */
17
+
18
     /* Wait for child completion */
19
     if (wait == 1)
20
     {
21
@@ -231,10 +235,9 @@
22
     }
23
 
24
     End:
25
-    /* Close created pipes */
26
+    /* Close read end of pipes */
27
     for (i = 0; i < OUT_ERR; i++)
28
-        for (j = 0; j < RD_WR; j++)
29
-            close (aaiPipe[i][j]);
30
+        close (aaiPipe[i][RD]);
31
 
32
     return (-fError);
33
 }// Spawn()
(-)xfce4-genmon-plugin/files/patch-panel-plugin__main.c (-32 lines)
Lines 1-32 Link Here
1
--- ./panel-plugin/main.c.orig	2008-03-15 23:38:18.000000000 +0100
2
+++ ./panel-plugin/main.c	2010-11-07 11:28:17.000000000 +0100
3
@@ -32,6 +32,7 @@
4
 
5
 #include <libxfce4util/libxfce4util.h>
6
 #include <libxfcegui4/dialogs.h>
7
+#include <libxfcegui4/xfce-exec.h>
8
 #include <libxfce4panel/xfce-panel-plugin.h>
9
 #include <libxfce4panel/xfce-panel-convenience.h>
10
 
11
@@ -94,10 +95,18 @@
12
 {
13
     struct genmon_t *poPlugin = (genmon_t *) p_pvPlugin;
14
     struct monitor_t *poMonitor = &(poPlugin->oMonitor);
15
-    char result[256];
16
+    GError *error = NULL;
17
+
18
+	xfce_exec(poMonitor->onClickCmd, 0, 0, &error);
19
+    if (error) {
20
+        char first[256];
21
+        g_snprintf (first, sizeof(first), _("Could not run \"%s\""), poMonitor->onClickCmd);
22
+        xfce_message_dialog (NULL, _("Xfce Panel"), 
23
+                             GTK_STOCK_DIALOG_ERROR, first, error->message,
24
+                             GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
25
+        g_error_free (error);
26
+    }
27
 
28
-    genmon_SpawnCmd (poMonitor->onClickCmd, result,
29
-        sizeof (poMonitor->onClickCmd), 0);
30
 }
31
 
32
 /**************************************************************/
(-)xfce4-genmon-plugin/pkg-plist (-2 / +27 lines)
Lines 1-19 Link Here
1
libexec/xfce4/panel-plugins/xfce4-genmon-plugin
1
libexec/xfce4/panel-plugins/xfce4-genmon-plugin
2
share/locale/ast/LC_MESSAGES/xfce4-genmon-plugin.mo
2
share/locale/ca/LC_MESSAGES/xfce4-genmon-plugin.mo
3
share/locale/ca/LC_MESSAGES/xfce4-genmon-plugin.mo
3
share/locale/cs/LC_MESSAGES/xfce4-genmon-plugin.mo
4
share/locale/cs/LC_MESSAGES/xfce4-genmon-plugin.mo
5
share/locale/da/LC_MESSAGES/xfce4-genmon-plugin.mo
6
share/locale/de/LC_MESSAGES/xfce4-genmon-plugin.mo
7
share/locale/el/LC_MESSAGES/xfce4-genmon-plugin.mo
4
share/locale/en_GB/LC_MESSAGES/xfce4-genmon-plugin.mo
8
share/locale/en_GB/LC_MESSAGES/xfce4-genmon-plugin.mo
9
share/locale/es/LC_MESSAGES/xfce4-genmon-plugin.mo
5
share/locale/eu/LC_MESSAGES/xfce4-genmon-plugin.mo
10
share/locale/eu/LC_MESSAGES/xfce4-genmon-plugin.mo
6
share/locale/fr/LC_MESSAGES/xfce4-genmon-plugin.mo
11
share/locale/fr/LC_MESSAGES/xfce4-genmon-plugin.mo
12
share/locale/gl/LC_MESSAGES/xfce4-genmon-plugin.mo
13
share/locale/hu/LC_MESSAGES/xfce4-genmon-plugin.mo
14
share/locale/id/LC_MESSAGES/xfce4-genmon-plugin.mo
15
share/locale/it/LC_MESSAGES/xfce4-genmon-plugin.mo
16
share/locale/ja/LC_MESSAGES/xfce4-genmon-plugin.mo
17
share/locale/kk/LC_MESSAGES/xfce4-genmon-plugin.mo
7
share/locale/lv/LC_MESSAGES/xfce4-genmon-plugin.mo
18
share/locale/lv/LC_MESSAGES/xfce4-genmon-plugin.mo
8
share/locale/pl/LC_MESSAGES/xfce4-genmon-plugin.mo
19
share/locale/pl/LC_MESSAGES/xfce4-genmon-plugin.mo
20
share/locale/pt/LC_MESSAGES/xfce4-genmon-plugin.mo
9
share/locale/pt_BR/LC_MESSAGES/xfce4-genmon-plugin.mo
21
share/locale/pt_BR/LC_MESSAGES/xfce4-genmon-plugin.mo
10
share/locale/pt_PT/LC_MESSAGES/xfce4-genmon-plugin.mo
22
share/locale/ru/LC_MESSAGES/xfce4-genmon-plugin.mo
11
share/locale/sq/LC_MESSAGES/xfce4-genmon-plugin.mo
23
share/locale/sq/LC_MESSAGES/xfce4-genmon-plugin.mo
24
share/locale/sv/LC_MESSAGES/xfce4-genmon-plugin.mo
25
share/locale/tr/LC_MESSAGES/xfce4-genmon-plugin.mo
26
share/locale/ug/LC_MESSAGES/xfce4-genmon-plugin.mo
27
share/locale/uk/LC_MESSAGES/xfce4-genmon-plugin.mo
12
share/locale/ur/LC_MESSAGES/xfce4-genmon-plugin.mo
28
share/locale/ur/LC_MESSAGES/xfce4-genmon-plugin.mo
29
share/locale/ur_PK/LC_MESSAGES/xfce4-genmon-plugin.mo
30
share/locale/zh_CN/LC_MESSAGES/xfce4-genmon-plugin.mo
13
share/xfce4/panel-plugins/genmon.desktop
31
share/xfce4/panel-plugins/genmon.desktop
14
@dirrmtry share/xfce4/panel-plugins
32
@dirrmtry share/xfce4/panel-plugins
15
@dirrmtry share/xfce4
33
@dirrmtry share/locale/ur_PK/LC_MESSAGES
34
@dirrmtry share/locale/ur_PK
16
@dirrmtry share/locale/ur/LC_MESSAGES
35
@dirrmtry share/locale/ur/LC_MESSAGES
17
@dirrmtry share/locale/ur
36
@dirrmtry share/locale/ur
37
@dirrmtry share/locale/ug/LC_MESSAGES
38
@dirrmtry share/locale/ug
39
@dirrmtry share/locale/kk/LC_MESSAGES
40
@dirrmtry share/locale/kk
41
@dirrmtry share/locale/ast/LC_MESSAGES
42
@dirrmtry share/locale/ast
18
@dirrmtry libexec/xfce4/panel-plugins
43
@dirrmtry libexec/xfce4/panel-plugins
19
@dirrmtry libexec/xfce4
44
@dirrmtry libexec/xfce4

Return to bug 155966