feat: use gnupg from system package manager

5 files changed, 10 insertions, 130 deletions

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 835fcfd7..31588de3 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -62,9 +62,9 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo
-          sudo apt-get -y install gcc g++ libconfig++-dev libboost-all-dev ninja-build libarchive-dev
+          sudo apt-get -y install gcc g++ ninja-build
+          sudo apt-get -y install libarchive-dev libconfig++-dev libboost-all-dev libgpgme-dev
           sudo apt-get -y install gpg
-
       - name: Cache Qt
         id: cache-qt
         uses: actions/cache@v1
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 748005e2..8648281d 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -41,7 +41,8 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo
-          sudo apt-get -y install gcc g++ libconfig++-dev libboost-all-dev ninja-build libarchive-dev
+          sudo apt-get -y install gcc g++ ninja-build
+          sudo apt-get -y install libarchive-dev libconfig++-dev libboost-all-dev libgpgme-dev
           sudo apt-get -y install gpg
         if: matrix.os == 'ubuntu-latest'
 
diff --git a/.github/workflows/release-deb-package.yml b/.github/workflows/release-deb-package.yml
index f2f52548..b25ec355 100644
--- a/.github/workflows/release-deb-package.yml
+++ b/.github/workflows/release-deb-package.yml
@@ -38,8 +38,9 @@ jobs:
       - name: Install Dependence (Ubuntu 20.04)
         run: |
           sudo apt-get update
-          sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo qt5-default ninja-build
-          sudo apt-get -y install gcc g++ libconfig++-dev libboost-all-dev libarchive-dev
+          sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo qt5-default
+          sudo apt-get -y install gcc g++ ninja-build
+          sudo apt-get -y install libarchive-dev libconfig++-dev libboost-all-dev libgpgme-dev
           sudo apt-get -y install gpg
         if: matrix.os == 'ubuntu-20.04'
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9d1650bd..14951adb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,9 +44,10 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo
-          sudo apt-get -y install gcc-8 g++-8 libconfig++-dev libboost-all-dev libarchive-dev
+          sudo apt-get -y install gcc-8 g++-8 ninja-build
+          sudo apt-get -y install libconfig++-dev libboost-all-dev libarchive-dev libgpgme-dev
           sudo apt-get -y install gpgsm libxcb-xinerama0 libxcb-icccm4-dev libcups2-dev libdrm-dev libegl1-mesa-dev
-          sudo apt-get -y install libgcrypt11-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev gyp ninja-build
+          sudo apt-get -y install libgcrypt11-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev gyp
           sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-image0
           sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-*
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 8
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 0f4488e1..2c39eb4d 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -32,129 +32,6 @@ add_subdirectory(json EXCLUDE_FROM_ALL)
 include(GenerateExportHeader)
 add_subdirectory(qt-aes EXCLUDE_FROM_ALL)
 
-# gnupg
-
-include(ExternalProject)
-
-# libgpg-error
-
-if (NOT MINGW)
-    set(GPG_ERROR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libgpg-error)
-    set(GPG_ERROR_BIN ${CMAKE_CURRENT_BINARY_DIR}/libgpg-error)
-    set(GPG_ERROR_STATIC_LIB ${GPG_ERROR_BIN}/lib/libgpg-error.a)
-    set(GPG_ERROR_INCLUDES ${GPG_ERROR_BIN}/include)
-    set(GPG_ERROR_LIBS ${GPG_ERROR_BIN}/lib)
-    file(MAKE_DIRECTORY ${GPG_ERROR_INCLUDES})
-else ()
-    find_library(GPG_ERROR_STATIC_LIB libgpg-error.a)
-endif ()
-
-if (NOT MINGW)
-
-    ExternalProject_Add(libgpg-error
-            PREFIX ${GPG_ERROR_BIN}
-            SOURCE_DIR ${GPG_ERROR_DIR}
-            CONFIGURE_COMMAND ${GPG_ERROR_DIR}/configure --enable-maintainer-mode --prefix=${GPG_ERROR_BIN} --enable-static=yes
-            BUILD_COMMAND make
-            INSTALL_COMMAND make install
-            BUILD_BYPRODUCTS ${GPG_ERROR_STATIC_LIB})
-
-    ExternalProject_Add_Step(libgpg-error autogen
-            WORKING_DIRECTORY ${GPG_ERROR_DIR}
-            COMMAND ${GPG_ERROR_DIR}/autogen.sh
-            DEPENDERS configure)
-
-endif ()
-
-add_library(gpg-error STATIC IMPORTED GLOBAL)
-if (NOT MINGW)
-    add_dependencies(gpg-error libgpg-error)
-    set_target_properties(gpg-error PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${GPG_ERROR_INCLUDES})
-endif ()
-set_target_properties(gpg-error PROPERTIES IMPORTED_LOCATION ${GPG_ERROR_STATIC_LIB})
-
-# libassuan
-
-if (NOT MINGW)
-    set(ASSUAN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libassuan)
-    set(ASSUAN_BIN ${CMAKE_CURRENT_BINARY_DIR}/libassuan)
-    set(ASSUAN_STATIC_LIB ${ASSUAN_BIN}/lib/libassuan.a)
-    set(ASSUAN_INCLUDES ${ASSUAN_BIN}/include)
-    set(ASSUAN_LIBS ${ASSUAN_BIN}/lib)
-    file(MAKE_DIRECTORY ${ASSUAN_INCLUDES})
-else ()
-    find_library(ASSUAN_STATIC_LIB libassuan.a)
-endif ()
-
-if (NOT MINGW)
-
-    ExternalProject_Add(libassuan
-            PREFIX ${ASSUAN_BIN}
-            SOURCE_DIR ${ASSUAN_DIR}
-            CONFIGURE_COMMAND ${ASSUAN_DIR}/configure --enable-maintainer-mode --prefix=${ASSUAN_BIN} --enable-static=yes
-            --with-libgpg-error-prefix=${GPG_ERROR_BIN}
-            BUILD_COMMAND make
-            INSTALL_COMMAND make install
-            BUILD_BYPRODUCTS ${ASSUAN_STATIC_LIB})
-
-    ExternalProject_Add_Step(libassuan autogen
-            WORKING_DIRECTORY ${ASSUAN_DIR}
-            COMMAND ${ASSUAN_DIR}/autogen.sh
-            DEPENDERS configure)
-
-    ExternalProject_Add_StepDependencies(libassuan autogen libgpg-error)
-
-endif ()
-
-add_library(assuan STATIC IMPORTED GLOBAL)
-if (NOT MINGW)
-    add_dependencies(assuan libassuan gpg-error)
-    set_target_properties(assuan PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${ASSUAN_INCLUDES})
-endif ()
-set_target_properties(assuan PROPERTIES IMPORTED_LOCATION ${ASSUAN_STATIC_LIB})
-
-# gpgme
-
-if (NOT MINGW)
-    set(GPGME_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gpgme)
-    set(GPGME_BIN ${CMAKE_CURRENT_BINARY_DIR}/gpgme)
-    set(GPGME_STATIC_LIB ${GPGME_BIN}/lib/libgpgme.a)
-    set(GPGME_INCLUDES ${GPGME_BIN}/include)
-    file(MAKE_DIRECTORY ${GPGME_INCLUDES})
-else ()
-    find_library(GPGME_STATIC_LIB libgpgme.a)
-endif ()
-
-if (NOT MINGW)
-
-    ExternalProject_Add(libgpgme
-            PREFIX ${GPGME_BIN}
-            SOURCE_DIR ${GPGME_DIR}
-            CONFIGURE_COMMAND ${GPGME_DIR}/configure --enable-maintainer-mode --prefix=${GPGME_BIN} --enable-shared=no --enable-static=yes --disable-gpg-test --enable-languages=cpp
-            --with-libgpg-error-prefix=${GPG_ERROR_BIN}
-            --with-libassuan-prefix=${ASSUAN_BIN}
-            "LIB=-lassuan -lgpg-error"
-            "LDFLAGS=-L${ASSUAN_LIBS} -L${GPG_ERROR_LIBS} "
-            BUILD_COMMAND make
-            INSTALL_COMMAND make install
-            BUILD_BYPRODUCTS ${GPGME_STATIC_LIB})
-
-    ExternalProject_Add_Step(libgpgme autogen
-            WORKING_DIRECTORY ${GPGME_DIR}
-            COMMAND ${GPGME_DIR}/autogen.sh
-            DEPENDERS configure)
-
-    ExternalProject_Add_StepDependencies(libgpgme autogen libassuan libgpg-error)
-
-endif ()
-
-add_library(gpgme STATIC IMPORTED GLOBAL)
-if (NOT MINGW)
-    add_dependencies(gpgme libgpgme assuan gpg-error)
-    set_target_properties(gpgme PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${GPGME_INCLUDES})
-endif ()
-set_target_properties(gpgme PROPERTIES IMPORTED_LOCATION ${GPGME_STATIC_LIB})
-
 # encoding detect library
 aux_source_directory(./encoding-detect ENCODING_DETECT_SOURCE_CODE)
 add_library(encoding_detect STATIC ${ENCODING_DETECT_SOURCE_CODE})
\ No newline at end of file