[arch-commits] Commit in gnome-nettool/repos (10 files)
Jan Steffens
heftig at nymeria.archlinux.org
Fri May 3 03:24:58 UTC 2013
Date: Friday, May 3, 2013 @ 05:24:57
Author: heftig
Revision: 184172
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnome-nettool/repos/extra-i686/PKGBUILD
(from rev 184171, gnome-nettool/trunk/PKGBUILD)
gnome-nettool/repos/extra-i686/gnome-nettool.install
(from rev 184171, gnome-nettool/trunk/gnome-nettool.install)
gnome-nettool/repos/extra-i686/printf.patch
(from rev 184171, gnome-nettool/trunk/printf.patch)
gnome-nettool/repos/extra-x86_64/PKGBUILD
(from rev 184171, gnome-nettool/trunk/PKGBUILD)
gnome-nettool/repos/extra-x86_64/gnome-nettool.install
(from rev 184171, gnome-nettool/trunk/gnome-nettool.install)
gnome-nettool/repos/extra-x86_64/printf.patch
(from rev 184171, gnome-nettool/trunk/printf.patch)
Deleted:
gnome-nettool/repos/extra-i686/PKGBUILD
gnome-nettool/repos/extra-i686/gnome-nettool.install
gnome-nettool/repos/extra-x86_64/PKGBUILD
gnome-nettool/repos/extra-x86_64/gnome-nettool.install
------------------------------------+
/PKGBUILD | 70 +++++++++++++++++++++++++++++++++++
/gnome-nettool.install | 24 ++++++++++++
extra-i686/PKGBUILD | 32 ----------------
extra-i686/gnome-nettool.install | 12 ------
extra-i686/printf.patch | 34 +++++++++++++++++
extra-x86_64/PKGBUILD | 32 ----------------
extra-x86_64/gnome-nettool.install | 12 ------
extra-x86_64/printf.patch | 34 +++++++++++++++++
8 files changed, 162 insertions(+), 88 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-05-03 03:23:55 UTC (rev 184171)
+++ extra-i686/PKGBUILD 2013-05-03 03:24:57 UTC (rev 184172)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Kritoke <kritoke at nospam.gmail.com>
-
-pkgname=gnome-nettool
-pkgver=3.2.0
-pkgrel=3
-pkgdesc="A Collection of GNOME3 Networking Tools."
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools')
-optdepends=('nmap: Port scanning'
- 'net-tools: Network statistics')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-schemas-compile
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-nettool/repos/extra-i686/PKGBUILD (from rev 184171, gnome-nettool/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-05-03 03:24:57 UTC (rev 184172)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Kritoke <kritoke at nospam.gmail.com>
+
+pkgname=gnome-nettool
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="A Collection of GNOME3 Networking Tools."
+arch=(i686 x86_64)
+license=(GPL)
+depends=(gtk3 libgtop dnsutils iputils dconf whois hicolor-icon-theme)
+makedepends=(yelp-tools intltool nmap net-tools)
+optdepends=('nmap: Port scanning'
+ 'net-tools: Network statistics')
+groups=(gnome-extra)
+url="http://www.gnome.org"
+install=gnome-nettool.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ printf.patch)
+sha256sums=('3a3480dcef181684f3e37d779cfd43f9b21920412aff78501de1695faf194a28'
+ '4b06c0748650996100f710a2d7c90afc8fb75bbdd1984f243f42318d0985229e')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../printf.patch
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-schemas-compile
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-i686/gnome-nettool.install
===================================================================
--- extra-i686/gnome-nettool.install 2013-05-03 03:23:55 UTC (rev 184171)
+++ extra-i686/gnome-nettool.install 2013-05-03 03:24:57 UTC (rev 184172)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install
-}
Copied: gnome-nettool/repos/extra-i686/gnome-nettool.install (from rev 184171, gnome-nettool/trunk/gnome-nettool.install)
===================================================================
--- extra-i686/gnome-nettool.install (rev 0)
+++ extra-i686/gnome-nettool.install 2013-05-03 03:24:57 UTC (rev 184172)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install
+}
Copied: gnome-nettool/repos/extra-i686/printf.patch (from rev 184171, gnome-nettool/trunk/printf.patch)
===================================================================
--- extra-i686/printf.patch (rev 0)
+++ extra-i686/printf.patch 2013-05-03 03:24:57 UTC (rev 184172)
@@ -0,0 +1,34 @@
+diff -u -r gnome-nettool-3.8.0/src/info.c gnome-nettool-3.8.0-printf/src/info.c
+--- gnome-nettool-3.8.0/src/info.c 2013-05-02 13:58:40.000000000 +0200
++++ gnome-nettool-3.8.0-printf/src/info.c 2013-05-03 05:20:04.684921458 +0200
+@@ -232,13 +232,13 @@
+ text_rx_bytes = util_legible_bytes (netload.bytes_in);
+ text_tx_bytes = util_legible_bytes (netload.bytes_out);
+
+- g_sprintf (rx_pkt, "%lld", netload.packets_in);
+- g_sprintf (tx_pkt, "%lld", netload.packets_out);
++ g_sprintf (rx_pkt, "%" G_GUINT64_FORMAT, netload.packets_in);
++ g_sprintf (tx_pkt, "%" G_GUINT64_FORMAT, netload.packets_out);
+
+- g_sprintf (rx_error, "%lld", netload.errors_in);
+- g_sprintf (tx_error, "%lld", netload.errors_out);
++ g_sprintf (rx_error, "%" G_GUINT64_FORMAT, netload.errors_in);
++ g_sprintf (tx_error, "%" G_GUINT64_FORMAT, netload.errors_out);
+
+- g_sprintf (collisions, "%lld", netload.collisions);
++ g_sprintf (collisions, "%" G_GUINT64_FORMAT, netload.collisions);
+
+ gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes);
+ gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt);
+diff -u -r gnome-nettool-3.8.0/src/utils.c gnome-nettool-3.8.0-printf/src/utils.c
+--- gnome-nettool-3.8.0/src/utils.c 2013-05-02 13:58:40.000000000 +0200
++++ gnome-nettool-3.8.0-printf/src/utils.c 2013-05-03 05:21:45.704202804 +0200
+@@ -272,7 +272,7 @@
+ unit = "KiB";
+ }
+
+- result = g_strdup_printf ("%lld.%lld %s", short_rx / 10,
++ result = g_strdup_printf ("%" G_GUINT64_FORMAT ".%" G_GUINT64_FORMAT " %s", short_rx / 10,
+ short_rx % 10, unit);
+ return result;
+ }
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-05-03 03:23:55 UTC (rev 184171)
+++ extra-x86_64/PKGBUILD 2013-05-03 03:24:57 UTC (rev 184172)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Kritoke <kritoke at nospam.gmail.com>
-
-pkgname=gnome-nettool
-pkgver=3.2.0
-pkgrel=3
-pkgdesc="A Collection of GNOME3 Networking Tools."
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools')
-optdepends=('nmap: Port scanning'
- 'net-tools: Network statistics')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-schemas-compile
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-nettool/repos/extra-x86_64/PKGBUILD (from rev 184171, gnome-nettool/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-05-03 03:24:57 UTC (rev 184172)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Kritoke <kritoke at nospam.gmail.com>
+
+pkgname=gnome-nettool
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="A Collection of GNOME3 Networking Tools."
+arch=(i686 x86_64)
+license=(GPL)
+depends=(gtk3 libgtop dnsutils iputils dconf whois hicolor-icon-theme)
+makedepends=(yelp-tools intltool nmap net-tools)
+optdepends=('nmap: Port scanning'
+ 'net-tools: Network statistics')
+groups=(gnome-extra)
+url="http://www.gnome.org"
+install=gnome-nettool.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ printf.patch)
+sha256sums=('3a3480dcef181684f3e37d779cfd43f9b21920412aff78501de1695faf194a28'
+ '4b06c0748650996100f710a2d7c90afc8fb75bbdd1984f243f42318d0985229e')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../printf.patch
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-schemas-compile
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-x86_64/gnome-nettool.install
===================================================================
--- extra-x86_64/gnome-nettool.install 2013-05-03 03:23:55 UTC (rev 184171)
+++ extra-x86_64/gnome-nettool.install 2013-05-03 03:24:57 UTC (rev 184172)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install
-}
Copied: gnome-nettool/repos/extra-x86_64/gnome-nettool.install (from rev 184171, gnome-nettool/trunk/gnome-nettool.install)
===================================================================
--- extra-x86_64/gnome-nettool.install (rev 0)
+++ extra-x86_64/gnome-nettool.install 2013-05-03 03:24:57 UTC (rev 184172)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install
+}
Copied: gnome-nettool/repos/extra-x86_64/printf.patch (from rev 184171, gnome-nettool/trunk/printf.patch)
===================================================================
--- extra-x86_64/printf.patch (rev 0)
+++ extra-x86_64/printf.patch 2013-05-03 03:24:57 UTC (rev 184172)
@@ -0,0 +1,34 @@
+diff -u -r gnome-nettool-3.8.0/src/info.c gnome-nettool-3.8.0-printf/src/info.c
+--- gnome-nettool-3.8.0/src/info.c 2013-05-02 13:58:40.000000000 +0200
++++ gnome-nettool-3.8.0-printf/src/info.c 2013-05-03 05:20:04.684921458 +0200
+@@ -232,13 +232,13 @@
+ text_rx_bytes = util_legible_bytes (netload.bytes_in);
+ text_tx_bytes = util_legible_bytes (netload.bytes_out);
+
+- g_sprintf (rx_pkt, "%lld", netload.packets_in);
+- g_sprintf (tx_pkt, "%lld", netload.packets_out);
++ g_sprintf (rx_pkt, "%" G_GUINT64_FORMAT, netload.packets_in);
++ g_sprintf (tx_pkt, "%" G_GUINT64_FORMAT, netload.packets_out);
+
+- g_sprintf (rx_error, "%lld", netload.errors_in);
+- g_sprintf (tx_error, "%lld", netload.errors_out);
++ g_sprintf (rx_error, "%" G_GUINT64_FORMAT, netload.errors_in);
++ g_sprintf (tx_error, "%" G_GUINT64_FORMAT, netload.errors_out);
+
+- g_sprintf (collisions, "%lld", netload.collisions);
++ g_sprintf (collisions, "%" G_GUINT64_FORMAT, netload.collisions);
+
+ gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes);
+ gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt);
+diff -u -r gnome-nettool-3.8.0/src/utils.c gnome-nettool-3.8.0-printf/src/utils.c
+--- gnome-nettool-3.8.0/src/utils.c 2013-05-02 13:58:40.000000000 +0200
++++ gnome-nettool-3.8.0-printf/src/utils.c 2013-05-03 05:21:45.704202804 +0200
+@@ -272,7 +272,7 @@
+ unit = "KiB";
+ }
+
+- result = g_strdup_printf ("%lld.%lld %s", short_rx / 10,
++ result = g_strdup_printf ("%" G_GUINT64_FORMAT ".%" G_GUINT64_FORMAT " %s", short_rx / 10,
+ short_rx % 10, unit);
+ return result;
+ }
More information about the arch-commits
mailing list