diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-07-14 13:01:36 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-07-14 13:01:36 -0400 |
| commit | c795d4b2f1e982f1a83e766554c3f0398e2ab822 (patch) | |
| tree | 810f12e6c1b85a9ecd4ab1f80dc1f00e12801f05 | |
| parent | cb28263cb1f72b3d7f21e8d79c3318eba60386b4 (diff) | |
| parent | bd30c3babbab1fd5141499c877261077301234fb (diff) | |
| download | monzero-gui-c795d4b2f1e982f1a83e766554c3f0398e2ab822.tar.gz monzero-gui-c795d4b2f1e982f1a83e766554c3f0398e2ab822.tar.xz monzero-gui-c795d4b2f1e982f1a83e766554c3f0398e2ab822.zip | |
Merge pull request #3969
bd30c3b docker: fix linux build (selsta)
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | Dockerfile.linux | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76a0b826..5a1268fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,7 +103,7 @@ jobs: restore-keys: | docker-linux-static- - name: install dependencies - run: sudo apt -y install xvfb libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0 + run: sudo apt -y install xvfb libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xkb1 libxcb-shape0 libxkbcommon-x11-0 - name: prepare build environment run: docker build --tag monero:build-env-linux --build-arg THREADS=3 --file Dockerfile.linux . - name: build diff --git a/Dockerfile.linux b/Dockerfile.linux index 6ca59083..0551369a 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -55,7 +55,7 @@ RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb- git reset --hard acf790d7752f36e450d476ad79807d4012ec863b && \ git submodule init && \ git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ - git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \ + git -C m4 reset --hard c617eee22ae5c285e79e81ec39ce96862fd3262f && \ ./autogen.sh --enable-shared --disable-static && \ make -j$THREADS && \ make -j$THREADS install && \ @@ -66,7 +66,7 @@ RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb- git reset --hard d882052fb2ce439c6483fce944ba8f16f7294639 && \ git submodule init && \ git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ - git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \ + git -C m4 reset --hard c617eee22ae5c285e79e81ec39ce96862fd3262f && \ ./autogen.sh --enable-shared --disable-static && \ make -j$THREADS && \ make -j$THREADS install && \ @@ -77,7 +77,7 @@ RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb- git reset --hard 0e51ee5570a6a80bdf98770b975dfe8a57f4eeb1 && \ git submodule init && \ git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ - git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \ + git -C m4 reset --hard c617eee22ae5c285e79e81ec39ce96862fd3262f && \ ./autogen.sh --enable-shared --disable-static && \ make -j$THREADS && \ make -j$THREADS install && \ @@ -88,7 +88,7 @@ RUN git clone -b 0.3.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb- git reset --hard 0317caf63de532fd7a0493ed6afa871a67253747 && \ git submodule init && \ git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ - git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \ + git -C m4 reset --hard c617eee22ae5c285e79e81ec39ce96862fd3262f && \ ./autogen.sh --enable-shared --disable-static && \ make -j$THREADS && \ make -j$THREADS install && \ @@ -99,7 +99,7 @@ RUN git clone -b 0.4.1 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb- git reset --hard 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2 && \ git submodule init && \ git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ - git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \ + git -C m4 reset --hard c617eee22ae5c285e79e81ec39ce96862fd3262f && \ ./autogen.sh --enable-shared --disable-static && \ make -j$THREADS && \ make -j$THREADS install && \ |