[arch-commits] Commit in gnome-nettool/trunk (PKGBUILD printf.patch)

[Jan Steffens]

    Date: Friday, May 31, 2013 @ 19:14:01
  Author: heftig
Revision: 186903

3.8.1

Modified:
  gnome-nettool/trunk/PKGBUILD
Deleted:
  gnome-nettool/trunk/printf.patch

--------------+
 PKGBUILD     |    9 +++------
 printf.patch |   34 ----------------------------------
 2 files changed, 3 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-31 16:49:40 UTC (rev 186902)
+++ PKGBUILD	2013-05-31 17:14:01 UTC (rev 186903)
@@ -4,7 +4,7 @@
 # Contributor: Kritoke <kritoke at nospam.gmail.com>
 
 pkgname=gnome-nettool
-pkgver=3.8.0
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A Collection of GNOME3 Networking Tools."
 arch=(i686 x86_64)
@@ -16,14 +16,11 @@
 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')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../printf.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-schemas-compile
   make

Deleted: printf.patch
===================================================================
--- printf.patch	2013-05-31 16:49:40 UTC (rev 186902)
+++ printf.patch	2013-05-31 17:14:01 UTC (rev 186903)
@@ -1,34 +0,0 @@
-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;	
- }