[arch-commits] Commit in xfce4-netload-plugin/trunk (2 files)
Date: Saturday, May 7, 2016 @ 07:07:07 Author: foutrelis Revision: 267146 upgpkg: xfce4-netload-plugin 1.2.4-3 Remove install file. Modified: xfce4-netload-plugin/trunk/PKGBUILD Deleted: xfce4-netload-plugin/trunk/xfce4-netload-plugin.install --+ PKGBUILD |3 +-- xfce4-netload-plugin.install | 13 - 2 files changed, 1 insertion(+), 15 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-05-07 05:07:03 UTC (rev 267145) +++ PKGBUILD2016-05-07 05:07:07 UTC (rev 267146) @@ -4,7 +4,7 @@ pkgname=xfce4-netload-plugin pkgver=1.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="A netload plugin for the Xfce panel" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin; @@ -12,7 +12,6 @@ groups=('xfce4-goodies') depends=('xfce4-panel') makedepends=('intltool') -install=$pkgname.install source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) sha256sums=('fface918822c012d806717116566e54947ad7613b9290b45a18e2d5ffb8730d3') Deleted: xfce4-netload-plugin.install === --- xfce4-netload-plugin.install2016-05-07 05:07:03 UTC (rev 267145) +++ xfce4-netload-plugin.install2016-05-07 05:07:07 UTC (rev 267146) @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et:
[arch-commits] Commit in xfce4-netload-plugin/trunk (2 files)
Date: Monday, November 24, 2014 @ 16:14:48 Author: foutrelis Revision: 227049 upgpkg: xfce4-netload-plugin 1.2.4-1 New upstream release. Modified: xfce4-netload-plugin/trunk/PKGBUILD Deleted: xfce4-netload-plugin/trunk/0001-Add-argument-as_bits-to-format_byte_humanreadable-fu.patch -+ 0001-Add-argument-as_bits-to-format_byte_humanreadable-fu.patch | 147 -- PKGBUILD| 17 - 2 files changed, 4 insertions(+), 160 deletions(-) Deleted: 0001-Add-argument-as_bits-to-format_byte_humanreadable-fu.patch === --- 0001-Add-argument-as_bits-to-format_byte_humanreadable-fu.patch 2014-11-24 10:28:49 UTC (rev 227048) +++ 0001-Add-argument-as_bits-to-format_byte_humanreadable-fu.patch 2014-11-24 15:14:48 UTC (rev 227049) @@ -1,147 +0,0 @@ -From 2e2d905b28d31c6065183ee7a52d238f0be410f5 Mon Sep 17 00:00:00 2001 -From: Mike Massonnet m...@gandi.net -Date: Sat, 15 Nov 2014 23:27:36 +0100 -Subject: [PATCH] Add argument as_bits to format_byte_humanreadable function - - panel-plugin/commandline.c | 6 +++--- - panel-plugin/netload.c | 7 --- - panel-plugin/utils.c | 25 + - panel-plugin/utils.h | 4 +++- - 4 files changed, 27 insertions(+), 15 deletions(-) - -diff --git a/panel-plugin/commandline.c b/panel-plugin/commandline.c -index 5624845..8dfb4fb 100644 a/panel-plugin/commandline.c -+++ b/panel-plugin/commandline.c -@@ -73,9 +73,9 @@ int main(int argc, char* argv[]) - for (;;) - { - get_current_netload(data, in, out, tot); --format_byte_humanreadable(bufIn, 20, (double)in, 0); --format_byte_humanreadable(bufOut, 20, (double)out, 0); --format_byte_humanreadable(bufTot, 20, (double)tot, 0); -+format_byte_humanreadable(bufIn, 20, (double)in, 0, FALSE); -+format_byte_humanreadable(bufOut, 20, (double)out, 0, FALSE); -+format_byte_humanreadable(bufTot, 20, (double)tot, 0, FALSE); - printf(Current netload:\nIN : %s\nOUT: %s\nTOT: %s\nIP: %s\n, - bufIn, bufOut, bufTot, get_ip_address(data)); - sleep(1); -diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c -index 79d6bdb..990a75d 100644 a/panel-plugin/netload.c -+++ b/panel-plugin/netload.c -@@ -27,6 +27,7 @@ - #include utils.h - #include global.h - -+#include glib.h - #include gtk/gtk.h - - #include libxfce4util/libxfce4util.h -@@ -240,11 +241,11 @@ static gboolean update_monitors(t_global_monitor *global) - if (global-monitor-options.show_bars) - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(global-monitor-status[i]), temp); - --format_byte_humanreadable( buffer[i], BUFSIZ - 1, display[i], 2 ); --format_byte_humanreadable( buffer_panel[i], BUFSIZ - 1, display[i], 2 ); -+format_byte_humanreadable( buffer[i], BUFSIZ - 1, display[i], 2, FALSE ); -+format_byte_humanreadable( buffer_panel[i], BUFSIZ - 1, display[i], 2, FALSE ); - } - --format_byte_humanreadable( buffer[TOT], BUFSIZ - 1, (display[IN]+display[OUT]), 2 ); -+format_byte_humanreadable( buffer[TOT], BUFSIZ - 1, (display[IN]+display[OUT]), 2, FALSE ); - - { - char* ip = get_ip_address((global-monitor-data)); -diff --git a/panel-plugin/utils.c b/panel-plugin/utils.c -index c2824ba..c262f87 100644 a/panel-plugin/utils.c -+++ b/panel-plugin/utils.c -@@ -70,19 +70,28 @@ unsigned long max_array( unsigned long array[], int size ) - - - /* -- */ --char* format_byte_humanreadable(char* string, int stringsize, double number, int digits) -+char* format_byte_humanreadable(char* string, int stringsize, double number, int digits, gboolean as_bits) - { - char* str = string; - char buffer[BUFSIZ], formatstring[BUFSIZ]; - char* bufptr = buffer; - char* unit_names[] = { N_(B), N_(KiB), N_(MiB), N_(GiB) }; -+char* unit_names_bits[] = { N_(bps), N_(Kbps), N_(Mbps), N_(Gbps) }; - unsigned int uidx = 0; --double number_displayed = number / 1024.0; -+double number_displayed = 0; -+double thousand_divider = as_bits ? 1000 : 1024; - unsigned int i; - int numberOfIntegerChars, count; - struct lconv* localeinfo = localeconv(); - int grouping = (int)localeinfo-grouping[0] == 0 ? INT_MAX : (int)localeinfo-grouping[0]; - -+/* Start with kilo and adapt to bits values*/ -+uidx = 1; -+number_displayed = number / thousand_divider; -+if (as_bits) -+{ -+number_displayed *= 8; -+} - - /* sensible value for digits */ - if (digits 0 || digits = 10) -@@ -90,16 +99,16 @@ char* format_byte_humanreadable(char* string, int stringsize, double number, int - digits = 2; - } - --
[arch-commits] Commit in xfce4-netload-plugin/trunk (2 files)
Date: Tuesday, November 18, 2014 @ 22:04:26 Author: foutrelis Revision: 226369 upgpkg: xfce4-netload-plugin 1.2.3-2 Fix bandwidth display in tooltip (FS#42834). Added: xfce4-netload-plugin/trunk/0001-Add-argument-as_bits-to-format_byte_humanreadable-fu.patch Modified: xfce4-netload-plugin/trunk/PKGBUILD -+ 0001-Add-argument-as_bits-to-format_byte_humanreadable-fu.patch | 147 ++ PKGBUILD| 15 - 2 files changed, 159 insertions(+), 3 deletions(-) Added: 0001-Add-argument-as_bits-to-format_byte_humanreadable-fu.patch === --- 0001-Add-argument-as_bits-to-format_byte_humanreadable-fu.patch (rev 0) +++ 0001-Add-argument-as_bits-to-format_byte_humanreadable-fu.patch 2014-11-18 21:04:26 UTC (rev 226369) @@ -0,0 +1,147 @@ +From 2e2d905b28d31c6065183ee7a52d238f0be410f5 Mon Sep 17 00:00:00 2001 +From: Mike Massonnet m...@gandi.net +Date: Sat, 15 Nov 2014 23:27:36 +0100 +Subject: [PATCH] Add argument as_bits to format_byte_humanreadable function + +--- + panel-plugin/commandline.c | 6 +++--- + panel-plugin/netload.c | 7 --- + panel-plugin/utils.c | 25 + + panel-plugin/utils.h | 4 +++- + 4 files changed, 27 insertions(+), 15 deletions(-) + +diff --git a/panel-plugin/commandline.c b/panel-plugin/commandline.c +index 5624845..8dfb4fb 100644 +--- a/panel-plugin/commandline.c b/panel-plugin/commandline.c +@@ -73,9 +73,9 @@ int main(int argc, char* argv[]) + for (;;) + { + get_current_netload(data, in, out, tot); +-format_byte_humanreadable(bufIn, 20, (double)in, 0); +-format_byte_humanreadable(bufOut, 20, (double)out, 0); +-format_byte_humanreadable(bufTot, 20, (double)tot, 0); ++format_byte_humanreadable(bufIn, 20, (double)in, 0, FALSE); ++format_byte_humanreadable(bufOut, 20, (double)out, 0, FALSE); ++format_byte_humanreadable(bufTot, 20, (double)tot, 0, FALSE); + printf(Current netload:\nIN : %s\nOUT: %s\nTOT: %s\nIP: %s\n, + bufIn, bufOut, bufTot, get_ip_address(data)); + sleep(1); +diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c +index 79d6bdb..990a75d 100644 +--- a/panel-plugin/netload.c b/panel-plugin/netload.c +@@ -27,6 +27,7 @@ + #include utils.h + #include global.h + ++#include glib.h + #include gtk/gtk.h + + #include libxfce4util/libxfce4util.h +@@ -240,11 +241,11 @@ static gboolean update_monitors(t_global_monitor *global) + if (global-monitor-options.show_bars) + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(global-monitor-status[i]), temp); + +-format_byte_humanreadable( buffer[i], BUFSIZ - 1, display[i], 2 ); +-format_byte_humanreadable( buffer_panel[i], BUFSIZ - 1, display[i], 2 ); ++format_byte_humanreadable( buffer[i], BUFSIZ - 1, display[i], 2, FALSE ); ++format_byte_humanreadable( buffer_panel[i], BUFSIZ - 1, display[i], 2, FALSE ); + } + +-format_byte_humanreadable( buffer[TOT], BUFSIZ - 1, (display[IN]+display[OUT]), 2 ); ++format_byte_humanreadable( buffer[TOT], BUFSIZ - 1, (display[IN]+display[OUT]), 2, FALSE ); + + { + char* ip = get_ip_address((global-monitor-data)); +diff --git a/panel-plugin/utils.c b/panel-plugin/utils.c +index c2824ba..c262f87 100644 +--- a/panel-plugin/utils.c b/panel-plugin/utils.c +@@ -70,19 +70,28 @@ unsigned long max_array( unsigned long array[], int size ) + + + /* -- */ +-char* format_byte_humanreadable(char* string, int stringsize, double number, int digits) ++char* format_byte_humanreadable(char* string, int stringsize, double number, int digits, gboolean as_bits) + { + char* str = string; + char buffer[BUFSIZ], formatstring[BUFSIZ]; + char* bufptr = buffer; + char* unit_names[] = { N_(B), N_(KiB), N_(MiB), N_(GiB) }; ++char* unit_names_bits[] = { N_(bps), N_(Kbps), N_(Mbps), N_(Gbps) }; + unsigned int uidx = 0; +-double number_displayed = number / 1024.0; ++double number_displayed = 0; ++double thousand_divider = as_bits ? 1000 : 1024; + unsigned int i; + int numberOfIntegerChars, count; + struct lconv* localeinfo = localeconv(); + int grouping = (int)localeinfo-grouping[0] == 0 ? INT_MAX : (int)localeinfo-grouping[0]; + ++/* Start with kilo and adapt to bits values*/ ++uidx = 1; ++number_displayed = number / thousand_divider; ++if (as_bits) ++{ ++number_displayed *= 8; ++} + + /* sensible value for digits */ + if (digits 0 || digits = 10) +@@ -90,16 +99,16 @@ char* format_byte_humanreadable(char* string, int stringsize, double number, int + digits = 2; +
[arch-commits] Commit in xfce4-netload-plugin/trunk (2 files)
Date: Sunday, July 15, 2012 @ 13:44:40 Author: foutrelis Revision: 163557 upgpkg: xfce4-netload-plugin 1.2.0-1 New upstream release. Modified: xfce4-netload-plugin/trunk/PKGBUILD xfce4-netload-plugin/trunk/xfce4-netload-plugin.install --+ PKGBUILD | 31 +-- xfce4-netload-plugin.install |3 ++- 2 files changed, 19 insertions(+), 15 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-07-15 14:10:24 UTC (rev 163556) +++ PKGBUILD2012-07-15 17:44:40 UTC (rev 163557) @@ -1,33 +1,36 @@ # $Id$ -# Maintainer: aurelien aurel...@archlinux.org +# Maintainer: # Contributor: Aurelien Foret orel...@chez.com pkgname=xfce4-netload-plugin -pkgver=1.1.0 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc=A netload plugin for the Xfce panel arch=('i686' 'x86_64') +url=http://xfce-goodies.berlios.de/; license=('GPL') -url=http://xfce-goodies.berlios.de/; groups=('xfce4-goodies') depends=('xfce4-panel') makedepends=('intltool') options=('!libtool') install=xfce4-netload-plugin.install -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('8029daacf1602275c75ab07d1e2cccea0993caab') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha256sums=('c824f09e2d3860011b44d8272d661c458237786828027f3d9ad6a1d4f0096845') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-debug + cd $srcdir/$pkgname-$pkgver + + ./configure \ +--prefix=/usr \ +--sysconfdir=/etc \ +--libexecdir=/usr/lib \ +--localstatedir=/var \ +--disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } +# vim:set ts=2 sw=2 et: Modified: xfce4-netload-plugin.install === --- xfce4-netload-plugin.install2012-07-15 14:10:24 UTC (rev 163556) +++ xfce4-netload-plugin.install2012-07-15 17:44:40 UTC (rev 163557) @@ -7,6 +7,7 @@ } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } +# vim:set ts=2 sw=2 et: