[Reproducible-commits] [doxygen] 01/01: Replace patch with the one applied upstream

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository doxygen.

commit dbf4c42ef3a3981abdfc35125505888000ceded9
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon May 16 14:00:36 2016 +0200

    Replace patch with the one applied upstream
---
 ...tion-to-produce-timezone-independent-timestamps | 69 ++++++++++++++++++----
 1 file changed, 57 insertions(+), 12 deletions(-)

diff --git a/debian/patches/Modified-function-to-produce-timezone-independent-timestamps b/debian/patches/Modified-function-to-produce-timezone-independent-timestamps
index e36c01f..9c086be 100644
--- a/debian/patches/Modified-function-to-produce-timezone-independent-timestamps
+++ b/debian/patches/Modified-function-to-produce-timezone-independent-timestamps
@@ -1,13 +1,58 @@
-Description: Modified function QDateTime::setTime_t to produce timezone independent timestamps by using UTC
-
---- doxygen-1.8.9.1.orig/qtools/qdatetime.cpp
-+++ doxygen-1.8.9.1/qtools/qdatetime.cpp
-@@ -1142,7 +1142,7 @@ QDateTime::QDateTime( const QDate &date,
- void QDateTime::setTime_t( uint secsSince1Jan1970UTC )
- {
-     time_t tmp = (time_t) secsSince1Jan1970UTC;
--    tm *tM = localtime( &tmp );
+Description: Bug 751984 - Use UTC timezone when displaying QDateTimes parsed from SOURCE_DATE_EPOCH
+Author: Ximin Luo <infinity0 at pwned.gg>
+Applied-Upstream: 9a2c7bbfb0c53b4532db7280e6804c7ce76d70a3
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/qtools/qdatetime.cpp
++++ b/qtools/qdatetime.cpp
+@@ -1158,6 +1158,29 @@
+ 
+ 
+ /*!
++  Sets the UTC date and time given the number of seconds that have passed
++  since 00:00:00 on January 1, 1970, Coordinated Universal Time (UTC).
++
++  Note that Microsoft Windows supports only a limited range of values for
++  \a secsSince1Jan1970UTC.
++*/
++
++void QDateTime::setTimeUtc_t( uint secsSince1Jan1970UTC )
++{
++    time_t tmp = (time_t) secsSince1Jan1970UTC;
 +    tm *tM = gmtime( &tmp );
-     if ( !tM ) {
- 	tM = gmtime( &tmp );
- 	if ( !tM ) {
++    if ( !tM ) {
++	    d.jd = QDate::greg2jul( 1970, 1, 1 );
++	    t.ds = 0;
++	    return;
++    }
++    d.jd = QDate::greg2jul( tM->tm_year + 1900, tM->tm_mon + 1, tM->tm_mday );
++    t.ds = MSECS_PER_HOUR*tM->tm_hour + MSECS_PER_MIN*tM->tm_min +
++	    1000*tM->tm_sec;
++}
++
++
++/*!
+   Returns the datetime as a string.
+ 
+   The string format is "Sat May 20 03:40:13 1998".
+--- a/qtools/qdatetime.h
++++ b/qtools/qdatetime.h
+@@ -173,6 +173,7 @@
+     void   setDate( const QDate &date ) { d=date; }
+     void   setTime( const QTime &time ) { t=time; }
+     void   setTime_t( uint secsSince1Jan1970UTC );
++    void   setTimeUtc_t( uint secsSince1Jan1970UTC );
+ 
+     QString toString()	const;
+ 
+--- a/src/util.cpp
++++ b/src/util.cpp
+@@ -2497,7 +2497,7 @@
+     }
+     else // all ok, replace current time with epoch value
+     {
+-      current.setTime_t((ulong)epoch); // TODO: add support for 64bit epoch value
++      current.setTimeUtc_t((ulong)epoch); // TODO: add support for 64bit epoch value
+     }
+   }
+   return theTranslator->trDateTime(current.date().year(),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/doxygen.git