commit: a5f06a4b8a63dcb51935678be595fd1b3ae05517 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> AuthorDate: Tue May 3 03:18:24 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 3 03:33:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f06a4b
gnome-extra/cinnamon-control-center: Fix libnma dependency Closes: https://bugs.gentoo.org/840317 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> Signed-off-by: Sam James <sam <AT> gentoo.org> .../cinnamon-control-center-5.2.1-r1.ebuild | 105 +++++++++++++++++++++ .../cinnamon-control-center-5.2.1-fix-libnma.patch | 58 ++++++++++++ 2 files changed, 163 insertions(+) diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild new file mode 100644 index 000000000000..27ee0069d477 --- /dev/null +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9,10} ) + +inherit meson gnome2-utils python-any-r1 xdg virtualx + +DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop" +HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center"; +SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test" +REQUIRED_USE="modemmanager? ( networkmanager )" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +RESTRICT="test" + +COMMON_DEPEND=" + >=dev-libs/glib-2.44.0:2 + >=gnome-base/libgnomekbd-3.0.0:0= + >=gnome-extra/cinnamon-desktop-5.2:0= + >=gnome-extra/cinnamon-menus-5.2:0= + media-libs/fontconfig + >=sys-auth/polkit-0.103 + >=x11-libs/gdk-pixbuf-2.23.0:2 + >=x11-libs/gtk+-3.16.0:3 + >=x11-libs/libnotify-0.7.3:0= + x11-libs/libX11 + >=x11-libs/libxklavier-5.1 + + colord? ( >=x11-misc/colord-0.1.14:0= ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + >=gnome-extra/cinnamon-settings-daemon-5.2:0= + >=x11-libs/libXi-1.2 ) + networkmanager? ( + >=gnome-extra/nm-applet-1.2.0 + >=net-libs/libnma-1.8.34 + >=net-misc/networkmanager-1.2.0:=[modemmanager?] + + modemmanager? ( >=net-misc/modemmanager-0.7 ) + ) + gnome-online-accounts? ( + >=net-libs/gnome-online-accounts-3.18.0 + ) +" +RDEPEND=" + ${COMMON_DEPEND} + x11-themes/adwaita-icon-theme + + colord? ( >=gnome-extra/gnome-color-manager-3 ) + input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) + systemd? ( >=sys-apps/systemd-31 ) + !systemd? ( app-admin/openrc-settingsd ) +" +DEPEND=" + ${COMMON_DEPEND} + app-text/iso-codes + x11-base/xorg-proto +" +BDEPEND=" + ${PYTHON_DEPS} + dev-util/glib-utils + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" + +PATCHES=( + # Fix >=libnma-1.8.34 + # https://github.com/linuxmint/cinnamon-control-center/commit/0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 + "${FILESDIR}"/${PN}-5.2.1-fix-libnma.patch +) + +src_prepare() { + default + python_fix_shebang meson_install_schemas.py +} + +src_configure() { + local emesonargs=( + $(meson_use colord color) + $(meson_use modemmanager) + $(meson_use networkmanager) + $(meson_use gnome-online-accounts onlineaccounts) + $(meson_use input_devices_wacom wacom) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postinst + gnome2_schemas_update +} diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch new file mode 100644 index 000000000000..116c9a3058d3 --- /dev/null +++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch @@ -0,0 +1,58 @@ +From 0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 Mon Sep 17 00:00:00 2001 +From: Michael Webster <[email protected]> +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,
