1 |
commit: 88fe3266fa3609994af53f845d39ef618aa6f9dc |
2 |
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> |
3 |
AuthorDate: Tue Dec 28 04:19:55 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 21 17:13:49 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88fe3266 |
7 |
|
8 |
gnome-extra/cinnamon-control-center: Remove old |
9 |
|
10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
11 |
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
gnome-extra/cinnamon-control-center/Manifest | 1 - |
15 |
.../cinnamon-control-center-4.8.2.ebuild | 84 ---------------------- |
16 |
.../cinnamon-control-center-4.8.2-build-fix.patch | 36 ---------- |
17 |
3 files changed, 121 deletions(-) |
18 |
|
19 |
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest |
20 |
index 07e7e0b9b741..8d09cffdc441 100644 |
21 |
--- a/gnome-extra/cinnamon-control-center/Manifest |
22 |
+++ b/gnome-extra/cinnamon-control-center/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST cinnamon-control-center-4.8.2.tar.gz 3865765 BLAKE2B 8e36888aec00252842bcdb3f29dd0728833c597260fdb6b2b160db455e900686086b1b04b393d58ec358f44aa64c14341e49738de7a85002a5e5d695974c578a SHA512 c64e554488b401291daf125cc5627201cac58d5e6efab697d0b9cac64b666a7d2a7e27f459bb560918876cc8cf5e3720c11a59cee70401e50682a4b82a20f1b5 |
25 |
DIST cinnamon-control-center-5.0.2.tar.gz 3866962 BLAKE2B d292d610516647e149198cbfce652bfd094338612ef6b4765fcb80bd1fe15f2d643bbaa5343f1d79d57f3327c87a3256cfc3900493daf6f80569b1a0bacd821a SHA512 f47b88005ba1d7359ab99d80e99d2c42a93561ecddd98014f91674a5ae806b991169c88f3af6c8c187df23ebb8a9e12bbae5eefbfeaf2f3d087981192448c3c2 |
26 |
|
27 |
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 |
28 |
deleted file mode 100644 |
29 |
index ffeb6732bad9..000000000000 |
30 |
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,84 +0,0 @@ |
33 |
-# Copyright 1999-2021 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-inherit meson xdg virtualx |
39 |
- |
40 |
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop" |
41 |
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center" |
42 |
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="GPL-2+" |
45 |
-SLOT="0" |
46 |
-IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test" |
47 |
-REQUIRED_USE="modemmanager? ( networkmanager )" |
48 |
-KEYWORDS="amd64 ~arm64 x86" |
49 |
-RESTRICT="test" |
50 |
- |
51 |
-COMMON_DEPEND=" |
52 |
- >=dev-libs/glib-2.44.0:2 |
53 |
- >=gnome-base/libgnomekbd-3.0.0:0= |
54 |
- >=gnome-extra/cinnamon-desktop-4.8:0= |
55 |
- >=gnome-extra/cinnamon-menus-4.8:0= |
56 |
- media-libs/fontconfig |
57 |
- >=sys-auth/polkit-0.103 |
58 |
- >=x11-libs/gdk-pixbuf-2.23.0:2 |
59 |
- >=x11-libs/gtk+-3.16.0:3 |
60 |
- >=x11-libs/libnotify-0.7.3:0= |
61 |
- x11-libs/libX11 |
62 |
- >=x11-libs/libxklavier-5.1 |
63 |
- |
64 |
- colord? ( >=x11-misc/colord-0.1.14:0= ) |
65 |
- input_devices_wacom? ( |
66 |
- >=dev-libs/libwacom-0.7 |
67 |
- >=gnome-extra/cinnamon-settings-daemon-4.8:0= |
68 |
- >=x11-libs/libXi-1.2 ) |
69 |
- networkmanager? ( |
70 |
- >=gnome-extra/nm-applet-1.2.0 |
71 |
- >=net-misc/networkmanager-1.2.0:=[modemmanager?] |
72 |
- |
73 |
- modemmanager? ( >=net-misc/modemmanager-0.7 ) |
74 |
- ) |
75 |
-" |
76 |
-RDEPEND=" |
77 |
- ${COMMON_DEPEND} |
78 |
- x11-themes/adwaita-icon-theme |
79 |
- |
80 |
- colord? ( >=gnome-extra/gnome-color-manager-3 ) |
81 |
- input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) |
82 |
- systemd? ( >=sys-apps/systemd-31 ) |
83 |
- !systemd? ( app-admin/openrc-settingsd ) |
84 |
-" |
85 |
-DEPEND=" |
86 |
- ${COMMON_DEPEND} |
87 |
- app-text/iso-codes |
88 |
- x11-base/xorg-proto |
89 |
-" |
90 |
-BDEPEND=" |
91 |
- dev-util/glib-utils |
92 |
- >=dev-util/intltool-0.40.1 |
93 |
- >=sys-devel/gettext-0.17 |
94 |
- virtual/pkgconfig |
95 |
-" |
96 |
- |
97 |
-PATCHES=( |
98 |
- # Fix build when modemmanager is disabled |
99 |
- # https://github.com/linuxmint/cinnamon-control-center/pull/257 |
100 |
- "${FILESDIR}/${PN}-4.8.2-build-fix.patch" |
101 |
-) |
102 |
- |
103 |
-src_configure() { |
104 |
- local emesonargs=( |
105 |
- -Donlineaccounts=false |
106 |
- $(meson_use colord color) |
107 |
- $(meson_use modemmanager) |
108 |
- $(meson_use networkmanager) |
109 |
- $(meson_use input_devices_wacom wacom) |
110 |
- ) |
111 |
- meson_src_configure |
112 |
-} |
113 |
- |
114 |
-src_test() { |
115 |
- virtx meson_src_test |
116 |
-} |
117 |
|
118 |
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 |
119 |
deleted file mode 100644 |
120 |
index 041a5d23e500..000000000000 |
121 |
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch |
122 |
+++ /dev/null |
123 |
@@ -1,36 +0,0 @@ |
124 |
-From a9d7d0f7f36bc724ecb65019999fc1c4d671bcba Mon Sep 17 00:00:00 2001 |
125 |
-From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@××××××××.me> |
126 |
-Date: Thu, 31 Dec 2020 10:09:17 +0100 |
127 |
-Subject: [PATCH] Add ifdefs to prevent undefined reference to modem functions |
128 |
- in network panel |
129 |
- |
130 |
---- |
131 |
- panels/network/cc-network-panel.c | 4 ++++ |
132 |
- 1 file changed, 4 insertions(+) |
133 |
- |
134 |
-diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c |
135 |
-index 8b28439..38d9842 100644 |
136 |
---- a/panels/network/cc-network-panel.c |
137 |
-+++ b/panels/network/cc-network-panel.c |
138 |
-@@ -29,7 +29,9 @@ |
139 |
- #include <NetworkManager.h> |
140 |
- |
141 |
- #include "net-device.h" |
142 |
-+#ifdef BUILD_MODEM |
143 |
- #include "net-device-mobile.h" |
144 |
-+#endif |
145 |
- #include "net-device-wifi.h" |
146 |
- #include "net-device-ethernet.h" |
147 |
- #include "net-object.h" |
148 |
-@@ -651,9 +653,11 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device) |
149 |
- case NM_DEVICE_TYPE_ETHERNET: |
150 |
- device_g_type = NET_TYPE_DEVICE_ETHERNET; |
151 |
- break; |
152 |
-+ #ifdef BUILD_MODEM |
153 |
- case NM_DEVICE_TYPE_MODEM: |
154 |
- device_g_type = NET_TYPE_DEVICE_MOBILE; |
155 |
- break; |
156 |
-+ #endif |
157 |
- case NM_DEVICE_TYPE_WIFI: |
158 |
- device_g_type = NET_TYPE_DEVICE_WIFI; |
159 |
- break; |