Date: Sun, 11 Mar 2012 11:12:59 GMT From: Ivan Klymenko <fidaj@ukr.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/165926: [patch] deskutils/cairo-dock-plugins fix many bugs Message-ID: <201203111112.q2BBCxbQ091773@red.freebsd.org> Resent-Message-ID: <201203111120.q2BBKA9B009001@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 165926 >Category: ports >Synopsis: [patch] deskutils/cairo-dock-plugins fix many bugs >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: Sun Mar 11 11:20:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Ivan Klymenko >Release: FreeBSD 10.0-CURRENT amd64 >Organization: individual >Environment: >Description: log files 8.2-RELEASE/amd64 https://redports.org/~fidaj/20120311082946-69966-15316/cairo-dock-plugins-2.3.0.3_3.log 8.2-RELEASE/i386 https://redports.org/~fidaj/20120311082946-69966-15317/cairo-dock-plugins-2.3.0.3_3.log 9.0-RELEASE/amd64 https://redports.org/~fidaj/20120311075042-60553-15312/cairo-dock-plugins-2.3.0.3_3.log 9.0-RELEASE/i386 https://redports.org/~fidaj/20120311075042-60553-15313/cairo-dock-plugins-2.3.0.3_3.log >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/cairo-dock-plugins/Makefile b/cairo-dock-plugins/Makefile index d14c1ac..53408cf 100644 --- a/cairo-dock-plugins/Makefile +++ b/cairo-dock-plugins/Makefile @@ -7,9 +7,11 @@ PORTNAME= cairo-dock-plugins DISTVERSION= 2.3.0~3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils -MASTER_SITES= http://launchpadlibrarian.net/73753265/ +MASTER_SITES= http://launchpadlibrarian.net/73753265/ \ + http://pazzle.otdux.com.ua/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ICONS_PACKAGE}${EXTRACT_SUFX} MAINTAINER= fidaj@ukr.net COMMENT= Cairo-Dock-Plugins for Cairo-Dock @@ -20,6 +22,7 @@ LIB_DEPENDS= etpan:${PORTSDIR}/mail/libetpan \ DATADIR= ${PREFIX}/share/cairo-dock +ICONS_PACKAGE= cairo-dock-plugins-png-icons GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GMAKE= yes @@ -29,7 +32,7 @@ USE_PYTHON= yes USE_XORG= xrender USE_DOS2UNIX= YES USE_CMAKE= yes -USE_GCC= 4.5+ +USE_GCC= 4.6+ MAKE_JOBS_SAFE= YES PLIST_SUB+= PYVER="${PYTHON_VERSION:S/thon//}" @@ -42,6 +45,9 @@ OPTIONS= GMENU "Common Applications menu" On \ .include <bsd.port.options.mk> +post-patch: + @${CP} -R ${WRKDIR}/${ICONS_PACKAGE}/* ${WRKSRC} + .if defined(WITH_GMENU) LIB_DEPENDS+= gnome-menu.2:${PORTSDIR}/x11/gnome-menus CMAKE_ARGS+= -Denable_gmenu:STRING=yes diff --git a/cairo-dock-plugins/distinfo b/cairo-dock-plugins/distinfo index 847bf58..960b8ac 100644 --- a/cairo-dock-plugins/distinfo +++ b/cairo-dock-plugins/distinfo @@ -1,2 +1,4 @@ SHA256 (cairo-dock-plugins-2.3.0~3.tar.gz) = 2bcfae5b6876a0a9a36ce7e0deb42a2d72234299da651c24f34e398f956a25cf SIZE (cairo-dock-plugins-2.3.0~3.tar.gz) = 5959407 +SHA256 (cairo-dock-plugins-png-icons.tar.gz) = f88327b073ac3673ea8765c608c7fe7beb1357b2c16c4dd8a26c14ec9cc2244a +SIZE (cairo-dock-plugins-png-icons.tar.gz) = 1446489 diff --git a/cairo-dock-plugins/files/patch-CDBashApplet.sh b/cairo-dock-plugins/files/patch-CDBashApplet.sh new file mode 100644 index 0000000..a66b73e --- /dev/null +++ b/cairo-dock-plugins/files/patch-CDBashApplet.sh @@ -0,0 +1,8 @@ +--- Dbus/interfaces/bash/CDBashApplet.sh.orig 2012-03-09 17:46:25.024862245 +0200 ++++ Dbus/interfaces/bash/CDBashApplet.sh 2012-03-09 17:46:37.734860652 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + # This is a part of the external applets for Cairo-Dock + # Copyright : (C) 2010-2011 by Nochka85 diff --git a/cairo-dock-plugins/files/patch-Doncky-data-nvidia-config b/cairo-dock-plugins/files/patch-Doncky-data-nvidia-config new file mode 100644 index 0000000..32045c2 --- /dev/null +++ b/cairo-dock-plugins/files/patch-Doncky-data-nvidia-config @@ -0,0 +1,8 @@ +--- Doncky/data/nvidia-config.orig 2012-03-09 17:35:57.094857454 +0200 ++++ Doncky/data/nvidia-config 2012-03-09 17:36:09.384875249 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + # Compiz check for Cairo-Dock + # diff --git a/cairo-dock-plugins/files/patch-Network-Monitor-data-access-point b/cairo-dock-plugins/files/patch-Network-Monitor-data-access-point new file mode 100644 index 0000000..3b0f834 --- /dev/null +++ b/cairo-dock-plugins/files/patch-Network-Monitor-data-access-point @@ -0,0 +1,15 @@ +--- Network-Monitor/data/access-point.orig 2012-03-10 14:23:34.754015275 +0200 ++++ Network-Monitor/data/access-point 2012-03-10 14:27:01.954034690 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + # Compiz check for Cairo-Dock + # +@@ -17,4 +17,5 @@ + # GNU General Public License for more details. + # http://www.gnu.org/licenses/licenses.html#GPL + +-iwlist $1 scan | grep "ESSID" ++#iwlist $1 scan | grep "ESSID" ++ifconfig $1 scan diff --git a/cairo-dock-plugins/files/patch-Network-Monitor-data-wifi b/cairo-dock-plugins/files/patch-Network-Monitor-data-wifi new file mode 100644 index 0000000..49022f7 --- /dev/null +++ b/cairo-dock-plugins/files/patch-Network-Monitor-data-wifi @@ -0,0 +1,18 @@ +--- Network-Monitor/data/wifi.orig 2012-03-10 14:33:22.124016420 +0200 ++++ Network-Monitor/data/wifi 2012-03-10 14:42:50.174065239 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + # Compiz check for Cairo-Dock + # +@@ -17,4 +17,8 @@ + # GNU General Public License for more details. + # http://www.gnu.org/licenses/licenses.html#GPL + +-iwconfig 2>/dev/null ++#iwconfig 2>/dev/null ++ ++lwlan = `ifconfig | awk -F": " '{print $1}' | awk '{print $1}' | grep wlan` ++ ++ifconfig $lwlan diff --git a/cairo-dock-plugins/files/patch-System-Monitor-data-nvidia-config b/cairo-dock-plugins/files/patch-System-Monitor-data-nvidia-config new file mode 100644 index 0000000..9f37356 --- /dev/null +++ b/cairo-dock-plugins/files/patch-System-Monitor-data-nvidia-config @@ -0,0 +1,8 @@ +--- System-Monitor/data/nvidia-config.orig 2012-03-09 17:41:19.754859912 +0200 ++++ System-Monitor/data/nvidia-config 2012-03-09 17:41:43.364873894 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + # nVidia parameters script for Cairo-Dock + # diff --git a/cairo-dock-plugins/files/patch-System-Monitor.conf.in b/cairo-dock-plugins/files/patch-System-Monitor.conf.in new file mode 100644 index 0000000..e2f3f7c --- /dev/null +++ b/cairo-dock-plugins/files/patch-System-Monitor.conf.in @@ -0,0 +1,11 @@ +--- System-Monitor/data/System-Monitor.conf.in.orig 2012-03-10 14:48:59.993985159 +0200 ++++ System-Monitor/data/System-Monitor.conf.in 2012-03-10 14:49:10.124034439 +0200 +@@ -183,7 +183,7 @@ + asound=true + + #u Path to sound file: +-sound path = /usr/share/sounds/error.wav ++sound path = /usr/local/share/sounds/error.wav + + #F[System-Monitor;gtk-execute] + frame_sysmon= diff --git a/cairo-dock-plugins/files/patch-applet-appli-finder.c b/cairo-dock-plugins/files/patch-applet-appli-finder.c new file mode 100644 index 0000000..abbf94b --- /dev/null +++ b/cairo-dock-plugins/files/patch-applet-appli-finder.c @@ -0,0 +1,20 @@ +--- Scooby-Do/src/applet-appli-finder.c.orig 2012-03-10 14:50:21.113987701 +0200 ++++ Scooby-Do/src/applet-appli-finder.c 2012-03-10 14:50:35.394070505 +0200 +@@ -70,7 +70,7 @@ + cd_debug ("la liste des applis a change dans %s!\n", cURI); + // on reconstruit la liste des applis. + cd_do_reset_applications_list (); +- _browse_dir ("/usr/share/applications"); // oui c'est bourrin, ca ne doit pas arriver tres souvent? ++ _browse_dir ("/usr/local/share/applications"); // oui c'est bourrin, ca ne doit pas arriver tres souvent? + myData.pApplications = g_list_sort (myData.pApplications, (GCompareFunc) _compare_appli); + } + static void _browse_dir (const gchar *cDirPath) +@@ -210,7 +210,7 @@ + //\_______________ On liste les applis. + if (myData.pApplications == NULL) // on n'a pas encore liste les applications, on le fait maintenant. + { +- _browse_dir ("/usr/share/applications"); ++ _browse_dir ("/usr/local/share/applications"); + myData.pApplications = g_list_sort (myData.pApplications, (GCompareFunc) _compare_appli); // on parcourt tout d'un coup (plutot que par exemple seulement les .desktop correspondant a la 1ere lettre car il y'a les sous-rep a parcourir, donc il faut de toute maniere se farcir la totale; de plus la commande peut differer du nom du .desktop. + } + diff --git a/cairo-dock-plugins/files/patch-applet-notifications.c b/cairo-dock-plugins/files/patch-applet-notifications.c new file mode 100644 index 0000000..828cb5d --- /dev/null +++ b/cairo-dock-plugins/files/patch-applet-notifications.c @@ -0,0 +1,11 @@ +--- logout/src/applet-notifications.c.orig 2012-03-10 14:47:11.714017314 +0200 ++++ logout/src/applet-notifications.c 2012-03-10 14:47:23.824032902 +0200 +@@ -26,7 +26,7 @@ + #include "applet-struct.h" + #include "applet-notifications.h" + +-#define GUEST_SESSION_LAUNCHER "/usr/share/gdm/guest-session/guest-session-launch" ++#define GUEST_SESSION_LAUNCHER "/usr/local/share/gdm/guest-session/guest-session-launch" + + + static void _logout (void) diff --git a/cairo-dock-plugins/files/patch-calc.sh b/cairo-dock-plugins/files/patch-calc.sh new file mode 100644 index 0000000..af6e6da --- /dev/null +++ b/cairo-dock-plugins/files/patch-calc.sh @@ -0,0 +1,8 @@ +--- Scooby-Do/data/calc.sh.orig 2012-03-09 17:33:51.704873391 +0200 ++++ Scooby-Do/data/calc.sh 2012-03-09 17:34:12.744872958 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + # Compiz check for Cairo-Dock + # diff --git a/cairo-dock-plugins/files/patch-demo_bash.sh b/cairo-dock-plugins/files/patch-demo_bash.sh new file mode 100644 index 0000000..beaf962 --- /dev/null +++ b/cairo-dock-plugins/files/patch-demo_bash.sh @@ -0,0 +1,17 @@ +--- Dbus/demos/demo_bash/demo_bash.sh.orig 2012-03-10 14:49:47.073972280 +0200 ++++ Dbus/demos/demo_bash/demo_bash.sh 2012-03-10 14:51:40.554027497 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + # This is a part of the external demo applets for Cairo-Dock + # +@@ -24,7 +24,7 @@ + ### Contact : nochka85@glx-dock.org + ### Rev : 09/02/2011 + +-. /usr/share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh $* ++. /usr/local/share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh $* + + ############################################################################################################# + diff --git a/cairo-dock-plugins/files/patch-netspeed b/cairo-dock-plugins/files/patch-netspeed new file mode 100644 index 0000000..b617e58 --- /dev/null +++ b/cairo-dock-plugins/files/patch-netspeed @@ -0,0 +1,17 @@ +--- netspeed/data/netspeed.orig 2012-03-09 17:36:57.984857300 +0200 ++++ netspeed/data/netspeed 2012-03-09 17:38:25.094870374 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + # Compiz check for Cairo-Dock + # +@@ -19,7 +19,7 @@ + + rm -f /tmp/netspeed + #Il est pas beau mon script hein ^^ +-cat /proc/net/dev | sed -e '{1d;2d;3d}' -e "s/:/é/g" -e "s/ /_/g" -e "s/_*\(.*\)é_*\([0-9][0-9]*\)__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*\([0-9][0-9]*\)__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*/\1>\2>\3/" > /tmp/netspeed ++cat /compat/linux/proc/net/dev | sed -e '{1d;2d;3d}' -e "s/:/é/g" -e "s/ /_/g" -e "s/_*\(.*\)é_*\([0-9][0-9]*\)__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*\([0-9][0-9]*\)__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*__*[0-9][0-9]*/\1>\2>\3/" > /tmp/netspeed + echo time >> /tmp/netspeed + date +%s%N >> /tmp/netspeed + echo stop >> /tmp/netspeed diff --git a/cairo-dock-plugins/files/patch-updatedb.sh b/cairo-dock-plugins/files/patch-updatedb.sh new file mode 100644 index 0000000..bbd6699 --- /dev/null +++ b/cairo-dock-plugins/files/patch-updatedb.sh @@ -0,0 +1,8 @@ +--- Scooby-Do/data/updatedb.sh.orig 2012-03-09 17:32:56.414874523 +0200 ++++ Scooby-Do/data/updatedb.sh 2012-03-09 17:33:01.154874299 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + # Compiz check for Cairo-Dock + # diff --git a/cairo-dock-plugins/files/patch-upload2free.sh b/cairo-dock-plugins/files/patch-upload2free.sh new file mode 100644 index 0000000..3406ed3 --- /dev/null +++ b/cairo-dock-plugins/files/patch-upload2free.sh @@ -0,0 +1,8 @@ +--- dnd2share/data/upload2free.sh.orig 2012-03-09 17:43:14.294869326 +0200 ++++ dnd2share/data/upload2free.sh 2012-03-09 17:43:57.334859814 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 diff --git a/cairo-dock-plugins/files/patch-wifi-data-access-point b/cairo-dock-plugins/files/patch-wifi-data-access-point new file mode 100644 index 0000000..f49b173 --- /dev/null +++ b/cairo-dock-plugins/files/patch-wifi-data-access-point @@ -0,0 +1,15 @@ +--- wifi/data/access-point.orig 2012-03-10 14:23:34.754015275 +0200 ++++ wifi/data/access-point 2012-03-10 14:27:01.954034690 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + # Compiz check for Cairo-Dock + # +@@ -17,4 +17,5 @@ + # GNU General Public License for more details. + # http://www.gnu.org/licenses/licenses.html#GPL + +-iwlist $1 scan | grep "ESSID" ++#iwlist $1 scan | grep "ESSID" ++ifconfig $1 scan diff --git a/cairo-dock-plugins/files/patch-wifi-data-wifi b/cairo-dock-plugins/files/patch-wifi-data-wifi new file mode 100644 index 0000000..1ea8d81 --- /dev/null +++ b/cairo-dock-plugins/files/patch-wifi-data-wifi @@ -0,0 +1,18 @@ +--- wifi/data/wifi.orig 2012-03-10 14:33:22.124016420 +0200 ++++ wifi/data/wifi 2012-03-10 14:42:50.174065239 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + + # Compiz check for Cairo-Dock + # +@@ -17,4 +17,8 @@ + # GNU General Public License for more details. + # http://www.gnu.org/licenses/licenses.html#GPL + +-iwconfig 2>/dev/null ++#iwconfig 2>/dev/null ++ ++lwlan = `ifconfig | awk -F": " '{print $1}' | awk '{print $1}' | grep wlan` ++ ++ifconfig $lwlan >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203111112.q2BBCxbQ091773>