From af7cbde3ae4e69e00ad0d36fdfe21fea360e1cf0 Mon Sep 17 00:00:00 2001 From: Alex Greenland Date: Sat, 3 Jun 2023 15:36:24 +0100 Subject: [PATCH] Remove sunwait patch #2738 --- src/Makefile | 10 +--------- src/sunwait.patch | 34 ---------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 src/sunwait.patch diff --git a/src/Makefile b/src/Makefile index 29e395f7b..22c2dc775 100644 --- a/src/Makefile +++ b/src/Makefile @@ -104,15 +104,7 @@ ifeq (,$(OPENCV)) endif .PHONY : check_deps -patchsunwait: - @echo `date +%F\ %R:%S` Initializing sunwait submodule... - @git submodule init - @git submodule update - @echo `date +%F\ %R:%s` Patching sunwait compile warnings... - @patch -p1 -d sunwait-src/ < sunwait.patch - @touch patchsunwait - -sunwait: ##################### patchsunwait +sunwait: @echo `date +%F\ %R:%S` Building sunwait... @$(MAKE) -C sunwait-src @cp sunwait-src/sunwait . diff --git a/src/sunwait.patch b/src/sunwait.patch deleted file mode 100644 index b983bff3f..000000000 --- a/src/sunwait.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/sunriset.cpp b/sunriset.cpp -index ed6ee0b..f7f7974 100755 ---- a/sunriset.cpp -+++ b/sunriset.cpp -@@ -148,7 +148,7 @@ void sunpos (const double d, double *lon, double *r) - void sun_RA_dec (const double d, double *RA, double *dec, double *r) - { - double lon, obl_ecl; -- double xs, ys, zs; -+ double xs, ys; - double xe, ye, ze; - - /* Compute Sun's ecliptical coordinates */ -@@ -157,7 +157,6 @@ void sun_RA_dec (const double d, double *RA, double *dec, double *r) - /* Compute ecliptic rectangular coordinates */ - xs = *r * cosd(lon); - ys = *r * sind(lon); -- zs = 0; /* because the Sun is always in the ecliptic plane! */ - - /* Compute obliquity of ecliptic (inclination of Earth's axis) */ - obl_ecl = 23.4393 - 3.563E-7 * d; -diff --git a/sunwait.cpp b/sunwait.cpp -index 7e43bc9..8ff6429 100755 ---- a/sunwait.cpp -+++ b/sunwait.cpp -@@ -662,7 +662,7 @@ int main (int argc, char *argv[]) - if (pRun->debug == ONOFF_ON) printf ("Debug: argv[%d]: >%s<\n", i, arg); - - // Strip any hyphen from arguments, but not negative signs of numbers -- if (arg[0] == '-' && arg[1] != '\0' && !isdigit(arg[1])) *arg++; -+ if (arg[0] == '-' && arg[1] != '\0' && !isdigit(arg[1])) memmove(arg, arg + 1, sizeof arg - 1); - - // Normal help or version info - if (!strcmp (arg, "v") ||