From ae9982925e24448abf8947200f3061b640a3c268 Mon Sep 17 00:00:00 2001 From: Jon Lund Steffensen Date: Sat, 13 Jun 2020 18:19:20 -0700 Subject: Remove Travis macOS workaround --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index b165a69..61474cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,13 +35,6 @@ before_install: | brew link --force gettext brew install intltool brew upgrade python - - # distuninstallcheck fails on macOS when automake 1.16 or 1.16.1 is used. - # http://gnu-automake.7480.n7.nabble.com/bug-31222-automake-1-16-1-am-pep3147-tweak-bug-td22937.html - # No upstream release yet, use upstream patch. - pushd /usr/local/Cellar/automake/*/share/automake-* - curl "https://git.savannah.gnu.org/cgit/automake.git/patch/?id=a348d830659fffd2cfc42994524783b07e69b4b5" | tail -n 14 | sudo patch -p2 - popd fi install: -- cgit v1.2.3-70-g09d2 From d87a28a6f5ce98fa7c7594d71cd2a4a7502f7963 Mon Sep 17 00:00:00 2001 From: Masanori Kakura Date: Wed, 2 Oct 2019 22:24:22 +0900 Subject: src/redshift.c: Use localtime_s() on Windows AppVeyor's GCC no longer supports localtime_r(). We need to use localtime_s() on Windows. --- src/redshift.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/redshift.c b/src/redshift.c index e0221d5..d2ba577 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -28,6 +28,7 @@ #include #include #include +#include /* poll.h is not available on Windows but there is no Windows location provider using polling. On Windows, we just define some stubs to make things compile. @@ -210,7 +211,11 @@ get_seconds_since_midnight(double timestamp) { time_t t = (time_t)timestamp; struct tm tm; +#ifdef _WIN32 + localtime_s(&tm, &t); +#else localtime_r(&t, &tm); +#endif return tm.tm_sec + tm.tm_min * 60 + tm.tm_hour * 3600; } -- cgit v1.2.3-70-g09d2 From afb806f0bfcf324403e30aa3d4f031159c253ae0 Mon Sep 17 00:00:00 2001 From: Jon Lund Steffensen Date: Sat, 13 Jun 2020 18:46:29 -0700 Subject: Try to remove brew upgrade python --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61474cc..cc0d35d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,6 @@ before_install: | brew install gettext brew link --force gettext brew install intltool - brew upgrade python fi install: -- cgit v1.2.3-70-g09d2