* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/, gnome-extra/cinnamon-control-center/files/
@ 2024-02-15 13:29 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2024-02-15 13:29 UTC (permalink / raw
To: gentoo-commits
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>
| 1 +
.../cinnamon-control-center-6.0.0.ebuild | 122 +++++++++++++++++++++
...control-center-6.0.0-fix-optional-wayland.patch | 48 ++++++++
3 files changed, 171 insertions(+)
--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 <sparky@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);
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/, gnome-extra/cinnamon-control-center/files/
@ 2024-09-27 5:57 Eli Schwartz
0 siblings, 0 replies; 8+ messages in thread
From: Eli Schwartz @ 2024-09-27 5:57 UTC (permalink / raw
To: gentoo-commits
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>
| 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 --------
| 1 -
5 files changed, 194 deletions(-)
--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 <leigh123linux@gmail.com>
-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 <sparky@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);
--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>
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/, gnome-extra/cinnamon-control-center/files/
@ 2023-06-10 23:05 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2023-06-10 23:05 UTC (permalink / raw
To: gentoo-commits
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>
| 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(-)
--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 <miketwebster@gmail.com>
-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',
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/, gnome-extra/cinnamon-control-center/files/
@ 2023-05-07 22:14 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-05-07 22:14 UTC (permalink / raw
To: gentoo-commits
commit: fce3f97653fce4ccbe8143ef48645f873e1cb4b3
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sun May 7 19:06:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 7 22:13:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce3f976
gnome-extra/cinnamon-control-center: drop 5.2.1-r2, 5.2.1-r3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 1 -
.../cinnamon-control-center-5.2.1-r2.ebuild | 105 --------------------
.../cinnamon-control-center-5.2.1-r3.ebuild | 109 ---------------------
...amon-control-center-5.2.1-fix-libgnomekbd.patch | 47 ---------
.../cinnamon-control-center-5.2.1-fix-libnma.patch | 61 ------------
5 files changed, 323 deletions(-)
--git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index ed20f18e7243..bbefcddf00ef 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-control-center-5.2.1.tar.gz 3863530 BLAKE2B 826494b8f8a4dead32d6031d7b4b2a44d357b3e8fedf1065b61193caa86ad433ba68fd9344f70bbce77bb94e086ae15f8854dc73916a5f60c49b1b2bd9e7101c SHA512 d322a9b460f13c697d327dda75a3ea16dd96414ed52ffbcdfc19479533178585da795c064ae441b36ef02f1aa779704db039328ca4ac4c373f363967948f2301
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.2.1-r2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r2.ebuild
deleted file mode 100644
index 015bff834cc5..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-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 ~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.2:0=
- >=gnome-extra/cinnamon-menus-5.2:0=
- media-libs/fontconfig
- >=sys-auth/polkit-0.103
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.16.0:3
- >=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:=
- >=gnome-extra/cinnamon-settings-daemon-5.2:0=
- >=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 >=libnma-1.8.34
- # https://github.com/linuxmint/cinnamon-control-center/commit/0f4d212874c4fbee18b860963d0a5c7bd54dcfd1
- "${FILESDIR}"/${PN}-5.2.1-fix-libnma.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/cinnamon-control-center-5.2.1-r3.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild
deleted file mode 100644
index 4f9aebd7f2ef..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-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 ~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.2:0=
- >=gnome-extra/cinnamon-menus-5.2:0=
- media-libs/fontconfig
- >=sys-auth/polkit-0.103
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.16.0:3
- >=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:=
- >=gnome-extra/cinnamon-settings-daemon-5.2:0=
- >=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 >=libnma-1.8.34
- # https://github.com/linuxmint/cinnamon-control-center/commit/0f4d212874c4fbee18b860963d0a5c7bd54dcfd1
- "${FILESDIR}"/${PN}-5.2.1-fix-libnma.patch
-
- # Fix >=libgnomekbd-3.28
- # https://github.com/linuxmint/cinnamon-control-center/commit/8cb73375e66b93da18f7bde728d4a832c07aada4
- "${FILESDIR}"/${PN}-5.2.1-fix-libgnomekbd.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.2.1-fix-libgnomekbd.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch
deleted file mode 100644
index 389c97b6085c..000000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/870151
-https://github.com/linuxmint/cinnamon-control-center/pull/297
-
-From 8cb73375e66b93da18f7bde728d4a832c07aada4 Mon Sep 17 00:00:00 2001
-From: Eicke Herbertz <wolletd@posteo.de>
-Date: Tue, 23 Aug 2022 19:28:57 +0200
-Subject: [PATCH] region panel: add keys removed from libgnomekbd's API (#297)
-
-in version 3.28
----
- panels/region/cinnamon-region-panel-xkb.c | 6 ++++++
- panels/region/cinnamon-region-panel-xkb.h | 5 +++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/panels/region/cinnamon-region-panel-xkb.c b/panels/region/cinnamon-region-panel-xkb.c
-index b7417e2e..3152471b 100644
---- a/panels/region/cinnamon-region-panel-xkb.c
-+++ b/panels/region/cinnamon-region-panel-xkb.c
-@@ -36,6 +36,12 @@
-
- #define GKBD_CONFIG_KEY_LOAD_EXTRA_ITEMS "load-extra-items"
-
-+// These were removed from the API of libgnomekbd in version 3.28
-+const gchar GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP[] = "default-group";
-+const gchar GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW[] = "group-per-window";
-+const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[] = "layouts";
-+const gchar GKBD_KEYBOARD_CONFIG_KEY_OPTIONS[] = "options";
-+
- XklEngine *engine;
- XklConfigRegistry *config_registry;
-
-diff --git a/panels/region/cinnamon-region-panel-xkb.h b/panels/region/cinnamon-region-panel-xkb.h
-index bd7b47d3..cfa396de 100644
---- a/panels/region/cinnamon-region-panel-xkb.h
-+++ b/panels/region/cinnamon-region-panel-xkb.h
-@@ -36,6 +36,11 @@ extern GSettings *xkb_keyboard_settings;
- extern GSettings *xkb_desktop_settings;
- extern GkbdKeyboardConfig initial_config;
-
-+extern const gchar GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP[];
-+extern const gchar GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW[];
-+extern const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[];
-+extern const gchar GKBD_KEYBOARD_CONFIG_KEY_OPTIONS[];
-+
- extern void setup_xkb_tabs (GtkBuilder * dialog);
-
- extern void xkb_layouts_fill_selected_tree (GtkBuilder * dialog);
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch
deleted file mode 100644
index ae9caceed7f9..000000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://bugs.gentoo.org/840317
-https://github.com/linuxmint/cinnamon/issues/10616
-
-From 0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 31 Jan 2022 08:56:28 -0500
-Subject: [PATCH] network: Remove old workaround for openvpn widgets.
-
-I can't reproduce the original issue anymore, and NMACertChooser
-is removed in network-manager-openvpn 1.8.34.
-
-Fixes #10616
-
-ref:
-6db4961fd3a002182984d0e71ec364c9befdd93b
----
- meson.build | 2 --
- panels/network/cc-network-panel.c | 10 ----------
- 2 files changed, 12 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index f1f213b..c4d7d86 100644
---- a/meson.build
-+++ b/meson.build
-@@ -56,8 +56,6 @@ else
- libnma= dependency('', required: false)
- endif
-
--config.set('HAVE_NMA_18', libnm.version().version_compare('>=1.8.0'))
--
- if get_option('modemmanager')
- if not get_option('networkmanager')
- error('*** NetworkManager is required by ModemManager ***')
-diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
-index a4289de..d1925e4 100644
---- a/panels/network/cc-network-panel.c
-+++ b/panels/network/cc-network-panel.c
-@@ -47,10 +47,6 @@
- #include <libmm-glib.h>
- #endif
-
--#ifdef HAVE_NMA_18
--#include <nma-cert-chooser.h>
--#endif
--
- CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)
-
- #define NETWORK_PANEL_PRIVATE(o) \
-@@ -1244,12 +1240,6 @@ cc_network_panel_init (CcNetworkPanel *panel)
- return;
- }
-
--#ifdef HAVE_NMA_18
-- /* some newer VPN plugins pre-require internal resources from libnma */
-- /* this solution is really ugly, but works clean */
-- gtk_widget_destroy (nma_cert_chooser_new ("dummy", NMA_CERT_CHOOSER_FLAG_NONE));
--#endif
--
- panel->priv->cancellable = g_cancellable_new ();
-
- panel->priv->treeview = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/, gnome-extra/cinnamon-control-center/files/
@ 2022-09-19 3:42 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-09-19 3:42 UTC (permalink / raw
To: gentoo-commits
commit: c61a3e9874559dd0193824abf3657bd58a3b662f
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sat Sep 17 21:30:40 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 03:42:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61a3e98
gnome-extra/cinnamon-control-center: Fix libgnomekbd 3.28 compat
Bug: https://bugs.gentoo.org/870151
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Closes: https://github.com/gentoo/gentoo/pull/27334
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../cinnamon-control-center-5.2.1-r3.ebuild | 109 +++++++++++++++++++++
...amon-control-center-5.2.1-fix-libgnomekbd.patch | 47 +++++++++
2 files changed, 156 insertions(+)
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild
new file mode 100644
index 000000000000..98fd094c3e28
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+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+"
+SLOT="0"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
+REQUIRED_USE="modemmanager? ( networkmanager )"
+KEYWORDS="~amd64 ~arm64 ~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.2:0=
+ >=gnome-extra/cinnamon-menus-5.2:0=
+ media-libs/fontconfig
+ >=sys-auth/polkit-0.103
+ >=x11-libs/gdk-pixbuf-2.23.0:2
+ >=x11-libs/gtk+-3.16.0:3
+ >=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:=
+ >=gnome-extra/cinnamon-settings-daemon-5.2:0=
+ >=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 >=libnma-1.8.34
+ # https://github.com/linuxmint/cinnamon-control-center/commit/0f4d212874c4fbee18b860963d0a5c7bd54dcfd1
+ "${FILESDIR}"/${PN}-5.2.1-fix-libnma.patch
+
+ # Fix >=libgnomekbd-3.28
+ # https://github.com/linuxmint/cinnamon-control-center/commit/8cb73375e66b93da18f7bde728d4a832c07aada4
+ "${FILESDIR}"/${PN}-5.2.1-fix-libgnomekbd.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.2.1-fix-libgnomekbd.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch
new file mode 100644
index 000000000000..389c97b6085c
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/870151
+https://github.com/linuxmint/cinnamon-control-center/pull/297
+
+From 8cb73375e66b93da18f7bde728d4a832c07aada4 Mon Sep 17 00:00:00 2001
+From: Eicke Herbertz <wolletd@posteo.de>
+Date: Tue, 23 Aug 2022 19:28:57 +0200
+Subject: [PATCH] region panel: add keys removed from libgnomekbd's API (#297)
+
+in version 3.28
+---
+ panels/region/cinnamon-region-panel-xkb.c | 6 ++++++
+ panels/region/cinnamon-region-panel-xkb.h | 5 +++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/panels/region/cinnamon-region-panel-xkb.c b/panels/region/cinnamon-region-panel-xkb.c
+index b7417e2e..3152471b 100644
+--- a/panels/region/cinnamon-region-panel-xkb.c
++++ b/panels/region/cinnamon-region-panel-xkb.c
+@@ -36,6 +36,12 @@
+
+ #define GKBD_CONFIG_KEY_LOAD_EXTRA_ITEMS "load-extra-items"
+
++// These were removed from the API of libgnomekbd in version 3.28
++const gchar GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP[] = "default-group";
++const gchar GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW[] = "group-per-window";
++const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[] = "layouts";
++const gchar GKBD_KEYBOARD_CONFIG_KEY_OPTIONS[] = "options";
++
+ XklEngine *engine;
+ XklConfigRegistry *config_registry;
+
+diff --git a/panels/region/cinnamon-region-panel-xkb.h b/panels/region/cinnamon-region-panel-xkb.h
+index bd7b47d3..cfa396de 100644
+--- a/panels/region/cinnamon-region-panel-xkb.h
++++ b/panels/region/cinnamon-region-panel-xkb.h
+@@ -36,6 +36,11 @@ extern GSettings *xkb_keyboard_settings;
+ extern GSettings *xkb_desktop_settings;
+ extern GkbdKeyboardConfig initial_config;
+
++extern const gchar GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP[];
++extern const gchar GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW[];
++extern const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[];
++extern const gchar GKBD_KEYBOARD_CONFIG_KEY_OPTIONS[];
++
+ extern void setup_xkb_tabs (GtkBuilder * dialog);
+
+ extern void xkb_layouts_fill_selected_tree (GtkBuilder * dialog);
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/, gnome-extra/cinnamon-control-center/files/
@ 2022-01-21 17:15 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-01-21 17:15 UTC (permalink / raw
To: gentoo-commits
commit: 88fe3266fa3609994af53f845d39ef618aa6f9dc
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Tue Dec 28 04:19:55 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 17:13:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88fe3266
gnome-extra/cinnamon-control-center: Remove old
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 1 -
.../cinnamon-control-center-4.8.2.ebuild | 84 ----------------------
.../cinnamon-control-center-4.8.2-build-fix.patch | 36 ----------
3 files changed, 121 deletions(-)
--git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 07e7e0b9b741..8d09cffdc441 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-control-center-4.8.2.tar.gz 3865765 BLAKE2B 8e36888aec00252842bcdb3f29dd0728833c597260fdb6b2b160db455e900686086b1b04b393d58ec358f44aa64c14341e49738de7a85002a5e5d695974c578a SHA512 c64e554488b401291daf125cc5627201cac58d5e6efab697d0b9cac64b666a7d2a7e27f459bb560918876cc8cf5e3720c11a59cee70401e50682a4b82a20f1b5
DIST cinnamon-control-center-5.0.2.tar.gz 3866962 BLAKE2B d292d610516647e149198cbfce652bfd094338612ef6b4765fcb80bd1fe15f2d643bbaa5343f1d79d57f3327c87a3256cfc3900493daf6f80569b1a0bacd821a SHA512 f47b88005ba1d7359ab99d80e99d2c42a93561ecddd98014f91674a5ae806b991169c88f3af6c8c187df23ebb8a9e12bbae5eefbfeaf2f3d087981192448c3c2
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
deleted file mode 100644
index ffeb6732bad9..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson 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+"
-SLOT="0"
-IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test"
-REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="amd64 ~arm64 x86"
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.44.0:2
- >=gnome-base/libgnomekbd-3.0.0:0=
- >=gnome-extra/cinnamon-desktop-4.8:0=
- >=gnome-extra/cinnamon-menus-4.8:0=
- media-libs/fontconfig
- >=sys-auth/polkit-0.103
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.16.0:3
- >=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
- >=gnome-extra/cinnamon-settings-daemon-4.8:0=
- >=x11-libs/libXi-1.2 )
- networkmanager? (
- >=gnome-extra/nm-applet-1.2.0
- >=net-misc/networkmanager-1.2.0:=[modemmanager?]
-
- modemmanager? ( >=net-misc/modemmanager-0.7 )
- )
-"
-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="
- dev-util/glib-utils
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-
-PATCHES=(
- # Fix build when modemmanager is disabled
- # https://github.com/linuxmint/cinnamon-control-center/pull/257
- "${FILESDIR}/${PN}-4.8.2-build-fix.patch"
-)
-
-src_configure() {
- local emesonargs=(
- -Donlineaccounts=false
- $(meson_use colord color)
- $(meson_use modemmanager)
- $(meson_use networkmanager)
- $(meson_use input_devices_wacom wacom)
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
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
deleted file mode 100644
index 041a5d23e500..000000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a9d7d0f7f36bc724ecb65019999fc1c4d671bcba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
-Date: Thu, 31 Dec 2020 10:09:17 +0100
-Subject: [PATCH] Add ifdefs to prevent undefined reference to modem functions
- in network panel
-
----
- panels/network/cc-network-panel.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
-index 8b28439..38d9842 100644
---- a/panels/network/cc-network-panel.c
-+++ b/panels/network/cc-network-panel.c
-@@ -29,7 +29,9 @@
- #include <NetworkManager.h>
-
- #include "net-device.h"
-+#ifdef BUILD_MODEM
- #include "net-device-mobile.h"
-+#endif
- #include "net-device-wifi.h"
- #include "net-device-ethernet.h"
- #include "net-object.h"
-@@ -651,9 +653,11 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
- case NM_DEVICE_TYPE_ETHERNET:
- device_g_type = NET_TYPE_DEVICE_ETHERNET;
- break;
-+ #ifdef BUILD_MODEM
- case NM_DEVICE_TYPE_MODEM:
- device_g_type = NET_TYPE_DEVICE_MOBILE;
- break;
-+ #endif
- case NM_DEVICE_TYPE_WIFI:
- device_g_type = NET_TYPE_DEVICE_WIFI;
- break;
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/, gnome-extra/cinnamon-control-center/files/
@ 2018-05-26 11:32 Mart Raudsepp
0 siblings, 0 replies; 8+ messages in thread
From: Mart Raudsepp @ 2018-05-26 11:32 UTC (permalink / raw
To: gentoo-commits
commit: 5262145bd0a849a97569837b4236c669279c6826
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 11:13:32 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 26 11:30:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5262145b
gnome-extra/cinnamon-control-center: remove old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
| 3 -
.../cinnamon-control-center-3.0.1.ebuild | 93 ------------------
.../cinnamon-control-center-3.2.0.ebuild | 92 ------------------
.../cinnamon-control-center-3.2.1.ebuild | 90 -----------------
.../cinnamon-control-center-2.8.0-optional.patch | 107 ---------------------
5 files changed, 385 deletions(-)
--git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 77d8ee9dd66..0c37f75e876 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,4 +1 @@
-DIST cinnamon-control-center-3.0.1.tar.gz 3834138 BLAKE2B ecc6f496deacf967026698be22477e90cd72973e3fbb49ef65c54522c0d910d41ff70a5d4adb7d6d0bb65d3e47b8188def6201af75be4ae4309354a2669e362e SHA512 97f726cddb12afd697a542bf40b89c84e8256cc7e1bff31eaf3ed86ba9ffe23660085e4e4123f955f1aa4aa31930b209c2a26649f2dec55d10a4803d86942e46
-DIST cinnamon-control-center-3.2.0.tar.gz 3837279 BLAKE2B eee6a735b8686229d27d90d655e1598700b329dd72c61cc0535e4f423eb9ff2534b0f733db872db65a8a5372bf71ab69c2a9cec7b4d189e06e3f89bf9ec6be80 SHA512 19a3481ba52784c733e5aae9603596a29fc12c78f21b8fe08492deda8c3eeac2bdbfc2da24f29dc5db6f6de02a26a43f67f3141dbfbd07c26f0e38a872c39216
-DIST cinnamon-control-center-3.2.1.tar.gz 3838032 BLAKE2B 615cee8d3bb4498c2faa9ae7bf776ab872169c9e0eb98412383e927f9dc199deb8d70ac3efad7e13c2ce6892a634a80dd114ec228cd4c308ba043799d7853ee0 SHA512 77f98aa47a10ef280ca7c3f8662e770d87a5427c91093382d3c289abcc0eac38317a31cd47a19a8ee67a4579375b84392f45d239b98fe494f7abfe10ef186554
DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e8a87a83235f85738e4b5ee7ea9db31f63c5681b1eec24388ff29b54bc1e01c12e3a15d5eb445c72ffe8576c211f708945ed5dde2bf SHA512 09e482976fbefbd388151736fde4d4e198f3584b47f270ad7d0ce4299029012fa7c7825e221a094c8536ebd5824406bb943a8aad5cf51d60dc22dcf5c02b3b91
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild
deleted file mode 100644
index 500f58d7c46..00000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom systemd"
-KEYWORDS="amd64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-# networkmanager is not optional
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.31:2
- dev-libs/libxml2:2
- >=gnome-base/libgnomekbd-2.91.91:0=
- >=gnome-extra/cinnamon-desktop-1.0:0=
- >=gnome-extra/cinnamon-menus-1.0:0=
- >=gnome-extra/cinnamon-settings-daemon-1.0:0=
- >=gnome-extra/nm-applet-0.9.8
- media-libs/fontconfig
- >=net-misc/modemmanager-0.7
- >=net-misc/networkmanager-0.9.8:=[modemmanager]
- >=sys-auth/polkit-0.103
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.4.1:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libxklavier
- colord? ( >=x11-misc/colord-0.1.14:0= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/gtk+-3.8:3
- >=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
- systemd? ( >=sys-apps/systemd-31 )
- !systemd? ( app-admin/openrc-settingsd sys-auth/consolekit )
- x11-themes/adwaita-icon-theme
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- x11-base/xorg-proto
-
- dev-libs/libxslt
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
- sys-devel/autoconf-archive
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-src_prepare() {
- # make some panels optional
- eapply "${FILESDIR}"/${PN}-2.8.0-optional.patch
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-systemd doesn't do anything in $PN-2.2.5
- gnome2_src_configure \
- --disable-static \
- --enable-documentation \
- --without-libsocialweb \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable input_devices_wacom wacom)
-}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild
deleted file mode 100644
index 94fc1bf250a..00000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom systemd"
-KEYWORDS="~amd64 ~x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-# networkmanager is not optional
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.31:2
- dev-libs/libxml2:2
- >=gnome-base/libgnomekbd-2.91.91:0=
- >=gnome-extra/cinnamon-desktop-1.0:0=
- >=gnome-extra/cinnamon-menus-1.0:0=
- >=gnome-extra/cinnamon-settings-daemon-1.0:0=
- >=gnome-extra/nm-applet-0.9.8
- media-libs/fontconfig
- >=net-misc/modemmanager-0.7
- >=net-misc/networkmanager-0.9.8:=[modemmanager]
- >=sys-auth/polkit-0.103
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.4.1:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libxklavier
- colord? ( >=x11-misc/colord-0.1.14:0= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/gtk+-3.8:3
- >=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
- systemd? ( >=sys-apps/systemd-31 )
- !systemd? ( app-admin/openrc-settingsd sys-auth/consolekit )
- x11-themes/adwaita-icon-theme
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- x11-base/xorg-proto
-
- dev-libs/libxslt
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-src_prepare() {
- # make some panels optional
- eapply "${FILESDIR}"/${PN}-2.8.0-optional.patch
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-systemd doesn't do anything in $PN-2.2.5
- gnome2_src_configure \
- --disable-static \
- --enable-documentation \
- --without-libsocialweb \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable input_devices_wacom wacom)
-}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild
deleted file mode 100644
index a3713bb7b68..00000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom systemd"
-KEYWORDS="~amd64 ~x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-# networkmanager is not optional
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.31:2
- dev-libs/libxml2:2
- >=gnome-base/libgnomekbd-2.91.91:0=
- >=gnome-extra/cinnamon-desktop-1.0:0=
- >=gnome-extra/cinnamon-menus-1.0:0=
- >=gnome-extra/cinnamon-settings-daemon-1.0:0=
- >=gnome-extra/nm-applet-0.9.8
- media-libs/fontconfig
- >=net-misc/modemmanager-0.7
- >=net-misc/networkmanager-0.9.8:=[modemmanager]
- >=sys-auth/polkit-0.103
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.4.1:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libxklavier
- colord? ( >=x11-misc/colord-0.1.14:0= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/gtk+-3.8:3
- >=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
- systemd? ( >=sys-apps/systemd-31 )
- !systemd? ( app-admin/openrc-settingsd sys-auth/consolekit )
- x11-themes/adwaita-icon-theme
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- x11-base/xorg-proto
-
- dev-libs/libxslt
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
- sys-devel/autoconf-archive
-"
-src_prepare() {
- # make some panels optional
- eapply "${FILESDIR}"/${PN}-2.8.0-optional.patch
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-systemd doesn't do anything in $PN-2.2.5
- gnome2_src_configure \
- --disable-static \
- --enable-documentation \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable systemd)
-}
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch
deleted file mode 100644
index d5beadf7e0e..00000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 144bf78..a83e1eb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -121,7 +121,6 @@ PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES cinnamon-desktop x11)
- PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
-
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
- PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
- libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
-@@ -197,15 +196,51 @@ if test x"$enable_cups" != x"no" ; then
- AC_SUBST(CUPS_LIBS)
- fi
-
-+build_color=false
-+AC_ARG_ENABLE(color,
-+ AC_HELP_STRING([--disable-color],
-+ [disable color management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_COLOR=yes ;;
-+ no) WANT_COLOR=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
-+ esac],
-+ [WANT_COLOR=yes]) dnl Default value
-+
-+if test x$WANT_COLOR = xyes; then
-+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
-+ build_color=true
-+fi
-+if test "x$build_color" = xtrue ; then
-+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+AC_SUBST(COLOR_PANEL_CFLAGS)
-+AC_SUBST(COLOR_PANEL_LIBS)
-+
- build_wacom=false
--PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
-+AC_ARG_ENABLE(wacom,
-+ AC_HELP_STRING([--disable-wacom],
-+ [disable wacom management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_WACOM=yes ;;
-+ no) WANT_WACOM=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
-+ esac],
-+ [WANT_WACOM=yes]) dnl Default value
-+
-+if test x$WANT_WACOM = xyes; then
-+ PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
- cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
- cinnamon-desktop
-- gtk+-3.0 >= 3.8.0],
-- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
--
-+ gtk+-3.0 >= 3.8.0])
-+ build_wacom="true"
-+ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
-+fi
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
-+AC_SUBST(WACOM_PANEL_CFLAGS)
-+AC_SUBST(WACOM_PANEL_LIBS)
-
- # This is a hard-dependency for the region and user-accounts panels
- PKG_CHECK_MODULES(ISOCODES, iso-codes)
-@@ -408,6 +443,13 @@ fi
- #else
- # AC_MSG_NOTICE([ Using ConsoleKit for session tracking])
- #fi
-+
-+if test "x$build_color" = "xtrue"; then
-+ AC_MSG_NOTICE([** Colord support (Color management panel)])
-+else
-+ AC_MSG_NOTICE([ Colord support disabled])
-+fi
-+
- if test "x$build_wacom" = "xtrue"; then
- AC_MSG_NOTICE([** Wacom support (Wacom panel)])
- else
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 76fbc88..c5c2d1a 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -2,7 +2,6 @@ NULL =
-
- enabled_panels = \
- common \
-- color \
- display \
- region \
- universal-access \
-@@ -18,6 +17,12 @@ else
- disabled_panels += network
- endif
-
-+if BUILD_COLOR
-+enabled_panels += color
-+else
-+disabled_panels += color
-+endif
-+
- if BUILD_WACOM
- enabled_panels += wacom
- else
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/, gnome-extra/cinnamon-control-center/files/
@ 2016-06-25 16:53 Pacho Ramos
0 siblings, 0 replies; 8+ messages in thread
From: Pacho Ramos @ 2016-06-25 16:53 UTC (permalink / raw
To: gentoo-commits
commit: c5df152887a3531158b277c4b93d1da877749dc7
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 15:05:45 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 16:26:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5df1528
gnome-extra/cinnamon-control-center: Drop old
Package-Manager: portage-2.3.0_rc1
| 2 -
.../cinnamon-control-center-2.6.0-r1.ebuild | 107 ---------------------
.../cinnamon-control-center-2.6.0-optional.patch | 99 -------------------
3 files changed, 208 deletions(-)
--git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index a298eb0..74c10e5 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,3 +1 @@
-DIST cinnamon-control-center-2.6.0-pyongyang.tar.xz 32912 SHA256 d26e31c1377abc1c3e47e1c8e78572e0169d21bdfddb920ab839bec4e1bbe8a7 SHA512 3c6d6a970382a8e0429cc78873e4d230d5848f2a6ae4feee4d28db28cb21124f59cd7b4632f3a427f91dd7e497ee32dd3f7ba5139a3c1566264904939007d28e WHIRLPOOL a1a4102ddb13e00414b58352c3eabbd02dc425f2b3a59027a579d9ac78bdd0fd7dcacc8c204ceaeb858944202af72bbfcecabb48aa1e7ddf4ff6ec4e682fb97d
-DIST cinnamon-control-center-2.6.0.tar.gz 4169903 SHA256 bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49 SHA512 ed383484b751a9d98de7f136c21c5eb6ce7cfe1418945bd0725aa9e9f08397eb78854b38db258434ed8895dbadd2ce29b5a423a9025dea17fb4876f8847ff125 WHIRLPOOL 7e6d3373e97116d5b531f4fcff85984050fd5d7ad343137b76e30089b3c6f4ff5409f68867289f3967a257a67cd04059f2aa02c48a4e0e4c29b43755d6f4cd84
DIST cinnamon-control-center-2.8.1.tar.gz 4090162 SHA256 595076ef89949c31357cd45f41818df1f6b7350a2b810f107e0b88cd9870e273 SHA512 e0f21bc29128b56d2024ea5bd9dff70a917259437804f4aad0942ee1313090b70e6811d1b54513b4639c0bff0230efcb2847a42fcf9ad183b24a3cbfeda976de WHIRLPOOL 47d3255eeddd782fb5c87ff82ed5d8ab8588b8066b9da9344abcfa259d0b481e06f676cefa43563f28ddc75d2c8112b30712b4ae52f750e03f779b1a73108c7b
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild
deleted file mode 100644
index 3eab01b..0000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-2.6.0-pyongyang.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups input_devices_wacom"
-KEYWORDS="amd64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-# networkmanager is not optional
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.31:2
- dev-libs/libxml2:2
- >=gnome-base/libgnomekbd-2.91.91:0=
- >=gnome-extra/cinnamon-desktop-1.0:0=
- >=gnome-extra/cinnamon-menus-1.0:0=
- >=gnome-extra/cinnamon-settings-daemon-1.0:0=
- >=gnome-extra/nm-applet-0.9.8
- media-libs/fontconfig
- >=media-libs/libcanberra-0.13[gtk3]
- >=media-sound/pulseaudio-1.1[glib]
- >=net-misc/modemmanager-0.7
- >=net-misc/networkmanager-0.9.8[modemmanager]
- >=sys-auth/polkit-0.103
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.4.1:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libxklavier
- colord? ( >=x11-misc/colord-0.1.14:0= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/gtk+-3.8:3
- >=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
- || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
- x11-themes/gnome-icon-theme
- x11-themes/gnome-icon-theme-symbolic
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- x11-proto/xproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
-
- dev-libs/libxslt
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
-
- app-arch/xz-utils
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-src_prepare() {
- # make some panels optional
- epatch "${FILESDIR}"/${PN}-2.6.0-optional.patch
-
- # North Korea causes build failure
- cp "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.png panels/datetime/data/ || die
- epatch "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.patch
-
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-systemd doesn't do anything in $PN-2.2.5
- gnome2_src_configure \
- --disable-static \
- --enable-documentation \
- --without-libsocialweb \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable input_devices_wacom wacom)
-}
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch
deleted file mode 100644
index b76405c..0000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 144bf78..a83e1eb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -121,7 +121,6 @@ PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES cinnamon-desktop x11)
- PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
-
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
- PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
- libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
-@@ -197,15 +196,51 @@ if test x"$enable_cups" != x"no" ; then
- AC_SUBST(CUPS_LIBS)
- fi
-
-+build_color=false
-+AC_ARG_ENABLE(color,
-+ AC_HELP_STRING([--disable-color],
-+ [disable color management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_COLOR=yes ;;
-+ no) WANT_COLOR=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
-+ esac],
-+ [WANT_COLOR=yes]) dnl Default value
-+
-+if test x$WANT_COLOR = xyes; then
-+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
-+ build_color=true
-+fi
-+if test "x$build_color" = xtrue ; then
-+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+AC_SUBST(COLOR_PANEL_CFLAGS)
-+AC_SUBST(COLOR_PANEL_LIBS)
-+
- build_wacom=false
--PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
-+AC_ARG_ENABLE(wacom,
-+ AC_HELP_STRING([--disable-wacom],
-+ [disable wacom management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_WACOM=yes ;;
-+ no) WANT_WACOM=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
-+ esac],
-+ [WANT_WACOM=yes]) dnl Default value
-+
-+if test x$WANT_WACOM = xyes; then
-+ PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
- cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
- cinnamon-desktop
-- gtk+-3.0 >= 3.8.0],
-- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
--
-+ gtk+-3.0 >= 3.8.0])
-+ build_wacom="true"
-+ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
-+fi
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
-+AC_SUBST(WACOM_PANEL_CFLAGS)
-+AC_SUBST(WACOM_PANEL_LIBS)
-
- # This is a hard-dependency for the region and user-accounts panels
- PKG_CHECK_MODULES(ISOCODES, iso-codes)
-@@ -408,6 +443,13 @@ fi
- #else
- # AC_MSG_NOTICE([ Using ConsoleKit for session tracking])
- #fi
-+
-+if test "x$build_color" = "xtrue"; then
-+ AC_MSG_NOTICE([** Colord support (Color management panel)])
-+else
-+ AC_MSG_NOTICE([ Colord support disabled])
-+fi
-+
- if test "x$build_wacom" = "xtrue"; then
- AC_MSG_NOTICE([** Wacom support (Wacom panel)])
- else
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 76fbc88..466c2c6 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -18,6 +18,12 @@ else
- disabled_panels += network
- endif
-
-+if BUILD_COLOR
-+enabled_panels += color
-+else
-+disabled_panels += color
-+endif
-+
- if BUILD_WACOM
- enabled_panels += wacom
- else
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-09-27 5:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-15 13:29 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/, gnome-extra/cinnamon-control-center/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-09-27 5:57 Eli Schwartz
2023-06-10 23:05 Andreas Sturmlechner
2023-05-07 22:14 Sam James
2022-09-19 3:42 Sam James
2022-01-21 17:15 Sam James
2018-05-26 11:32 Mart Raudsepp
2016-06-25 16:53 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox