cassidy/GlobalProtect-openconnect
1
0
Fork 0
mirror of https://github.com/yuezk/GlobalProtect-openconnect.git synced 2025-04-02 18:31:50 -04:00
Code Issues Projects Releases Wiki Activity

snap worked

Browse Source
This commit is contained in:
Kevin Yue 2021-09-19 23:00:09 +08:00
parent 283c772b7e
commit 197fd585ca
4 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GPClient/CMakeLists.txt
View File

@ -34,7 +34,13 @@ add_3rdparty(
SingleApplication SingleApplication
GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
GIT_TAG v3.3.0 GIT_TAG v3.3.0
CMAKE_ARGS -DQAPPLICATION_CLASS=QApplication CMAKE_ARGS
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
-DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}
-DCMAKE_INCLUDE_PATH=$ENV{CMAKE_INCLUDE_PATH}
-DCMAKE_LIBRARY_PATH=$ENV{CMAKE_LIBRARY_PATH}
-DQAPPLICATION_CLASS=QApplication
) )
add_3rdparty( add_3rdparty(

8
GPService/CMakeLists.txt
View File

@ -26,7 +26,13 @@ add_3rdparty(
SingleApplication SingleApplication
GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
GIT_TAG v3.3.0 GIT_TAG v3.3.0
CMAKE_ARGS -DQAPPLICATION_CLASS=QCoreApplication CMAKE_ARGS
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
-DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}
-DCMAKE_INCLUDE_PATH=$ENV{CMAKE_INCLUDE_PATH}
-DCMAKE_LIBRARY_PATH=$ENV{CMAKE_LIBRARY_PATH}
-DQAPPLICATION_CLASS=QCoreApplication
) )
ExternalProject_Get_Property(SingleApplication-${PROJECT_NAME} SOURCE_DIR BINARY_DIR) ExternalProject_Get_Property(SingleApplication-${PROJECT_NAME} SOURCE_DIR BINARY_DIR)

5
GPService/main.cpp
View File

@ -1,6 +1,4 @@
#include <iostream>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <QtCore/QProcessEnvironment>
#include "gpservice.h" #include "gpservice.h"
#include "singleapplication.h" #include "singleapplication.h"
@ -19,9 +17,6 @@ int main(int argc, char *argv[])
GPService service; GPService service;
QString env = "ENV: " + QProcessEnvironment::systemEnvironment().toStringList().join("\n");
std::cout << env.toStdString();
UnixSignalWatcher sigwatch; UnixSignalWatcher sigwatch;
sigwatch.watchForSignal(SIGINT); sigwatch.watchForSignal(SIGINT);
sigwatch.watchForSignal(SIGTERM); sigwatch.watchForSignal(SIGTERM);

32
snap/snapcraft.yaml
View File

@ -16,9 +16,7 @@ layout:
/usr/share/vpnc-scripts: /usr/share/vpnc-scripts:
bind: $SNAP/usr/share/vpnc-scripts bind: $SNAP/usr/share/vpnc-scripts
/usr/local/sbin: /usr/local/sbin:
bind: $SNAP/usr/local/sbin bind: $SNAP/usr/sbin
/usr/share/qt5:
bind: $SNAP/usr/share/qt5
slots: slots:
gpservice-slot: gpservice-slot:
@ -34,10 +32,10 @@ plugs:
apps: apps:
gpservice: gpservice:
# daemon: simple daemon: simple
command: usr/bin/gpservice command: usr/bin/gpservice
extensions: command-chain:
- kde-neon - snap/command-chain/desktop-launch
environment: environment:
LANG: en_US.utf8 LANG: en_US.utf8
plugs: plugs:
@ -62,24 +60,14 @@ apps:
parts: parts:
application: application:
plugin: nil plugin: cmake
source: . source: .
build-packages:
- libglu1-mesa-dev
build-snaps: build-snaps:
- kde-frameworks-5-core18-sdk - kde-frameworks-5-core18-sdk
stage-snaps:
- kde-frameworks-5-core18
stage-packages: stage-packages:
- openconnect - openconnect
override-build: | - libatm1
KF5_DIR=/snap/kde-frameworks-5-core18-sdk/current configflags:
- -DCMAKE_BUILD_TYPE=Release
export QTDIR=$KF5_DIR/usr/lib/qt5
export PATH=$QTDIR/bin:$KF5_DIR/usr/bin:$PATH
export LD_LIBRARY_PATH=$KF5_DIR/usr/lib/$SNAPCRAFT_ARCH_TRIPLET:$QTDIR/lib:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=$QTDIR/lib/pkgconfig:$PKG_CONFIG_PATH
export QMAKESPEC=$KF5_DIR/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/mkspecs/linux-g++
# export QT_SELECT=qt5
qmake CONFIG+=release # -qtconf $KF5_DIR/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/qt.conf
make -j$(nproc)
make INSTALL_ROOT=$SNAPCRAFT_PART_INSTALL install