ci: upload offline tarball

.github/workflows/build.yaml

@@ -44,8 +44,7 @@ jobs:
       with:
         version: 9
     - name: Prepare workspace
-      run: rm -rf source && mkdir -p source/artifacts
-
+      run: rm -rf source && mkdir source
     - name: Checkout GlobalProtect-openconnect
       uses: actions/checkout@v4
       with:
@@ -53,7 +52,6 @@ jobs:
         repository: yuezk/GlobalProtect-openconnect
         ref: ${{ github.ref }}
         path: source/gp
-
     - name: Create tarball
       run: |
         cd source/gp
@@ -62,28 +60,13 @@ jobs:
           touch SNAPSHOT
         fi
         make tarball
-
-        mv -v .build/tarball/*.tar.gz ../artifacts/
-
-    - name: Generate RPM spec file
-      env:
-        RELEASE_TAG: ${{ github.ref == 'refs/heads/dev' && 'snapshot' || github.ref_name }}
-      run: |
-        cd source/gp
-
-        make init-rpm \
-          REVISION='1%{?dist}' \
-          RPM_SOURCE=https://github.com/yuezk/GlobalProtect-openconnect/releases/download/${RELEASE_TAG}/%{name}-%{version}.tar.gz
-
-        mv -v .build/rpm/*.spec ../artifacts/
-
     - name: Upload tarball
       uses: actions/upload-artifact@v4
       with:
         name: artifact-source
         if-no-files-found: error
         path: |
-          source/artifacts/*
+          source/gp/.build/tarball/*.tar.gz
 
   tarball-offline:
     if: ${{ github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/') }}

Cargo.lock

@@ -1599,7 +1599,6 @@ dependencies = [
  "clap-verbosity-flag",
  "dns-lookup",
  "env_logger",
- "gtk",
  "log",
  "log-reload",
  "md5",

Makefile

@@ -8,8 +8,6 @@ RUST_VERSION = 1.80
 
 VERSION = $(shell $(CARGO) metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
 REVISION ?= 1
-RPM_SOURCE ?= %{name}.tar.gz
-
 PPA_REVISION ?= 1
 PKG_NAME = globalprotect-openconnect
 PKG = $(PKG_NAME)-$(VERSION)
@@ -236,7 +234,6 @@ init-rpm: clean-rpm
 
 	sed -i "s/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.spec
 	sed -i "s/@REVISION@/$(REVISION)/g" .build/rpm/globalprotect-openconnect.spec
-	sed -i "s|@SOURCE@|$(RPM_SOURCE)|g" .build/rpm/globalprotect-openconnect.spec
 	sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/rpm/globalprotect-openconnect.spec
 	sed -i "s/@DATE@/$(shell LC_ALL=en.US date "+%a %b %d %Y")/g" .build/rpm/globalprotect-openconnect.spec
 

crates/gpapi/Cargo.toml

@@ -39,9 +39,6 @@ clap-verbosity-flag = { workspace = true, optional = true }
 env_logger = { workspace = true, optional = true }
 log-reload = { version = "0.1", optional = true }
 
-[target.'cfg(not(any(target_os="macos", target_os="windows")))'.dependencies]
-gtk = "0.18"
-
 [features]
 tauri = ["dep:tauri"]
 clap = ["dep:clap", "dep:clap-verbosity-flag"]

crates/gpapi/src/utils/env_utils.rs

@@ -41,6 +41,12 @@ pub fn patch_gui_runtime_env(hidpi: bool) {
   // This is to avoid blank screen on some systems
   std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1");
 
+  // Workaround for https://github.com/tauri-apps/tao/issues/929
+  let is_wayland = std::env::var("XDG_SESSION_TYPE").unwrap_or_default() == "wayland";
+  if is_wayland {
+    env::set_var("GDK_BACKEND", "x11");
+  }
+
   if hidpi {
     info!("Setting GDK_SCALE=2 and GDK_DPI_SCALE=0.5");
     std::env::set_var("GDK_SCALE", "2");

crates/gpapi/src/utils/window.rs

@@ -1,97 +1,73 @@
+use std::{process::ExitStatus, time::Duration};
+
+use anyhow::bail;
+use log::info;
 use tauri::WebviewWindow;
+use tokio::process::Command;
 
 pub trait WindowExt {
   fn raise(&self) -> anyhow::Result<()>;
 }
 
 impl WindowExt for WebviewWindow {
-  #[cfg(any(target_os = "macos", target_os = "windows"))]
   fn raise(&self) -> anyhow::Result<()> {
-    self.show()?;
-    Ok(())
-  }
-
-  #[cfg(not(any(target_os = "macos", target_os = "windows")))]
-  fn raise(&self) -> anyhow::Result<()> {
-    unix::raise_window(self)
+    raise_window(self)
   }
 }
 
-#[cfg(not(any(target_os = "macos", target_os = "windows")))]
-mod unix {
-  use std::{process::ExitStatus, time::Duration};
+pub fn raise_window(win: &WebviewWindow) -> anyhow::Result<()> {
+  let is_wayland = std::env::var("XDG_SESSION_TYPE").unwrap_or_default() == "wayland";
 
-  use anyhow::bail;
-  use gtk::{
-    glib::Cast,
-    traits::{EventBoxExt, GtkWindowExt, WidgetExt},
-    EventBox,
-  };
-  use log::info;
-  use tauri::WebviewWindow;
-  use tokio::process::Command;
-
-  pub fn raise_window(win: &WebviewWindow) -> anyhow::Result<()> {
-    let is_wayland = std::env::var("XDG_SESSION_TYPE").unwrap_or_default() == "wayland";
-
-    if is_wayland {
-      let gtk_win = win.gtk_window()?;
-      if let Some(header) = gtk_win.titlebar() {
-        let _ = header.downcast::<EventBox>().map(|event_box| {
-          event_box.set_above_child(false);
-        });
-      }
-
-      gtk_win.hide();
-      gtk_win.show_all();
-    } else {
-      if !win.is_visible()? {
-        win.show()?;
-      }
-      let title = win.title()?;
-      tokio::spawn(async move {
-        if let Err(err) = wmctrl_raise_window(&title).await {
-          info!("Window not raised: {}", err);
-        }
-      });
+  if is_wayland {
+    win.hide()?;
+    win.show()?;
+  } else {
+    if !win.is_visible()? {
+      win.show()?;
     }
-
-    // Calling window.show() on window object will cause the menu to be shown.
-    // We need to hide it again.
-    win.hide_menu()?;
-
-    Ok(())
+    let title = win.title()?;
+    tokio::spawn(async move {
+      if let Err(err) = wmctrl_raise_window(&title).await {
+        info!("Window not raised: {}", err);
+      }
+    });
   }
 
-  async fn wmctrl_raise_window(title: &str) -> anyhow::Result<()> {
-    let mut counter = 0;
+  // Calling window.show() on Windows will cause the menu to be shown.
+  // We need to hide it again.
+  win.hide_menu()?;
 
-    loop {
-      if let Ok(exit_status) = wmctrl_try_raise_window(title).await {
-        if exit_status.success() {
-          info!("Window raised after {} attempts", counter + 1);
-          return Ok(());
-        }
+  Ok(())
+}
+
+async fn wmctrl_raise_window(title: &str) -> anyhow::Result<()> {
+  let mut counter = 0;
+
+  loop {
+    if let Ok(exit_status) = wmctrl_try_raise_window(title).await {
+      if exit_status.success() {
+        info!("Window raised after {} attempts", counter + 1);
+        return Ok(());
       }
-
-      if counter >= 10 {
-        bail!("Failed to raise window: {}", title)
-      }
-
-      counter += 1;
-      tokio::time::sleep(Duration::from_millis(100)).await;
     }
-  }
 
-  async fn wmctrl_try_raise_window(title: &str) -> anyhow::Result<ExitStatus> {
-    let exit_status = Command::new("wmctrl")
-      .arg("-F")
-      .arg("-a")
-      .arg(title)
-      .spawn()?
-      .wait()
-      .await?;
+    if counter >= 10 {
+      bail!("Failed to raise window: {}", title)
+    }
 
-    Ok(exit_status)
+    counter += 1;
+    tokio::time::sleep(Duration::from_millis(100)).await;
   }
 }
+
+async fn wmctrl_try_raise_window(title: &str) -> anyhow::Result<ExitStatus> {
+  let exit_status = Command::new("wmctrl")
+    .arg("-F")
+    .arg("-a")
+    .arg(title)
+    .spawn()?
+    .wait()
+    .await?;
+
+  Ok(exit_status)
+}

packaging/rpm/globalprotect-openconnect.spec.in

@@ -6,7 +6,7 @@ Group:          Productivity/Networking/PPP
 
 License:        GPL-3.0
 URL:            https://github.com/yuezk/GlobalProtect-openconnect
-Source:         @SOURCE@
+Source:         %{name}.tar.gz
 
 BuildRequires:  make
 BuildRequires:  rust