[PATCH v2 0/1] MR2362: gitlab: Build-Depend on libpcsclite-dev for winscard.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54656 -- v2: gitlab: Install libpcsclite-dev and pcscd for winscard. https://gitlab.winehq.org/wine/wine/-/merge_requests/2362
From: Francois Gouget <fgouget(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54656 --- libpcsclite-dev:i386 should not be needed for 32-bit support, but installing it should not be an issue either. This still does not provide a virtual smartcard so most of the tests will still be skipped. But at least it allows to reproduce bug 54661. --- tools/gitlab/image.docker | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index cf16ed49c95..0f73b26190c 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libopenal-dev:amd64 libopenal-dev:i386 \ libosmesa6-dev:amd64 libosmesa6-dev:i386 \ libpcap-dev:amd64 libpcap-dev:i386 \ + libpcsclite-dev:amd64 \ libpulse-dev:amd64 libpulse-dev:i386 \ libsane-dev:amd64 libsane-dev:i386 \ libsdl2-dev:amd64 libsdl2-dev:i386 \ @@ -52,11 +53,13 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ samba-dev:amd64 \ unixodbc-dev:amd64 unixodbc-dev:i386 \ x11proto-dev && \ + apt-get install -y --no-install-recommends libpcsclite-dev:i386 && \ apt-get install -y ccache netbase curl ca-certificates xserver-xorg-video-dummy xserver-xorg xfonts-base xinit fvwm \ winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio libasound2-plugins:amd64 libasound2-plugins:i386 \ libmjpegutils-2.1-0:amd64 libmjpegutils-2.1-0:i386 gstreamer1.0-libav:amd64 gstreamer1.0-libav:i386 \ gstreamer1.0-plugins-base:amd64 gstreamer1.0-plugins-good:amd64 gstreamer1.0-plugins-bad:amd64 gstreamer1.0-plugins-ugly:amd64 \ - gstreamer1.0-plugins-base:i386 gstreamer1.0-plugins-good:i386 gstreamer1.0-plugins-bad:i386 gstreamer1.0-plugins-ugly:i386 && \ + gstreamer1.0-plugins-base:i386 gstreamer1.0-plugins-good:i386 gstreamer1.0-plugins-bad:i386 gstreamer1.0-plugins-ugly:i386 \ + pcscd && \ apt-get clean && \ useradd -m gitlab -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2362
v2: - Prevent apt-get from trying to replace python3:amd64 with python3:i386 to satisfy the libpcsclite-dev:i386 Recommends dependency. - Add pcscd... though it won't be running in the container environment? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2362#note_27297
Hans Leidekker (@hans) commented about tools/gitlab/image.docker:
samba-dev:amd64 \ unixodbc-dev:amd64 unixodbc-dev:i386 \ x11proto-dev && \ + apt-get install -y --no-install-recommends libpcsclite-dev:i386 && \ libpcsclite-dev:i386 should not be needed for 32-bit support, but installing it should not be an issue either.
It is an issue because configure will pick it up and enable winscard in the 32-bit build. Again, I don't think this is worth fixing given that it requires this workaround as well as complicating the implementation. Let's just install the 64-bit version. Testing the 32-bit version can wait until we can run it without depending on 32-bit host libraries. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2362#note_27299
This merge request was closed by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2362
participants (4)
-
Alexandre Julliard (＠julliard) -
Francois Gouget
-
Francois Gouget (＠fgouget)
-
Hans Leidekker (＠hans)