commit: 26f8317761f052cbbcacd2d5e1d813fb62bf8bb3
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sun Jan 7 20:58:19 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 13:29:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f83177
gnome-extra/cinnamon-control-center: add 6.0.0
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-6.0.0.ebuild | 122 +++++++++++++++++++++
...control-center-6.0.0-fix-optional-wayland.patch | 48 ++++++++
3 files changed, 171 insertions(+)
diff --git a/gnome-extra/cinnamon-control-center/Manifest
b/gnome-extra/cinnamon-control-center/Manifest
index f97119ba2dda..f8fdbc3c86fd 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,2 +1,3 @@
DIST cinnamon-control-center-5.6.1.tar.gz 3874429 BLAKE2B
53344aead6c5e31eeadf70e26a2ae61db930e595b5e546ac08b57029c924e4105d126fe6a27cd3ef7d4a59b51f83e0790dfaf815d9a3addfa5c496eab82d4537
SHA512
8679cc3afab77605b5e949e58cacb55782fca0ebc41991de7421b12fcd6c85991b6e4f5c70611753724ff47ea4eb39339ea4cea29e3f4e3399d9141fe4c80c7f
DIST cinnamon-control-center-5.8.2.tar.gz 3820570 BLAKE2B
3bc009e696c7d469b2a2e15aecc62f290e26d08f65400418666e4a5564a3a113107996326e1edec93a45e9cb935ea96946e385376fe7f1b4b1185425bb4d4964
SHA512
b7b726659ca712a81c8b52bf514c8f061f5146a4728a3f2172ac5658b947e3e72c3194513ac815efaa727664e03ce2684d8d491bfcf0f6e91ea4566d832e86a2
+DIST cinnamon-control-center-6.0.0.tar.gz 3821056 BLAKE2B
b856e4c258a76aa5e558cca53ac333df81ae135d731a5de65470282e741a95f2c179fbd9f28e8bb26824de5ee1f9b9fcb0143fee1760800149a345085c45f11b
SHA512
e49b72590418da63c6db9c4224e6a32f9014bf4a4810e3a89babaa21d211ade135912e7be1a356c57328d85774517e0f696c724e62b2d3581c5f73c8a88cf486
diff --git
a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0.ebuild
b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0.ebuild
new file mode 100644
index 000000000000..c6374005882f
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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+ LGPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager
gnome-online-accounts systemd test wayland"
+REQUIRED_USE="modemmanager? ( networkmanager )"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+RESTRICT="test"
+
+COMMON_DEPEND="
+ app-accessibility/at-spi2-core:2
+ >=dev-libs/glib-2.44.0:2
+ >=gnome-base/libgnomekbd-3.0.0:0=
+ >=gnome-extra/cinnamon-desktop-6.0:0=
+ >=gnome-extra/cinnamon-menus-6.0
+ media-libs/fontconfig
+ >=sys-auth/polkit-0.103
+ >=sys-power/upower-0.99.8:=
+ >=x11-libs/gdk-pixbuf-2.23.0:2
+ >=x11-libs/gtk+-3.16.0:3[wayland=]
+ >=dev-libs/libgudev-232
+ >=x11-libs/libnotify-0.7.3
+ x11-libs/cairo
+ x11-libs/libX11
+ >=x11-libs/libxklavier-5.1:=
+ x11-libs/pango
+
+ colord? (
+ >=x11-misc/colord-0.1.14:0=
+ )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7:=
+ >=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 optional wayland
+ # https://github.com/linuxmint/cinnamon-control-center/pull/323
+ "${FILESDIR}/${PN}-6.0.0-fix-optional-wayland.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-6.0.0-fix-optional-wayland.patch
b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch
new file mode 100644
index 000000000000..2aab3af02146
--- /dev/null
+++
b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch
@@ -0,0 +1,48 @@
+From 1f90a561e4ba0e7431aeb64602e293b05a09be15 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <spa...@bluefang-logic.com>
+Date: Sun, 7 Jan 2024 21:46:36 -0500
+Subject: [PATCH] Fix optional wayland handling in cc-display-panel
+
+---
+ meson.build | 1 +
+ panels/display/cc-display-panel.c | 6 ++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 6c3d5e3..11aafd5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -196,6 +196,7 @@ final_message = [ '',
+ '** Colord support (Color management panel) :
@0@'.format(colord.found()),
+ '** Wacom support (Wacom panel) :
@0@'.format(libwacom.found()),
+ '** Online-Accounts support (Online-Accounts panel) :
@0@'.format(goa.found()),
++ '** Wayland support :
@0@'.format(cc.has_header('gdk/gdkwayland.h', dependencies: gtk)),
+ '',
+ ]
+ message('\n'.join(final_message))
+diff --git a/panels/display/cc-display-panel.c
b/panels/display/cc-display-panel.c
+index 5a513b4..0676f66 100644
+--- a/panels/display/cc-display-panel.c
++++ b/panels/display/cc-display-panel.c
+@@ -28,7 +28,9 @@
+
+ #include <libcinnamon-desktop/cdesktop-enums.h>
+ #include <math.h>
++#ifdef GDK_WINDOWING_WAYLAND
+ #include <gdk/gdkwayland.h>
++#endif
+
+ #include <libupower-glib/upower.h>
+
+@@ -114,7 +116,11 @@ struct _CcDisplayPanel
+
+ CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel)
+
++#ifdef GDK_WINDOWING_WAYLAND
+ #define WAYLAND_SESSION() (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default()))
++#else
++#define WAYLAND_SESSION() (FALSE)
++#endif
+
+ static void update_bottom_buttons (CcDisplayPanel *panel);
+ static void apply_current_configuration (CcDisplayPanel *self);
