From cede16a522dcb686f78d3c4369aba803305ddc87 Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Fri, 21 Apr 2023 14:42:51 +0000
Subject: [PATCH] libsecp256k1: update hardcoded .so lib name in binaries

follow-up 2a2b683d2334adc74dcf426d07aa6a923473f723

TODO: maybe we should drop the version number in the lib name we bundle...
---
 contrib/build-linux/appimage/make_appimage.sh | 2 +-
 contrib/build-wine/deterministic.spec         | 2 +-
 contrib/build-wine/make_win.sh                | 2 +-
 contrib/osx/make_osx.sh                       | 2 +-
 contrib/osx/osx.spec                          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/build-linux/appimage/make_appimage.sh b/contrib/build-linux/appimage/make_appimage.sh
index 5db025f8b..ec8c9aeb3 100755
--- a/contrib/build-linux/appimage/make_appimage.sh
+++ b/contrib/build-linux/appimage/make_appimage.sh
@@ -78,7 +78,7 @@ info "installing python."
 )
 
 
-if [ -f "$DLL_TARGET_DIR/libsecp256k1.so.1" ]; then
+if [ -f "$DLL_TARGET_DIR/libsecp256k1.so.2" ]; then
     info "libsecp256k1 already built, skipping"
 else
     "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp"
diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
index e62c38414..c133de4e6 100644
--- a/contrib/build-wine/deterministic.spec
+++ b/contrib/build-wine/deterministic.spec
@@ -31,7 +31,7 @@ binaries = []
 # Workaround for "Retro Look":
 binaries += [b for b in collect_dynamic_libs('PyQt5') if 'qwindowsvista' in b[0]]
 
-binaries += [('C:/tmp/libsecp256k1-1.dll', '.')]
+binaries += [('C:/tmp/libsecp256k1-2.dll', '.')]
 binaries += [('C:/tmp/libusb-1.0.dll', '.')]
 binaries += [('C:/tmp/libzbar-0.dll', '.')]
 
diff --git a/contrib/build-wine/make_win.sh b/contrib/build-wine/make_win.sh
index 5d9423c34..6cda8dcab 100755
--- a/contrib/build-wine/make_win.sh
+++ b/contrib/build-wine/make_win.sh
@@ -43,7 +43,7 @@ rm "$here"/dist/* -rf
 
 mkdir -p "$CACHEDIR" "$DLL_TARGET_DIR" "$PIP_CACHE_DIR"
 
-if [ -f "$DLL_TARGET_DIR/libsecp256k1-1.dll" ]; then
+if [ -f "$DLL_TARGET_DIR/libsecp256k1-2.dll" ]; then
     info "libsecp256k1 already built, skipping"
 else
     "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp"
diff --git a/contrib/osx/make_osx.sh b/contrib/osx/make_osx.sh
index 615e6dbe7..3f5f0e03d 100755
--- a/contrib/osx/make_osx.sh
+++ b/contrib/osx/make_osx.sh
@@ -180,7 +180,7 @@ info "generating locale"
 ) || fail "failed generating locale"
 
 
-if [ ! -f "$DLL_TARGET_DIR/libsecp256k1.1.dylib" ]; then
+if [ ! -f "$DLL_TARGET_DIR/libsecp256k1.2.dylib" ]; then
     info "Building libsecp256k1 dylib..."
     "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp"
 else
diff --git a/contrib/osx/osx.spec b/contrib/osx/osx.spec
index 7b983eea6..b4fb53df9 100644
--- a/contrib/osx/osx.spec
+++ b/contrib/osx/osx.spec
@@ -50,7 +50,7 @@ datas += collect_data_files('bitbox02')
 
 # Add libusb so Trezor and Safe-T mini will work
 binaries = [(electrum + "electrum/libusb-1.0.dylib", ".")]
-binaries += [(electrum + "electrum/libsecp256k1.1.dylib", ".")]
+binaries += [(electrum + "electrum/libsecp256k1.2.dylib", ".")]
 binaries += [(electrum + "electrum/libzbar.0.dylib", ".")]
 
 # Workaround for "Retro Look":