diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-04 10:44:43 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-04 10:44:43 +0200 |
| commit | 64552a84f9eb436e191d738ef4ebc552a768048d (patch) | |
| tree | 9a16774f362322e8aa58fc2971593ea690149b87 /extra/gnome-nettool | |
| parent | aeb7c621efc55ae3b2761257f0fc307f097efec0 (diff) | |
| parent | 5f3b2100b811506bec6bcf63b24d1c605dfe8cb6 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/gnome-nettool/PKGBUILD
Diffstat (limited to 'extra/gnome-nettool')
| -rw-r--r-- | extra/gnome-nettool/PKGBUILD | 21 | ||||
| -rw-r--r-- | extra/gnome-nettool/printf.patch | 34 |
2 files changed, 46 insertions, 9 deletions
diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD index 683995e29..e1da9bfed 100644 --- a/extra/gnome-nettool/PKGBUILD +++ b/extra/gnome-nettool/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 183390 2013-04-21 22:10:08Z heftig $ +# $Id: PKGBUILD 184172 2013-05-03 03:24:57Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <kritoke@nospam.gmail.com> pkgname=gnome-nettool -pkgver=3.2.0 -pkgrel=3 +pkgver=3.8.0 +pkgrel=1 pkgdesc="A Collection of GNOME3 Networking Tools." arch=(i686 x86_64 mips64el) -license=('GPL') -depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme') -makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools') +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') +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') +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 diff --git a/extra/gnome-nettool/printf.patch b/extra/gnome-nettool/printf.patch new file mode 100644 index 000000000..89868411a --- /dev/null +++ b/extra/gnome-nettool/printf.patch @@ -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; + } |