Date: Sun, 27 Mar 2011 08:49:35 GMT From: Olivier Duchateau <duchateau.olivier@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/155966: [UPDATE] sysutils/xfce4-genmon-plugin to 3.3.0 Message-ID: <201103270849.p2R8nZIk060432@red.freebsd.org> Resent-Message-ID: <201103270850.p2R8oCbd052233@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155966 >Category: ports >Synopsis: [UPDATE] sysutils/xfce4-genmon-plugin to 3.3.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Mar 27 08:50:11 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: FreeBSD 8.2-RELEASE >Organization: >Environment: FreeBSD bornem.errements.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: Announce: http://foo-projects.org/pipermail/xfce/2011-March/028497.html Full compatibility with Xfce 4.8. - Delete patches, now they are included by upstream - Change value of MASTER_SITES (use one of Xfce's mirrors sites) >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN /usr/ports/sysutils/xfce4-genmon-plugin/Makefile xfce4-genmon-plugin/Makefile --- /usr/ports/sysutils/xfce4-genmon-plugin/Makefile 2011-03-03 11:12:25.000000000 +0100 +++ xfce4-genmon-plugin/Makefile 2011-03-27 10:10:32.000000000 +0200 @@ -6,10 +6,10 @@ # PORTNAME= xfce4-genmon-plugin -PORTVERSION= 3.2 -PORTREVISION= 11 +PORTVERSION= 3.3.0 CATEGORIES= sysutils xfce -MASTER_SITES= CRITICAL/xfce4 +MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= miwi@FreeBSD.org @@ -19,12 +19,9 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig -USE_XFCE= configenv libutil libgui panel +USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig +USE_XFCE= configenv libgui panel -post-patch: - @${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \ - s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \ - ${WRKSRC}/configure +CONFIGURE_ENV+= ac_cv_prog_AWK="${AWK}" .include <bsd.port.mk> diff -urN /usr/ports/sysutils/xfce4-genmon-plugin/distinfo xfce4-genmon-plugin/distinfo --- /usr/ports/sysutils/xfce4-genmon-plugin/distinfo 2011-03-19 13:33:41.000000000 +0100 +++ xfce4-genmon-plugin/distinfo 2011-03-26 10:39:26.000000000 +0100 @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-genmon-plugin-3.2.tar.bz2) = b2c15d4745092321f4c502123dba58fded6d80f4c2ade4e819fd65eaa541c133 -SIZE (xfce4/xfce4-genmon-plugin-3.2.tar.bz2) = 142540 +SHA256 (xfce4/xfce4-genmon-plugin-3.3.0.tar.bz2) = 56cf632c196cf988cef36c3965651e9fd9c838c21c133d643e3563e18f45e7c0 +SIZE (xfce4/xfce4-genmon-plugin-3.3.0.tar.bz2) = 125754 diff -urN /usr/ports/sysutils/xfce4-genmon-plugin/files/patch-panel-plugin__cmdspawn.c xfce4-genmon-plugin/files/patch-panel-plugin__cmdspawn.c --- /usr/ports/sysutils/xfce4-genmon-plugin/files/patch-panel-plugin__cmdspawn.c 2010-11-07 16:40:44.000000000 +0100 +++ xfce4-genmon-plugin/files/patch-panel-plugin__cmdspawn.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ ---- ./panel-plugin/cmdspawn.c.orig 2007-11-23 16:32:40.000000000 +0100 -+++ ./panel-plugin/cmdspawn.c 2010-11-07 11:29:03.000000000 +0100 -@@ -184,6 +184,7 @@ - return (-1); - case 0: - /* Redirect stdout/stderr to associated pipe's write-ends */ -+ close(0); /* stdin is not used in child */ - for (i = 0; i < OUT_ERR; i++) { - j = i + 1; // stdout/stderr file descriptor - close (j); -@@ -199,6 +200,9 @@ - exit (-1); - } - -+ for (i = 0; i < OUT_ERR; i++) -+ close (aaiPipe[i][WR]); /* close write end of pipes in parent */ -+ - /* Wait for child completion */ - if (wait == 1) - { -@@ -231,10 +235,9 @@ - } - - End: -- /* Close created pipes */ -+ /* Close read end of pipes */ - for (i = 0; i < OUT_ERR; i++) -- for (j = 0; j < RD_WR; j++) -- close (aaiPipe[i][j]); -+ close (aaiPipe[i][RD]); - - return (-fError); - }// Spawn() diff -urN /usr/ports/sysutils/xfce4-genmon-plugin/files/patch-panel-plugin__main.c xfce4-genmon-plugin/files/patch-panel-plugin__main.c --- /usr/ports/sysutils/xfce4-genmon-plugin/files/patch-panel-plugin__main.c 2010-11-07 16:40:44.000000000 +0100 +++ xfce4-genmon-plugin/files/patch-panel-plugin__main.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ ---- ./panel-plugin/main.c.orig 2008-03-15 23:38:18.000000000 +0100 -+++ ./panel-plugin/main.c 2010-11-07 11:28:17.000000000 +0100 -@@ -32,6 +32,7 @@ - - #include <libxfce4util/libxfce4util.h> - #include <libxfcegui4/dialogs.h> -+#include <libxfcegui4/xfce-exec.h> - #include <libxfce4panel/xfce-panel-plugin.h> - #include <libxfce4panel/xfce-panel-convenience.h> - -@@ -94,10 +95,18 @@ - { - struct genmon_t *poPlugin = (genmon_t *) p_pvPlugin; - struct monitor_t *poMonitor = &(poPlugin->oMonitor); -- char result[256]; -+ GError *error = NULL; -+ -+ xfce_exec(poMonitor->onClickCmd, 0, 0, &error); -+ if (error) { -+ char first[256]; -+ g_snprintf (first, sizeof(first), _("Could not run \"%s\""), poMonitor->onClickCmd); -+ xfce_message_dialog (NULL, _("Xfce Panel"), -+ GTK_STOCK_DIALOG_ERROR, first, error->message, -+ GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); -+ g_error_free (error); -+ } - -- genmon_SpawnCmd (poMonitor->onClickCmd, result, -- sizeof (poMonitor->onClickCmd), 0); - } - - /**************************************************************/ diff -urN /usr/ports/sysutils/xfce4-genmon-plugin/pkg-plist xfce4-genmon-plugin/pkg-plist --- /usr/ports/sysutils/xfce4-genmon-plugin/pkg-plist 2010-11-07 16:43:01.000000000 +0100 +++ xfce4-genmon-plugin/pkg-plist 2011-03-27 10:10:32.000000000 +0200 @@ -1,19 +1,44 @@ libexec/xfce4/panel-plugins/xfce4-genmon-plugin +share/locale/ast/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/de/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/en_GB/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/gl/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/hu/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/lv/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-genmon-plugin.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/sq/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/uk/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/ur/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-genmon-plugin.mo share/xfce4/panel-plugins/genmon.desktop @dirrmtry share/xfce4/panel-plugins -@dirrmtry share/xfce4 +@dirrmtry share/locale/ur_PK/LC_MESSAGES +@dirrmtry share/locale/ur_PK @dirrmtry share/locale/ur/LC_MESSAGES @dirrmtry share/locale/ur +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry libexec/xfce4/panel-plugins @dirrmtry libexec/xfce4 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103270849.p2R8nZIk060432>