commit: 6ec588504e60f2112ee7498887ab014e3e8f213d
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Thu Sep 26 22:41:35 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 05:55:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec58850
gnome-extra/cinnamon-control-center: drop 6.0.0-r1
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
gnome-extra/cinnamon-control-center/Manifest | 1 -
.../cinnamon-control-center-6.0.0-r1.ebuild | 123 ---------------------
.../files/cinnamon-control-center-6.0.0-c99.patch | 21 ----
...control-center-6.0.0-fix-optional-wayland.patch | 48 --------
gnome-extra/cinnamon-control-center/metadata.xml | 1 -
5 files changed, 194 deletions(-)
diff --git a/gnome-extra/cinnamon-control-center/Manifest
b/gnome-extra/cinnamon-control-center/Manifest
index d035bb584cf3..acff82b0bbb7 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-control-center-6.0.0.tar.gz 3821056 BLAKE2B
b856e4c258a76aa5e558cca53ac333df81ae135d731a5de65470282e741a95f2c179fbd9f28e8bb26824de5ee1f9b9fcb0143fee1760800149a345085c45f11b
SHA512
e49b72590418da63c6db9c4224e6a32f9014bf4a4810e3a89babaa21d211ade135912e7be1a356c57328d85774517e0f696c724e62b2d3581c5f73c8a88cf486
DIST cinnamon-control-center-6.2.0.tar.gz 3813695 BLAKE2B
4ddc97e600b2643ee16477165171f5251f7004d53524a77ec5d363717b84cec61c5bd83334a6dbb261d6ef40bd927fcdf6ef779953ad549881871f2f0e70471e
SHA512
815158d057267956470d858cfb62e527c3655adce08e1f9b928f3d8b8b43ffc15d04ab1b11d5603dc75e7347925067e9627cc199f0328ccacd0421112de3b7b4
diff --git
a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0-r1.ebuild
b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0-r1.ebuild
deleted file mode 100644
index 26f3280b8412..000000000000
---
a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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"
- "${FILESDIR}/${PN}-6.0.0-c99.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-c99.patch
b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch
deleted file mode 100644
index b5a73ae3186d..000000000000
---
a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/919085
-https://github.com/linuxmint/cinnamon-control-center/commit/0361ff2974eb4741f3cd8b6db00dbe1ab56c8a59
-
-From 0361ff2974eb4741f3cd8b6db00dbe1ab56c8a59 Mon Sep 17 00:00:00 2001
-From: Leigh Scott <[email protected]>
-Date: Thu, 18 Jan 2024 21:30:28 +0000
-Subject: [PATCH] network: Fix warning about missing cast to GtkWidget* (#324)
-
-Based on
https://github.com/GNOME/gnome-control-center/commit/167d11e2107e46b4621cf6fc370c5b191b4b7732
---- a/panels/network/connection-editor/net-connection-editor.c
-+++ b/panels/network/connection-editor/net-connection-editor.c
-@@ -845,7 +845,7 @@ net_connection_editor_new (GtkWindow *parent_window,
- editor = g_object_new (NET_TYPE_CONNECTION_EDITOR, NULL);
-
- if (parent_window) {
-- editor->parent_window = g_object_ref (parent_window);
-+ editor->parent_window = GTK_WIDGET (g_object_ref
(parent_window));
- gtk_window_set_transient_for (GTK_WINDOW (editor->window),
- parent_window);
- }
-
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
deleted file mode 100644
index 2aab3af02146..000000000000
---
a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1f90a561e4ba0e7431aeb64602e293b05a09be15 Mon Sep 17 00:00:00 2001
-From: Sparky Bluefang <[email protected]>
-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);
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml
b/gnome-extra/cinnamon-control-center/metadata.xml
index 05d588225e68..10edebb3fffb 100644
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -13,7 +13,6 @@
<remote-id
type="github">linuxmint/cinnamon-control-center</remote-id>
</upstream>
<use>
- <flag name="gnome-online-accounts">Enable configuration panel
for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
<flag name="modemmanager">Enable support for mobile broadband
devices using <pkg>net-misc/modemmanager</pkg></flag>
</use>
</pkgmetadata>
