diff options
Diffstat (limited to 'gnome-base/gnome-settings-daemon')
4 files changed, 1 insertions, 197 deletions
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index b5dd85263fe2..c46cdf49cd69 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,9 +1,5 @@ -AUX glib-2.58-compat.patch 1328 BLAKE2B aa65a9aca82aa201995bc8b8a02cc9fa4fa3ec2d6410981df8ef9ac77d15afb8ea819970e0305d3d2c8d376e3cb193183b0a9d897132d0bf770063e2974efb6f SHA512 bf5586896c12584606ddcf36f5745e745e90cd1d391ae93527d50e249746eeedeb50a7c808d5bd08a80526d30a550f665551f13694333961bf97cab0c36a3324 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b -DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973 SHA512 fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb -DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0 DIST gnome-settings-daemon-3.30.2-patchset.tar.xz 20132 BLAKE2B b8f2573e806ee5aedcc1476de3550cdc39933c869d64c9d13e463cdf27fa7695e69e57612738fa5438988eda78ae998808508c94fbf841ec037eb1f103921458 SHA512 7318029f4145379b05f7a95686917b4ea7623fd0059559930072350db12170d6083d75c170578516bcede5282da677013086c343abe779b9d1696bd882b7e34d DIST gnome-settings-daemon-3.30.2.tar.xz 1376776 BLAKE2B a7cf276c5a802b7d9a6f738048b5bc34d97f79723c6f4cfb4f29ac3ed0f43e307cbdd6793e8d8115f51981ee576737d75c58531dcd5d0779d9f3670b68523a60 SHA512 517cb6bab3da10d5d47ab9c9690da3fa23e64d023d01b7cc101441f6b65639f3b6c8d0a0d19da80b22924b3dbe6430b2573fb861060f02fda248b24f00be5d84 -EBUILD gnome-settings-daemon-3.24.4.ebuild 4717 BLAKE2B 97dfe4ac80f022e19c5315a82f3ebaafe9decbdebd3d722a9cd8b25ff5daecd1dfc6151c9c7976883dfd01f30ee841aef6fe015c51fc58b81883f119c931b9f9 SHA512 dea9e27581240b46d5a07edf5d04dc5860b9566bb0d52b162f82e9a49bbe911ebfedf152c8c1dab0a50b9de0c57e3d89dc8198831bc70d494bf5502d11fddb18 EBUILD gnome-settings-daemon-3.30.2-r1.ebuild 3885 BLAKE2B d59a394535e6c4589d67bfcae5e9b2e0f6690f9523f617dd3b214c1f79c9c40fd40262a2ccfce56671dcb266d8f43b51728cb151f4f58d4425ccb239eb534251 SHA512 6ddd62b160bfaf78c5004e7bb66c7f7204d612806997b5e196a17b1cb4c9f436c08cfce9b736a4033419bf520623b4ec71cf74c84a45d51209efe90a0a06b5df -MISC metadata.xml 774 BLAKE2B 94211f84287a451ef68bddcae9824b5345379600b3761067267d8c127bc083337e9bdf41162308efd47f419f13ed790221f082ea6282aa0038a85d13c9edc902 SHA512 4de08b4c743a03dfbb7e9e39cff7473c0f9529ba897b78d0adef9fb980b584a65274b617d1cf50b824e9c35722f6f6ab0565da37ae5fb4c820bdae37b5832833 +MISC metadata.xml 541 BLAKE2B 75d0ed012c7883ff60c068d96d055d35f4778d4d601ec2585f9165faa1420f2debe22d5dd1903c3aa535af5162e8c74c4cac22cd7f92b4b17381a14c941400b0 SHA512 e3bb0d368457d4100eb616e348b1cd08c5b61ec3b4ea518946b1aef80f4f1f89215552123c1cfcad382af26e9f217a4d8f3ff41fd7b71df377400eb592f55787 diff --git a/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch b/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch deleted file mode 100644 index 94e1cad666e3..000000000000 --- a/gnome-base/gnome-settings-daemon/files/glib-2.58-compat.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3110457f72f70b2d283c1ad2f27b91b95d75d92f Mon Sep 17 00:00:00 2001 -From: Christian Hergert <chergert@redhat.com> -Date: Wed, 18 Jul 2018 19:31:17 -0700 -Subject: [PATCH] housekeeping: fix improper notify_notification_close() usage - -notify_notification_close() expects that a parameter will be available for -the error location, which could be a dangling pointer in a register or -on the stack in the case of some architectures. - -This was caught by GNOME/glib#1425 which allows us to check proper type -parameters. ---- - plugins/housekeeping/gsd-disk-space.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c -index 0ae40193..0eee94ea 100644 ---- a/plugins/housekeeping/gsd-disk-space.c -+++ b/plugins/housekeeping/gsd-disk-space.c -@@ -1017,7 +1017,9 @@ gsd_ldsm_clean (void) - g_clear_object (&ldsm_monitor); - g_clear_object (&settings); - g_clear_object (&privacy_settings); -- g_clear_pointer (¬ification, notify_notification_close); -+ /* NotifyNotification::closed callback will drop reference */ -+ if (notification != NULL) -+ notify_notification_close (notification, NULL); - g_slist_free_full (ignore_paths, g_free); - ignore_paths = NULL; - } --- -2.17.0 - diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild deleted file mode 100644 index 20b059fb7b2e..000000000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -GNOME2_LA_PUNT="yes" -#PYTHON_COMPAT=( python{2_7,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 -PYTHON_COMPAT=( python2_7 ) - -inherit gnome2 python-any-r1 systemd udev virtualx - -DESCRIPTION="Gnome Settings Daemon" -HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland" -REQUIRED_USE=" - input_devices_wacom? ( udev ) - smartcard? ( udev ) - wayland? ( udev ) -" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" - -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2[dbus] - >=x11-libs/gtk+-3.15.3:3[X,wayland?] - >=gnome-base/gnome-desktop-3.11.1:3= - >=gnome-base/gsettings-desktop-schemas-3.23.3 - >=gnome-base/librsvg-2.36.2:2 - media-fonts/cantarell - media-libs/alsa-lib - media-libs/fontconfig - media-libs/libcanberra[gtk3] - >=media-sound/pulseaudio-2 - >=sys-power/upower-0.99:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/libnotify-0.7.3:= - x11-libs/libX11 - x11-libs/libxkbfile - x11-libs/libXi - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXtst - x11-libs/libXxf86misc - x11-misc/xkeyboard-config - - >=app-misc/geoclue-2.3.1:2.0 - >=dev-libs/libgweather-3.9.5:2= - >=sci-geosciences/geocode-glib-3.10 - >=sys-auth/polkit-0.103 - - colord? ( - >=media-libs/lcms-2.2:2 - >=x11-misc/colord-1.0.2:= ) - cups? ( >=net-print/cups-1.4[dbus] ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=x11-libs/pango-1.20 - x11-drivers/xf86-input-wacom - virtual/libgudev:= ) - networkmanager? ( >=net-misc/networkmanager-1.0 ) - smartcard? ( >=dev-libs/nss-3.11.2 ) - udev? ( virtual/libgudev:= ) - wayland? ( dev-libs/wayland ) -" -# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly -# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x -# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x -# systemd needed for power and session management, bug #464944 -RDEPEND="${COMMON_DEPEND} - gnome-base/dconf - !openrc-force? ( sys-apps/systemd ) - !<gnome-base/gnome-control-center-2.22 - !<gnome-extra/gnome-color-manager-3.1.1 - !<gnome-extra/gnome-power-manager-3.1.3 - !<gnome-base/gnome-session-3.23.2 -" -# xproto-7.0.15 needed for power plugin -DEPEND="${COMMON_DEPEND} - cups? ( sys-apps/sed ) - test? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') - gnome-base/gnome-session ) - dev-libs/libxml2:2 - sys-devel/gettext - >=dev-util/intltool-0.40 - virtual/pkgconfig - x11-base/xorg-proto -" - -# TypeErrors with python3; weird test errors with python2; all in power component that was made required now -RESTRICT="!test? ( test )" - -PATCHES=( - # Make colord and wacom optional; requires eautoreconf - # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf - # Reduce memory usage by not initing GTK+ where not needed - # Reduce memory usage by using a fake CSS theme instead of full Adwaita for GTK+ needing plugins; requires eautoreconf - # Fix build system to require gudev with wayland, bug #627966 - "${WORKDIR}"/patches/ - "${FILESDIR}"/glib-2.58-compat.patch -) - -python_check_deps() { - if use test; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && - has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --with-udevrulesdir="$(get_udevdir)"/rules.d \ - $(use_enable colord color) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable debug more-warnings) \ - $(use_enable networkmanager network-manager) \ - $(use_enable smartcard smartcard-support) \ - $(use_enable udev gudev) \ - $(use_enable input_devices_wacom wacom) \ - $(use_enable wayland) -} - -src_test() { - virtx emake check -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! systemd_is_booted; then - ewarn "${PN} needs Systemd to be *running* for working" - ewarn "properly. Please follow the this guide to migrate:" - ewarn "https://wiki.gentoo.org/wiki/Systemd" - fi - - if use openrc-force; then - ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," - ewarn "this can lead to unexpected problems and is not supported neither by" - ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," - ewarn "you will need to disable this USE flag system wide and retest before" - ewarn "opening any bug report." - fi -} diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml index 3b84b19df418..5e2d0958ba4e 100644 --- a/gnome-base/gnome-settings-daemon/metadata.xml +++ b/gnome-base/gnome-settings-daemon/metadata.xml @@ -9,9 +9,5 @@ <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag> <flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag> <flag name="systemd">Rely on <pkg>sys-apps/systemd</pkg> as runtime logind provider</flag> - <flag name="openrc-force">Skip systemd dependency (#480336), - enabling this flag will become your setup to be fully - unsupported by upstream and downstream Gnome team. Do not - try to enable it unless completely needed</flag> </use> </pkgmetadata> |