Date: Wed, 30 Mar 2005 12:27:46 +0400 (MSD) From: Andrej Zverev <az@inec.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/79358: [update] devel/esvn to 0.6.9 Message-ID: <200503300827.j2U8Rkfm036237@waterwall.inec.ru> Resent-Message-ID: <200503300830.j2U8U3XK025389@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79358 >Category: ports >Synopsis: [update] devel/esvn to 0.6.9 >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: Wed Mar 30 08:30:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Andrej Zverev >Release: FreeBSD 5.4-PRERELEASE i386 >Organization: >Environment: System: FreeBSD az.inec.ru 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Fri Mar 4 19:52:44 MSK 2005 az@az.inec.ru:/usr/obj/usr/src/sys/GENERIC i386 >Description: Removed file: files/patch-esvn_utils.h Added file: files/patch-src-entries_parser.cpp >How-To-Repeat: >Fix: Apply this patch --- esvn.patch begins here --- diff -Nru esvn.orig/Makefile esvn/Makefile --- esvn.orig/Makefile Mon Jan 17 16:10:52 2005 +++ esvn/Makefile Wed Mar 30 10:23:53 2005 @@ -6,7 +6,7 @@ # PORTNAME= esvn -PORTVERSION= 0.6.8 +PORTVERSION= 0.6.9 CATEGORIES= devel MASTER_SITES= http://esvn.umputun.com/ DISTNAME= ${PORTNAME}-${PORTVERSION}-1 @@ -19,7 +19,7 @@ ESVN_DIST= esvn ESVNPRO= esvn.pro esvn-diff-wrapper.pro -ESVNDOCS= html-docs html-docs/common html-docs/common/admon html-docs/common/navig html-docs/images +ESVNDOCS= html-docs html-docs/common html-docs/common/admon html-docs/common/navig html-docs/images WRKSRC= ${WRKDIR}/${ESVN_DIST} diff -Nru esvn.orig/distinfo esvn/distinfo --- esvn.orig/distinfo Mon Jan 17 16:10:52 2005 +++ esvn/distinfo Wed Mar 30 09:56:55 2005 @@ -1,2 +1,2 @@ -MD5 (esvn-0.6.8-1.tar.gz) = 1682b7a21217e108cc00cc95b55ffe72 -SIZE (esvn-0.6.8-1.tar.gz) = 1920635 +MD5 (esvn-0.6.9-1.tar.gz) = d9feb055f19073328059b1994a04b19a +SIZE (esvn-0.6.9-1.tar.gz) = 1921281 diff -Nru esvn.orig/files/patch-esvn_utils.h esvn/files/patch-esvn_utils.h --- esvn.orig/files/patch-esvn_utils.h Fri Dec 10 14:49:09 2004 +++ esvn/files/patch-esvn_utils.h Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- src/esvn_utils.h.orig Sat Nov 27 12:55:50 2004 -+++ src/esvn_utils.h Fri Dec 10 10:50:35 2004 -@@ -5,6 +5,8 @@ - #include <qdir.h> - #include <vector> - -+#include <time.h> -+ - namespace EsvnUtils - { - inline QDateTime UTC2Local(const QDateTime& utc) diff -Nru esvn.orig/files/patch-src-entries_parser.cpp esvn/files/patch-src-entries_parser.cpp --- esvn.orig/files/patch-src-entries_parser.cpp Thu Jan 1 03:00:00 1970 +++ esvn/files/patch-src-entries_parser.cpp Wed Mar 23 15:49:51 2005 @@ -0,0 +1,31 @@ +--- src/entries_parser.cpp Thu Feb 24 08:15:56 2005 ++++ src/entries_parser.cpp Wed Mar 23 15:46:18 2005 +@@ -246,14 +246,27 @@ + + int gm_sec = isoDateTime.mid(17,2).toInt(); + +- time_t utc_time = mktime(&m); ++ time_t utc_time; + ++#if defined(__FreeBSD__) ++ ++ // BSD has inverse of gmtime() ++ utc_time = timegm(&m); ++ ++#else ++ ++ // all others do mktime() and adjust timezone + // mktime assumes broken-down time in local timezone, + // to get UTC we need to correct result by timezone offset ++ ++ utc_time = mktime(&m); ++ + #if (_WINDOWS || ESVN_WIN ) + utc_time -= _timezone; + #else + utc_time -= timezone; ++#endif ++ + #endif + + // round to remove leap seconds in "right" timezones --- esvn.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503300827.j2U8Rkfm036237>