commit: e61a5b7671e9209dedad34a3069a0547fc0953dd Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> AuthorDate: Fri Jan 8 06:48:06 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Jan 24 17:30:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61a5b76
gnome-extra/cinnamon-control-center: 4.8.2 version bump Project was converted to meson. Bug: https://bugs.gentoo.org/757708 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> gnome-extra/cinnamon-control-center/Manifest | 1 + .../cinnamon-control-center-4.8.2.ebuild | 84 ++++++++++++++++++++++ .../cinnamon-control-center-4.8.2-build-fix.patch | 36 ++++++++++ 3 files changed, 121 insertions(+) diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest index eaf4c20b158..9ae72fa3a49 100644 --- a/gnome-extra/cinnamon-control-center/Manifest +++ b/gnome-extra/cinnamon-control-center/Manifest @@ -1 +1,2 @@ DIST cinnamon-control-center-4.6.2.tar.gz 3877007 BLAKE2B f64ebfedc73eb92b96f81fb2743d818ec1602a550130d362eadba4c66a24a0e1f2bdffbe0bf80b23426ab57cead910c78b061b52e4eb82d0e6173d1da2d62749 SHA512 c759c14cc295ba15bde87ad1544d4bdef284d8e3fb8fbee528e9a258aaf83c6f6d76944042230725804ea6c05bd2cb5cbb59cb7507378b952221f381fc47075e +DIST cinnamon-control-center-4.8.2.tar.gz 3865765 BLAKE2B 8e36888aec00252842bcdb3f29dd0728833c597260fdb6b2b160db455e900686086b1b04b393d58ec358f44aa64c14341e49738de7a85002a5e5d695974c578a SHA512 c64e554488b401291daf125cc5627201cac58d5e6efab697d0b9cac64b666a7d2a7e27f459bb560918876cc8cf5e3720c11a59cee70401e50682a4b82a20f1b5 diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild new file mode 100644 index 00000000000..6faf4e6c0ab --- /dev/null +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson 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 systemd test" +REQUIRED_USE="modemmanager? ( networkmanager )" +KEYWORDS="~amd64 ~arm64 ~x86" +RESTRICT="test" + +COMMON_DEPEND=" + >=dev-libs/glib-2.44.0:2 + >=gnome-base/libgnomekbd-3.0.0:0= + >=gnome-extra/cinnamon-desktop-4.8:0= + >=gnome-extra/cinnamon-menus-4.8: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-4.8:0= + >=x11-libs/libXi-1.2 ) + networkmanager? ( + >=gnome-extra/nm-applet-1.2.0 + >=net-misc/networkmanager-1.2.0:=[modemmanager?] + + modemmanager? ( >=net-misc/modemmanager-0.7 ) + ) +" +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=" + dev-util/glib-utils + >=dev-util/intltool-0.40.1 + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" + +PATCHES=( + # Fix build when modemmanager is disabled + # https://github.com/linuxmint/cinnamon-control-center/pull/257 + "${FILESDIR}/${PN}-4.8.2-build-fix.patch" +) + +src_configure() { + local emesonargs=( + -Donlineaccounts=false + $(meson_use colord color) + $(meson_use modemmanager) + $(meson_use networkmanager) + $(meson_use input_devices_wacom wacom) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch new file mode 100644 index 00000000000..041a5d23e50 --- /dev/null +++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch @@ -0,0 +1,36 @@ +From a9d7d0f7f36bc724ecb65019999fc1c4d671bcba Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <[email protected]> +Date: Thu, 31 Dec 2020 10:09:17 +0100 +Subject: [PATCH] Add ifdefs to prevent undefined reference to modem functions + in network panel + +--- + panels/network/cc-network-panel.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c +index 8b28439..38d9842 100644 +--- a/panels/network/cc-network-panel.c ++++ b/panels/network/cc-network-panel.c +@@ -29,7 +29,9 @@ + #include <NetworkManager.h> + + #include "net-device.h" ++#ifdef BUILD_MODEM + #include "net-device-mobile.h" ++#endif + #include "net-device-wifi.h" + #include "net-device-ethernet.h" + #include "net-object.h" +@@ -651,9 +653,11 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device) + case NM_DEVICE_TYPE_ETHERNET: + device_g_type = NET_TYPE_DEVICE_ETHERNET; + break; ++ #ifdef BUILD_MODEM + case NM_DEVICE_TYPE_MODEM: + device_g_type = NET_TYPE_DEVICE_MOBILE; + break; ++ #endif + case NM_DEVICE_TYPE_WIFI: + device_g_type = NET_TYPE_DEVICE_WIFI; + break;
