From 4f4d6bc1b64229a75c4ad622fea706fda1b8657d Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 7 Jul 2026 22:55:03 +0200 Subject: [PATCH] networkmanager-vpnc: fix gui configuration https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/-/merge_requests/19 --- .../export_nm_vpn_editor_factory_vpnc.patch | 46 +++++++++++++++++++ .../ne/networkmanager-vpnc/package.nix | 3 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/by-name/ne/networkmanager-vpnc/export_nm_vpn_editor_factory_vpnc.patch diff --git a/pkgs/by-name/ne/networkmanager-vpnc/export_nm_vpn_editor_factory_vpnc.patch b/pkgs/by-name/ne/networkmanager-vpnc/export_nm_vpn_editor_factory_vpnc.patch new file mode 100644 index 000000000000..f7567942d6a8 --- /dev/null +++ b/pkgs/by-name/ne/networkmanager-vpnc/export_nm_vpn_editor_factory_vpnc.patch @@ -0,0 +1,46 @@ +commit 4c9e26cdc9f58f0e35aa345ae3bb643bea139608 +Author: Christian Krause +Date: Tue May 6 00:33:39 2025 +0200 + + Export nm_vpn_editor_factory_vpnc properly + + - commit e2fc231149165cb37a25362b85cbcd58b15a2a11 removed + libnm-glib version + - after that commit, nm_vpn_editor_factory_vpnc was not correctly + exported anymore which caused the settings editor be missing + when adding or editing a vnpc connection in gnome-control-center + - this commit re-adds the removed G_MODULE_EXPORT declaration + +diff --git a/properties/nm-vpnc-editor.c b/properties/nm-vpnc-editor.c +index a06807d..0c8081d 100644 +--- a/properties/nm-vpnc-editor.c ++++ b/properties/nm-vpnc-editor.c +@@ -27,7 +27,6 @@ + #include "nm-default.h" + + #include "nm-vpnc-editor.h" +-#include "nm-vpnc-editor-plugin.h" + + #include + #include +@@ -1130,3 +1129,20 @@ vpnc_editor_interface_init (NMVpnEditorInterface *iface) + iface->get_widget = get_widget; + iface->update_connection = update_connection; + } ++ ++/*****************************************************************************/ ++ ++#ifndef NM_VPN_OLD ++ ++#include "nm-vpnc-editor-plugin.h" ++ ++G_MODULE_EXPORT NMVpnEditor * ++nm_vpn_editor_factory_vpnc (NMVpnEditorPlugin *editor_plugin, ++ NMConnection *connection, ++ GError **error) ++{ ++ g_return_val_if_fail (!error || !*error, NULL); ++ ++ return nm_vpnc_editor_new (connection, error); ++} ++#endif diff --git a/pkgs/by-name/ne/networkmanager-vpnc/package.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix index c3ec042cf249..8ddaccc461fc 100644 --- a/pkgs/by-name/ne/networkmanager-vpnc/package.nix +++ b/pkgs/by-name/ne/networkmanager-vpnc/package.nix @@ -1,6 +1,7 @@ { stdenv, lib, + fetchpatch, fetchurl, replaceVars, vpnc, @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { (replaceVars ./fix-paths.patch { inherit vpnc kmod; }) + # https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/-/merge_requests/19 + ./export_nm_vpn_editor_factory_vpnc.patch ]; nativeBuildInputs = [