From 7653b66a59e59ebc037412b44ac24ecd2d987fbb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Jan 2017 14:50:05 +0000 Subject: upstream gives no sign of multi-monitor bugfix for qt5-greeter in 6 months, so revert back to good old gtk-greeter --- .../files/lightdm-gtk-greeter-redcore.patch | 6 +- .../lightdm-gtk-greeter-2.0.1-r4.ebuild | 46 -------- .../lightdm-gtk-greeter-2.0.1-r5.ebuild | 46 ++++++++ x11-misc/lightdm/lightdm-1.16.7-r1.ebuild | 131 --------------------- x11-misc/lightdm/lightdm-1.16.7-r2.ebuild | 130 ++++++++++++++++++++ 5 files changed, 179 insertions(+), 180 deletions(-) delete mode 100644 x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r4.ebuild create mode 100644 x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r5.ebuild delete mode 100644 x11-misc/lightdm/lightdm-1.16.7-r1.ebuild create mode 100644 x11-misc/lightdm/lightdm-1.16.7-r2.ebuild diff --git a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-redcore.patch b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-redcore.patch index 56c24eb3..d4d234e6 100644 --- a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-redcore.patch +++ b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-redcore.patch @@ -1,12 +1,12 @@ diff -Nur a/data/lightdm-gtk-greeter.conf b/data/lightdm-gtk-greeter.conf --- a/data/lightdm-gtk-greeter.conf 2015-05-21 03:40:39.000000000 +0100 -+++ b/data/lightdm-gtk-greeter.conf 2016-04-28 16:39:15.844142626 +0100 ++++ b/data/lightdm-gtk-greeter.conf 2017-01-15 14:47:41.852905539 +0000 @@ -45,18 +45,19 @@ # transition-duration = overrides default value # [greeter] -#background= -+background=#005fce ++background=#990000 #user-background= -#theme-name= +theme-name=Redcore-daylight @@ -25,4 +25,4 @@ diff -Nur a/data/lightdm-gtk-greeter.conf b/data/lightdm-gtk-greeter.conf #reader= #position= #screensaver-timeout= -+default-user-image=/usr/share/pixmaps/redcore-symbolic.png ++default-user-image=/usr/share/pixmaps/redcore-symbolic-dark.png diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r4.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r4.ebuild deleted file mode 100644 index 79802130..00000000 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit versionator - -DESCRIPTION="LightDM GTK+ Greeter" -HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter" -SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz branding? ( -https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )" - -LICENSE="GPL-3 LGPL-3 - branding? ( CC-BY-3.0 )" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="ayatana +branding" - -COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 ) - branding? ( >=x11-themes/redcore-artwork-core-1 ) - x11-libs/gtk+:3 - >=x11-misc/lightdm-1.2.2" - -DEPEND="${COMMON_DEPEND} - sys-devel/gettext" - -RDEPEND="${COMMON_DEPEND} - x11-themes/gnome-themes-standard - || ( >=x11-themes/adwaita-icon-theme-3.14.1 x11-themes/gnome-icon-theme )" - - -src_prepare() { - if use branding; then - epatch "${FILESDIR}/${PN}-redcore.patch" - fi -} - -src_configure() { - econf --enable-kill-on-sigterm \ - $(use_enable ayatana libindicator) -} - -src_install() { - default -} diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r5.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r5.ebuild new file mode 100644 index 00000000..79802130 --- /dev/null +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r5.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +inherit versionator + +DESCRIPTION="LightDM GTK+ Greeter" +HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter" +SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz branding? ( +https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )" + +LICENSE="GPL-3 LGPL-3 + branding? ( CC-BY-3.0 )" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="ayatana +branding" + +COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 ) + branding? ( >=x11-themes/redcore-artwork-core-1 ) + x11-libs/gtk+:3 + >=x11-misc/lightdm-1.2.2" + +DEPEND="${COMMON_DEPEND} + sys-devel/gettext" + +RDEPEND="${COMMON_DEPEND} + x11-themes/gnome-themes-standard + || ( >=x11-themes/adwaita-icon-theme-3.14.1 x11-themes/gnome-icon-theme )" + + +src_prepare() { + if use branding; then + epatch "${FILESDIR}/${PN}-redcore.patch" + fi +} + +src_configure() { + econf --enable-kill-on-sigterm \ + $(use_enable ayatana libindicator) +} + +src_install() { + default +} diff --git a/x11-misc/lightdm/lightdm-1.16.7-r1.ebuild b/x11-misc/lightdm/lightdm-1.16.7-r1.ebuild deleted file mode 100644 index 252bd6f7..00000000 --- a/x11-misc/lightdm/lightdm-1.16.7-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils pam readme.gentoo systemd versionator - -TRUNK_VERSION="$(get_version_component_range 1-2)" -DESCRIPTION="A lightweight display manager" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM" -SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz - mirror://gentoo/introspection-20110205.m4.tar.bz2" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="audit +gtk +introspection kde qt4 qt5 +gnome" -REQUIRED_USE="|| ( gtk kde )" - -COMMON_DEPEND="audit? ( sys-process/audit ) - >=dev-libs/glib-2.32.3:2 - dev-libs/libxml2 - dev-libs/libbsd - gnome? ( sys-apps/accountsservice ) - virtual/pam - x11-libs/libX11 - >=x11-libs/libxklavier-5 - introspection? ( >=dev-libs/gobject-introspection-1 ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - )" -RDEPEND="${COMMON_DEPEND} - >=sys-auth/pambase-20101024-r2" -DEPEND="${COMMON_DEPEND} - dev-util/gtk-doc-am - dev-util/intltool - gnome? ( gnome-base/gnome-common ) - sys-devel/gettext - virtual/pkgconfig" -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter ) - qt5? ( x11-misc/lightdm-qt5-greeter ) - kde? ( x11-misc/lightdm-kde )" - -DOCS=( NEWS ) -RESTRICT="test" - -src_prepare() { - sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 - sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die - - einfo "Fixing the session-wrapper variable in lightdm.conf" - sed -i -e \ - "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ - data/lightdm.conf || die "Failed to fix lightdm.conf" - - epatch_user - - # Remove bogus Makefile statement. This needs to go upstream - sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die - if has_version dev-libs/gobject-introspection; then - eautoreconf - else - AT_M4DIR=${WORKDIR} eautoreconf - fi -} - -src_configure() { - # Set default values if global vars unset - local _greeter _session _user - _greeter=${LIGHTDM_GREETER:=qt-lightdm-greeter} - _session=${LIGHTDM_SESSION:=gnome} - _user=${LIGHTDM_USER:=root} - # Let user know how lightdm is configured - einfo "Gentoo configuration" - einfo "Default greeter: ${_greeter}" - einfo "Default session: ${_session}" - einfo "Greeter user: ${_user}" - - # also disable tests because libsystem.c does not build. Tests are - # restricted so it does not matter anyway. - econf \ - --localstatedir=/var \ - --disable-static \ - --disable-tests \ - $(use_enable audit libaudit) \ - $(use_enable introspection) \ - $(use_enable qt4 liblightdm-qt) \ - $(use_enable qt5 liblightdm-qt5) \ - --with-user-session=${_session} \ - --with-greeter-session=${_greeter} \ - --with-greeter-user=${_user} \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html -} - -src_install() { - default - - # Delete apparmor profiles because they only work with Ubuntu's - # apparmor package. Bug #494426 - if [[ -d ${D}/etc/apparmor.d ]]; then - rm -r "${D}/etc/apparmor.d" || die \ - "Failed to remove apparmor profiles" - fi - - insinto /etc/${PN} - doins data/{${PN},keys}.conf - doins "${FILESDIR}"/Xsession - fperms +x /etc/${PN}/Xsession - # /var/lib/lightdm-data could be useful. Bug #522228 - dodir /var/lib/lightdm-data - - prune_libtool_files --all - rm -rf "${ED}"/etc/init - - # Remove existing pam file. We will build a new one. Bug #524792 - rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter} - pamd_mimic system-local-login ${PN} auth account password session #372229 - pamd_mimic system-local-login ${PN}-greeter auth account password session #372229 - dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163 - - readme.gentoo_create_doc - - systemd_dounit "${FILESDIR}/${PN}.service" -} diff --git a/x11-misc/lightdm/lightdm-1.16.7-r2.ebuild b/x11-misc/lightdm/lightdm-1.16.7-r2.ebuild new file mode 100644 index 00000000..e83cc4ea --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.16.7-r2.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils pam readme.gentoo systemd versionator + +TRUNK_VERSION="$(get_version_component_range 1-2)" +DESCRIPTION="A lightweight display manager" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM" +SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz + mirror://gentoo/introspection-20110205.m4.tar.bz2" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86" +IUSE="audit +gtk +introspection kde qt4 qt5 +gnome" +REQUIRED_USE="|| ( gtk kde )" + +COMMON_DEPEND="audit? ( sys-process/audit ) + >=dev-libs/glib-2.32.3:2 + dev-libs/libxml2 + dev-libs/libbsd + gnome? ( sys-apps/accountsservice ) + virtual/pam + x11-libs/libX11 + >=x11-libs/libxklavier-5 + introspection? ( >=dev-libs/gobject-introspection-1 ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + )" +RDEPEND="${COMMON_DEPEND} + >=sys-auth/pambase-20101024-r2" +DEPEND="${COMMON_DEPEND} + dev-util/gtk-doc-am + dev-util/intltool + gnome? ( gnome-base/gnome-common ) + sys-devel/gettext + virtual/pkgconfig" +PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter ) + kde? ( x11-misc/lightdm-kde )" + +DOCS=( NEWS ) +RESTRICT="test" + +src_prepare() { + sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 + sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die + + einfo "Fixing the session-wrapper variable in lightdm.conf" + sed -i -e \ + "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ + data/lightdm.conf || die "Failed to fix lightdm.conf" + + epatch_user + + # Remove bogus Makefile statement. This needs to go upstream + sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die + if has_version dev-libs/gobject-introspection; then + eautoreconf + else + AT_M4DIR=${WORKDIR} eautoreconf + fi +} + +src_configure() { + # Set default values if global vars unset + local _greeter _session _user + _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} + _session=${LIGHTDM_SESSION:=gnome} + _user=${LIGHTDM_USER:=root} + # Let user know how lightdm is configured + einfo "Gentoo configuration" + einfo "Default greeter: ${_greeter}" + einfo "Default session: ${_session}" + einfo "Greeter user: ${_user}" + + # also disable tests because libsystem.c does not build. Tests are + # restricted so it does not matter anyway. + econf \ + --localstatedir=/var \ + --disable-static \ + --disable-tests \ + $(use_enable audit libaudit) \ + $(use_enable introspection) \ + $(use_enable qt4 liblightdm-qt) \ + $(use_enable qt5 liblightdm-qt5) \ + --with-user-session=${_session} \ + --with-greeter-session=${_greeter} \ + --with-greeter-user=${_user} \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html +} + +src_install() { + default + + # Delete apparmor profiles because they only work with Ubuntu's + # apparmor package. Bug #494426 + if [[ -d ${D}/etc/apparmor.d ]]; then + rm -r "${D}/etc/apparmor.d" || die \ + "Failed to remove apparmor profiles" + fi + + insinto /etc/${PN} + doins data/{${PN},keys}.conf + doins "${FILESDIR}"/Xsession + fperms +x /etc/${PN}/Xsession + # /var/lib/lightdm-data could be useful. Bug #522228 + dodir /var/lib/lightdm-data + + prune_libtool_files --all + rm -rf "${ED}"/etc/init + + # Remove existing pam file. We will build a new one. Bug #524792 + rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter} + pamd_mimic system-local-login ${PN} auth account password session #372229 + pamd_mimic system-local-login ${PN}-greeter auth account password session #372229 + dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163 + + readme.gentoo_create_doc + + systemd_dounit "${FILESDIR}/${PN}.service" +} -- cgit v1.2.3