head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.118 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.116 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.114 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.112 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.110 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.108 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.106 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.104 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.102 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.100 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.98 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.96 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.94 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.92 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.90 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.88 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.86 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.84 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.82 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.80 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.78 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.76 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.74 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.70 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.50 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.72 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.68 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.66 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.64 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.62 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.60 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.58 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.56 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.54 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.52 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.48 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.46 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.44 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.42 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.40 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.38 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.36 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.34 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.32 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.30 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.28 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.26 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.24 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.22 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.20 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.18 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.16 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.14 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.12 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.10 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.8 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.6 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.4 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.2; locks; strict; comment @# @; 1.1 date 2011.10.11.22.01.23; author tron; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2011.10.11.22.01.23; author spz; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2011.10.14.20.04.56; author spz; state Exp; branches; next ; desc @@ 1.1 log @Fix build problem under NetBSD/amd64 5.1_STABLE. @ text @$NetBSD$ Fix build on systems where the "tv_sec" member of "struct timeval" is not not of type "time_t", e.g. NetBSD/amd64 5.1. --- etimedate/fl_time.cpp.orig 2005-08-31 20:50:39.000000000 +0100 +++ etimedate/fl_time.cpp 2011-10-11 22:57:46.000000000 +0100 @@@@ -46,6 +46,15 @@@@ } #endif /* HAVE_STIME */ +static struct tm * +my_localtime(const struct timeval *tv) +{ + time_t clock; + clock = tv->tv_sec; + return localtime(&clock); +} + + Fl_Time::Fl_Time(int x, int y, int w, int h, char *l) : Fl_Group(x, y, w, h, l) { int button_width = (int)(w/7); @@@@ -98,7 +107,7 @@@@ gettimeofday(¤t_tv, 0); display_tv.tv_sec = current_tv.tv_sec; display_tv.tv_usec = current_tv.tv_usec; - display_time_tm = localtime(¤t_tv.tv_sec); + display_time_tm = my_localtime(¤t_tv); if(type() == FL_TIME_24HOUR) strftime(time_string, 19, "%2H:%2M", display_time_tm); else strftime(time_string, 19, "%2I:%2M %p", display_time_tm); @@@@ -118,7 +127,7 @@@@ gettimeofday(¤t_tv, 0); display_tv.tv_sec = current_tv.tv_sec - different; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); if(type() == FL_TIME_24HOUR) strftime(time_string, 19, "%2H:%2M", display_time_tm); else strftime(time_string, 19, "%2I:%2M %p", display_time_tm); @@@@ -132,7 +141,7 @@@@ { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); return display_time_tm->tm_hour; } @@@@ -141,7 +150,7 @@@@ { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); return display_time_tm->tm_min; } @@@@ -150,7 +159,7 @@@@ { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); if(type() == FL_TIME_24HOUR) strftime(time_string, 19, "%2H:%2M", display_time_tm); else strftime(time_string, 19, "%2I:%2M %p", display_time_tm); @@@@ -163,7 +172,7 @@@@ { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); display_time_tm->tm_hour = value; display_tv.tv_sec = mktime(display_time_tm); } @@@@ -173,7 +182,7 @@@@ { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); if(value < 0) { display_time_tm->tm_min = 59; @@@@ -194,7 +203,7 @@@@ void Fl_Time::settime() { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); // return display_time_tm->tm_min; time_t ct = mktime (display_time_tm); if (stime(&ct)!=0) @ 1.1.2.1 log @file patch-fl_time_cpp was added on branch pkgsrc-2011Q3 on 2011-10-14 20:04:56 +0000 @ text @d1 95 @ 1.1.2.2 log @Pullup ticket #3547 - requested by dholland x11/ede: build fix Revisions pulled up: - x11/ede/distinfo 1.3-1.4 - x11/ede/patches/patch-esvrconf_escreensaver_cpp 1.1 - x11/ede/patches/patch-eworkpanel_workpanel_cpp 1.1 - x11/ede/patches/patch-fl_time_cpp 1.1 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: dholland Date: Sun Oct 9 06:52:46 UTC 2011 Modified Files: pkgsrc/x11/ede: distinfo Added Files: pkgsrc/x11/ede/patches: patch-esvrconf_escreensaver_cpp patch-eworkpanel_workpanel_cpp Log Message: Fix LP64 build. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/ede/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/x11/ede/patches/patch-esvrconf_escreensaver_cpp \ pkgsrc/x11/ede/patches/patch-eworkpanel_workpanel_cpp ------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Tue Oct 11 22:01:23 UTC 2011 Modified Files: pkgsrc/x11/ede: distinfo Added Files: pkgsrc/x11/ede/patches: patch-fl_time_cpp Log Message: Fix build problem under NetBSD/amd64 5.1_STABLE. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/ede/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/x11/ede/patches/patch-fl_time_cpp @ text @a0 95 $NetBSD$ Fix build on systems where the "tv_sec" member of "struct timeval" is not not of type "time_t", e.g. NetBSD/amd64 5.1. --- etimedate/fl_time.cpp.orig 2005-08-31 20:50:39.000000000 +0100 +++ etimedate/fl_time.cpp 2011-10-11 22:57:46.000000000 +0100 @@@@ -46,6 +46,15 @@@@ } #endif /* HAVE_STIME */ +static struct tm * +my_localtime(const struct timeval *tv) +{ + time_t clock; + clock = tv->tv_sec; + return localtime(&clock); +} + + Fl_Time::Fl_Time(int x, int y, int w, int h, char *l) : Fl_Group(x, y, w, h, l) { int button_width = (int)(w/7); @@@@ -98,7 +107,7 @@@@ gettimeofday(¤t_tv, 0); display_tv.tv_sec = current_tv.tv_sec; display_tv.tv_usec = current_tv.tv_usec; - display_time_tm = localtime(¤t_tv.tv_sec); + display_time_tm = my_localtime(¤t_tv); if(type() == FL_TIME_24HOUR) strftime(time_string, 19, "%2H:%2M", display_time_tm); else strftime(time_string, 19, "%2I:%2M %p", display_time_tm); @@@@ -118,7 +127,7 @@@@ gettimeofday(¤t_tv, 0); display_tv.tv_sec = current_tv.tv_sec - different; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); if(type() == FL_TIME_24HOUR) strftime(time_string, 19, "%2H:%2M", display_time_tm); else strftime(time_string, 19, "%2I:%2M %p", display_time_tm); @@@@ -132,7 +141,7 @@@@ { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); return display_time_tm->tm_hour; } @@@@ -141,7 +150,7 @@@@ { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); return display_time_tm->tm_min; } @@@@ -150,7 +159,7 @@@@ { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); if(type() == FL_TIME_24HOUR) strftime(time_string, 19, "%2H:%2M", display_time_tm); else strftime(time_string, 19, "%2I:%2M %p", display_time_tm); @@@@ -163,7 +172,7 @@@@ { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); display_time_tm->tm_hour = value; display_tv.tv_sec = mktime(display_time_tm); } @@@@ -173,7 +182,7 @@@@ { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); if(value < 0) { display_time_tm->tm_min = 59; @@@@ -194,7 +203,7 @@@@ void Fl_Time::settime() { struct tm *display_time_tm; - display_time_tm = localtime(&display_tv.tv_sec); + display_time_tm = my_localtime(&display_tv); // return display_time_tm->tm_min; time_t ct = mktime (display_time_tm); if (stime(&ct)!=0) @