From 771978952a98a0da2d215c9ed8c5db13250ad58d Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue, 30 Sep 2025 11:20:12 +0100 Subject: [PATCH 1/4] depends: Fix `$(package)_fetched` target Ensure the download timestamp is created only after a successful download. --- depends/funcs.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/depends/funcs.mk b/depends/funcs.mk index 28baf47147a..31ce5f67118 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -247,7 +247,6 @@ endif $($(1)_fetched): mkdir -p $$(@D) $(SOURCES_PATH) rm -f $$@ - touch $$@ cd $$(@D); $($(1)_fetch_cmds) cd $($(1)_source_dir); $(foreach source,$($(1)_all_sources),$(build_SHA256SUM) $(source) >> $$(@);) touch $$@ From 46135d90ea9002e273f2a75283444afd080b81b1 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue, 30 Sep 2025 11:22:50 +0100 Subject: [PATCH 2/4] depends: Drop redundant check for downloaded file The `fetch_file` commands are invoked for the `$($(package)_fetched)` target, so the existence of the download stamp has already been tested. --- depends/funcs.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/depends/funcs.mk b/depends/funcs.mk index 31ce5f67118..33c9c68cbef 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -36,9 +36,8 @@ define fetch_file_inner endef define fetch_file - ( test -f $$($(1)_source_dir)/$(4) || \ ( $(call fetch_file_inner,$(1),$(2),$(3),$(4),$(5)) || \ - $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5)))) + $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5))) endef # Shell script to create a source tarball in $(1)_source from local directory From 6de80512632afe612a3427463c94ac51f90f5203 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue, 30 Sep 2025 11:26:29 +0100 Subject: [PATCH 3/4] depends: Use hash instead of file name for package download stamp The package version is still included for convenience. --- depends/funcs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/funcs.mk b/depends/funcs.mk index 33c9c68cbef..6c38334e48f 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -108,7 +108,7 @@ $(1)_prefixbin:=$($($(1)_type)_prefix)/bin/ $(1)_all_sources=$($(1)_file_name) $($(1)_extra_sources) #stamps -$(1)_fetched=$(SOURCES_PATH)/download-stamps/.stamp_fetched-$(1)-$($(1)_file_name).hash +$(1)_fetched=$(SOURCES_PATH)/download-stamps/.stamp_fetched-$(1)-$($(1)_version)-$($(1)_sha256_hash).hash $(1)_extracted=$$($(1)_extract_dir)/.stamp_extracted $(1)_preprocessed=$$($(1)_extract_dir)/.stamp_preprocessed $(1)_cleaned=$$($(1)_extract_dir)/.stamp_cleaned From 93a70a42d30fa2f9404b76d5bbdb5ea316fc1032 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue, 30 Sep 2025 11:26:47 +0100 Subject: [PATCH 4/4] depends: Update URL for `qrencode` package source tarball The https://fukuchi.org/ homepage no longer links to the source tarball, and previously available files appear to have been removed. The homepage now instructs users to download source tarballs from the GitHub releases page instead. The diff between the source trees is immaterial. --- depends/packages/qrencode.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/depends/packages/qrencode.mk b/depends/packages/qrencode.mk index e3f614091db..9aae62f01c1 100644 --- a/depends/packages/qrencode.mk +++ b/depends/packages/qrencode.mk @@ -1,8 +1,9 @@ package=qrencode $(package)_version=4.1.1 -$(package)_download_path=https://fukuchi.org/works/qrencode/ +$(package)_download_path=https://github.com/fukuchi/libqrencode/archive/refs/tags/ +$(package)_download_file=v$($(package)_version).tar.gz $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=da448ed4f52aba6bcb0cd48cac0dd51b8692bccc4cd127431402fca6f8171e8e +$(package)_sha256_hash=5385bc1b8c2f20f3b91d258bf8ccc8cf62023935df2d2676b5b67049f31a049c $(package)_patches=cmake_fixups.patch define $(package)_set_vars