void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-07-28 00:13:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert GIT_UPDATE_M4 in Dockerfile

Browse source 
This partially reverts commit 9461095c88.
This commit is contained in:
Ilya Fedin 2025-05-28 15:16:53 +00:00 • committed by John Preston
parent 845fddf5f2
commit 28b54fac37
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Telegram/build/docker/centos_env/Dockerfile
View file

@ -1,6 +1,5 @@
{%- set GIT = "https://github.com" -%} {%- set GIT = "https://github.com" -%}
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
{%- set GIT_UPDATE_M4 = "git submodule set-url m4 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 && git submodule update --init --recursive --depth=1" -%}
{%- set TOOLSET = "gcc-toolset-14" -%} {%- set TOOLSET = "gcc-toolset-14" -%}
{%- set QT = "6.9.0" -%} {%- set QT = "6.9.0" -%}
{%- set QT_TAG = "v" ~ QT -%} {%- set QT_TAG = "v" ~ QT -%}
@ -299,9 +298,8 @@ RUN git clone -b libxcb-1.16 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb.git \
&& rm -rf libxcb && rm -rf libxcb
FROM builder AS xcb-wm FROM builder AS xcb-wm
RUN git clone -b xcb-util-wm-0.4.2 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-wm.git \ RUN git clone -b xcb-util-wm-0.4.2 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-wm.git \
&& cd libxcb-wm \ && cd libxcb-wm \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-wm-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-wm-cache" install \
@ -309,9 +307,8 @@ RUN git clone -b xcb-util-wm-0.4.2 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-wm.git
&& rm -rf libxcb-wm && rm -rf libxcb-wm
FROM builder AS xcb-util FROM builder AS xcb-util
RUN git clone -b xcb-util-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-util.git \ RUN git clone -b xcb-util-0.4.1 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-util.git \
&& cd libxcb-util \ && cd libxcb-util \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-util-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-util-cache" install \
@ -321,9 +318,8 @@ RUN git clone -b xcb-util-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-util.git
FROM builder AS xcb-image FROM builder AS xcb-image
COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache / COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
RUN git clone -b xcb-util-image-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-image.git \ RUN git clone -b xcb-util-image-0.4.1 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-image.git \
&& cd libxcb-image \ && cd libxcb-image \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-image-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-image-cache" install \
@ -331,9 +327,8 @@ RUN git clone -b xcb-util-image-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-ima
&& rm -rf libxcb-image && rm -rf libxcb-image
FROM builder AS xcb-keysyms FROM builder AS xcb-keysyms
RUN git clone -b xcb-util-keysyms-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-keysyms.git \ RUN git clone -b xcb-util-keysyms-0.4.1 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-keysyms.git \
&& cd libxcb-keysyms \ && cd libxcb-keysyms \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-keysyms-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-keysyms-cache" install \
@ -341,9 +336,8 @@ RUN git clone -b xcb-util-keysyms-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-k
&& rm -rf libxcb-keysyms && rm -rf libxcb-keysyms
FROM builder AS xcb-render-util FROM builder AS xcb-render-util
RUN git clone -b xcb-util-renderutil-0.3.10 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-render-util.git \ RUN git clone -b xcb-util-renderutil-0.3.10 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-render-util.git \
&& cd libxcb-render-util \ && cd libxcb-render-util \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-render-util-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-render-util-cache" install \
@ -355,9 +349,8 @@ COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache / COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache /
COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-cache / COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-cache /
RUN git clone -b xcb-util-cursor-0.1.4 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-cursor.git \ RUN git clone -b xcb-util-cursor-0.1.4 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-cursor.git \
&& cd libxcb-cursor \ && cd libxcb-cursor \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-cursor-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-cursor-cache" install \