Compare commits

..

No commits in common. "2761f7521a5e8e4928fd766af28b94d763c15708" and "c52ccb87f156b7c04daafe683beb574dd553ff0b" have entirely different histories.

8 changed files with 9 additions and 30 deletions

View File

@ -31,8 +31,6 @@ jobs:
- name: Build - name: Build
run: | run: |
./scripts/install-ubuntu.sh ./scripts/install-ubuntu.sh
# assert no library missing
test $(ldd $(which gpclient) | grep 'not found' | wc -l) -eq 0
snapshot-archive-all: snapshot-archive-all:
if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }} if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}

View File

@ -29,5 +29,3 @@ jobs:
- name: Build - name: Build
run: | run: |
./scripts/install-ubuntu.sh ./scripts/install-ubuntu.sh
# assert no library missing
test $(ldd $(which gpclient) | grep 'not found' | wc -l) -eq 0

View File

@ -87,11 +87,7 @@ set(qtkeychain_INCLUDE_DIR "${SOURCE_DIR}")
set(qtkeychain_BINARY_DIR "${BINARY_DIR}") set(qtkeychain_BINARY_DIR "${BINARY_DIR}")
set(qtkeychain_LIBRARY ${BINARY_DIR}/libqt5keychain.so) set(qtkeychain_LIBRARY ${BINARY_DIR}/libqt5keychain.so)
add_dependencies(gpclient add_dependencies(gpclient SingleApplication-${PROJECT_NAME} plog-${PROJECT_NAME} qtkeychain-${PROJECT_NAME})
SingleApplication-${PROJECT_NAME}
plog-${PROJECT_NAME}
qtkeychain-${PROJECT_NAME}
)
target_include_directories(gpclient PRIVATE target_include_directories(gpclient PRIVATE
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}

View File

@ -97,14 +97,6 @@ git clone https://github.com/yuezk/GlobalProtect-openconnect.git
cd GlobalProtect-openconnect cd GlobalProtect-openconnect
``` ```
### MX Linux
The following instructions are for **MX-21.2.1_x64 KDE**.
```sh
sudo apt install qttools5-dev libsecret-1-dev libqt5keychain1
./scripts/install-debian.sh
```
### Ubuntu/Mint ### Ubuntu/Mint
> **⚠️ REQUIRED for Ubuntu 18.04 ⚠️** > **⚠️ REQUIRED for Ubuntu 18.04 ⚠️**
@ -146,7 +138,6 @@ Install the Qt5 dependencies and OpenConnect:
- QtWebSockets - QtWebSockets
- QtDBus - QtDBus
- openconnect v8.x - openconnect v8.x
- qtkeychain
...then build and install with: ...then build and install with:

View File

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

View File

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

View File

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

View File

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