commit: 5df54bc7b01051bca5d787f7e645cb2f0f596c25 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Mon Jun 27 21:30:42 2016 +0000 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> CommitDate: Wed Jul 20 22:49:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5df54bc7
mate-extra/mate-screensaver: Patch configure.ac systemd, #585446 #589258 Package-Manager: portage-2.2.28 ...screensaver-1.10-fix-systemd-configure.ac.patch | 33 ++++++ .../mate-screensaver-1.10.2-r2.ebuild | 125 +++++++++++++++++++++ 2 files changed, 158 insertions(+) diff --git a/mate-extra/mate-screensaver/files/mate-screensaver-1.10-fix-systemd-configure.ac.patch b/mate-extra/mate-screensaver/files/mate-screensaver-1.10-fix-systemd-configure.ac.patch new file mode 100644 index 0000000..a5cf836 --- /dev/null +++ b/mate-extra/mate-screensaver/files/mate-screensaver-1.10-fix-systemd-configure.ac.patch @@ -0,0 +1,33 @@ +From 95b8f96ad66ab555c763dafebac8a49b9c6f3d51 Mon Sep 17 00:00:00 2001 +From: Monsta <mon...@inbox.ru> +Date: Thu, 1 Oct 2015 11:20:49 +0300 +Subject: [PATCH] configure.ac: add support for new libsystemd library + +From 6d4a81780e3598435b565569e8e16f1410cb5761 Mon Sep 17 00:00:00 2001 +From: Monsta <mon...@inbox.ru> +Date: Mon, 5 Oct 2015 16:30:14 +0300 +Subject: [PATCH] fix build w/o systemd support + +fixes https://github.com/mate-desktop/mate-screensaver/issues/83 + +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 379f9b1..87ab770 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -934,9 +934,9 @@ AC_ARG_WITH(systemd, + [Add systemd support]), + [with_systemd=$withval], [with_systemd=auto]) + +-PKG_CHECK_MODULES(SYSTEMD, +- [libsystemd-login], +- [have_systemd=yes], [have_systemd=no]) ++PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes], ++ [PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login], ++ [have_systemd=yes], [have_systemd=no])]) + + if test "x$with_systemd" = "xauto" ; then + if test x$have_systemd = xno ; then diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.10.2-r2.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.10.2-r2.ebuild new file mode 100644 index 0000000..9469fdb --- /dev/null +++ b/mate-extra/mate-screensaver/mate-screensaver-1.10.2-r2.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="yes" + +inherit gnome2 multilib autotools readme.gentoo versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"; +DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" +HOMEPAGE="http://mate-desktop.org"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +IUSE="X consolekit kernel_linux libnotify opengl pam systemd" + +DOC_CONTENTS=" + Information for converting screensavers is located in + /usr/share/doc/${PF}/xss-conversion.txt* +" + +RDEPEND=" + >=dev-libs/dbus-glib-0.71:0 + >=dev-libs/glib-2.36:2 + gnome-base/dconf:0 + >=mate-base/libmatekbd-1.10:0 + >=mate-base/mate-desktop-1.10:0 + >=mate-base/mate-menus-1.10:0 + >=mate-base/mate-session-manager-1.10:0 + >=sys-apps/dbus-0.30:0 + >=x11-libs/gdk-pixbuf-2.14:2 + >=x11-libs/gtk+-2.24:2 + >=x11-libs/libX11-1:0 + x11-libs/cairo:0 + x11-libs/libXext:0 + x11-libs/libXrandr:0 + x11-libs/libXScrnSaver:0 + x11-libs/libXxf86misc:0 + x11-libs/libXxf86vm:0 + x11-libs/libxklavier:0 + x11-libs/pango:0 + virtual/libintl:0 + consolekit? ( sys-auth/consolekit:0 ) + libnotify? ( >=x11-libs/libnotify-0.7:0 ) + opengl? ( virtual/opengl:0 ) + pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) + !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) + systemd? ( sys-apps/systemd:0= ) + !!<gnome-extra/gnome-screensaver-3:0" + +DEPEND="${RDEPEND} + >=dev-util/intltool-0.35:* + >=mate-base/mate-common-1.10:0 + sys-devel/gettext:* + x11-proto/randrproto:0 + x11-proto/scrnsaverproto:0 + x11-proto/xextproto:0 + x11-proto/xf86miscproto:0 + virtual/pkgconfig:*" + +src_prepare() { + gnome2_src_prepare + epatch "${FILESDIR}/mate-screensaver-1.10-fix-systemd-configure.ac.patch" + eautoreconf +} + +src_configure() { + gnome2_src_configure \ + $(use_with consolekit console-kit) \ + $(use_enable debug) \ + $(use_with libnotify) \ + $(use_with opengl libgl) \ + $(use_enable pam) \ + $(use_with systemd) \ + $(use_with X x) \ + --enable-locking \ + --with-kbd-layout-indicator \ + --with-xf86gamma-ext \ + --with-xscreensaverdir=/usr/share/xscreensaver/config \ + --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver +} + +src_install() { + gnome2_src_install + + # Install the conversion script in the documentation. + dodoc "${S}"/data/migrate-xscreensaver-config.sh + dodoc "${S}"/data/xscreensaver-config.xsl + dodoc "${FILESDIR}"/xss-conversion.txt + + # Non PAM users will need this suid to read the password hashes. + # OpenPAM users will probably need this too when + # http://bugzilla.gnome.org/show_bug.cgi?id=370847 + # is fixed. + if ! use pam ; then + fperms u+s /usr/libexec/mate-screensaver-dialog + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + + if has_version "<x11-base/xorg-server-1.5.3-r4" ; then + ewarn "You have a too old xorg-server installation. This will cause" + ewarn "mate-screensaver to eat up your CPU. Please consider upgrading." + echo + fi + + if has_version "<x11-misc/xscreensaver-4.22-r2" ; then + ewarn "You have xscreensaver installed, you probably want to disable it." + ewarn "To prevent a duplicate screensaver entry in the menu, you need to" + ewarn "build xscreensaver with -gnome in the USE flags." + ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use" + echo + fi + + readme.gentoo_print_elog +}
