Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch from libproxy to GProxyResolver #27476

Merged
merged 1 commit into from
Feb 14, 2024
Merged

Switch from libproxy to GProxyResolver #27476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions Telegram/build/docker/centos_env/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ FROM builder AS patches
RUN git init patches \
&& cd patches \
&& git remote add origin {{ GIT }}/desktop-app/patches.git \
&& git fetch --depth=1 origin 61a1f5871bc83ec0514f867960616f45e142297c \
&& git fetch --depth=1 origin 7f880df36a926fa2eeb4ef473261f2ca09d3c135 \
&& git reset --hard FETCH_HEAD \
&& rm -rf .git

Expand Down Expand Up @@ -109,20 +109,6 @@ RUN git clone -b v21.9 --depth=1 --recursive {{ GIT }}/protocolbuffers/protobuf.
&& cmake --build build --parallel \
&& rm -rf .git

FROM patches AS libproxy
RUN git clone -b 0.4.18 --depth=1 {{ GIT }}/libproxy/libproxy.git \
&& cd libproxy \
&& git apply ../patches/libproxy.patch \
&& cmake -GNinja -B build . \
-DCMAKE_BUILD_TYPE=None \
-DWITH_DBUS=OFF \
-DWITH_NM=OFF \
-DWITH_NMold=OFF \
&& cmake --build build --parallel \
&& DESTDIR="{{ LibrariesPath }}/libproxy-cache" cmake --install build \
&& cd .. \
&& rm -rf libproxy

FROM builder AS lcms2
RUN git clone -b lcms2.15 --depth=1 {{ GIT }}/mm2/Little-CMS.git \
&& cd Little-CMS \
Expand Down Expand Up @@ -753,7 +739,6 @@ RUN git clone -b 1.78.1 --depth=1 {{ GIT }}/GNOME/gobject-introspection.git \

FROM patches AS qt
COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
COPY --link --from=libproxy {{ LibrariesPath }}/libproxy-cache /
COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache /
Expand Down Expand Up @@ -782,7 +767,6 @@ RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git qt_{{ QT }} \
CMAKE_BUILD_TYPE=None \
-opensource \
-confirm-license \
-libproxy \
-qt-libpng \
-qt-harfbuzz \
-qt-pcre \
Expand Down Expand Up @@ -856,7 +840,6 @@ FROM builder-base
COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
COPY --link --from=xz {{ LibrariesPath }}/xz-cache /
COPY --link --from=protobuf {{ LibrariesPath }}/protobuf protobuf
COPY --link --from=libproxy {{ LibrariesPath }}/libproxy-cache /
COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
Expand Down
2 changes: 1 addition & 1 deletion cmake
Open in desktop
Submodule cmake updated 1 files
+0 −1 external/qt/CMakeLists.txt
Loading