Date: Mon, 9 Apr 2012 10:10:16 GMT From: Ivan Klymenko <fidaj@ukr.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/165926: [patch] deskutils/cairo-dock-plugins fix many bugs Message-ID: <201204091010.q39AAGsH081960@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/165926; it has been noted by GNATS. From: Ivan Klymenko <fidaj@ukr.net> To: bug-followup@FreeBSD.org, fidaj@ukr.net Cc: Subject: Re: ports/165926: [patch] deskutils/cairo-dock-plugins fix many bugs Date: Mon, 9 Apr 2012 12:38:49 +0300 --MP_/ltEjUJ1TbIV+cpm0LK_b_PN Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Updated and corrected several errors listed in the following PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=165898 http://www.freebsd.org/cgi/query-pr.cgi?pr=166607 http://www.freebsd.org/cgi/query-pr.cgi?pr=166747 http://www.freebsd.org/cgi/query-pr.cgi?pr=166749 Builgroup: 10-CURRENT/amd64 Log: https://redports.org//~fidaj/20120408095210-66266-19217/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 10-CURRENT/i386 Log: https://redports.org//~fidaj/20120408095204-88817-19216/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 9.0-RELEASE/amd64 Log: https://redports.org//~fidaj/20120408095130-65624-19215/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 9.0-RELEASE/i386 Log: https://redports.org//~fidaj/20120408095125-54119-19214/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 8.2-RELEASE/amd64 Log: https://redports.org//~fidaj/20120408095119-58507-19213/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 8.2-RELEASE/i386 Log: https://redports.org//~fidaj/20120408095112-43678-19212/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 7.4-RELEASE/amd64 Log: https://redports.org//~fidaj/20120408095104-94627-19211/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 7.4-RELEASE/i386 Log: https://redports.org//~fidaj/20120408095057-58944-19210/cairo-dock-plugins-2.3.0.3_3.log --MP_/ltEjUJ1TbIV+cpm0LK_b_PN Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=patch-cairo-dock-plugins-update.txt diff --git a/cairo-dock-plugins/Makefile b/cairo-dock-plugins/Makefile index d14c1ac..ad329f7 100644 --- a/cairo-dock-plugins/Makefile +++ b/cairo-dock-plugins/Makefile @@ -7,9 +7,11 @@ =20 PORTNAME=3D cairo-dock-plugins DISTVERSION=3D 2.3.0~3 -PORTREVISION=3D 2 +PORTREVISION=3D 3 CATEGORIES=3D deskutils -MASTER_SITES=3D http://launchpadlibrarian.net/73753265/ +MASTER_SITES=3D http://launchpadlibrarian.net/73753265/ \ + http://pazzle.otdux.com.ua/ +DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX} ${ICONS_PACKAGE}${EXTRACT_SUFX} =20 MAINTAINER=3D fidaj@ukr.net COMMENT=3D Cairo-Dock-Plugins for Cairo-Dock @@ -20,6 +22,7 @@ LIB_DEPENDS=3D etpan:${PORTSDIR}/mail/libetpan \ =20 DATADIR=3D ${PREFIX}/share/cairo-dock =20 +ICONS_PACKAGE=3D cairo-dock-plugins-png-icons GNU_CONFIGURE=3D yes USE_GETTEXT=3D yes USE_GMAKE=3D yes @@ -29,7 +32,7 @@ USE_PYTHON=3D yes USE_XORG=3D xrender USE_DOS2UNIX=3D YES USE_CMAKE=3D yes -USE_GCC=3D 4.5+ +USE_GCC=3D 4.6+ MAKE_JOBS_SAFE=3D YES PLIST_SUB+=3D PYVER=3D"${PYTHON_VERSION:S/thon//}" =20 @@ -42,6 +45,9 @@ OPTIONS=3D GMENU "Common Applications menu" On \ =20 .include <bsd.port.options.mk> =20 +post-patch: + @${CP} -R ${WRKDIR}/${ICONS_PACKAGE}/* ${WRKSRC} + .if defined(WITH_GMENU) LIB_DEPENDS+=3D gnome-menu.2:${PORTSDIR}/x11/gnome-menus CMAKE_ARGS+=3D -Denable_gmenu:STRING=3Dyes @@ -91,6 +97,7 @@ PLIST_SUB+=3D XFCE_INTEGRATION=3D"@comment " =20 .if defined(WITH_ALSA_MIXER) LIB_DEPENDS+=3D asound.2:${PORTSDIR}/audio/alsa-lib +RUN_DEPENDS+=3D ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PO= RTSDIR}/audio/alsa-plugins CMAKE_ARGS+=3D -Denable_alsa_mixer:STRING=3Dyes PLIST_SUB+=3D ALSA_MIXER=3D"" .else 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) =3D 2bcfae5b6876a0a9a36ce7e0deb= 42a2d72234299da651c24f34e398f956a25cf SIZE (cairo-dock-plugins-2.3.0~3.tar.gz) =3D 5959407 +SHA256 (cairo-dock-plugins-png-icons.tar.gz) =3D f88327b073ac3673ea8765c60= 8c7fe7beb1357b2c16c4dd8a26c14ec9cc2244a +SIZE (cairo-dock-plugins-png-icons.tar.gz) =3D 1446489 diff --git a/cairo-dock-plugins/files/patch-CDBashApplet.sh b/cairo-dock-pl= ugins/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.02486224= 5 +0200 ++++ Dbus/interfaces/bash/CDBashApplet.sh 2012-03-09 17:46:37.734860652 +02= 00 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash +=20 + # 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/cai= ro-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 +=20 + # Compiz check for Cairo-Dock + # diff --git a/cairo-dock-plugins/files/patch-GMenu-applet-menu b/cairo-dock-= plugins/files/patch-GMenu-applet-menu new file mode 100644 index 0000000..add348e --- /dev/null +++ b/cairo-dock-plugins/files/patch-GMenu-applet-menu @@ -0,0 +1,22 @@ +--- GMenu/src/applet-menu.c.orig 2011-06-19 02:27:29.000000000 +0300 ++++ GMenu/src/applet-menu.c 2012-04-08 11:24:51.000000000 +0300 +@@ -693,15 +693,15 @@ + =09 + // workaround pour KDE, qui ne loupe pas une occasion de se distinguer. + const gchar *cMenuFileName =3D NULL; +- if (! g_file_test ("/etc/xdg/menus/applications.menu", G_FILE_TEST_EXIST= S)) // on pourrait aussi aller lire le start-here.menu, mais je suis pas s= ur que ce soit standard. ++ if (! g_file_test ("/usr/local/etc/xdg/menus/gnome-applications.menu", G= _FILE_TEST_EXISTS)) // on pourrait aussi aller lire le start-here.menu, ma= is je suis pas sur que ce soit standard. + { +- if (g_file_test ("/etc/xdg/menus/kde-applications.menu", G_FILE_TEST_EX= ISTS)) ++ if (g_file_test ("/usr/local/etc/xdg/menus/kde-applications.menu", G_FI= LE_TEST_EXISTS)) + cMenuFileName =3D "kde-applications.menu"; +- else if (g_file_test ("/etc/xdg/menus/xfce-applications.menu", G_FILE_T= EST_EXISTS)) ++ else if (g_file_test ("/usr/local/etc/xdg/menus/xfce-applications.menu"= , G_FILE_TEST_EXISTS)) + cMenuFileName =3D "xfce-applications.menu"; + } + if (cMenuFileName =3D=3D NULL) +- cMenuFileName =3D "applications.menu"; ++ cMenuFileName =3D "gnome-applications.menu"; + =09 + main_menu =3D create_applications_menu (cMenuFileName, NULL, NULL); + =09 diff --git a/cairo-dock-plugins/files/patch-Network-Monitor-data-access-poi= nt 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 +=20 + # Compiz check for Cairo-Dock + # +@@ -17,4 +17,5 @@ + # GNU General Public License for more details. + # http://www.gnu.org/licenses/licenses.html#GPL +=20 +-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/cai= ro-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 +=20 + # Compiz check for Cairo-Dock + # +@@ -17,4 +17,8 @@ + # GNU General Public License for more details. + # http://www.gnu.org/licenses/licenses.html#GPL +=20 +-iwconfig 2>/dev/null ++#iwconfig 2>/dev/null ++ ++lwlan =3D `ifconfig | awk -F": " '{print $1}' | awk '{print $1}' | grep w= lan` ++ ++ifconfig $lwlan diff --git a/cairo-dock-plugins/files/patch-System-Monitor-data-nvidia-conf= ig 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 +=20 + # 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.99= 3985159 +0200 ++++ System-Monitor/data/System-Monitor.conf.in 2012-03-10 14:49:10.1240344= 39 +0200 +@@ -183,7 +183,7 @@ + asound=3Dtrue +=20 + #u Path to sound file: +-sound path =3D /usr/share/sounds/error.wav ++sound path =3D /usr/local/share/sounds/error.wav +=20 + #F[System-Monitor;gtk-execute] + frame_sysmon=3D diff --git a/cairo-dock-plugins/files/patch-applet-appli-finder.c b/cairo-d= ock-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 do= it pas arriver tres souvent? ++ _browse_dir ("/usr/local/share/applications"); // oui c'est bourrin, ca= ne doit pas arriver tres souvent? + myData.pApplications =3D g_list_sort (myData.pApplications, (GCompareFun= c) _compare_appli); + } + static void _browse_dir (const gchar *cDirPath) +@@ -210,7 +210,7 @@ + //\_______________ On liste les applis. + if (myData.pApplications =3D=3D NULL) // on n'a pas encore liste les ap= plications, on le fait maintenant. + { +- _browse_dir ("/usr/share/applications"); ++ _browse_dir ("/usr/local/share/applications"); + myData.pApplications =3D g_list_sort (myData.pApplications, (GCompareFu= nc) _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. + } + =09 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" +=20 +-#define GUEST_SESSION_LAUNCHER "/usr/share/gdm/guest-session/guest-sessio= n-launch" ++#define GUEST_SESSION_LAUNCHER "/usr/local/share/gdm/guest-session/guest-= session-launch" +=20 +=20 + static void _logout (void) diff --git a/cairo-dock-plugins/files/patch-calc.sh b/cairo-dock-plugins/fi= les/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 +=20 + # Compiz check for Cairo-Dock + # diff --git a/cairo-dock-plugins/files/patch-demo_bash.sh b/cairo-dock-plugi= ns/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 +=20 + # 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 +=20 +-. /usr/share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh $* ++. /usr/local/share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh $* +=20 + #########################################################################= #################################### +=20 diff --git a/cairo-dock-plugins/files/patch-netspeed b/cairo-dock-plugins/f= iles/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 +=20 + # Compiz check for Cairo-Dock + # +@@ -19,7 +19,7 @@ + =20 + rm -f /tmp/netspeed + #Il est pas beau mon script hein ^^ +-cat /proc/net/dev | sed -e '{1d;2d;3d}' -e "s/:/=C3=A9/g" -e "s/ /_/g" -e= "s/_*\(.*\)=C3=A9_*\([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/:/=C3=A9/g" -e= "s/ /_/g" -e "s/_*\(.*\)=C3=A9_*\([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-plugin= s/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 +=20 + # Compiz check for Cairo-Dock + # diff --git a/cairo-dock-plugins/files/patch-upload2free.sh b/cairo-dock-plu= gins/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 +=20 + # Compiz check for Cairo-Dock + # +@@ -17,4 +17,5 @@ + # GNU General Public License for more details. + # http://www.gnu.org/licenses/licenses.html#GPL +=20 +-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-plu= gins/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 +=20 + # Compiz check for Cairo-Dock + # +@@ -17,4 +17,8 @@ + # GNU General Public License for more details. + # http://www.gnu.org/licenses/licenses.html#GPL +=20 +-iwconfig 2>/dev/null ++#iwconfig 2>/dev/null ++ ++lwlan =3D `ifconfig | awk -F": " '{print $1}' | awk '{print $1}' | grep w= lan` ++ ++ifconfig $lwlan --MP_/ltEjUJ1TbIV+cpm0LK_b_PN--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204091010.q39AAGsH081960>