commit: 7e8b8ba95d62aca9b1b6c17587d4ce74a8e97dca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 22:32:09 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 23:04:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e8b8ba9
gnome-extra/cinnamon-control-center: drop 5.6.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
gnome-extra/cinnamon-control-center/Manifest | 1 -
.../cinnamon-control-center-5.6.0.ebuild | 106 ---------------------
...namon-control-center-5.6.0-fix-icon-build.patch | 57 -----------
3 files changed, 164 deletions(-)
diff --git a/gnome-extra/cinnamon-control-center/Manifest
b/gnome-extra/cinnamon-control-center/Manifest
index bbefcddf00ef..cc722d1a215b 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-control-center-5.6.0.tar.gz 3872303 BLAKE2B
c0db21dbad031e3a3e06ea2f6253421c548b993eef323e2be1ad131e0a8e980b7b3a93d9a7a6d1feaf13ebe8c5f77fd286f0cb56b7d22c7cb447e46178c6f328
SHA512
336c554c93212c28df4f163b6a06d2c287901c167dc8e5563dbb44ddd69119db36d15086b6b1e78ff1b199424a4a24ac9605d59877a3f8174fd1f406a0f7ca4f
DIST cinnamon-control-center-5.6.1.tar.gz 3874429 BLAKE2B
53344aead6c5e31eeadf70e26a2ae61db930e595b5e546ac08b57029c924e4105d126fe6a27cd3ef7d4a59b51f83e0790dfaf815d9a3addfa5c496eab82d4537
SHA512
8679cc3afab77605b5e949e58cacb55782fca0ebc41991de7421b12fcd6c85991b6e4f5c70611753724ff47ea4eb39339ea4cea29e3f4e3399d9141fe4c80c7f
diff --git
a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.0.ebuild
b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.0.ebuild
deleted file mode 100644
index 72f7af2e81f4..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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"
-REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~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.6:0=
- >=gnome-extra/cinnamon-menus-5.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
- >=dev-libs/libgudev-232
- >=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:=
- >=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 build when colord flag disabled
- # https://github.com/linuxmint/cinnamon-control-center/issues/309
- "${FILESDIR}"/${PN}-5.6.0-fix-icon-build.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.6.0-fix-icon-build.patch
b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.6.0-fix-icon-build.patch
deleted file mode 100644
index a874152cfe27..000000000000
---
a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.6.0-fix-icon-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 65fb97ead94f7d531491ca6e59f2acff0192023f Mon Sep 17 00:00:00 2001
-From: Michael Webster <[email protected]>
-Date: Mon, 19 Dec 2022 10:42:00 -0500
-Subject: [PATCH] Fix build when the color panel is disabled.
-
-A typo in the display panel's build was resulting in it using
-the 'sizes' variable defined in the color panel, as its build
-file was being processed first.
-
-When the color panel is disabled, that variable is no longer
-pre-defined, exposing the typo and breaking the build.
-
-Fixes #309.
----
- panels/color/icons/meson.build | 4 ++--
- panels/display/icons/meson.build | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/panels/color/icons/meson.build b/panels/color/icons/meson.build
-index 1d5680e1..271d894d 100644
---- a/panels/color/icons/meson.build
-+++ b/panels/color/icons/meson.build
-@@ -1,5 +1,5 @@
-
--sizes = [
-+color_icon_sizes = [
- '16x16',
- '22x22',
- '24x24',
-@@ -10,7 +10,7 @@ sizes = [
- 'scalable',
- ]
-
--foreach size : sizes
-+foreach size : color_icon_sizes
- install_subdir(size,
- strip_directory: true,
- install_dir: get_option('datadir') / 'icons' / 'hicolor' / size / 'apps',
-diff --git a/panels/display/icons/meson.build
b/panels/display/icons/meson.build
-index 3ee26b87..454f608f 100644
---- a/panels/display/icons/meson.build
-+++ b/panels/display/icons/meson.build
-@@ -1,4 +1,4 @@
--icon_sizes = [
-+display_icon_sizes = [
- '16x16',
- '22x22',
- '24x24',
-@@ -6,7 +6,7 @@ icon_sizes = [
- 'scalable'
- ]
-
--foreach size : sizes
-+foreach size : display_icon_sizes
- install_subdir(size,
- strip_directory: true,
- install_dir: get_option('datadir') / 'icons' / 'hicolor' / size / 'apps',
