Update qrencode to 4.1.1
This commit is contained in:
+8
-22
@@ -91,19 +91,12 @@ install-prefix: $(packages)
|
||||
@rm -rf "$(host_prefix)"
|
||||
@mkdir -p "$(host_prefix)"
|
||||
@set -euo pipefail; \
|
||||
shopt -s nullglob; \
|
||||
for p in $(packages); do \
|
||||
artifacts=( "$(BASE_CACHE)/$(HOST)/$$p/"*.tar.gz ); \
|
||||
if (( $${#artifacts[@]} == 0 )); then \
|
||||
echo "ERROR: expected a built artifact for $$p under $(BASE_CACHE)/$(HOST)/$$p"; \
|
||||
for f in $(foreach p,$(packages),$($(p)_cached)); do \
|
||||
p="$$(basename "$$(dirname "$$f")")"; \
|
||||
if [[ ! -f "$$f" ]]; then \
|
||||
echo "ERROR: expected current built artifact for $$p: $$f"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
if (( $${#artifacts[@]} > 1 )); then \
|
||||
echo "WARN: multiple built artifacts for $$p; using newest by modification time"; \
|
||||
fi; \
|
||||
IFS=$$'\n' sorted=( $$(ls -t "$${artifacts[@]}") ); \
|
||||
unset IFS; \
|
||||
f="$${sorted[0]}"; \
|
||||
echo " - $$p: $$f"; \
|
||||
tar --no-same-owner -xzf "$$f" -C "$(host_prefix)"; \
|
||||
done
|
||||
@@ -112,19 +105,12 @@ ifneq ($(native_packages),)
|
||||
@rm -rf "$(build_prefix)"
|
||||
@mkdir -p "$(build_prefix)"
|
||||
@set -euo pipefail; \
|
||||
shopt -s nullglob; \
|
||||
for p in $(native_packages); do \
|
||||
artifacts=( "$(BASE_CACHE)/$(HOST)/$$p/"*.tar.gz ); \
|
||||
if (( $${#artifacts[@]} == 0 )); then \
|
||||
echo "ERROR: expected a built artifact for $$p under $(BASE_CACHE)/$(HOST)/$$p"; \
|
||||
for f in $(foreach p,$(native_packages),$($(p)_cached)); do \
|
||||
p="$$(basename "$$(dirname "$$f")")"; \
|
||||
if [[ ! -f "$$f" ]]; then \
|
||||
echo "ERROR: expected current native built artifact for $$p: $$f"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
if (( $${#artifacts[@]} > 1 )); then \
|
||||
echo "WARN: multiple built artifacts for $$p; using newest by modification time"; \
|
||||
fi; \
|
||||
IFS=$$'\n' sorted=( $$(ls -t "$${artifacts[@]}") ); \
|
||||
unset IFS; \
|
||||
f="$${sorted[0]}"; \
|
||||
echo " - $$p: $$f"; \
|
||||
tar --no-same-owner -xzf "$$f" -C "$(build_prefix)"; \
|
||||
done
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
package=qrencode
|
||||
$(package)_version=3.4.4
|
||||
$(package)_download_path=https://fukuchi.org/works/qrencode/
|
||||
$(package)_file_name=$(package)-$($(package)_version).tar.bz2
|
||||
$(package)_sha256_hash=efe5188b1ddbcbf98763b819b146be6a90481aac30cfc8d858ab78a19cde1fa5
|
||||
$(package)_version=4.1.1
|
||||
$(package)_download_path=https://github.com/fukuchi/libqrencode/archive/v$($(package)_version)/
|
||||
$(package)_file_name=lib$(package)-$($(package)_version).tar.gz
|
||||
$(package)_sha256_hash=5385bc1b8c2f20f3b91d258bf8ccc8cf62023935df2d2676b5b67049f31a049c
|
||||
|
||||
define $(package)_set_vars
|
||||
$(package)_config_opts=--disable-shared -without-tools --disable-sdltest
|
||||
$(package)_config_opts=--disable-shared --without-tools
|
||||
$(package)_config_opts_linux=--with-pic
|
||||
endef
|
||||
|
||||
define $(package)_preprocess_cmds
|
||||
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub use
|
||||
./autogen.sh && cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
|
||||
endef
|
||||
|
||||
define $(package)_config_cmds
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ branch. You can find instructions for installing or building them in the
|
||||
| PCRE | | | | | [Yes](https://github.com/agrarian-project/agrarian/blob/master/depends/packages/qt.mk#L66) |
|
||||
| protobuf | [2.6.1](https://github.com/google/protobuf/releases) | | No | | |
|
||||
| Python (tests) | | [3.5](https://www.python.org/downloads) | | | |
|
||||
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
|
||||
| qrencode | [4.1.1](https://github.com/fukuchi/libqrencode/releases/tag/v4.1.1) | | No | | |
|
||||
| Qt | [6.8.3](https://download.qt.io/official_releases/qt/) | 6.8 LTS | No | | |
|
||||
| XCB | | | | | [Yes](https://github.com/agrarian-project/agrarian/blob/master/depends/packages/qt.mk#L87) (Linux only) |
|
||||
| xkbcommon | | | | | [Yes](https://github.com/agrarian-project/agrarian/blob/master/depends/packages/qt.mk#L86) (Linux only) |
|
||||
|
||||
@@ -18,6 +18,7 @@ The current deterministic `depends/` baseline is:
|
||||
- FreeType 2.14.3 for Qt 6 static font support
|
||||
- Berkeley DB 4.8.30 for portable legacy wallet compatibility
|
||||
- protobuf 2.6.1 for the existing Qt payment request sources
|
||||
- qrencode 4.1.1 for Qt wallet QR code support
|
||||
- libevent 2.1.12-stable
|
||||
- GMP 6.1.2
|
||||
- ZeroMQ 4.3.5 when enabled
|
||||
|
||||
Reference in New Issue
Block a user