From e3872864be25f7421015bef2732fa57c0c9fb726 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Aug 2018 08:53:53 +0100 Subject: gentoo resync : 04.08.2018 --- gnome-extra/cinnamon-settings-daemon/Manifest | 3 + .../cinnamon-settings-daemon-3.8.4.ebuild | 87 ++++++++++++++++++++++ ...amon-settings-daemon-3.8.0-accountservice.patch | 57 ++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild create mode 100644 gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch (limited to 'gnome-extra/cinnamon-settings-daemon') diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest index 305bc3622bfc..9d0483580665 100644 --- a/gnome-extra/cinnamon-settings-daemon/Manifest +++ b/gnome-extra/cinnamon-settings-daemon/Manifest @@ -1,4 +1,7 @@ AUX cinnamon-settings-daemon-3.0.1-optional.patch 3242 BLAKE2B 6f2b64711df08f037155360728ad3f1da4184e2531e2b516b1e656379a9fc8edc26757a9b758f435c227b68c8a9936654b2147602f41b38e6eb198b4045bd10c SHA512 77d0e4c7f72b43b14e5d3106fde06d119f2e20b372e5cfa3565b67cdba6d1150fc1c59866df7db85307d1b3d8b0b2c90d5e04acbb6429e801a3aedd6135f72e8 +AUX cinnamon-settings-daemon-3.8.0-accountservice.patch 2213 BLAKE2B 2e867654ff2cb062434621e3f336aa9b833f31c2e7dfc214dbefc74bc2655b95376b945386e29873c9fc696b6e6c027fd6d2d1296c0002a0322e3a1f921c2d76 SHA512 87a15d3274129ea8fe9195f3abb0cfe1dc6d11337e5f2748197cb8b1ecd062e9da1967fe83f11fa7b98af2d95eef9fa4a3f6c55642be2715bcb76355a30fe8ca DIST cinnamon-settings-daemon-3.6.1.tar.gz 995005 BLAKE2B c512fe53b707099dca0926893f03056d508bbe22026367c3212a99f22df60d629e02e080fccdeb73151c7aa7e93396b47bede1820059f4a53eace11a56ae5521 SHA512 48a28decff08a191f4ec604386c3bb5c07001d4bc4f7b6d1da379626b41650653fdd14205bbed5321c41fbc281e8638b17e1de30dbba5d299f79cde03216cb33 +DIST cinnamon-settings-daemon-3.8.4.tar.gz 660607 BLAKE2B 1db6e8677c9f9e1fc649d29b3de46d2797f01dbaad3a907329eb6781c6c4ec17706d06045ae230315c7802a5ea176dda73dfcd437fd07e3398ad732e96240a83 SHA512 5bd91e781d47413b50b69b6a8d4cbe9060579452db7408d375f01b05b4070caa684d333ef875a7dda85d1acad3442cddd38e13167fa198e3a5540fef7bedfb75 EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2042 BLAKE2B 5941be45774f98c77b5cff4ea89403166943715c46a7904f634c394fc168bc6aeccd9dfbd35869cf36dd0fa4af89ec286aebaf9be861722dc4096399c9ed3ea8 SHA512 41702acbfccba846c82ebec1e88a9b15c3b5946cd73231075086b7bac52734f15d8061e02f80e7431469b204d2f2e8259dd5d101361f48357c5e1c0fbcee10f0 +EBUILD cinnamon-settings-daemon-3.8.4.ebuild 2128 BLAKE2B fcfa71c27b440eb39ab6ad5dbf4e6283476189084c7cb57ca04e8cae5796cf1cda726371ee7d026dbe83425a61a89d2e2ba9deffe987932332a9edc7ed3c1edc SHA512 7dfe766d4cc43325b633465e78bf7f0825d3f375eda5ddad413ead31111016f116f29f2d4a2260e18cb56aa95874525e19d68306b8c9ba666e19cb970d7345de MISC metadata.xml 453 BLAKE2B 430a92263b5593b373d945790b066af782b50e58008c4cbe045b768b757bf0ff286629df2a1e35b8fa13582aea2e134a8b55468e1abb3b67598f4f338c4f67f2 SHA512 b4525358e2f21c39d179f8003bd27122af405a7c79dbde94bb0d3b5086f9c39691c9dae986cacbe669316e92459cec19a40af2ed651d0abfcbbbce0857054ee8 diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild new file mode 100644 index 000000000000..538687301a25 --- /dev/null +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 virtualx + +DESCRIPTION="Cinnamon's settings daemon" +HOMEPAGE="http://cinnamon.linuxmint.com/" +SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+colord cups input_devices_wacom smartcard systemd" +RESTRICT=test + +# udev is non-optional since lots of plugins, not just gudev, pull it in +RDEPEND=" + >=dev-libs/glib-2.38:2 + >=gnome-base/libgnomekbd-3.6 + >=gnome-base/librsvg-2.36.2 + >=gnome-extra/cinnamon-desktop-2.8.0:0= + media-libs/fontconfig + >=media-libs/lcms-2.2:2 + media-libs/libcanberra:0=[gtk3] + sys-apps/dbus + >=sys-auth/polkit-0.97 + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.9.10:3 + >=x11-libs/libnotify-0.7.3:0= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxklavier + virtual/libgudev:= + >=sys-power/upower-0.9.11 + + colord? ( >=x11-misc/colord-0.1.27:= ) + cups? ( >=net-print/cups-1.4[dbus] ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + x11-drivers/xf86-input-wacom + x11-libs/libXtst ) + smartcard? ( >=dev-libs/nss-3.11.2 ) + systemd? ( sys-apps/systemd:0= ) + !systemd? ( sys-auth/elogind:0= ) +" +DEPEND="${RDEPEND} + dev-libs/libxml2:2 + >=dev-util/intltool-0.37.1 + x11-base/xorg-proto + virtual/pkgconfig +" + +src_prepare() { + # make colord and wacom optional + eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch + eapply "${FILESDIR}"/${PN}-3.8.0-accountservice.patch + + # Disable broken test + sed -e '/g_test_add_func ("\/color\/edid/d' \ + -i plugins/color/gcm-self-test.c || die + + eautoreconf + gnome2_src_prepare +} + +src_configure() { + # no point in disabling gudev since other plugins pull it in + gnome2_src_configure \ + --disable-static \ + --enable-gudev \ + --enable-polkit \ + --enable-logind \ + --disable-accountservice \ + $(use_enable colord color) \ + $(use_enable cups) \ + $(use_enable smartcard smartcard-support) \ + $(use_enable input_devices_wacom wacom) +} + +src_test() { + virtx emake check +} diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch new file mode 100644 index 000000000000..c12f2730ceae --- /dev/null +++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch @@ -0,0 +1,57 @@ +From 15b1c1488f28e69cee86ff25bf0c95ebf5245add Mon Sep 17 00:00:00 2001 +From: Kristian Fiskerstrand +Date: Sat, 30 Jun 2018 22:35:52 +0200 +Subject: [PATCH] Make account service optional + +--- + configure.ac | 6 ++++++ + plugins/background/csd-background-manager.c | 4 ++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index af5d3a4..a30126e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -166,6 +166,12 @@ else + fi + AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes) + ++AC_ARG_ENABLE(accountservice, AS_HELP_STRING([--disable-accountservice],[Disable accountservice]), enable_accountservice=$enableval) ++ ++if test x$enable_accountservice = "xyes"; then ++ AC_DEFINE(HAVE_ACCOUNTSERVICE, 1, [define if accountservice is available]) ++fi ++ + dnl --------------------------------------------------------------------------- + dnl - common + dnl --------------------------------------------------------------------------- +diff --git a/plugins/background/csd-background-manager.c b/plugins/background/csd-background-manager.c +index 282094a..a692c6e 100644 +--- a/plugins/background/csd-background-manager.c ++++ b/plugins/background/csd-background-manager.c +@@ -135,9 +135,9 @@ settings_change_event_cb (GSettings *settings, + { + gnome_bg_load_from_preferences (manager->priv->bg, + manager->priv->settings); +- ++#ifdef HAVE_ACCOUNTSERVICE + gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg)); +- ++#endif + return FALSE; + } + +diff --git a/plugins/background/csd-background-manager.c +b/plugins/background/csd-background-manager.c +index a692c6e..a99b478 100644 +--- a/plugins/background/csd-background-manager.c ++++ b/plugins/background/csd-background-manager.c +@@ -186,8 +186,9 @@ setup_bg (CsdBackgroundManager *manager) + watch_bg_preferences (manager); + gnome_bg_load_from_preferences (manager->priv->bg, + manager->priv->settings); +- ++#ifdef HAVE_ACCOUNTSERVICE + gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg)); ++#endif + } -- cgit v1.2.3