From 8b6a7a443ed675b9bc61142c1401b481fba4f629 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 14 Feb 2024 08:39:50 +0400
Subject: [PATCH] Switch from libproxy to GProxyResolver

---
 Telegram/build/docker/centos_env/Dockerfile | 19 +------------------
 cmake                                       |  2 +-
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index b3d1a06503..5e96e33405 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -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
 
@@ -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 \
@@ -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 /
@@ -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 \
@@ -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 /
diff --git a/cmake b/cmake
index a32690808b..a46279fcfe 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit a32690808bd91c15206524eb7fd3a346bf51b149
+Subproject commit a46279fcfe69ebcc806bb31679ccece5f7c07508