AaronFiore/electrum
1
0
Fork 0
Code Activity

build: bump zbar version in win/mac/android builds

Browse Source 
- new version (0.23.93) fixes a security issue
  bb05ec54ee/ChangeLog (L5)
This commit is contained in:
SomberNight
2024-01-10 16:38:09 +00:00
parent d89f9846b9
commit 0a6283b1ef
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/android/Dockerfile
View File

@@ -127,6 +127,7 @@ RUN apt -y update -qq \
build-essential \ build-essential \
ccache \ ccache \
autoconf \ autoconf \
autopoint \
libtool \ libtool \
pkg-config \ pkg-config \
zlib1g-dev \ zlib1g-dev \

6
contrib/android/p4a_recipes/libzbar/__init__.py
View File

@@ -6,13 +6,15 @@ from pythonforandroid.util import load_source
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py')) util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py'))
assert LibZBarRecipe._version == "0.10"
assert LibZBarRecipe.depends == ['libiconv'] assert LibZBarRecipe.depends == ['libiconv']
assert LibZBarRecipe.python_depends == [] assert LibZBarRecipe.python_depends == []
class LibZBarRecipePinned(util.InheritedRecipeMixin, LibZBarRecipe): class LibZBarRecipePinned(util.InheritedRecipeMixin, LibZBarRecipe):
sha512sum = "d624f8ab114bf59c62e364f8b3e334bece48f5c11654739d810ed2b8553b8390a70763b0ae12d83c1472cfeda5d9e1a0b7c9c60228a79bf9f5a6fae4a9f7ccb9" version = "bb05ec54eec57f8397cb13fb9161372a281a1219"
url = "https://github.com/mchehab/zbar/archive/{version}.zip"
sha512sum = "186312ef0a50404efef79a5fbed34534569fab2873a6bb6d2e3d8ea64fa461c5537ca4fb0e659670d72b021e514f8fd4651b1e85954bf987015d8eb2e6f68375"
patches = [] # werror.patch not needed for modern zbar
recipe = LibZBarRecipePinned() recipe = LibZBarRecipePinned()

3
contrib/make_zbar.sh
View File

@@ -10,7 +10,8 @@
# Or for a Windows x86_64 (64-bit) target, run: # Or for a Windows x86_64 (64-bit) target, run:
# $ GCC_TRIPLET_HOST="x86_64-w64-mingw32" BUILD_TYPE="wine" ./contrib/make_zbar.sh # $ GCC_TRIPLET_HOST="x86_64-w64-mingw32" BUILD_TYPE="wine" ./contrib/make_zbar.sh
ZBAR_VERSION="aac86d5f08d64ab4c3da78188eb622fa3cb07182" ZBAR_VERSION="bb05ec54eec57f8397cb13fb9161372a281a1219"
# ^ tag 0.23.93
set -e set -e