-DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
-DIST cinnamon-session-3.8.0.tar.gz 197983 BLAKE2B e0a8b57637668586f941c64df6e610a5df385a6ea67a71e1e666344a73e0095861beb9d958344dfd18988960df1e4380e72257c5f490ab344a4e0de6a749c2d1 SHA512 c737ee77396d38e27d93a5d2cec76d9072038f6a096c6071f450a9a3eb71d83beb1da3ff3320820d7989731281e5a108c330eec333a7fcb66ca7a37f16501c76
DIST cinnamon-session-4.0.0.tar.gz 198396 BLAKE2B 713573d445f09cfa4707c3ccaff04bdcc95ea7b60568fc136359258022af287df66992444da462f0488dc4049036deb190523695e519eb61329e922e05871c39 SHA512 7e91bef4e294175fa3333a96d0cb9d06db36c9b5a86d6e52734447ea62d411535760fc46713961a46299ebeb3767a0abd4768279e9f6c176ae882de9b7aedc5e
+++ /dev/null
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc elogind ipv6 systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.88
- >=dev-libs/glib-2.37.3:2
- media-libs/libcanberra
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3:3
- x11-libs/cairo
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcomposite
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango[X]
- virtual/opengl
- systemd? ( >=sys-apps/systemd-183
- sys-auth/polkit )
- elogind? ( sys-power/upower
- sys-auth/polkit[elogind] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- >=gnome-extra/cinnamon-desktop-2.6[systemd=]
- elogind? ( sys-auth/elogind[policykit] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- doc? ( app-text/xmlto )
-
- gnome-base/gnome-common
-"
-
-src_prepare() {
- # make upower and logind check non-automagic
- eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
- eapply "${FILESDIR}/${PN}-3.6.1-elogind.patch"
- eapply "${FILESDIR}/${PN}-3.6.1-elogind2.patch"
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-gconf \
- --disable-static \
- --enable-logind \
- $(use_enable doc docbook-docs) \
- $(use_enable ipv6)
-}
+++ /dev/null
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit meson eutils gnome2
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc elogind ipv6 systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.88
- >=dev-libs/glib-2.37.3:2
- media-libs/libcanberra
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3:3
- x11-libs/cairo
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcomposite
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango[X]
- >=x11-libs/xapps-1.0.4
- virtual/opengl
- systemd? ( >=sys-apps/systemd-183
- sys-auth/polkit )
- elogind? ( sys-power/upower
- sys-auth/polkit[elogind] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- >=gnome-extra/cinnamon-desktop-2.6[systemd=]
- elogind? ( sys-auth/elogind[policykit] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- doc? ( app-text/xmlto )
-
- gnome-base/gnome-common
-"
-
-src_prepare() {
- eapply "${FILESDIR}/${PN}-3.8.0-elogind.patch" \
- "${FILESDIR}/${PN}-3.8.0-elogind2.patch"
- gnome2_src_prepare
-}
-
-src_configure() {
- meson_src_configure \
- -Dwith-gconf=false \
- -Dwith-docbook=$(usex doc true false) \
- -Dwith-ipv6=$(usex ipv6 true false)
-}
-
-src_install() {
- meson_src_install
-}
+++ /dev/null
---- a/configure.ac~ 2016-05-20 13:03:13.000000000 +0200
-+++ b/configure.ac 2016-06-25 17:36:55.389583194 +0200
-@@ -56,7 +56,15 @@
-
- dnl We can only support old upower
- dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
--PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+AC_ARG_ENABLE([old-upower],
-+ AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]),
-+ [enable_old_upower=$enableval],
-+ [enable_old_upower=auto])
-+
-+have_old_upower=no
-+if test x$enable_old_upower != xno ; then
-+ PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+fi
- AS_IF([test x$have_old_upower = xyes], [
- AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
- ])
-@@ -96,9 +104,15 @@
- dnl Check for logind
- dnl ====================================================================
-
--PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login], [have_logind=yes], [
-- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
--])
-+AC_ARG_ENABLE([logind],
-+ AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+ [enable_logind=$enableval],
-+ [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no])
-+fi
-
- if test x$have_logind = xyes; then
- AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
+++ /dev/null
-diff --git a/cinnamon-session/Makefile.am b/cinnamon-session/Makefile.am
-index 789d47d..d8093d4 100644
---- a/cinnamon-session/Makefile.am
-+++ b/cinnamon-session/Makefile.am
-@@ -71,6 +71,7 @@ cinnamon_session_CPPFLAGS = \
- $(XEXT_CFLAGS) \
- $(GCONF_CFLAGS) \
- $(LOGIND_CFLAGS) \
-+ $(ELOGIND_CFLAGS) \
- -I$(top_srcdir)/egg \
- -DLOCALE_DIR=\""$(datadir)/locale"\" \
- -DDATA_DIR=\""$(datadir)/cinnamon-session"\" \
-@@ -91,6 +92,7 @@ cinnamon_session_LDADD = \
- $(UPOWER_LIBS) \
- $(GCONF_LIBS) \
- $(LOGIND_LIBS) \
-+ $(ELOGIND_LIBS) \
- $(EXECINFO_LIBS)
-
- libcsmutil_la_SOURCES = \
-diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
-index cef991c..dc2aa2e 100644
---- a/cinnamon-session/csm-systemd.c
-+++ b/cinnamon-session/csm-systemd.c
-@@ -32,7 +32,11 @@
- #include <sys/types.h>
- #include <pwd.h>
-
-+#ifdef HAVE_ELOGIND
-+#include <elogind/sd-login.h>
-+#else
- #include <systemd/sd-login.h>
-+#endif
-
- #include <glib.h>
- #include <glib-object.h>
-diff --git a/configure.ac b/configure.ac
-index 38db5a3..8dafc6a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,15 +113,23 @@ AC_ARG_ENABLE([logind],
-
- have_logind=no
- if test x$enable_logind != xno ; then
-- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no])
-+ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
- fi
-
- if test x$have_logind = xyes; then
- AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
- fi
-
-+have_elogind=no
-+PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
-+if test x$have_elogind = xyes; then
-+ AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
-+fi
-+
- AC_SUBST(LOGIND_CFLAGS)
- AC_SUBST(LOGIND_LIBS)
-+AC_SUBST(ELOGIND_CFLAGS)
-+AC_SUBST(ELOGIND_LIBS)
-
- dnl ====================================================================
- dnl Option to disable DBus user session support.
+++ /dev/null
-diff --git a/configure.ac b/configure.ac
-index c46b35f..5bde44a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,7 +113,7 @@ AC_ARG_ENABLE([logind],
-
- have_logind=no
- if test x$enable_logind != xno ; then
-- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
-+ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
- fi
-
- if test x$have_logind = xyes; then
-@@ -124,6 +124,7 @@ have_elogind=no
- PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
- if test x$have_elogind = xyes; then
- AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
-+ AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
- fi
-
- AC_SUBST(LOGIND_CFLAGS)
projects / gentoo.git / commitdiff