[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-session-manager/, mate-base/mate-session-manager/files/

[NP Hardass]

commit:     49a833f8505ced965116b7894c9342845ccd40e2
Author:     Alexander van der Meij <alexandervdm <AT> gliese <DOT> me>
AuthorDate: Wed Nov 25 11:43:57 2015 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 09:29:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=49a833f8

mate-base/mate-session-manager: Version bump to 1.10.3, fix upower deps

Package-Manager: portage-2.2.26
Signed-off-by: NP-Hardass <NP-Hardass <AT> gentoo.org>

 mate-base/mate-session-manager/Manifest            |   2 +-
 ...session-manager-1.10.3-upower-0.99-series.patch | 119 +++++++++++++++++++++
 ...2.ebuild => mate-session-manager-1.10.3.ebuild} |   7 +-
 3 files changed, 125 insertions(+), 3 deletions(-)

diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index d4419f3..7d2d9b0 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -1,2 +1,2 @@
-DIST mate-session-manager-1.10.2.tar.xz 549568 SHA256 ed9d622d0747521c5ef11bbaea85f40445ef68c06ef6d1626b53055b0185cf7a SHA512 e431be2edb515101dc9fefb46a5ea2856ba37858eb5cf88ba94feec4c84b22e32b4cb7ae2276006cf26dad226fa545663a503a0c08476518901a9ee321f9d9b5 WHIRLPOOL af2087ff17ccc308e24b34f04cd0754593b1524171f340a670991dbc0992475b718aba59178dde31ea6fbd7e16b617640167ae2b8a2764791512c1496eb6820a
+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 0000000..bf97fdf
--- /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@×××××××××.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.2.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.10.3.ebuild
similarity index 90%
rename from mate-base/mate-session-manager/mate-session-manager-1.10.2.ebuild
rename to mate-base/mate-session-manager/mate-session-manager-1.10.3.ebuild
index c47c0da..cb24fef 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.10.2.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -46,7 +46,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.76
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 	gnome-keyring? ( gnome-base/gnome-keyring )
 	systemd? ( sys-apps/systemd )
-	upower? ( >=sys-power/upower-pm-utils-0.9.23 )"
+	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40:*
@@ -62,6 +62,9 @@ src_prepare() {
 	# 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
 }