From 58c6ee341c6670bd5ccade78bee6da3f3ef02a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 10 Aug 2022 17:41:16 +0700 Subject: [PATCH] cinnamon-control-center: update to 5.4.6. --- .../patches/network-fix.patch | 58 ------------------- srcpkgs/cinnamon-control-center/template | 6 +- 2 files changed, 3 insertions(+), 61 deletions(-) delete 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 deleted file mode 100644 index 116c9a3058d..00000000000 --- a/srcpkgs/cinnamon-control-center/patches/network-fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 Mon Sep 17 00:00:00 2001 -From: Michael Webster -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 - #endif - --#ifdef HAVE_NMA_18 --#include --#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 1449c05709f..346cf02ebf0 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=2 +version=5.4.6 +revision=1 build_style=meson build_helper=gir hostmakedepends="gettext-devel glib-devel @@ -18,7 +18,7 @@ maintainer="Orphaned " 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 +checksum=e20cd4e94b0110b31753f81dd209e88d0dcc350450aa365c7227c5ca8f92e0ac # requires X and wacom devices? make_check=no