fix: update cmake version

CMakeLists.txt

@@ -30,6 +30,8 @@ find_package(Qt5 REQUIRED COMPONENTS
     DBus
 )
 
+find_package(Qt5Keychain REQUIRED)
+
 add_subdirectory(3rdparty/qt-unix-signals)
 add_subdirectory(3rdparty/inih)
 add_subdirectory(GPService)

GPClient/CMakeLists.txt

@@ -64,17 +64,6 @@ add_3rdparty(
         -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
 )
 
-add_3rdparty(
-    qtkeychain
-    GIT_REPOSITORY https://github.com/frankosterfeld/qtkeychain.git
-    GIT_TAG master
-    CMAKE_ARGS
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
-        -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
-        -DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}
-)
-
 ExternalProject_Get_Property(SingleApplication-${PROJECT_NAME} SOURCE_DIR BINARY_DIR)
 set(SingleApplication_INCLUDE_DIR ${SOURCE_DIR})
 set(SingleApplication_LIBRARY ${BINARY_DIR}/libSingleApplication.a)
@@ -82,15 +71,9 @@ set(SingleApplication_LIBRARY ${BINARY_DIR}/libSingleApplication.a)
 ExternalProject_Get_Property(plog-${PROJECT_NAME} SOURCE_DIR)
 set(plog_INCLUDE_DIR "${SOURCE_DIR}/include")
 
-ExternalProject_Get_Property(qtkeychain-${PROJECT_NAME} SOURCE_DIR BINARY_DIR)
-set(qtkeychain_INCLUDE_DIR "${SOURCE_DIR}")
-set(qtkeychain_BINARY_DIR "${BINARY_DIR}")
-set(qtkeychain_LIBRARY ${BINARY_DIR}/libqt5keychain.so)
-
 add_dependencies(gpclient
     SingleApplication-${PROJECT_NAME}
     plog-${PROJECT_NAME}
-    qtkeychain-${PROJECT_NAME}
 )
 
 target_include_directories(gpclient PRIVATE
@@ -99,13 +82,11 @@ target_include_directories(gpclient PRIVATE
     ${CMAKE_CURRENT_BINARY_DIR}
     ${SingleApplication_INCLUDE_DIR}
     ${plog_INCLUDE_DIR}
-    ${qtkeychain_INCLUDE_DIR}
+    ${QTKEYCHAIN_INCLUDE_DIRS}/qt5keychain
-    ${qtkeychain_BINARY_DIR}
 )
 
 target_link_libraries(gpclient
     ${SingleApplication_LIBRARY}
-    ${qtkeychain_LIBRARY}
     Qt5::Widgets
     Qt5::Network
     Qt5::WebSockets
@@ -113,6 +94,7 @@ target_link_libraries(gpclient
     Qt5::WebEngineWidgets
     Qt5::DBus
     QtSignals
+    ${QTKEYCHAIN_LIBRARIES}
 )
 
 if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0 AND CMAKE_BUILD_TYPE STREQUAL Release)

debian/control

@@ -2,12 +2,12 @@ Source: globalprotect-openconnect
 Section: net
 Priority: optional
 Maintainer: Kevin Yue <k3vinyue@gmail.com>
-Build-Depends: cmake (>=3.16), pkg-config, debhelper (>=11~), qtbase5-dev, qttools5-dev, libqt5websockets5-dev (>=5.9), qtwebengine5-dev (>=5.9), libsecret-1-dev
+Build-Depends: cmake (>=3.10), pkg-config, debhelper (>=11~), qtbase5-dev, qttools5-dev, libqt5websockets5-dev (>=5.9), qtwebengine5-dev (>=5.9), qt5keychain-dev
 Standards-Version: 4.1.4
 Homepage: https://github.com/yuezk/GlobalProtect-openconnect
 
 Package: globalprotect-openconnect
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}, openconnect (>=8.0), libqt5websockets5 (>=5.9), libqt5webengine5 (>=5.9)
+Depends: ${misc:Depends}, ${shlibs:Depends}, openconnect (>=8.0), libqt5websockets5 (>=5.9), libqt5webengine5 (>=5.9), libqt5keychain1
 Description: A GlobalProtect VPN client (GUI) based on OpenConnect.

packaging/aur/PKGBUILD.in

@@ -13,7 +13,7 @@ backup=(
     etc/gpservice/gp.conf
 )
 install=gp.install
-depends=('openconnect>=8.0.0' qt5-base qt5-webengine qt5-websockets)
+depends=('openconnect>=8.0.0' qt5-base qt5-webengine qt5-websockets qt5-tools qtkeychain-qt5)
 makedepends=(git cmake)
 conflicts=('globalprotect-openconnect')
 provides=('globalprotect-openconnect' 'gpclient' 'gpservice')

packaging/obs/globalprotect-openconnect.spec

@@ -8,7 +8,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 License:        GPL-3.0
 URL:            https://github.com/yuezk/GlobalProtect-openconnect
 Source0:        %{name}.tar.gz
-BuildRequires:  cmake cmake(Qt5) cmake(Qt5Gui) cmake(Qt5WebEngine) cmake(Qt5WebSockets) cmake(Qt5DBus)
+BuildRequires:  cmake cmake(Qt5) cmake(Qt5Gui) cmake(Qt5WebEngine) cmake(Qt5WebSockets) cmake(Qt5DBus) cmake(Qt5Keychain)
 BuildRequires:  systemd-rpm-macros
 Requires:       openconnect >= 8.0
 Conflicts:      globalprotect-openconnect-snapshot

scripts/install-debian.sh

@@ -7,8 +7,7 @@ sudo apt-get install -y \
     libqt5websockets5-dev \
     qtwebengine5-dev \
     qttools5-dev \
-    libsecret-1-dev \
+    qt5keychain-dev \
     openconnect \
-	libqt5keychain1
 
 ./scripts/install.sh

scripts/install-fedora.sh

@@ -4,7 +4,7 @@ sudo dnf install -y \
     qt5-qtbase-devel \
     qt5-qtwebengine-devel \
     qt5-qtwebsockets-devel \
-    openconnect \
+    qtkeychain-qt5-devel \
-	qtkeychain
+    openconnect
 
 ./scripts/install.sh

scripts/install-opensuse.sh

@@ -4,7 +4,7 @@ sudo zypper install -y \
     libqt5-qtbase-devel \
     libqt5-qtwebsockets-devel \
     libqt5-qtwebengine-devel \
-    openconnect \
+    qtkeychain-qt5-devel \
-	qtkeychain-qt5
+    openconnect
 
 ./scripts/install.sh

scripts/install-ubuntu.sh

@@ -6,8 +6,8 @@ sudo apt-get install -y \
     qtbase5-dev \
     libqt5websockets5-dev \
     qtwebengine5-dev \
-	qttools5-dev \
+    qttools5-dev \
-    openconnect \
+    qt5keychain-dev \
-	libqt5keychain1
+    openconnect
 
 ./scripts/install.sh

scripts/verify-debian-package.sh

@@ -6,7 +6,7 @@ sudo apt-get install -y \
 	qtbase5-dev \
 	libqt5websockets5-dev \
 	qtwebengine5-dev \
-	libqt5keychain1 \
+	qt5keychain-dev \
 	cmake \
 	qttools5-dev \
 	debhelper