Skip to content

Commit cd1b7fa

Browse files
committed
Merge bitcoin/bitcoin#33577: Revert "depends: Update URL for qrencode package source tarball"
e4335a3 Revert "depends: Update URL for `qrencode` package source tarball" (Ava Chow) a89a822 Revert "depends: Use hash instead of file name for package download stamp" (Ava Chow) Pull request description: The new URL breaks CI on the current release branches, see bitcoin/bitcoin#33494 (comment). The old URL also no longer exists so the tarball is fetched from the depends sources cache that we host, but the original tarball has already been overwritten on there. We will need to manually reinstate the original tarball. ACKs for top commit: m3dwards: utACK e4335a3 maflcko: review ACK e4335a3 💤 glozow: ACK e4335a3 Tree-SHA512: a5028342d77b4768daaec8688acd364795d683aed2bea0407c7827d44f814a97d50cc3b30c2de2a8296a2b212115fe1e76c57685a74e93387fc57afdabb93bd2
2 parents 6b4a92b + e4335a3 commit cd1b7fa

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

depends/funcs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ $(1)_prefixbin:=$($($(1)_type)_prefix)/bin/
108108
$(1)_all_sources=$($(1)_file_name) $($(1)_extra_sources)
109109

110110
#stamps
111-
$(1)_fetched=$(SOURCES_PATH)/download-stamps/.stamp_fetched-$(1)-$($(1)_version)-$($(1)_sha256_hash).hash
111+
$(1)_fetched=$(SOURCES_PATH)/download-stamps/.stamp_fetched-$(1)-$($(1)_file_name).hash
112112
$(1)_extracted=$$($(1)_extract_dir)/.stamp_extracted
113113
$(1)_preprocessed=$$($(1)_extract_dir)/.stamp_preprocessed
114114
$(1)_cleaned=$$($(1)_extract_dir)/.stamp_cleaned

depends/packages/qrencode.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package=qrencode
22
$(package)_version=4.1.1
3-
$(package)_download_path=https://github.com/fukuchi/libqrencode/archive/refs/tags/
4-
$(package)_download_file=v$($(package)_version).tar.gz
3+
$(package)_download_path=https://fukuchi.org/works/qrencode/
54
$(package)_file_name=$(package)-$($(package)_version).tar.gz
6-
$(package)_sha256_hash=5385bc1b8c2f20f3b91d258bf8ccc8cf62023935df2d2676b5b67049f31a049c
5+
$(package)_sha256_hash=da448ed4f52aba6bcb0cd48cac0dd51b8692bccc4cd127431402fca6f8171e8e
76
$(package)_patches=cmake_fixups.patch
87

98
define $(package)_set_vars

0 commit comments

Comments
 (0)