* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/files/, kde-base/kdm/
@ 2011-11-20 16:30 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2011-11-20 16:30 UTC (permalink / raw
To: gentoo-commits
commit: e1f657bde508b37df7026d77fb8eae0ab8d249ad
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Nov 20 17:30:52 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 17:30:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e1f657bd
[kde-base/kdm] Revert crash detection logic, possibly related to bug 389757
(Portage version: 2.1.10.34/git/Linux x86_64, unsigned Manifest commit)
---
.../kdm/files/kdm-4.7.3-revertcrashlogic.patch | 145 ++++++++++++++++++
kde-base/kdm/kdm-4.7.3-r1.ebuild | 161 ++++++++++++++++++++
2 files changed, 306 insertions(+), 0 deletions(-)
diff --git a/kde-base/kdm/files/kdm-4.7.3-revertcrashlogic.patch b/kde-base/kdm/files/kdm-4.7.3-revertcrashlogic.patch
new file mode 100644
index 0000000..94e47d5
--- /dev/null
+++ b/kde-base/kdm/files/kdm-4.7.3-revertcrashlogic.patch
@@ -0,0 +1,145 @@
+diff --git a/kdm/backend/greet.h b/kdm/backend/greet.h
+index 2ef7026..41f0791 100644
+--- a/kdm/backend/greet.h
++++ b/kdm/backend/greet.h
+@@ -146,8 +146,6 @@ from the copyright holder.
+ #define G_DChoose 3 /* run chooser */
+ #endif
+
+-#define G_Interact 4 /* greeter got user input. possible crash is probably not spontaneous. */
+-
+ #define G_Shutdown 101 /* 5*int, string; async */
+ # define SHUT_REBOOT 1 /* how */
+ # define SHUT_HALT 2
+diff --git a/kdm/backend/session.c b/kdm/backend/session.c
+index 85ab1d7..1b47e9c 100644
+--- a/kdm/backend/session.c
++++ b/kdm/backend/session.c
+@@ -409,12 +409,16 @@ void
+ openGreeter()
+ {
+ char *name, **env;
++ static time_t lastStart;
+ int cmd;
+ Cursor xcursor;
+
+ gSet(&grttalk);
+ if (grtproc.pid > 0)
+ return;
++ updateNow();
++ if (now < lastStart + 10) /* XXX should use some readiness indicator instead */
++ sessionExit(EX_UNMANAGE_DPY);
+ ASPrintf(&name, "greeter for display %s", td->name);
+ debug("starting %s\n", name);
+
+@@ -443,6 +447,8 @@ openGreeter()
+ sessionExit(EX_UNMANAGE_DPY);
+ }
+ debug("%s ready\n", name);
++ updateNow();
++ lastStart = now;
+ }
+
+ int
+@@ -544,7 +550,7 @@ manageSession(void)
+ {
+ int ex, cmd;
+ volatile int clientPid = -1;
+- time_t tdiff, startt;
++ time_t tdiff;
+
+ debug("manageSession %s\n", td->name);
+ if ((ex = Setjmp(abortSession))) {
+@@ -576,13 +582,10 @@ manageSession(void)
+ updateNow();
+ tdiff = now - td->hstent->lastExit - td->openDelay;
+ if (autoLogon(tdiff)) {
+- if (!verify(conv_auto, False)) {
+- startt = now;
++ if (!verify(conv_auto, False))
+ goto gcont;
+- }
+ } else {
+ regreet:
+- startt = now;
+ openGreeter();
+ #ifdef XDMCP
+ if (((td->displayType & d_location) == dLocal) &&
+@@ -596,10 +599,6 @@ manageSession(void)
+ G_GreetTimed : G_Greet);
+ gcont:
+ cmd = ctrlGreeterWait(True);
+- if (cmd == G_Interact) {
+- startt = 0;
+- goto gcont;
+- }
+ #ifdef XDMCP
+ while (cmd == G_DChoose) {
+ choose:
+@@ -616,9 +615,6 @@ manageSession(void)
+ logError("Received unknown command %d from greeter\n", cmd);
+ closeGreeter(True);
+ }
+- updateNow();
+- if (now < startt + 120) /* Greeter crashed spontaneously. Avoid endless loop. */
+- sessionExit(EX_UNMANAGE_DPY);
+ goto regreet;
+ }
+ }
+diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
+index f169248..1bb744c 100644
+--- a/kdm/kfrontend/kgapp.cpp
++++ b/kdm/kfrontend/kgapp.cpp
+@@ -74,7 +74,7 @@ sigAlarm(int)
+
+ GreeterApp::GreeterApp(int &argc, char **argv) :
+ inherited(argc, argv),
+- regrabPtr(false), regrabKbd(false), initalBusy(true), sendInteract(false),
++ regrabPtr(false), regrabKbd(false), initalBusy(true),
+ dragWidget(0)
+ {
+ pingInterval = _isLocal ? 0 : _pingInterval;
+@@ -203,14 +203,6 @@ GreeterApp::x11EventFilter(XEvent * ev)
+ break;
+ }
+ break;
+- default:
+- return false;
+- }
+- if (sendInteract) {
+- sendInteract = false;
+- // We assume that no asynchronous communication is going on
+- // before the first user interaction.
+- gSendInt(G_Interact);
+ }
+ return false;
+ }
+@@ -487,7 +479,6 @@ main(int argc ATTR_UNUSED, char **argv)
+ }
+ }
+ QObject::connect(dialog, SIGNAL(ready()), &app, SLOT(markReady()));
+- app.enableSendInteract();
+ debug("entering event loop\n");
+ rslt = dialog->exec();
+ debug("left event loop\n");
+diff --git a/kdm/kfrontend/kgapp.h b/kdm/kfrontend/kgapp.h
+index b7c1b97..0979950 100644
+--- a/kdm/kfrontend/kgapp.h
++++ b/kdm/kfrontend/kgapp.h
+@@ -37,7 +37,6 @@ class GreeterApp : public QApplication {
+ public:
+ GreeterApp(int &argc, char **argv);
+ void markBusy();
+- void enableSendInteract() { sendInteract = true; }
+ virtual bool x11EventFilter(XEvent *);
+
+ public Q_SLOTS:
+@@ -51,7 +50,7 @@ class GreeterApp : public QApplication {
+
+ private:
+ int pingInterval, pingTimerId;
+- bool regrabPtr, regrabKbd, initalBusy, sendInteract;
++ bool regrabPtr, regrabKbd, initalBusy;
+ QPoint mouseStartPos, dialogStartPos;
+ QWidget *dragWidget;
+ };
diff --git a/kde-base/kdm/kdm-4.7.3-r1.ebuild b/kde-base/kdm/kdm-4.7.3-r1.ebuild
new file mode 100644
index 0000000..7e04b3f
--- /dev/null
+++ b/kde-base/kdm/kdm-4.7.3-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+inherit kde4-meta flag-o-matic
+
+DESCRIPTION="KDE login manager, similar to xdm and gdm"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+consolekit debug kerberos pam"
+
+DEPEND="
+ $(add_kdebase_dep libkworkspace)
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libXtst
+ consolekit? (
+ >=sys-apps/dbus-1.0.2
+ sys-auth/consolekit
+ )
+ kerberos? ( virtual/krb5 )
+ pam? (
+ $(add_kdebase_dep kcheckpass)
+ virtual/pam
+ )
+"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kdepasswd)
+ >=x11-apps/xinit-1.0.5-r2
+ x11-apps/xmessage
+"
+
+KMEXTRA="
+ libs/kdm/
+"
+
+PATCHES=(
+ "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+ "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+ "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
+)
+
+pkg_setup() {
+ kde4-meta_pkg_setup
+
+ # Create kdm:kdm user
+ KDM_HOME=/var/lib/kdm
+ enewgroup kdm
+ enewuser kdm -1 -1 "${KDM_HOME}" kdm
+}
+
+src_configure() {
+ # genkdmconf breaks with -O3
+ # last checked in 4.2.95
+ replace-flags -O3 -O2
+
+ mycmakeargs=(
+ $(cmake-utils_use kerberos KDE4_KRB5AUTH)
+ $(cmake-utils_use_with pam)
+ $(cmake-utils_use_with consolekit CkConnector)
+ )
+
+ kde4-meta_src_configure
+}
+
+src_install() {
+ export GENKDMCONF_FLAGS="--no-old --no-backup"
+
+ kde4-meta_src_install
+
+ # an equivalent file is already installed by kde-base/startkde, bug 377151
+ rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die
+
+ # Customize the kdmrc configuration:
+ # - SessionDirs set to /usr/share/xsessions
+ # - increase server timeout to 30s
+ # - TerminateServer=true to workaround X server regen bug, bug 278473
+ # - DataDir set to /var/lib/kdm
+ # - FaceDir set to /var/lib/kdm/faces
+ sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
+ -e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
+ -e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
+ -e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
+ -e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
+ -i "${ED}"/usr/share/config/kdm/kdmrc \
+ || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
+
+ # Don't install empty dir
+ rmdir "${ED}"/usr/share/config/kdm/sessions
+
+ # Set up permissions to kdm work directory
+ keepdir "${KDM_HOME}"
+ fowners root:kdm "${KDM_HOME}"
+ fperms 1770 "${KDM_HOME}"
+
+ # install logrotate file
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/kdm-logrotate kdm
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ local file src dest dir old_dirs=(
+ /var/lib/kdm-live
+ /var/lib/kdm-4.6
+ /var/lib/kdm-4.5
+ /var/lib/kdm-4.4
+ /usr/share/apps/kdm
+ /usr/kde/4.4/share/apps/kdm
+ /usr/kde/4.3/share/apps/kdm
+ /usr/kde/4.2/share/apps/kdm
+ )
+
+ mkdir -p "${EROOT}${KDM_HOME}/faces"
+ # Set the default kdm face icon if it's not already set by the system admin
+ # because this is user-overrideable in that way, it's not in src_install
+ for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
+ src=${file#*:}
+ dest=${file%:*}
+ if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
+ for dir in "${old_dirs[@]}"; do
+ if [[ -e ${EROOT}${dir}/${dest} ]]; then
+ cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
+ break 2
+ fi
+ done
+ if [[ -n ${src} ]]; then
+ cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \
+ "${EROOT}${KDM_HOME}/${dest}"
+ fi
+ fi
+ done
+ for dir in "${old_dirs[@]}"; do
+ if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
+ echo
+ elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
+ elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
+ echo
+ elog "After doing so, you may delete the directory."
+ echo
+ fi
+ done
+
+ # Make sure permissions are correct -- old installations may have
+ # gotten this wrong
+ use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
+ chmod 1770 "${EROOT}${KDM_HOME}"
+
+ if use consolekit; then
+ echo
+ elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
+ elog "make sure consolekit daemon is running and started at login time"
+ elog
+ elog "rc-update add consolekit default && /etc/init.d/consolekit start"
+ echo
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/files/, kde-base/kdm/
@ 2012-02-03 14:20 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2012-02-03 14:20 UTC (permalink / raw
To: gentoo-commits
commit: e804d3a225c430b0c1deae5f7f1ea7aabcb82712
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 14:14:25 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 14:14:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e804d3a2
[kde-base/kdm] Remove patch for pam here, because it has no effect. Patched libkworkspace instead bug 398333.
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)
---
.../kdm/files/kdebase-4.0.2-pam-optional.patch | 29 --------------------
kde-base/kdm/kdm-4.8.49.9999.ebuild | 1 -
kde-base/kdm/kdm-9999.ebuild | 1 -
3 files changed, 0 insertions(+), 31 deletions(-)
diff --git a/kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch b/kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch
deleted file mode 100644
index 6fb54f0..0000000
--- a/kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
-index 3499836..cd1c2bb 100644
---- a/kdebase/workspace/cmake/modules/FindPAM.cmake
-+++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
-@@ -5,6 +5,8 @@
- # PAM_INCLUDE_DIR - the pam include directory
- # PAM_LIBRARIES - libpam library
-
-+if (WITH_PAM)
-+
- if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
- # Already in cache, be silent
- set(PAM_FIND_QUIETLY TRUE)
-@@ -72,3 +74,5 @@ else (PAM_FOUND)
- endif (PAM_FOUND)
-
- mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
-+
-+endif (WITH_PAM)
-diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
-index ed8ab9e..ce3bcc2 100644
---- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
-+++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
-@@ -1,4 +1,4 @@
--find_package(PAM)
-+macro_optional_find_package(PAM)
-
- set(UNIXAUTH_LIBRARIES)
- set(UNIXAUTH_INCLUDE_DIRS)
diff --git a/kde-base/kdm/kdm-4.8.49.9999.ebuild b/kde-base/kdm/kdm-4.8.49.9999.ebuild
index ed4932f..93e9fec 100644
--- a/kde-base/kdm/kdm-4.8.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.8.49.9999.ebuild
@@ -38,7 +38,6 @@ KMEXTRA="
"
PATCHES=(
- "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
)
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index ed4932f..93e9fec 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -38,7 +38,6 @@ KMEXTRA="
"
PATCHES=(
- "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/files/, kde-base/kdm/
@ 2012-04-26 11:09 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2012-04-26 11:09 UTC (permalink / raw
To: gentoo-commits
commit: 04fee35361b323b89b979909171fa80c9526621a
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 11:03:41 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 11:03:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=04fee353
[kde-base/kdm] Add patch to fix grub:2 support by Egor Y. Egorov <egorov_egor <AT> bk.ru> wrt bug 413585.
(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)
---
kde-base/kdm/files/kdm-4.8.2-grub2.patch | 14 ++++++++++++++
kde-base/kdm/kdm-4.8.49.9999.ebuild | 1 +
kde-base/kdm/kdm-9999.ebuild | 1 +
3 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/kde-base/kdm/files/kdm-4.8.2-grub2.patch b/kde-base/kdm/files/kdm-4.8.2-grub2.patch
new file mode 100644
index 0000000..d48bd10
--- /dev/null
+++ b/kde-base/kdm/files/kdm-4.8.2-grub2.patch
@@ -0,0 +1,14 @@
+diff -uNr kdm-4.8.2_orig/kdm/backend/bootman.c kdm-4.8.2/kdm/backend/bootman.c
+--- kdm-4.8.2_orig/kdm/backend/bootman.c 2012-03-30 05:02:31.000000000 +0700
++++ kdm-4.8.2/kdm/backend/bootman.c 2012-04-26 09:33:58.683462475 +0700
+@@ -224,8 +224,8 @@
+ static int
+ getGrub2(char ***opts, int *def, int *cur)
+ {
+- grubConfig = "/boot/grub/grub.cfg";
+- return getGrub2OrBurg(opts, def, cur, "grub-reboot");
++ grubConfig = "/boot/grub2/grub.cfg";
++ return getGrub2OrBurg(opts, def, cur, "grub2-reboot");
+ }
+
+ static int
diff --git a/kde-base/kdm/kdm-4.8.49.9999.ebuild b/kde-base/kdm/kdm-4.8.49.9999.ebuild
index 93e9fec..36cb1d4 100644
--- a/kde-base/kdm/kdm-4.8.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.8.49.9999.ebuild
@@ -40,6 +40,7 @@ KMEXTRA="
PATCHES=(
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
+ "${FILESDIR}/${PN}-4.8.2-grub2.patch"
)
pkg_setup() {
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 93e9fec..36cb1d4 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -40,6 +40,7 @@ KMEXTRA="
PATCHES=(
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
+ "${FILESDIR}/${PN}-4.8.2-grub2.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/files/, kde-base/kdm/
@ 2012-04-29 18:27 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2012-04-29 18:27 UTC (permalink / raw
To: gentoo-commits
commit: bcaf2fbb854b1fffc004ff9094050526fadc8f81
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Sun Apr 29 18:27:00 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sun Apr 29 18:27:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bcaf2fbb
[kde-base/kdm] Remove Grub2 patch, since a fix has been applied upstream.
(Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit)
---
kde-base/kdm/files/kdm-4.8.2-grub2.patch | 14 --------------
kde-base/kdm/kdm-4.8.49.9999.ebuild | 1 -
kde-base/kdm/kdm-9999.ebuild | 1 -
3 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/kde-base/kdm/files/kdm-4.8.2-grub2.patch b/kde-base/kdm/files/kdm-4.8.2-grub2.patch
deleted file mode 100644
index d48bd10..0000000
--- a/kde-base/kdm/files/kdm-4.8.2-grub2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr kdm-4.8.2_orig/kdm/backend/bootman.c kdm-4.8.2/kdm/backend/bootman.c
---- kdm-4.8.2_orig/kdm/backend/bootman.c 2012-03-30 05:02:31.000000000 +0700
-+++ kdm-4.8.2/kdm/backend/bootman.c 2012-04-26 09:33:58.683462475 +0700
-@@ -224,8 +224,8 @@
- static int
- getGrub2(char ***opts, int *def, int *cur)
- {
-- grubConfig = "/boot/grub/grub.cfg";
-- return getGrub2OrBurg(opts, def, cur, "grub-reboot");
-+ grubConfig = "/boot/grub2/grub.cfg";
-+ return getGrub2OrBurg(opts, def, cur, "grub2-reboot");
- }
-
- static int
diff --git a/kde-base/kdm/kdm-4.8.49.9999.ebuild b/kde-base/kdm/kdm-4.8.49.9999.ebuild
index 36cb1d4..93e9fec 100644
--- a/kde-base/kdm/kdm-4.8.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.8.49.9999.ebuild
@@ -40,7 +40,6 @@ KMEXTRA="
PATCHES=(
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
- "${FILESDIR}/${PN}-4.8.2-grub2.patch"
)
pkg_setup() {
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 36cb1d4..93e9fec 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -40,7 +40,6 @@ KMEXTRA="
PATCHES=(
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
- "${FILESDIR}/${PN}-4.8.2-grub2.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/files/, kde-base/kdm/
@ 2013-04-29 18:03 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2013-04-29 18:03 UTC (permalink / raw
To: gentoo-commits
commit: d34f2ca789fa379b45fedce165c5433756ea36bd
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 18:06:21 2013 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 18:06:21 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d34f2ca7
[kde-base/kdm] add systemd service file, bug 455288
Package-Manager: portage-2.2.0_alpha173
---
kde-base/kdm/files/kdm.service | 12 ++++++++++++
kde-base/kdm/kdm-4.10.49.9999.ebuild | 4 +++-
kde-base/kdm/kdm-9999.ebuild | 4 +++-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/kde-base/kdm/files/kdm.service b/kde-base/kdm/files/kdm.service
new file mode 100644
index 0000000..412ffa3
--- /dev/null
+++ b/kde-base/kdm/files/kdm.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=KDM Display Manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/usr/bin/kdm -nodaemon
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/kde-base/kdm/kdm-4.10.49.9999.ebuild b/kde-base/kdm/kdm-4.10.49.9999.ebuild
index 4abbd31..16ffb13 100644
--- a/kde-base/kdm/kdm-4.10.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.10.49.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
KDE_HANDBOOK="optional"
KMNAME="kde-workspace"
-inherit kde4-meta flag-o-matic user
+inherit systemd kde4-meta flag-o-matic user
DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS=""
@@ -94,6 +94,8 @@ src_install() {
# install logrotate file
insinto /etc/logrotate.d
newins "${FILESDIR}"/kdm-logrotate kdm
+
+ systemd_dounit "${FILESDIR}"/kdm.service
}
pkg_postinst() {
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 4abbd31..16ffb13 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
KDE_HANDBOOK="optional"
KMNAME="kde-workspace"
-inherit kde4-meta flag-o-matic user
+inherit systemd kde4-meta flag-o-matic user
DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS=""
@@ -94,6 +94,8 @@ src_install() {
# install logrotate file
insinto /etc/logrotate.d
newins "${FILESDIR}"/kdm-logrotate kdm
+
+ systemd_dounit "${FILESDIR}"/kdm.service
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-04-29 18:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-29 18:03 [gentoo-commits] proj/kde:master commit in: kde-base/kdm/files/, kde-base/kdm/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2012-04-29 18:27 Michael Palimaka
2012-04-26 11:09 Johannes Huber
2012-02-03 14:20 Johannes Huber
2011-11-20 16:30 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox