Fix AppImage build for Ubuntu 22.04 (#241)

Co-authored-by: Nerixyz <[email protected]>
SevenTV · Oct 3, 2023 · be762f4 · be762f4
1 parent 705318f
commit be762f4
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 5 deletions.
diff --git a/.CI/CreateAppImage.sh b/.CI/CreateAppImage.sh
@@ -25,6 +25,13 @@ else
     echo "No Qt environment variable set, assuming system-installed Qt"
 fi
 
+if [ -n "$OPENSSL_1_1_1_DIR" ]; then
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPENSSL_1_1_1_DIR/lib"
+    export PATH="$OPENSSL_1_1_1_DIR/bin:$PATH"
+else
+    echo "No OpenSSL environment variable set, assuming system-installed OpenSSL"
+fi
+
 script_path=$(readlink -f "$0")
 script_dir=$(dirname "$script_path")
 chatterino_dir=$(dirname "$script_dir")

diff --git a/.docker/Dockerfile-ubuntu-22.04-base b/.docker/Dockerfile-ubuntu-22.04-base
@@ -1,6 +1,7 @@
 FROM ubuntu:22.04
 
 ENV TZ=UTC
+ENV OPENSSL_VER=1.1.1w
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update && apt-get -y install --no-install-recommends \
@@ -27,8 +28,20 @@ RUN apt-get update && apt-get -y install --no-install-recommends \
 RUN apt-get -y install \
         git \
         lsb-release \
+        checkinstall \
+        zlib1g-dev \
+        wget \
         python3-pip && \
         apt-get clean all
+
+
+#Install OpenSSL 1.1
+RUN wget https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz
+RUN tar xf openssl-$OPENSSL_VER.tar.gz
+RUN cd openssl-$OPENSSL_VER && \
+    ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib && \
+    make -j8 && \
+    make install
 
 # Install Qt as we do in CI
 

diff --git a/.docker/Dockerfile-ubuntu-22.04-build b/.docker/Dockerfile-ubuntu-22.04-build
@@ -6,7 +6,7 @@ RUN mkdir /src/build
 
 # cmake
 RUN cd /src/build && \
-        CXXFLAGS=-fno-sized-deallocation cmake \
+        OPENSSL_ROOT_DIR=/usr/local/ssl CXXFLAGS=-fno-sized-deallocation cmake \
         -DCMAKE_INSTALL_PREFIX=appdir/usr/ \
         -DCMAKE_PREFIX_PATH=/opt/qt515/lib/cmake \
         -DBUILD_WITH_QTKEYCHAIN=OFF \

diff --git a/.docker/Dockerfile-ubuntu-22.04-package b/.docker/Dockerfile-ubuntu-22.04-package
@@ -2,6 +2,7 @@ FROM chatterino-ubuntu-22.04-build
 
 # In CI, this is set from the aqtinstall action
 ENV Qt5_DIR=/opt/qt515
+ENV OPENSSL_1_1_1_DIR=/usr/local/ssl
 
 WORKDIR /src/build
 

diff --git a/.docker/Dockerfile-ubuntu-22.04-qt6-build b/.docker/Dockerfile-ubuntu-22.04-qt6-build
@@ -6,6 +6,7 @@ ARG QT_VERSION=6.2.4
 ARG BUILD_WITH_QT6=ON
 
 ENV TZ=UTC
+ENV OPENSSL_VER=1.1.1w
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update && apt-get -y install --no-install-recommends \
@@ -32,9 +33,22 @@ RUN apt-get update && apt-get -y install --no-install-recommends \
 RUN apt-get -y install \
         git \
         lsb-release \
+        checkinstall \
+        zlib1g-dev \
+        wget \
         python3-pip && \
         apt-get clean all
 
+
+#Install OpenSSL 1.1
+RUN wget https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz
+RUN tar xf openssl-$OPENSSL_VER.tar.gz
+RUN cd openssl-$OPENSSL_VER && \
+    ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib && \
+    make -j8 && \
+    make install
+
+
 # Install Qt as we do in CI
 
 RUN pip3 install -U pip && \
@@ -47,7 +61,7 @@ RUN mkdir /src/build
 
 # cmake
 RUN cd /src/build && \
-        CXXFLAGS=-fno-sized-deallocation cmake \
+        OPENSSL_ROOT_DIR=/usr/local/ssl CXXFLAGS=-fno-sized-deallocation cmake \
         -DBUILD_WITH_QT6=$BUILD_WITH_QT6 \
         -DCMAKE_INSTALL_PREFIX=appdir/usr/ \
         -DCMAKE_PREFIX_PATH=/opt/qt/$QT_VERSION/gcc_64/lib/cmake \

diff --git a/.docker/Dockerfile-ubuntu-22.04-qt6-package b/.docker/Dockerfile-ubuntu-22.04-qt6-package
@@ -4,6 +4,7 @@ FROM chatterino-ubuntu-$UBUNTU_VERSION-qt6-build
 
 # In CI, this is set from the aqtinstall action
 ENV Qt6_DIR=/opt/qt/6.2.4/gcc_64
+ENV OPENSSL_1_1_1_DIR=/usr/local/ssl
 
 WORKDIR /src/build
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,6 +22,9 @@ env:
   # Last known good conan version
   # 2.0.3 has a bug on Windows (conan-io/conan#13606)
   CONAN_VERSION: 2.0.2
+  OPENSSL_1_1_1_VERSION: 1.1.1w
+  OPENSSL_1_1_1_SHA256: "cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8"
+  OPENSSL_1_1_1_DIR: /usr/local/ssl
 
 jobs:
   build:
@@ -294,20 +297,35 @@ jobs:
               libxcb-image0 \
               libxcb-keysyms1 \
               libxcb-render-util0 \
-              libxcb-xinerama0
+              libxcb-xinerama0 \
+              wget \
+              zlib1g-dev
 
       - name: Apply Qt patches (Ubuntu)
         if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.qt-version, '5.')
         run: |
           patch "$Qt5_DIR/include/QtConcurrent/qtconcurrentthreadengine.h" .patches/qt5-on-newer-gcc.patch
         shell: bash
 
-      - name: Build (Ubuntu)
+      - name: Build OpenSSL 1.1.1
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          cd $RUNNER_WORKSPACE
+          wget "https://www.openssl.org/source/openssl-$OPENSSL_1_1_1_VERSION.tar.gz"
+          echo "${{ env.OPENSSL_1_1_1_SHA256 }}  openssl-$OPENSSL_1_1_1_VERSION.tar.gz" | sha256sum -c
+          tar xf "openssl-$OPENSSL_1_1_1_VERSION.tar.gz"
+          cd "openssl-$OPENSSL_1_1_1_VERSION"
+          ./config --prefix="$OPENSSL_1_1_1_DIR" --openssldir="$OPENSSL_1_1_1_DIR" shared zlib
+          make -j"$(nproc)"
+          sudo make install
+        shell: bash
+
+      - name: Build (Ubuntu), Qt ${{ matrix.qt-version }}
         if: startsWith(matrix.os, 'ubuntu')
         run: |
           mkdir build
           cd build
-          CXXFLAGS=-fno-sized-deallocation cmake \
+          OPENSSL_ROOT_DIR="$OPENSSL_1_1_1_DIR" CXXFLAGS=-fno-sized-deallocation cmake \
             -DCMAKE_INSTALL_PREFIX=appdir/usr/ \
             -DCMAKE_BUILD_TYPE=Release \
             -DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \