Release 1.4.4

Refs: #115

.github/workflows/build.yml

@@ -3,6 +3,7 @@ name: Build
 on:
   push:
     branches:
+      - master
       - develop
     tags:
       - "v*.*.*"
@@ -17,7 +18,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
     
     runs-on: ${{ matrix.os }}
 

GPClient/main.cpp

@@ -15,6 +15,8 @@
 #include "sigwatch.h"
 #include "version.h"
 
+#define QT_AUTO_SCREEN_SCALE_FACTOR "QT_AUTO_SCREEN_SCALE_FACTOR"
+
 int main(int argc, char *argv[])
 {
     plog::ColorConsoleAppender<plog::TxtFormatter> consoleAppender(plog::streamStdErr);
@@ -23,11 +25,16 @@ int main(int argc, char *argv[])
     PLOGI << "GlobalProtect started, version: " << VERSION;
 
     QString port = QString::fromLocal8Bit(qgetenv(ENV_CDP_PORT));
+    QString hidpiSupport = QString::fromLocal8Bit(qgetenv(QT_AUTO_SCREEN_SCALE_FACTOR));
 
-    if (port == "") {
+    if (port.isEmpty()) {
         qputenv(ENV_CDP_PORT, "12315");
     }
 
+    if (hidpiSupport.isEmpty()) {
+        qputenv(QT_AUTO_SCREEN_SCALE_FACTOR, "true");
+    }
+
     SingleApplication app(argc, argv);
     app.setQuitOnLastWindowClosed(false);
 

VERSION

@@ -1 +1 @@
-1.4.3
+1.4.4

debian/changelog

@@ -1,3 +1,13 @@
+globalprotect-openconnect (1.4.4-1) unstable; urgency=medium
+
+  * Updated VERSION, Bumped 1.4.3 –> 1.4.4
+  * fix: support the HighDPI displays
+  * [misc] update the build script
+  * [ci] Enable build job for master branch
+  * [ci] Add ubuntu 22.04
+
+ -- Kevin Yue <k3vinyue@gmail.com>  Sat, 14 May 2022 19:21:14 +0800
+
 globalprotect-openconnect (1.4.3-1) unstable; urgency=medium
 
   * Updated VERSION, Bumped 1.4.2 –> 1.4.3

packaging/aur/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Keinv Yue <yuezk001@gmail.com>
 
-_pkgver="1.4.3"
-_commit="28d832195876614c6c730b430978268242235ab3"
+_pkgver="1.4.4"
+_commit="4327235093159c6569af33021d4c763ebea3787a"
 pkgname=globalprotect-openconnect-git
 pkgver=${_pkgver}
 pkgrel=1

packaging/aur/PKGBUILD.in

@@ -0,0 +1,40 @@
+# Maintainer: Keinv Yue <yuezk001@gmail.com>
+
+_pkgver="{VERSION}"
+_commit="{COMMIT}"
+pkgname=globalprotect-openconnect-git
+pkgver=${_pkgver}
+pkgrel=1
+pkgdesc="A GlobalProtect VPN client (GUI) for Linux based on Openconnect and built with Qt5, supports SAML auth mode. (development version)"
+arch=(x86_64 aarch64)
+url="https://github.com/yuezk/GlobalProtect-openconnect"
+license=('GPL3')
+backup=(
+    etc/gpservice/gp.conf
+)
+install=gp.install
+depends=('openconnect>=8.0.0' qt5-base qt5-webengine qt5-websockets)
+makedepends=(git cmake)
+conflicts=('globalprotect-openconnect')
+provides=('globalprotect-openconnect' 'gpclient' 'gpservice')
+
+source=(git+https://github.com/yuezk/GlobalProtect-openconnect#commit=${_commit})
+sha256sums=('SKIP')
+
+prepare() {
+    cd GlobalProtect-openconnect
+    echo "${_pkgver}" > VERSION
+}
+
+build() {
+    cd GlobalProtect-openconnect
+    cmake -B build \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_CXX_FLAGS_RELEASE=-s
+    make -j$(nproc) -C build
+}
+
+package() {
+    cd GlobalProtect-openconnect
+    make DESTDIR="$pkgdir/" install -C build
+}

packaging/obs/globalprotect-openconnect.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat May 14 11:21:14 UTC 2022 - k3vinyue@gmail.com - 1.4.4
+
+- Update to 1.4.4
+  * Updated VERSION, Bumped 1.4.3 –> 1.4.4
+  * fix: support the HighDPI displays
+  * [misc] update the build script
+  * [ci] Enable build job for master branch
+  * [ci] Add ubuntu 22.04
+
 -------------------------------------------------------------------
 Mon May  9 14:20:54 UTC 2022 - k3vinyue@gmail.com - 1.4.3
 

packaging/obs/globalprotect-openconnect.spec

@@ -1,5 +1,5 @@
 Name:           globalprotect-openconnect
-Version:        1.4.3
+Version:        1.4.4
 Release:        1
 Summary:        A GlobalProtect VPN client powered by OpenConnect
 Group:          Productivity/Networking/PPP

scripts/prepare-packaging.sh

@@ -35,7 +35,7 @@ function update_rpm_changelog() {
 function generate_pkgbuild() {
 	local commit_id="$(git rev-parse HEAD)"
 	local version="$(cat VERSION)"
-	sed -i"" -e "s/{COMMIT}/${commit_id}/" -e "s/{VERSION}/${version}/" packaging/aur/PKGBUILD
+	sed -e "s/{COMMIT}/${commit_id}/" -e "s/{VERSION}/${version}/" packaging/aur/PKGBUILD.in > packaging/aur/PKGBUILD
 }
 
 # Update rpm version