From 8668c0f6c5fd1d084b8b2bdac1cfa1fcba412f65 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 19 Sep 2022 11:21:41 +0100 Subject: gentoo auto-resync : 19:09:2022 - 11:21:41 --- gnome-extra/Manifest.gz | Bin 11073 -> 11071 bytes gnome-extra/cinnamon-control-center/Manifest | 2 + .../cinnamon-control-center-5.2.1-r3.ebuild | 109 +++++++++++++++++++++ ...amon-control-center-5.2.1-fix-libgnomekbd.patch | 47 +++++++++ 4 files changed, 158 insertions(+) create mode 100644 gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild create mode 100644 gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch (limited to 'gnome-extra') diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz index eb548935c6cd..a93d0e2d55cd 100644 Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest index efac85d1455f..a0c205939271 100644 --- a/gnome-extra/cinnamon-control-center/Manifest +++ b/gnome-extra/cinnamon-control-center/Manifest @@ -1,4 +1,6 @@ +AUX cinnamon-control-center-5.2.1-fix-libgnomekbd.patch 1929 BLAKE2B b541f8105a18316961ab53471de074f0e610aaeb96fb67c682e61ba8ca677eecce5fceddb3e7989d3d259943212da9d7e565d4999552a9664cb225484a2c1f1f SHA512 dd62de8e8284c650304ae1681ea9ddf1bcfde197e19fcecc44442844ced4203d5c503f08a19103330a992040ae5ae3b8005d6898fce91b9336d59a0a3ffe774d AUX cinnamon-control-center-5.2.1-fix-libnma.patch 1922 BLAKE2B af679e2e7744dee5f600ef7474795e4362e9d019289785752979bdd2eebdb21b59bc00765ddb5cbdfd57dc7a106856b6916792d01f5b589b0fb9df2f87108fe1 SHA512 0323343831012e7724694818d9cbe65b7ba91effd06811ddfa4e4b75a44029f83f1497a3495facbfa05cbd0450e14b327d15c13cc357851172566a80f309708a DIST cinnamon-control-center-5.2.1.tar.gz 3863530 BLAKE2B 826494b8f8a4dead32d6031d7b4b2a44d357b3e8fedf1065b61193caa86ad433ba68fd9344f70bbce77bb94e086ae15f8854dc73916a5f60c49b1b2bd9e7101c SHA512 d322a9b460f13c697d327dda75a3ea16dd96414ed52ffbcdfc19479533178585da795c064ae441b36ef02f1aa779704db039328ca4ac4c373f363967948f2301 EBUILD cinnamon-control-center-5.2.1-r2.ebuild 2572 BLAKE2B d229569b2057b37880d025f9a8ed6e50db776d093d7b1b9ac2d191f908ce777fb9775822be2fb91afc3b6745bac42bfca49c7e18b634cdde2bbbed3f5fc68a76 SHA512 fab75a3a8502ae518aa521441b27c5cd6696076505b6e6e7825394f687462dc93ce933346485b280d9a437820786501d4ee9c17ca48cab2bf4a4ff66dcc45bc6 +EBUILD cinnamon-control-center-5.2.1-r3.ebuild 2754 BLAKE2B 97e209f1f3c8618812076d7c8638d1299ac0d86016f5d9435e2eeac557b38858b92bf76a641e8ee8c4d4773e2f2e7d6369edf8798ebb9e28b809ff5882b9fec8 SHA512 286ff8c931e06a0127d378859f41a29fcdae8e9f8522a28321cce8ec994ffe2d77206c323c452c6c81b02065a16b5b5a32dcfa4eaf013d49895845aa58c5ef4a MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3 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 +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); -- cgit v1.2.3