Skip to content

Commit

Permalink
[electrum] build: remove deprecated apt-key for winehq key
Browse files Browse the repository at this point in the history
Summary:
apt-key is deprecated and keys should be specified per source instead of
for all sources.

This is a backport of [[Electron-Cash#2820 | electroncash#2820]]

Also fix the build by bumping `windbind` to a version that supports the current dependency packages available in the ubuntu repo (`samba-common`...)

Test Plan: build the windows release `contrib/build-wine/build.sh`, and test the executables

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D15868
  • Loading branch information
EchterAgo authored and abc-bot committed Apr 4, 2024
1 parent 874d49c commit fa0cbd7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions contrib/build-wine/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ ENV WINEDIST=devel
ENV WINEVERSION=9.0.0~${UBUNTUDIST}-1

RUN echo "78b185fabdb323971d13bd329fefc8038e08559aa51c4996de18db0639a51df6 /tmp/winehq.key" | sha256sum -c - && \
apt-key add /tmp/winehq.key && \
echo deb https://dl.winehq.org/wine-builds/ubuntu/ ${UBUNTUDIST} main >> /etc/apt/sources.list && \
cat /tmp/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq.gpg && \
echo deb [signed-by=/etc/apt/keyrings/winehq.gpg] https://dl.winehq.org/wine-builds/ubuntu/ ${UBUNTUDIST} main >> /etc/apt/sources.list.d/winehq.list && \
apt-get update -q && \
apt-get install -qy \
wine-${WINEDIST}-amd64:amd64=${WINEVERSION} \
Expand All @@ -53,7 +53,7 @@ RUN echo "78b185fabdb323971d13bd329fefc8038e08559aa51c4996de18db0639a51df6 /tmp/
# xvfb is needed to launch the Visual Studio installer
xvfb=2:21.1.4-2ubuntu1.7~22.04.8 \
# winbind is needed for the Visual Studio installer and cl.exe PDB generation
winbind=2:4.15.13+dfsg-0ubuntu1.5
winbind=2:4.15.13+dfsg-0ubuntu1.6

RUN rm -rf /var/lib/apt/lists/* && \
apt-get autoremove -y && \
Expand Down

0 comments on commit fa0cbd7

Please sign in to comment.