diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest deleted file mode 100644 index 872d6b7..0000000 --- a/gnome-base/gnome-settings-daemon/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gnome-settings-daemon-45.1.tar.xz 1473256 BLAKE2B 25c114cc1918975247db360f24a9041d019546dd0a0714d19f2409b78ee6e2712d6dc1272eb9a40afb7ed4e973eaa45854322947567b5d54d2761b48a2e812b9 SHA512 ccec193f3f2acdfb5eefda697d6ef2ac0edca18e85d934a83cc34fd5af6c78c56469ffeebbd1c64e8c392462686663c2dd55000bc962beac472580fdfa0717a8 -DIST gnome-settings-daemon-46.0.tar.xz 1480952 BLAKE2B 42f2eb46b255e3e44a045b90b7ad98e15836aa3780f04740861c65417dd58e79996481d397f3f482158286c905245ca13dec0ad52770972856ecfd939d06073a SHA512 445e9ee4709af7a67ded55733d4041357995fe9746bcf00fa81f52f6dddc2071e7114e9bf836bcf464bc0f04da3b3c08be04c1942963c1910d1a14b4434f6633 diff --git a/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch b/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch deleted file mode 100644 index 3956b74..0000000 --- a/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1e07481d4fd989828a7237c365e5420f50196ddd Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Thu, 14 Mar 2019 09:43:00 +0200 -Subject: [PATCH] build: Make wacom optional and controllable via meson_options - ---- - meson.build | 4 ++-- - meson_options.txt | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index a8955a49..0ac4f3ba 100644 ---- a/meson.build -+++ b/meson.build -@@ -154,8 +154,8 @@ if enable_wayland - endif - config_h.set10('HAVE_WAYLAND', enable_wayland) - --# wacom (disabled for s390/s390x and non Linux platforms) --enable_wacom = host_is_linux_not_s390 -+# wacom -+enable_wacom = get_option('wacom') - if enable_wacom - assert(enable_gudev, 'GUDev support is required for wacom support.') - libwacom_dep = dependency('libwacom', version: '>= 0.7') -diff --git a/meson_options.txt b/meson_options.txt -index 3e04cf64..010053e2 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -9,6 +9,7 @@ option('network_manager', type: 'boolean', value: true, description: 'build with - option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)') - option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support') - option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support') -+option('wacom', type: 'boolean', value: true, description: 'build with Wacom devices support') - option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') - option('wwan', type: 'boolean', value: true, description: 'build with WWAN support') - option('colord', type: 'boolean', value: true, description: 'build with colord support') --- -2.34.1 - diff --git a/gnome-base/gnome-settings-daemon/files/46.0-fix-building-without-systemd.patch b/gnome-base/gnome-settings-daemon/files/46.0-fix-building-without-systemd.patch deleted file mode 100644 index fa0b2f0..0000000 --- a/gnome-base/gnome-settings-daemon/files/46.0-fix-building-without-systemd.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/meson.build b/meson.build -index deecd3f1e68b615d7a699ad8f0a29d60daffd1de..e07fa841b750cf6551ff510d03e87322d7f4cb26 100644 ---- a/meson.build -+++ b/meson.build -@@ -111,13 +111,20 @@ x11_dep = dependency('x11') - xfixes_dep = dependency('xfixes', version: '>= 6.0') - - enable_systemd = get_option('systemd') --systemd_dep = dependency('systemd', version: '>= 243', required: enable_systemd) --if systemd_dep.found() -- systemd_userunitdir = systemd_dep.get_variable(pkgconfig: 'systemduserunitdir', -- pkgconfig_define: ['prefix', gsd_prefix]) -+enable_elogind = get_option('elogind') -+ -+if enable_systemd and enable_elogind -+ error('Only systemd or elogind support should be activated') -+elif enable_systemd -+ systemd_dep = dependency('systemd', version: '>= 243', required: true) -+ libsystemd_dep = dependency('libsystemd', version: '>= 243', required: true) -+ systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', -+ define_variable: ['prefix', gsd_prefix]) -+elif enable_elogind -+ elogind_dep = dependency('libelogind', version: '>= 209', required: true) - endif --libsystemd_dep = dependency('libsystemd', version: '>= 243', required: enable_systemd) - -+config_h.set10('HAVE_SYSTEMD_LIB', enable_systemd or enable_elogind) - - m_dep = cc.find_library('m') - -diff --git a/meson_options.txt b/meson_options.txt -index 1d913b4d29d7e4af54b3381c4dbed71366175ec3..5e2cccab651ee873fd34dcdd0a7b826d7316291d 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,6 +1,6 @@ - option('udev_dir', type: 'string', value: '', description: 'Absolute path of the udev base directory') - option('systemd', type: 'boolean', value: true, description: 'Enable systemd integration') -- -+option('elogind', type: 'boolean', value: false, description: 'Use elogind') - option('alsa', type: 'boolean', value: true, description: 'build with ALSA support (not optional on Linux platforms)') - option('gudev', type: 'boolean', value: true, description: 'build with gudev device support (not optional on Linux platforms)') - option('cups', type: 'boolean', value: true, description: 'build with CUPS support') -diff --git a/plugins/sharing/gsd-sharing-manager.c b/plugins/sharing/gsd-sharing-manager.c -index 2ab2cb054f8dbbaa2d2198b0c90e62c0f1e975c2..c669e7bdebb651ed3ffa2cb78a2eb84907c2ae7c 100644 ---- a/plugins/sharing/gsd-sharing-manager.c -+++ b/plugins/sharing/gsd-sharing-manager.c -@@ -20,12 +20,15 @@ - #include "config.h" - - #include --#include - #include - #include - #include - #include - -+#if HAVE_SYSTEMD_LIB -+#include -+#endif -+ - #if HAVE_NETWORK_MANAGER - #include - #endif /* HAVE_NETWORK_MANAGER */ -diff --git a/plugins/sharing/meson.build b/plugins/sharing/meson.build -index bda21608a589385e3436e60b999f55e778065d53..c65c4f9a5c41d5c6eb3168d4624083d8ab2c4bc1 100644 ---- a/plugins/sharing/meson.build -+++ b/plugins/sharing/meson.build -@@ -6,9 +6,14 @@ sources = files( - deps = plugins_deps + [ - gio_unix_dep, - libnotify_dep, -- libsystemd_dep - ] - -+if enable_systemd -+ deps += libsystemd_dep -+elif enable_elogind -+ deps += elogind_dep -+endif -+ - if enable_network_manager - deps += libnm_dep - endif diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch deleted file mode 100644 index e6b22b3..0000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b5b933cf83fc79cc9dd382ddb0ec2567330e24e8 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sun, 8 Sep 2019 18:07:12 +0300 -Subject: [PATCH 2/3] build: Allow NM optional on Linux - ---- - meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/meson.build b/meson.build -index dce9bfa1..21d9341d 100644 ---- a/meson.build -+++ b/meson.build -@@ -223,7 +223,6 @@ endif - - # Sharing plugin - enable_network_manager = get_option('network_manager') --assert(enable_network_manager or not host_is_linux, 'NetworkManager support is not optional on Linux platforms') - if enable_network_manager - # network manager - libnm_dep = dependency('libnm', version: '>= 1.0') --- -2.26.2 - diff --git a/gnome-base/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.override b/gnome-base/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.override deleted file mode 100644 index f04a327..0000000 --- a/gnome-base/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.gnome.settings-daemon.plugins.power] -sleep-inactive-ac-type='nothing' diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-46.0-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-46.0-r1.ebuild deleted file mode 100644 index ec8d53e..0000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-46.0-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) - -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" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" - -IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE="^^ ( elogind systemd )" - -COMMON_DEPEND=" - >=sci-geosciences/geocode-glib-3.10:2 - >=dev-libs/glib-2.70:2 - >=gnome-base/gnome-desktop-3.37.1:3= - >=gnome-base/gsettings-desktop-schemas-46.0 - >=x11-libs/gtk+-3.15.3:3[X,wayland?] - >=dev-libs/libgweather-4.2.0:4= - colord? ( >=x11-misc/colord-1.4.5:= ) - media-libs/libcanberra[gtk3] - >=app-misc/geoclue-2.3.1:2.0 - >=x11-libs/libnotify-0.7.3 - >=media-libs/libpulse-16.1[glib] - >=sys-auth/polkit-0.114 - >=sys-power/upower-0.99.12:= - x11-libs/libX11 - >=x11-libs/libXfixes-6.0.0 - 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? ( app-crypt/gcr:4= ) - cups? ( >=net-print/cups-1.4[dbus] ) - modemmanager? ( - >=app-crypt/gcr-3.90.0:4= - >=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 - ) -" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto -" -# logind needed for power and session management, bug #464944 -RDEPEND="${COMMON_DEPEND} - gnome-base/dconf - elogind? ( sys-auth/elogind ) -" -# rfkill requires linux/rfkill.h, 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 - ${PYTHON_DEPS} - test? ( - dev-util/umockdev - $(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}"/46.0-fix-building-without-systemd.patch - "${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch - -) - -python_check_deps() { - if use test; then - python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_configure() { - local emesonargs=( - -Dudev_dir="$(get_udevdir)" - $(meson_use systemd) - $(meson_use elogind) - -Dalsa=true - -Dgudev=true - -Dgcr3=false - $(meson_use colord) - $(meson_use cups) - $(meson_use networkmanager network_manager) - -Drfkill=true - $(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 -}