From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2517815808B for ; Fri, 27 Sep 2024 05:57:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BC942BC058; Fri, 27 Sep 2024 05:57:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F3A4B2BC058 for ; Fri, 27 Sep 2024 05:57:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E66E3431BF for ; Fri, 27 Sep 2024 05:57:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5AD32801 for ; Fri, 27 Sep 2024 05:57:02 +0000 (UTC) From: "Eli Schwartz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" Message-ID: <1727416554.9e07d03499d06bab1f6d4e9e6b19a7b030980e3d.eschwartz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-desktop/, gnome-extra/cinnamon-desktop/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/cinnamon-desktop/Manifest gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch X-VCS-Directories: gnome-extra/cinnamon-desktop/files/ gnome-extra/cinnamon-desktop/ X-VCS-Committer: eschwartz X-VCS-Committer-Name: Eli Schwartz X-VCS-Revision: 9e07d03499d06bab1f6d4e9e6b19a7b030980e3d X-VCS-Branch: master Date: Fri, 27 Sep 2024 05:57:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9c24d607-e850-402e-be9c-cb8225f56b37 X-Archives-Hash: 26270a61fc2d67dddc7c7abf37119e82 commit: 9e07d03499d06bab1f6d4e9e6b19a7b030980e3d Author: Matthew S. Turnbull bluefang-logic com> AuthorDate: Thu Sep 26 22:53:54 2024 +0000 Commit: Eli Schwartz gentoo org> CommitDate: Fri Sep 27 05:55:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e07d034 gnome-extra/cinnamon-desktop: drop 6.0.0 Signed-off-by: Matthew S. Turnbull bluefang-logic.com> Signed-off-by: Eli Schwartz gentoo.org> gnome-extra/cinnamon-desktop/Manifest | 1 - .../cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild | 74 -------------------- ...namon-desktop-6.0.0-fix-idle-monitor-dbus.patch | 80 ---------------------- 3 files changed, 155 deletions(-) diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest index 0f1af609e90c..0d3a16060ba0 100644 --- a/gnome-extra/cinnamon-desktop/Manifest +++ b/gnome-extra/cinnamon-desktop/Manifest @@ -1,2 +1 @@ -DIST cinnamon-desktop-6.0.0.tar.gz 509871 BLAKE2B 908b53445327cdbb5560655700e6dfa829934714167f02dda2d9d31a02ae85fcf6565704e791f67f0725e9eb76ed65ef26944d3fac2a58e3091b2afd10bb70af SHA512 35c09c6c3b9563c27561624bb731f17dd4f07b4e5aca5af39ffd56f72fa271babb4fd2cfe7080ac078b0d9141fcbc904036f3f156c547d64e68ba53eea14a471 DIST cinnamon-desktop-6.2.0.tar.gz 510369 BLAKE2B e91cc5de64cfa2b936dd224727a493f7ca9049272d7cead88f6e6682b3e11505798d340e245816386e8427712dc3159c416bc51ac6b8cdf937649f34afa247f7 SHA512 be7e4fe206fb4fa62cacf7190b5702035313346ae51a3ef985ec2046d30e0ae5b1e1d314f82d362a363c3949deab02e4d2a4ea910ffe7f279111563c224f75f7 diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild deleted file mode 100644 index dad0b54da90f..000000000000 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild +++ /dev/null @@ -1,74 +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 - -DESCRIPTION="A collection of libraries and utilites used by Cinnamon" -HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-desktop" -SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-1 GPL-2+ LGPL-2+ LGPL-2.1+ MIT" -SLOT="0/4" # subslot = libcinnamon-desktop soname version -KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" -IUSE="systemd" - -RDEPEND=" - >=dev-libs/glib-2.37.3:2[dbus] - >=dev-libs/gobject-introspection-0.10.2:= - >=gnome-base/gsettings-desktop-schemas-3.5.91 - >=media-libs/libpulse-12.99.3[glib] - sys-apps/accountsservice - sys-apps/hwdata - x11-libs/cairo[X] - >=x11-libs/gdk-pixbuf-2.22:2[introspection] - >=x11-libs/gtk+-3.3.16:3[introspection] - x11-libs/libX11 - >=x11-libs/libXext-1.1 - x11-libs/libxkbfile - >=x11-libs/libXrandr-1.3 - x11-misc/xkeyboard-config - systemd? ( - sys-apps/systemd - ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/gdbus-codegen - dev-util/glib-utils - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - # https://github.com/linuxmint/cinnamon-desktop/commit/d0f8c74a7864786cf040da31c7db83d8d2fcc5e4 - "${FILESDIR}/${PN}-6.0.0-fix-idle-monitor-dbus.patch" -) - -src_prepare() { - default - python_fix_shebang install-scripts -} - -src_configure() { - local emesonargs=( - -Dpnp_ids="${EPREFIX}/usr/share/hwdata/pnp.ids" - $(meson_feature systemd) - ) - meson_src_configure -} - -pkg_postinst() { - gnome2_schemas_update -} - -pkg_postrm() { - gnome2_schemas_update -} diff --git a/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch deleted file mode 100644 index 76fa5c53cde6..000000000000 --- a/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch +++ /dev/null @@ -1,80 +0,0 @@ -From d0f8c74a7864786cf040da31c7db83d8d2fcc5e4 Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Mon, 15 Jan 2024 15:16:08 -0500 -Subject: [PATCH] gnome-idle-monitor.c: Fix some dbus names Mutter->Muffin. - -The session manager uses this to get notifications about idle -state changes now - instead of its own idle-monitor code (which -only worked with x11), it now relies on muffin to notify on -changes from various sources (xorg, wayland, upower). ---- - libcinnamon-desktop/gnome-idle-monitor.c | 6 +++--- - libcinnamon-desktop/idle-monitor.xml | 4 ++-- - libcinnamon-desktop/meson.build | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libcinnamon-desktop/gnome-idle-monitor.c b/libcinnamon-desktop/gnome-idle-monitor.c -index 71d8918..81aaaab 100644 ---- a/libcinnamon-desktop/gnome-idle-monitor.c -+++ b/libcinnamon-desktop/gnome-idle-monitor.c -@@ -67,7 +67,7 @@ G_DEFINE_TYPE_WITH_CODE (GnomeIdleMonitor, gnome_idle_monitor, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - gnome_idle_monitor_initable_iface_init)) - --#define IDLE_MONITOR_PATH "/org/gnome/Mutter/IdleMonitor/Core" -+#define IDLE_MONITOR_PATH "/org/cinnamon/Muffin/IdleMonitor/Core" - - static void - on_watch_fired (MetaDBusIdleMonitor *proxy, -@@ -256,7 +256,7 @@ on_name_appeared (GDBusConnection *connection, - meta_dbus_object_manager_client_new (connection, - G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE, - name_owner, -- "/org/gnome/Mutter/IdleMonitor", -+ "/org/cinnamon/Muffin/IdleMonitor", - monitor->priv->cancellable, - on_object_manager_ready, - monitor); -@@ -296,7 +296,7 @@ gnome_idle_monitor_initable_init (GInitable *initable, - monitor = GNOME_IDLE_MONITOR (initable); - - monitor->priv->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, -- "org.gnome.Mutter.IdleMonitor", -+ "org.cinnamon.Muffin.IdleMonitor", - G_BUS_NAME_WATCHER_FLAGS_NONE, - on_name_appeared, - on_name_vanished, -diff --git a/libcinnamon-desktop/idle-monitor.xml b/libcinnamon-desktop/idle-monitor.xml -index 4bd69cb..5203883 100644 ---- a/libcinnamon-desktop/idle-monitor.xml -+++ b/libcinnamon-desktop/idle-monitor.xml -@@ -3,14 +3,14 @@ - 'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'> - - - -- -+ - - - -diff --git a/libcinnamon-desktop/meson.build b/libcinnamon-desktop/meson.build -index fbab37a..61976c9 100644 ---- a/libcinnamon-desktop/meson.build -+++ b/libcinnamon-desktop/meson.build -@@ -1,7 +1,7 @@ - dbus_idle_built_sources = gnome.gdbus_codegen('meta-dbus-idle-monitor', - 'idle-monitor.xml', - namespace: 'MetaDBus', -- interface_prefix: 'org.gnome.Muffin', -+ interface_prefix: 'org.cinnamon.Muffin', - object_manager: true - ) -