From 03daecd031bfa5930d11a6f82decc11e6bc42afe Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 7 Dec 2025 19:32:21 +0000 Subject: [PATCH] Use existing build_timestamp to extract year with format specifier Co-authored-by: Flole998 <9951871+Flole998@users.noreply.github.com> --- Makefile | 4 ---- src/webui/extjs.c | 4 ++-- support/configure.inc | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 571f565b1..5e9688fbb 100644 --- a/Makefile +++ b/Makefile @@ -761,19 +761,15 @@ include ${ROOTDIR}/support/${OSENV}.mk # Build files DATE_FMT = %Y-%m-%dT%H:%M:%S%z -YEAR_FMT = %Y ifdef SOURCE_DATE_EPOCH BUILD_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)") - BUILD_YEAR ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(YEAR_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(YEAR_FMT)" 2>/dev/null || date -u "+$(YEAR_FMT)") else BUILD_DATE ?= $(shell date "+$(DATE_FMT)") - BUILD_YEAR ?= $(shell date "+$(YEAR_FMT)") endif $(BUILDDIR)/timestamp.c: FORCE @mkdir -p $(dir $@) @echo '#include "build.h"' > $@ @echo 'const char* build_timestamp = "'$(BUILD_DATE)'";' >> $@ - @echo 'const char* build_year = "'$(BUILD_YEAR)'";' >> $@ $(BUILDDIR)/timestamp.o: $(BUILDDIR)/timestamp.c $(pCC) $(CFLAGS) -c -o $@ $< diff --git a/src/webui/extjs.c b/src/webui/extjs.c index 0cd952859..5313b2f10 100644 --- a/src/webui/extjs.c +++ b/src/webui/extjs.c @@ -187,10 +187,10 @@ page_about(http_connection_t *hc, const char *remain, void *opaque) htsbuf_qprintf(hq, "
\n\
HTS Tvheadend %s
\n\ -

© 2006 - %s Andreas Smas, Jaroslav Kysela, Adam Sutton, et al.

\n\ +

© 2006 - %.4s Andreas Smas, Jaroslav Kysela, Adam Sutton, et al.

\n\

\n\

https://tvheadend.org

\n", - tvheadend_version, build_year); + tvheadend_version, build_timestamp); htsbuf_qprintf(hq, "

%s \n\ ExtJS. \ diff --git a/support/configure.inc b/support/configure.inc index ba950dd44..905685cb5 100755 --- a/support/configure.inc +++ b/support/configure.inc @@ -574,7 +574,6 @@ EOF cat >> "${CONFIG_H}" <