nixpkgs/pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff
Vladimír Čunát c198a36898 twinkle: fix build (fixes #3673)
Pulled patches from Debian and hacked around linking errors.
I'm able to ring my mobile phone now.
However, on exit the process is stuck and needs kill -9.

CC: maintainer @MarcWeber.
2014-08-20 21:32:19 +02:00

13 lines
420 B
Diff

Index: twinkle-1.4.2/src/log.cpp
===================================================================
--- twinkle-1.4.2.orig/src/log.cpp 2009-01-18 09:35:28.000000000 -0500
+++ twinkle-1.4.2/src/log.cpp 2013-07-25 11:43:08.901209713 -0400
@@ -161,7 +161,7 @@
gettimeofday(&t, NULL);
date = t.tv_sec;
- localtime_r(&date, &tm);
+ ost::localtime_r(&date, &tm);
*log_stream << "+++ ";
*log_stream << tm.tm_mday;