diff options
3 files changed, 220 insertions, 0 deletions
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest index 6cf562c9a635..7d2d9b018467 100644 --- a/mate-base/mate-session-manager/Manifest +++ b/mate-base/mate-session-manager/Manifest @@ -1 +1,2 @@ +DIST mate-session-manager-1.10.3.tar.xz 538432 SHA256 c73546a77c7fe0a50f8c8c7da02f654df28fa744abb2a661adaaf6c34b8a5de0 SHA512 9ab341bf0d618e440b9caa0c1a091b5628ab73ff75274b5b62deb0b3bdd3a4a119c1e7312dfa7b2ca17afaeda93d9ae9d4a2e830bdff196b64888baf9f265b89 WHIRLPOOL 5601c1bd25972645d3671fd38a0cacf51edd5ab3de78f401695c3847fcccf64a43463d85c6d951740fe1709cfae9af0cfb382b2ee617664967eb664f589e2561 DIST mate-session-manager-1.8.1.tar.xz 524204 SHA256 2f85a714704bc475d08809be6ecf24a5d94d2e2d0ea5ac704d67557c349d7b8c SHA512 1b09a471db710193a643ec90c9b153468d9a303957b9c4da4e30cf470aa5f582b6992f5e0ed69129943aa44f7c4e372e2a8554fc6020627817a3c49d656ca5b5 WHIRLPOOL 8c771ac713da92c2ae8bccc173a9cba4fc5bb16a943e588c679624e3e945555f2c37511426e666f38440947ec37139452ee230d07bc3a414a65629c04bfd31a6 diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.10.3-upower-0.99-series.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.10.3-upower-0.99-series.patch new file mode 100644 index 000000000000..bf97fdfa34fa --- /dev/null +++ b/mate-base/mate-session-manager/files/mate-session-manager-1.10.3-upower-0.99-series.patch @@ -0,0 +1,119 @@ +From f9a2293e611930bab7a799efe2569313a4414348 Mon Sep 17 00:00:00 2001 +From: Olaf Leidinger <oleid@mescharet.de> +Date: Sat, 14 Nov 2015 16:46:28 +0100 +Subject: [PATCH] compile fix for upower 0.99 series + +upower 0.99 has lost support for hibernate and suspend. This leads to undefined +references to up_client_get_can_suspend and up_client_get_can_hibernate on my +system. This patch removes any call to those functions for upower >= 0.99. +--- + configure.ac | 7 ++++++- + mate-session/gsm-logout-dialog.c | 8 ++++---- + mate-session/gsm-manager.c | 12 ++++++------ + 3 files changed, 16 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 74d86ac..9fe1f29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -146,13 +146,18 @@ AC_ARG_ENABLE(upower, + enable_upower=$enableval, + enable_upower=no) + if test "x$enable_upower" = "xyes"; then +- PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED, has_upower=yes, has_upower=no) ++ PKG_CHECK_MODULES([UPOWER], [upower-glib >= $UPOWER_REQUIRED], has_upower=yes, has_upower=no) + + if test "x$has_upower" = "xyes"; then + AC_DEFINE(HAVE_UPOWER, 1, [upower support]) + AC_SUBST(UPOWER_CFLAGS) + AC_SUBST(UPOWER_LIBS) + fi ++ PKG_CHECK_MODULES([UPOWER_HIBERNATE], [upower-glib < 0.99], has_upower_hibernate_suspend=yes, has_upower_hibernate_suspend=no) ++ if test "x$has_upower_hibernate_suspend" = "xyes"; then ++ AC_DEFINE(HAVE_UPOWER_HIBERNATE_SUSPEND, 1, [upower based support for hibernate and suspend (<0.99) ]) ++ fi ++ + fi + AM_CONDITIONAL(HAVE_UPOWER, test "x$has_upower" = "xyes") + AC_SUBST(HAVE_UPOWER) +diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c +index 464101b..f53c197 100644 +--- a/mate-session/gsm-logout-dialog.c ++++ b/mate-session/gsm-logout-dialog.c +@@ -215,10 +215,10 @@ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog) + if (LOGIND_RUNNING()) + ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd); + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) + else + #endif +-#ifdef HAVE_UPOWER ++#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND + ret = up_client_get_can_suspend (logout_dialog->priv->up_client); + #endif + return ret; +@@ -233,10 +233,10 @@ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog) + if (LOGIND_RUNNING()) + ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd); + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) + else + #endif +-#ifdef HAVE_UPOWER ++#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND + ret = up_client_get_can_hibernate (logout_dialog->priv->up_client); + #endif + return ret; +diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c +index db392b8..7930993 100644 +--- a/mate-session/gsm-manager.c ++++ b/mate-session/gsm-manager.c +@@ -1184,10 +1184,10 @@ manager_attempt_hibernate (GsmManager *manager) + gsm_systemd_attempt_hibernate (systemd); + } + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) + else { + #endif +-#ifdef HAVE_UPOWER ++#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND + can_hibernate = up_client_get_can_hibernate (manager->priv->up_client); + if (can_hibernate) { + +@@ -1203,7 +1203,7 @@ manager_attempt_hibernate (GsmManager *manager) + } + } + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) + } + #endif + } +@@ -1229,10 +1229,10 @@ manager_attempt_suspend (GsmManager *manager) + gsm_systemd_attempt_suspend (systemd); + } + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) + else { + #endif +-#ifdef HAVE_UPOWER ++#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND + can_suspend = up_client_get_can_suspend (manager->priv->up_client); + if (can_suspend) { + +@@ -1248,7 +1248,7 @@ manager_attempt_suspend (GsmManager *manager) + } + } + #endif +-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) + } + #endif + } +-- +2.6.3 + diff --git a/mate-base/mate-session-manager/mate-session-manager-1.10.3.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.10.3.ebuild new file mode 100644 index 000000000000..cb24fefd8b86 --- /dev/null +++ b/mate-base/mate-session-manager/mate-session-manager-1.10.3.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="yes" + +inherit autotools gnome2 versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="MATE session manager" +HOMEPAGE="http://mate-desktop.org/" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="ipv6 elibc_FreeBSD gnome-keyring systemd upower" + +# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and +# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* +# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). + +RDEPEND=">=dev-libs/dbus-glib-0.76 + >=dev-libs/glib-2.36:2 + dev-libs/libxslt + sys-apps/dbus + x11-apps/xdpyinfo + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-2.14:2 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXext + x11-libs/libXrender + x11-libs/libXtst + x11-libs/pango + x11-libs/xtrans + x11-misc/xdg-user-dirs + x11-misc/xdg-user-dirs-gtk + virtual/libintl + elibc_FreeBSD? ( dev-libs/libexecinfo ) + gnome-keyring? ( gnome-base/gnome-keyring ) + systemd? ( sys-apps/systemd ) + upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )" + +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40:* + >=dev-lang/perl-5 + >=mate-base/mate-common-1.10 + >=mate-base/mate-desktop-1.10 + >=sys-devel/gettext-0.10.40:* + virtual/pkgconfig:* + !<gnome-base/gdm-2.20.4" + +src_prepare() { + # Add "session saving" button back, + # see https://bugzilla.gnome.org/show_bug.cgi?id=575544 + epatch "${FILESDIR}"/${PN}-1.5.2-save-session-ui.patch + + # Upstream patch by oleid to fix building with upower 0.99 + epatch "${FILESDIR}"/${PN}-1.10.3-upower-0.99-series.patch + + eautoreconf + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --with-gtk=2.0 \ + $(use_enable ipv6) \ + $(use_with systemd) \ + $(use_enable upower) +} + +DOCS="AUTHORS ChangeLog NEWS README" + +src_install() { + gnome2_src_install + + dodir /etc/X11/Sessions/ + exeinto /etc/X11/Sessions/ + doexe "${FILESDIR}"/MATE + + dodir /usr/share/mate/applications/ + insinto /usr/share/mate/applications/ + doins "${FILESDIR}"/defaults.list + + dodir /etc/X11/xinit/xinitrc.d/ + exeinto /etc/X11/xinit/xinitrc.d/ + doexe "${FILESDIR}"/15-xdg-data-mate + + # This should be done in MATE too, see Gentoo bug #270852 + doexe "${FILESDIR}"/10-user-dirs-update-mate +} |