From cd11d931701022f48d694fcc588239183e0364ec Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Sun, 28 Mar 2004 15:42:06 +0000 Subject: [PATCH] - Fix Clock sensor with timezone set to local PR: ports/64847 Submitted by: Tim Bishop (maintainer) --- deskutils/gdesklets-ltvariations/Makefile | 3 ++- .../files/LTVClock::__init__.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 deskutils/gdesklets-ltvariations/files/LTVClock::__init__.py diff --git a/deskutils/gdesklets-ltvariations/Makefile b/deskutils/gdesklets-ltvariations/Makefile index 5a5dc56737df..59c8ce11658c 100644 --- a/deskutils/gdesklets-ltvariations/Makefile +++ b/deskutils/gdesklets-ltvariations/Makefile @@ -7,7 +7,7 @@ PORTNAME= ltvariations PORTVERSION= 0.26 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -35,6 +35,7 @@ do-build: @${WRKSRC}/Sensors/Install_${ii}_Sensor.bin --nomsg ${WRKSRC} .endfor @${PATCH} ${WRKSRC}/LTVUptime/__init__.py < ${FILESDIR}/LTVUptime::__init__.py + @${PATCH} ${WRKSRC}/LTVClock/__init__.py < ${FILESDIR}/LTVClock::__init__.py @${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; s|%%DISPLAY%%|${DISPLAY}|g' > ${PKGMESSAGE} do-install: diff --git a/deskutils/gdesklets-ltvariations/files/LTVClock::__init__.py b/deskutils/gdesklets-ltvariations/files/LTVClock::__init__.py new file mode 100644 index 000000000000..876e5adb569c --- /dev/null +++ b/deskutils/gdesklets-ltvariations/files/LTVClock::__init__.py @@ -0,0 +1,14 @@ +--- __init__.py.bak Sun Mar 28 15:47:22 2004 ++++ __init__.py Sun Mar 28 15:47:55 2004 +@@ -126,7 +126,10 @@ + timezone = self._get_config("timezone") + if timezone != self.__timezone: + self.__timezone = timezone +- offset = commands.getoutput("TZ=\"%(timezone)s\" date +%%z" % vars()) ++ if timezone == "localtime": ++ offset = commands.getoutput("date +%z") ++ else: ++ offset = commands.getoutput("TZ=\"%(timezone)s\" date +%%z" % vars()) + sign = (offset[0] == "+") and 1 or -1 + hours = int(offset[1:3]) + mins = int(offset[3:5])