From 68e229640bfcb4b33ecd890b3dbdcfb95db5138c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 29 Apr 2023 09:09:31 +0400
Subject: [PATCH] Revert "Build OpenSSL 1.1.1 in snap"

This reverts commit 0e97ef992e8ac97dd6ff50f7b35422c57ebddd21.
---
 snap/snapcraft.yaml | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f5a722081..668a220d1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -108,6 +108,7 @@ parts:
       - libheif-dev
       - libopus-dev
       - libpulse-dev
+      - libssl-dev
       - libwayland-dev
       - libxcb1-dev
       - libxcb-keysyms1-dev
@@ -120,6 +121,7 @@ parts:
       - libheif1
       - libopus0
       - libpulse0
+      - libssl3
       - libwayland-client0
       - libwebkit2gtk-4.1-0
       - libxcb1
@@ -165,7 +167,6 @@ parts:
       - glibmm
       - mozjpeg
       - openal
-      - openssl
       - protobuf
       - qt
       - rnnoise
@@ -352,29 +353,6 @@ parts:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
       - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so
 
-  openssl:
-    source: https://github.com/openssl/openssl.git
-    source-depth: 1
-    source-branch: OpenSSL_1_1_1-stable
-    plugin: make
-    build-environment:
-      - LDFLAGS: -s
-    override-build: |
-      ./config \
-        shared \
-        --prefix=/usr \
-        --openssldir=/usr/lib/ssl \
-        --libdir=lib/$CRAFT_ARCH_TRIPLET \
-        no-tests
-      craftctl default
-    prime:
-      - -./usr/bin
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.a
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so
-      - -./usr/share
-
   protobuf:
     source: https://github.com/protocolbuffers/protobuf.git
     source-depth: 1
@@ -418,6 +396,7 @@ parts:
       - libpcre2-dev
       - libpng-dev
       - libsm-dev
+      - libssl-dev
       - libvulkan-dev
       - libwayland-dev
       - libx11-dev
@@ -455,6 +434,7 @@ parts:
       - libpcre2-16-0
       - libpng16-16
       - libsm6
+      - libssl3
       - libvulkan1
       - libwayland-client0
       - libwayland-cursor0
@@ -527,7 +507,6 @@ parts:
     after:
       - glibmm
       - mozjpeg
-      - openssl
       - patches
 
   rnnoise:
@@ -566,6 +545,7 @@ parts:
       - libopenh264-dev
       - libopus-dev
       - libpipewire-0.3-dev
+      - libssl-dev
       - libvpx-dev
       - libx11-dev
       - libxcomposite-dev
@@ -582,6 +562,7 @@ parts:
       - libgl1
       - libopenh264-6
       - libopus0
+      - libssl3
       - libvpx7
       - libx11-6
       - libxcomposite1
@@ -604,4 +585,3 @@ parts:
       - ffmpeg
       - glibmm
       - mozjpeg
-      - openssl