From 27e5574c9ed56a2633e25f7fa8f591554266a1b4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 3 Jan 2023 20:27:24 +0000 Subject: gentoo auto-resync : 03:01:2023 - 20:27:24 --- gnome-base/gnome-settings-daemon/Manifest | 3 - ...aemon-3.38.1-Allow-udev-optional-on-Linux.patch | 134 ------------------- .../gnome-settings-daemon-42.2-r4.ebuild | 146 --------------------- 3 files changed, 283 deletions(-) delete mode 100644 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch delete mode 100644 gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2-r4.ebuild (limited to 'gnome-base/gnome-settings-daemon') diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index c3da10ca5cf7..ebc4cfedff50 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,9 +1,6 @@ AUX 42.1-build-Make-wacom-optional-and-controllable-via-meson.patch 1759 BLAKE2B e734dfb341143f3f246d268ff479a528fa09d6c5e496611e06e4ffea914098349eab2b2c5a4a55e8b47e5032b68bf6b929b76a1aa899402953cdcc1d3cf0589e SHA512 faffde0cd940ac6a8dabdab09ea38bd126e11822e75df5adf1a0bb3b055135a8c52abbb6ecb4d71476899ec0c5d8a78ba0075cb84cfebafe6c3aa5310dfca308 -AUX gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch 4505 BLAKE2B a61199b8da339dbe9bbe7e8941a56958f5a69fafeb95c6f7027c483e35b193854560ad12f2df45dd8374db1abcefd9bfb8dae5b5381be3215755f907a73726ec SHA512 468a73b69f441886d1ce5e0e5f263ea695170a3610f6124100e3eaed1d8dd62c3439193461620d6f8b18c81d2066163ff2c1839194ebcfeec424868163f46997 AUX gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch 694 BLAKE2B e4f32a376c2b1c55a396504e98c8a69d512bb9161a854482aa877023a2761e59d3fc682d724398ffb53bc138b010c33276071359d42ac19bcac2d9af87d42eef SHA512 618ad312b54709d0f95e5d881c2896c156246ae41eee1925f76b0a398b7ce6815a7466f8587f2291b07f7a34d1a3e1afb7df33823d9b52ebe8ad46a3f5f1e84d AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b -DIST gnome-settings-daemon-42.2.tar.xz 1483864 BLAKE2B c2051f129e66df8ca55eb72b0c3a037275c89d3c519fe01822aa4ad2309af9a27e840f4f797a8ecac8e0767d8e7894ffe9c5942840b0ca57536325e3cbe12617 SHA512 66f1e766a7d1c36d4609c9505ba5d99516505ecfc5123483a3cbc6189d21cce23abf26da067bf9c05c3c25bc96d4568a8b07477f0722b0cb9442085f6d886e5c DIST gnome-settings-daemon-43.0.tar.xz 1453808 BLAKE2B 365a1fe4d253e84b9fc355331688951e1428eaee421afbe052a16226c7006a420f28134b5fa02929bbb1d4250af243b02594444a4bdd208e5c41ed9e63e5f979 SHA512 8cc3ed73fa66d2cf72621db78be68e4fe01f292ab3987aff8cc67a1c67d910622e306c2d3e69a8dca5ac6517c8e57883faf02aec871c7aa1f1348d13ff1900a3 -EBUILD gnome-settings-daemon-42.2-r4.ebuild 3719 BLAKE2B 4662c0b1bbbf16de1e2eda9b79508020af0dca49498c2aa26ba23ca70e94578af349af41b7e73b7fde2a67839ac53b96c876b2224578013be464879df4a65133 SHA512 e4f09bf4043ce51d712a4d9883cf4e2bb8b84162c83367f705623eed209cd6292b9db3bbf7ad330a1bb0e0cef40d19578ecc82b0250721f7f25b10bb841ead86 EBUILD gnome-settings-daemon-43.0.ebuild 3541 BLAKE2B 485f9c2d6127a221d7cc2426a94dd58101b78129ce5dc7df583c29c9951838629cbbfb38876fef39ec786b54c2e998a40915c688d18e67770c7618267c42afb0 SHA512 eac98da5025105cffa80ac31345a4ed7cd9bd1b57556133dbde93e8b010c825fe65a570784c2a35e9aab0836dfd70636f2c88b9067a4a6c35611bbf4e59e51c9 MISC metadata.xml 663 BLAKE2B 27a0e4135576aeea4c6b962c90d894df06f92b3b015fab78246724ce7ca2f985cfde730f1f9c91f0cc01733f274c0225816e24fac2fca40c585b1a8667fd7d4d SHA512 e21c9dc181f13228662a2a91d7d8e0fedc6270f818a79308e270c9de788011379c155e835534ebb5dbd5f3b07a9e83ec618d9d85f81f46784007b380c6a7ef18 diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch deleted file mode 100644 index 658f4a3f48ee..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 6a44d3a6741da48d769353023c8801d41c969663 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sun, 12 Jul 2020 16:30:59 +0300 -Subject: [PATCH 3/3] Allow udev optional on Linux - ---- - meson.build | 4 ---- - plugins/power/gsd-backlight.c | 14 +++++++------- - plugins/power/meson.build | 6 +++--- - 3 files changed, 10 insertions(+), 14 deletions(-) - -diff --git a/meson.build b/meson.build -index 21d9341d..0a527513 100644 ---- a/meson.build -+++ b/meson.build -@@ -138,9 +138,6 @@ if enable_gudev - gudev_dep = dependency('gudev-1.0') - endif - config_h.set10('HAVE_GUDEV', enable_gudev) --if host_is_linux -- assert(enable_gudev, 'GUdev is not optional on Linux platforms') --endif - - # Check for colord - enable_colord = get_option('colord') -@@ -203,7 +200,6 @@ endif - - # Rfkill - enable_rfkill = get_option('rfkill') --assert(enable_rfkill or not host_is_linux, 'rfkill is not optional on Linux platforms') - if enable_rfkill - assert(cc.has_header('linux/rfkill.h'), 'rfkill support requested but RFKill headers not found') - assert(enable_gudev, 'GUdev is required for rfkill support') -diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c -index ca5f2723..f58f5343 100644 ---- a/plugins/power/gsd-backlight.c -+++ b/plugins/power/gsd-backlight.c -@@ -25,7 +25,7 @@ - #include "gsd-power-constants.h" - #include "gsd-power-manager.h" - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - #include - #endif /* __linux__ */ - -@@ -39,7 +39,7 @@ struct _GsdBacklight - gint brightness_target; - gint brightness_step; - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - GDBusProxy *logind_proxy; - - GUdevClient *udev; -@@ -77,7 +77,7 @@ G_DEFINE_TYPE_EXTENDED (GsdBacklight, gsd_backlight, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - gsd_backlight_initable_iface_init);) - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - static GUdevDevice* - gsd_backlight_udev_get_type (GList *devices, const gchar *type) - { -@@ -478,7 +478,7 @@ gsd_backlight_set_brightness_val_async (GsdBacklight *backlight, - - task = g_task_new (backlight, cancellable, callback, user_data); - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - if (backlight->udev_device != NULL) { - BacklightHelperData *task_data; - -@@ -831,7 +831,7 @@ gsd_backlight_initable_init (GInitable *initable, - return FALSE; - } - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - backlight->logind_proxy = - g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, - 0, -@@ -908,7 +908,7 @@ gsd_backlight_finalize (GObject *object) - { - GsdBacklight *backlight = GSD_BACKLIGHT (object); - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - g_assert (backlight->active_task == NULL); - g_assert (g_queue_is_empty (&backlight->tasks)); - g_clear_object (&backlight->logind_proxy); -@@ -961,7 +961,7 @@ gsd_backlight_init (GsdBacklight *backlight) - backlight->brightness_val = -1; - backlight->brightness_step = 1; - --#ifdef __linux__ -+#if defined(__linux__) && defined(HAVE_GUDEV) - backlight->active_task = NULL; - g_queue_init (&backlight->tasks); - #endif /* __linux__ */ -diff --git a/plugins/power/meson.build b/plugins/power/meson.build -index 69e619f2..6c6ea939 100644 ---- a/plugins/power/meson.build -+++ b/plugins/power/meson.build -@@ -24,7 +24,7 @@ native_deps = [ - dependency('gio-2.0', native:true) - ] - --if host_is_linux -+if host_is_linux and enable_gudev - deps += gudev_dep - endif - -@@ -66,7 +66,7 @@ gsd_power_enums_update = executable( - native: true - ) - --if host_is_linux -+if host_is_linux and enable_gudev - policy = 'org.gnome.settings-daemon.plugins.power.policy' - - policy_in = configure_file( -@@ -130,7 +130,7 @@ envs.set('BUILDDIR', meson.current_build_dir()) - envs.set('TOP_BUILDDIR', meson.build_root()) - envs.set('LD_PRELOAD', 'libumockdev-preload.so.0') - envs.set('NO_AT_BRIDGE', '1') --envs.set('HAVE_SYSFS_BACKLIGHT', host_is_linux ? '1' : '0') -+envs.set('HAVE_SYSFS_BACKLIGHT', (host_is_linux and enable_gudev) ? '1' : '0') - - if get_option('b_sanitize').split(',').contains('address') - # libasan needs to be loaded first; so we need to explicitly preload it --- -2.26.2 - diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2-r4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2-r4.ebuild deleted file mode 100644 index 3669dd83b3bc..000000000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2-r4.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) - -inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg - -DESCRIPTION="Gnome Settings Daemon" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ^^ ( elogind systemd ) - input_devices_wacom? ( udev ) - wayland? ( udev ) -" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" - -#