[PR PATCH] cinnamon-control-center: fix network settings segfault

[PR PATCH] cinnamon-control-center: fix network settings segfault

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 528 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages fix/cinnamon-37723
https://github.com/void-linux/void-packages/pull/37732

cinnamon-control-center: fix network settings segfault
fixes #37723

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**


A patch file from https://github.com/void-linux/void-packages/pull/37732.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/cinnamon-37723-37732.patch --]
[-- Type: text/x-diff, Size: 3495 bytes --]

From ffc7bed1d3a5e3d97d3c98c0c6d08914f35e6414 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 28 Jun 2022 14:58:38 -0400
Subject: [PATCH] cinnamon-control-center: fix network settings segfault

fixes #37723
---
 .../patches/network-fix.patch                 | 58 +++++++++++++++++++
 srcpkgs/cinnamon-control-center/template      |  3 +-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cinnamon-control-center/patches/network-fix.patch

diff --git a/srcpkgs/cinnamon-control-center/patches/network-fix.patch b/srcpkgs/cinnamon-control-center/patches/network-fix.patch
new file mode 100644
index 000000000000..116c9a3058d3
--- /dev/null
+++ b/srcpkgs/cinnamon-control-center/patches/network-fix.patch
@@ -0,0 +1,58 @@
+From 0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 31 Jan 2022 08:56:28 -0500
+Subject: [PATCH] network: Remove old workaround for openvpn widgets.
+
+I can't reproduce the original issue anymore, and NMACertChooser
+is removed in network-manager-openvpn 1.8.34.
+
+Fixes #10616
+
+ref:
+6db4961fd3a002182984d0e71ec364c9befdd93b
+---
+ meson.build                       |  2 --
+ panels/network/cc-network-panel.c | 10 ----------
+ 2 files changed, 12 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f1f213b..c4d7d86 100644
+--- a/meson.build
++++ b/meson.build
+@@ -56,8 +56,6 @@ else
+   libnma= dependency('', required: false)
+ endif
+ 
+-config.set('HAVE_NMA_18', libnm.version().version_compare('>=1.8.0'))
+-
+ if get_option('modemmanager')
+   if not get_option('networkmanager')
+     error('*** NetworkManager is required by ModemManager ***')
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index a4289de..d1925e4 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -47,10 +47,6 @@
+ #include <libmm-glib.h>
+ #endif
+ 
+-#ifdef HAVE_NMA_18
+-#include <nma-cert-chooser.h>
+-#endif
+-
+ CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)
+ 
+ #define NETWORK_PANEL_PRIVATE(o) \
+@@ -1244,12 +1240,6 @@ cc_network_panel_init (CcNetworkPanel *panel)
+                 return;
+         }
+ 
+-#ifdef HAVE_NMA_18
+-        /* some newer VPN plugins pre-require internal resources from libnma */
+-        /* this solution is really ugly, but works clean */
+-        gtk_widget_destroy (nma_cert_chooser_new ("dummy", NMA_CERT_CHOOSER_FLAG_NONE));
+-#endif
+-
+         panel->priv->cancellable = g_cancellable_new ();
+ 
+         panel->priv->treeview = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 692e838d5061..1449c05709fd 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
 version=5.2.1
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 hostmakedepends="gettext-devel glib-devel
@@ -19,6 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-control-center"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
 checksum=977ac52cf8bcdea99c03c6455f29276a57a605839cf16d190db2088df243366d
+# requires X and wacom devices?
 make_check=no
 
 libcinnamon-control-center_package() {

Re: [PR PATCH] [Merged]: cinnamon-control-center: fix network settings segfault

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

There's a merged pull request on the void-packages repository

cinnamon-control-center: fix network settings segfault
https://github.com/void-linux/void-packages/pull/37732

Description:
fixes #37723

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**