From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 30 08:50:21 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9747A16A4CE for ; Fri, 30 Apr 2004 08:50:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 690EE43D41 for ; Fri, 30 Apr 2004 08:50:21 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i3UFoLZx023462 for ; Fri, 30 Apr 2004 08:50:21 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i3UFoL6h023460; Fri, 30 Apr 2004 08:50:21 -0700 (PDT) (envelope-from gnats) Resent-Date: Fri, 30 Apr 2004 08:50:21 -0700 (PDT) Resent-Message-Id: <200404301550.i3UFoL6h023460@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Franz Klammer" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93FE916A4CF for ; Fri, 30 Apr 2004 08:41:28 -0700 (PDT) Received: from sv02.webonaut.com (kirk.webonaut.com [212.41.243.26]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AAB243D2D for ; Fri, 30 Apr 2004 08:41:27 -0700 (PDT) (envelope-from klammer@webonaut.com) Received: from localhost (localhost [127.0.0.1]) by sv02.webonaut.com (Postfix) with ESMTP id EA16F76423 for ; Fri, 30 Apr 2004 17:41:24 +0200 (CEST) Received: from sv02.webonaut.com ([127.0.0.1]) by localhost (sv02.webonaut.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 13318-10 for ; Fri, 30 Apr 2004 17:41:20 +0200 (CEST) Received: from ds9.webonaut.com (sisko.webonaut.com [212.41.243.28]) by sv02.webonaut.com (Postfix) with ESMTP id C169876421 for ; Fri, 30 Apr 2004 17:41:20 +0200 (CEST) Message-Id: <1083339682.0@ds9.webonaut.com> Date: Fri, 30 Apr 2004 17:41:22 +0200 From: "Franz Klammer" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.3.3 Subject: ports/66115: [MAINTAINER UPDATE] deskutils/gdesklets-0.26.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 15:50:21 -0000 >Number: 66115 >Category: ports >Synopsis: [MAINTAINER UPDATE] deskutils/gdesklets-0.26.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Apr 30 08:50:20 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Franz Klammer >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD 5.2-CURRENT #3: Fri Apr 30 16:29:25 CEST 2004 root@ds9.webonaut.com:/usr/obj/usr/src/sys/DS9 >Description: update to 0.26.2 if available use os.statvfs() instead of libgtop.get_fsusage() it maybe only a workaround for a while until the dDesklet-developer doing something other or using my patch: http://bugzilla.gnome.org/show_bug.cgi?id=141493 >How-To-Repeat: >Fix: --- gdesklets_statvfs2.diff begins here --- diff -Nur gdesklets.orig/Makefile gdesklets/Makefile --- gdesklets.orig/Makefile Mon Apr 5 05:30:17 2004 +++ gdesklets/Makefile Fri Apr 30 17:24:15 2004 @@ -6,8 +6,7 @@ # PORTNAME= gdesklets -PORTVERSION= 0.26.1 -PORTREVISION= 1 +PORTVERSION= 0.26.2 CATEGORIES= deskutils gnome MASTER_SITES= http://www.pycage.de/download/${PORTNAME}/ DISTNAME= gDesklets-${PORTVERSION} diff -Nur gdesklets.orig/distinfo gdesklets/distinfo --- gdesklets.orig/distinfo Wed Mar 24 00:28:32 2004 +++ gdesklets/distinfo Fri Apr 30 17:24:27 2004 @@ -1,2 +1,2 @@ -MD5 (gDesklets-0.26.1.tar.bz2) = bae8006b869c6fb05064579f7593d449 -SIZE (gDesklets-0.26.1.tar.bz2) = 339474 +MD5 (gDesklets-0.26.2.tar.bz2) = c001e527a4ed4fe2b66d71df9b8b21ab +SIZE (gDesklets-0.26.2.tar.bz2) = 401097 diff -Nur gdesklets.orig/files/patch-libdesklets::Disk.py gdesklets/files/patch-libdesklets::Disk.py --- gdesklets.orig/files/patch-libdesklets::Disk.py Tue Feb 24 17:07:10 2004 +++ gdesklets/files/patch-libdesklets::Disk.py Fri Apr 30 16:07:18 2004 @@ -1,14 +1,15 @@ ---- libdesklets/Disk.py.orig Mon Feb 23 10:52:50 2004 -+++ libdesklets/Disk.py Mon Feb 23 10:54:31 2004 -@@ -1,6 +1,6 @@ +--- libdesklets/Disk.py.orig Fri Feb 20 14:29:07 2004 ++++ libdesklets/Disk.py Fri Apr 30 15:50:42 2004 +@@ -1,6 +1,7 @@ import glibtop import polling - +import os ++import statvfs class Disk: -@@ -21,14 +21,19 @@ +@@ -21,14 +22,19 @@ # def __poll_partitions(self): @@ -35,3 +36,32 @@ return partitions +@@ -43,15 +49,19 @@ + #:/function + # + def __poll_size(self, partition): +- +- blocks, bfree, bavail, files, ffree = glibtop.get_fsusage(partition) +- free = float(bfree * 512) +- total = float(blocks * 512) +- used = total - free +- +- return (total, used)#, free) +- +- ++ ++ try: ++ statvfs_data = os.statvfs(partition) ++ free = float(statvfs_data[statvfs.F_BFREE] * statvfs_data[statvfs.F_FRSIZE]) ++ total = float(statvfs_data[statvfs.F_BLOCKS] * statvfs_data[statvfs.F_FRSIZE]) ++ except: ++ blocks, bfree, bavail, files, ffree = glibtop.get_fsusage(partition) ++ free = float(bfree * 512) ++ total = float(blocks * 512) ++ ++ used = total - free ++ ++ return (total, used)#, free) + + # + #:function get_fs | partition | Returns the filesystem for the given --- gdesklets_statvfs2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: