summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2023-01-02 22:56:26 -0500
committerMatt Turner <mattst88@gentoo.org>2023-01-03 09:07:48 -0500
commitb40713745c594fcaa92faee068dd6be3687383f5 (patch)
treef8fd5a7aecaaf7a0651eba6dd91e8fe1c24f1a6a
parentgnome-base/gnome-desktop: Drop old versions (diff)
downloadgentoo-b40713745c594fcaa92faee068dd6be3687383f5.tar.gz
gentoo-b40713745c594fcaa92faee068dd6be3687383f5.tar.bz2
gentoo-b40713745c594fcaa92faee068dd6be3687383f5.zip
gnome-base/gnome-settings-daemon: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
-rw-r--r--gnome-base/gnome-settings-daemon/Manifest1
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch134
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2-r4.ebuild146
3 files changed, 0 insertions, 281 deletions
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index ca47f78f7e6c..a0e1beef7f49 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,2 +1 @@
-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
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 <leio@gentoo.org>
-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 <gudev/gudev.h>
- #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"
-
-# <libgweather-4.2.0 because of libsoup:3 transition
-DEPEND="
- >=sci-geosciences/geocode-glib-3.10:0
- >=dev-libs/glib-2.58:2
- >=gnome-base/gnome-desktop-3.37.1:3=
- >=gnome-base/gsettings-desktop-schemas-42
- >=x11-libs/gtk+-3.15.3:3[X,wayland?]
- >=dev-libs/libgweather-4.0.0:4=
- <dev-libs/libgweather-4.2.0:4=
- colord? (
- >=x11-misc/colord-1.4.5:=
- >=media-libs/lcms-2.2:2
- )
- media-libs/libcanberra[gtk3]
- >=app-misc/geoclue-2.3.1:2.0
- >=x11-libs/libnotify-0.7.3
- >=media-sound/pulseaudio-12.99.3[glib]
- >=sys-auth/polkit-0.114
- >=sys-power/upower-0.99.12:=
- x11-libs/libX11
- >=x11-libs/libXfixes-6.0.0
- udev? ( dev-libs/libgudev:= )
- wayland? ( dev-libs/wayland )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7:=
- >=x11-libs/pango-1.20.0
- x11-libs/gdk-pixbuf:2
- )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- cups? ( >=net-print/cups-1.4[dbus] )
- modemmanager? (
- >=app-crypt/gcr-3.7.5:0=
- >=net-misc/modemmanager-1.0:=
- )
- networkmanager? ( >=net-misc/networkmanager-1.0 )
- media-libs/alsa-lib
- x11-libs/libXi
- x11-libs/libXext
- media-libs/fontconfig
- systemd? (
- >=sys-apps/systemd-243
- )
-"
-# logind needed for power and session management, bug #464944
-RDEPEND="${DEPEND}
- gnome-base/dconf
- elogind? ( sys-auth/elogind )
-"
-# rfkill requires linux/rfkill.h (and USE=udev), thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead
-BDEPEND="
- sys-kernel/linux-headers
- dev-util/glib-utils
- dev-util/gdbus-codegen
- x11-base/xorg-proto
- ${PYTHON_DEPS}
- test? (
- $(python_gen_any_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/python-dbusmock[${PYTHON_USEDEP}]
- ')
- gnome-base/gnome-session
- )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
- "${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch
- "${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch
-)
-
-python_check_deps() {
- if use test; then
- python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" \
- "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
- fi
-}
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- local emesonargs=(
- #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss?
- -Dudev_dir="$(get_udevdir)"
- $(meson_use systemd)
- -Dalsa=true
- $(meson_use udev gudev)
- $(meson_use colord)
- $(meson_use cups)
- $(meson_use networkmanager network_manager)
- $(meson_use udev rfkill)
- $(meson_use smartcard)
- $(meson_use input_devices_wacom wacom)
- $(meson_use wayland)
- $(meson_use modemmanager wwan)
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- # Don't auto-suspend by default on AC power
- insinto /usr/share/glib-2.0/schemas
- doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- udev_reload
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- udev_reload
- xdg_pkg_postrm
- gnome2_schemas_update
-}