diff options
author | 2004-04-28 12:29:58 +0000 | |
---|---|---|
committer | 2004-04-28 12:29:58 +0000 | |
commit | 15f16b504b63c662c04a226ad13e5ace52a3f518 (patch) | |
tree | 38fbb9e825f7e6bd4a03f13b007c9753ab21ecfa /gnome-base | |
parent | fix ppc64 bug #49102 (patch issue) (Manifest recommit) (diff) | |
download | gentoo-2-15f16b504b63c662c04a226ad13e5ace52a3f518.tar.gz gentoo-2-15f16b504b63c662c04a226ad13e5ace52a3f518.tar.bz2 gentoo-2-15f16b504b63c662c04a226ad13e5ace52a3f518.zip |
add gtk+-2.4 build patch
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/gdm/ChangeLog | 5 | ||||
-rw-r--r-- | gnome-base/gdm/files/digest-gdm-2.4.1.6 | 2 | ||||
-rw-r--r-- | gnome-base/gdm/files/digest-gdm-2.4.4.7 | 2 | ||||
-rw-r--r-- | gnome-base/gdm/files/gdm-2.4.1.7-gtk-2.4.patch | 108 | ||||
-rw-r--r-- | gnome-base/gdm/gdm-2.4.1.6.ebuild | 194 | ||||
-rw-r--r-- | gnome-base/gdm/gdm-2.4.1.7-r1.ebuild | 7 | ||||
-rw-r--r-- | gnome-base/gdm/gdm-2.4.4.7.ebuild | 126 |
7 files changed, 118 insertions, 326 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index e6ef9a9d8934..dfc4e6110096 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-base/gdm # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.57 2004/04/17 09:18:06 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.58 2004/04/28 12:29:57 foser Exp $ + + 28 Apr 2004; foser <foser@gentoo.org> gdm-2.4.1.7-r1.ebuild : + Added patch to build withg gtk-2.4, provided by gmsoft in #49185 17 Apr 2004; Travis Tilley <lv@gentoo.org> gdm-2.4.1.7-r1.ebuild: stable on amd64 diff --git a/gnome-base/gdm/files/digest-gdm-2.4.1.6 b/gnome-base/gdm/files/digest-gdm-2.4.1.6 deleted file mode 100644 index db7926072cb0..000000000000 --- a/gnome-base/gdm/files/digest-gdm-2.4.1.6 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 ef8cba099c650bd46661b764db2717bd gdm-2.4.1.6.tar.bz2 2085553 -MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423 diff --git a/gnome-base/gdm/files/digest-gdm-2.4.4.7 b/gnome-base/gdm/files/digest-gdm-2.4.4.7 deleted file mode 100644 index e668d8837757..000000000000 --- a/gnome-base/gdm/files/digest-gdm-2.4.4.7 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 a3d2f243c4f42e2542bda8cb5fb9a7c5 gdm-2.4.4.7.tar.bz2 2430455 -MD5 e0dcf60fc342ed1862f0fff26da984b2 gentoo-gdm-theme-r1.tar.bz2 54186 diff --git a/gnome-base/gdm/files/gdm-2.4.1.7-gtk-2.4.patch b/gnome-base/gdm/files/gdm-2.4.1.7-gtk-2.4.patch new file mode 100644 index 000000000000..fec686df9405 --- /dev/null +++ b/gnome-base/gdm/files/gdm-2.4.1.7-gtk-2.4.patch @@ -0,0 +1,108 @@ +diff -uNr gdm-2.4.1.7.orig/daemon/Makefile.am gdm-2.4.1.7/daemon/Makefile.am +--- gdm-2.4.1.7.orig/daemon/Makefile.am 2004-04-28 01:24:37.000000000 +0000 ++++ gdm-2.4.1.7/daemon/Makefile.am 2004-04-28 01:26:11.000000000 +0000 +@@ -4,11 +4,6 @@ + INCLUDES = \ + -I. \ + -I.. \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGNOME_DISABLE_DEPRECATED \ + -I$(top_srcdir)/vicious-extensions \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DLOCALEDIR=\"$(datadir)/locale\" \ +diff -uNr gdm-2.4.1.7.orig/daemon/Makefile.in gdm-2.4.1.7/daemon/Makefile.in +--- gdm-2.4.1.7.orig/daemon/Makefile.in 2004-04-28 01:24:37.000000000 +0000 ++++ gdm-2.4.1.7/daemon/Makefile.in 2004-04-28 01:26:03.000000000 +0000 +@@ -151,7 +151,7 @@ + + DEFS = @DEFS@ -DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" + +-INCLUDES = -I. -I.. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -I$(top_srcdir)/vicious-extensions -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" $(DAEMON_CFLAGS) -DPAM_PREFIX=\"$(PAM_PREFIX)\" $(GNOME_INCLUDEDIR) ++INCLUDES = -I. -I.. -I$(top_srcdir)/vicious-extensions -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" $(DAEMON_CFLAGS) -DPAM_PREFIX=\"$(PAM_PREFIX)\" $(GNOME_INCLUDEDIR) + + + bin_PROGRAMS = gdm-binary +diff -uNr gdm-2.4.1.7.orig/gui/Makefile.am gdm-2.4.1.7/gui/Makefile.am +--- gdm-2.4.1.7.orig/gui/Makefile.am 2004-04-28 01:24:37.000000000 +0000 ++++ gdm-2.4.1.7/gui/Makefile.am 2004-04-28 01:27:19.000000000 +0000 +@@ -9,11 +9,6 @@ + INCLUDES = \ + -I. \ + -I.. \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGNOME_DISABLE_DEPRECATED \ + -I$(top_srcdir)/daemon \ + -I$(top_srcdir)/vicious-extensions \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ +diff -uNr gdm-2.4.1.7.orig/gui/Makefile.in gdm-2.4.1.7/gui/Makefile.in +--- gdm-2.4.1.7.orig/gui/Makefile.in 2004-04-28 01:24:37.000000000 +0000 ++++ gdm-2.4.1.7/gui/Makefile.in 2004-04-28 01:27:11.000000000 +0000 +@@ -154,7 +154,7 @@ + DEFS = @DEFS@ -DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" -DGDM_FACTORY_CONFIG_FILE=\"@sysconfdir@/gdm/factory-gdm.conf\" -DGDM_GLADE_DIR=\"@datadir@/gdm\" + + +-INCLUDES = -I. -I.. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -I$(top_srcdir)/daemon -I$(top_srcdir)/vicious-extensions -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GUI_CFLAGS) ++INCLUDES = -I. -I.. -I$(top_srcdir)/daemon -I$(top_srcdir)/vicious-extensions -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GUI_CFLAGS) + + + noinst_LIBRARIES = libgdmwm.a libgdmlang.a +diff -uNr gdm-2.4.1.7.orig/gui/greeter/Makefile.am gdm-2.4.1.7/gui/greeter/Makefile.am +--- gdm-2.4.1.7.orig/gui/greeter/Makefile.am 2004-04-28 01:24:37.000000000 +0000 ++++ gdm-2.4.1.7/gui/greeter/Makefile.am 2004-04-28 01:29:06.000000000 +0000 +@@ -3,11 +3,6 @@ + ## Process this file with automake to produce makefile.in + INCLUDES = \ + -I. \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGNOME_DISABLE_DEPRECATED \ + -I$(top_srcdir)/gui \ + -I$(top_srcdir)/daemon \ + -I$(top_srcdir)/vicious-extensions \ +diff -uNr gdm-2.4.1.7.orig/gui/greeter/Makefile.in gdm-2.4.1.7/gui/greeter/Makefile.in +--- gdm-2.4.1.7.orig/gui/greeter/Makefile.in 2004-04-28 01:24:37.000000000 +0000 ++++ gdm-2.4.1.7/gui/greeter/Makefile.in 2004-04-28 01:28:55.000000000 +0000 +@@ -151,7 +151,7 @@ + + SUBDIRS = . themes + +-INCLUDES = -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -I$(top_srcdir)/gui -I$(top_srcdir)/daemon -I$(top_srcdir)/vicious-extensions -DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGREETERTHEMEDIR=\""$(datadir)/gdm/themes"\" $(GREETER_CFLAGS) ++INCLUDES = -I. -I$(top_srcdir)/gui -I$(top_srcdir)/daemon -I$(top_srcdir)/vicious-extensions -DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGREETERTHEMEDIR=\""$(datadir)/gdm/themes"\" $(GREETER_CFLAGS) + + + bin_PROGRAMS = gdmgreeter +diff -uNr gdm-2.4.1.7.orig/vicious-extensions/Makefile.am gdm-2.4.1.7/vicious-extensions/Makefile.am +--- gdm-2.4.1.7.orig/vicious-extensions/Makefile.am 2004-04-28 01:24:37.000000000 +0000 ++++ gdm-2.4.1.7/vicious-extensions/Makefile.am 2004-04-28 01:29:52.000000000 +0000 +@@ -4,11 +4,6 @@ + INCLUDES = \ + -I. \ + -I.. \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGNOME_DISABLE_DEPRECATED \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + $(GUI_CFLAGS) + +diff -uNr gdm-2.4.1.7.orig/vicious-extensions/Makefile.in gdm-2.4.1.7/vicious-extensions/Makefile.in +--- gdm-2.4.1.7.orig/vicious-extensions/Makefile.in 2004-04-28 01:24:37.000000000 +0000 ++++ gdm-2.4.1.7/vicious-extensions/Makefile.in 2004-04-28 01:29:46.000000000 +0000 +@@ -151,7 +151,7 @@ + + SUBDIRS = . + +-INCLUDES = -I. -I.. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GUI_CFLAGS) ++INCLUDES = -I. -I.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GUI_CFLAGS) + + + noinst_LIBRARIES = libvicious.a libviciousui.a diff --git a/gnome-base/gdm/gdm-2.4.1.6.ebuild b/gnome-base/gdm/gdm-2.4.1.6.ebuild deleted file mode 100644 index edac8e4322bc..000000000000 --- a/gnome-base/gdm/gdm-2.4.1.6.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.1.6.ebuild,v 1.8 2004/04/03 23:28:57 spyderous Exp $ - -inherit eutils gnome2 - -DESCRIPTION="GNOME2 Display Manager" -HOMEPAGE="http://www.gnome.org/" - -SLOT="0" -KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64" -LICENSE="GPL-2" -IUSE="" -SRC_URI="${SRC_URI} - mirror://gentoo/gentoo-gdm-theme.tar.bz2" -MY_V="`echo ${PV} |cut -b -5`" - -RDEPEND=">=sys-libs/pam-0.72 - >=sys-apps/tcp-wrappers-7.6 - >=x11-libs/gtk+-2 - >=gnome-base/libglade-2 - >=gnome-base/librsvg-2 - >=dev-libs/libxml2-2.4.12 - >=gnome-base/libgnome-2 - >=gnome-base/libgnomeui-2 - >=gnome-base/libgnomecanvas-2" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=app-text/scrollkeeper-0.3.11 - virtual/x11" - -src_unpack() { - unpack ${A} - - cd ${S}/daemon - cp gdm.h gdm.h.orig - sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ - gdm.h.orig > gdm.h - rm -f gdm.h.orig - - # Make Gentoo theme default - cd ${S}/config - cp gdm.conf.in gdm.conf.in.orig - sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ - -e "s:=circles:=gentoo-emergence:" \ - -e "s:command=/usr/X11R6/bin/X:command=/usr/X11R6/bin/X -nolisten tcp:" \ - gdm.conf.in.orig > gdm.conf.in - - rm -f gdm.conf.in.orig -} - -src_compile() { - ./configure --host=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var/lib \ - --with-pam-prefix=/etc \ - ${myconf} || die - - emake || die -} - -src_install() { - - make prefix=${D}/usr \ - sysconfdir=${D}/etc/X11 \ - localstatedir=${D}/var/lib \ - PAM_PREFIX=${D}/etc \ - install || die - - # We need to move gdm-binary to gdm, else our xdm script - # have problems stopping gdm (bug #5598) - rm -f ${D}/usr/bin/gdm - mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm - - rm -f ${D}/etc/pam.d/gdm - - # log - dodir /var/lib/gdm - chown gdm:gdm ${D}/var/lib/gdm - chmod 0750 ${D}/var/lib/gdm - - # pam startup - dodir /etc/pam.d - insinto /etc/pam.d - doins ${FILESDIR}/${MY_V}/pam.d/gdm - doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig - - # pam security - dodir /etc/security/console.apps - insinto /etc/security/console.apps - doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig - - # gnomerc - dodir /etc/X11/gdm - exeinto /etc/X11/gdm - doexe ${FILESDIR}/${MY_V}/gnomerc - - cd ${D}/etc/X11/gdm - for i in Init/Default PostSession/Default PreSession/Default gdm.conf - do - cp ${i} ${i}.orig - sed -e s:/usr/bin/X11:/usr/X11R6/bin:g \ - ${i}.orig > ${i} - rm ${i}.orig - done - - cd ${D}/etc/X11/gdm - cp gdm.conf gdm.conf.orig - - sed -e "s:0=/usr/X11R6/bin/X:0=/usr/X11R6/bin/X -dpi 100 -nolisten tcp dpms vt7:g" \ - -e "s:GtkRC=/opt/gnome/share/themes/Default/gtk/gtkrc:GtkRC=/usr/share/themes/Default/gtk/gtkrc:g" \ - -e "s:BackgroundColor=#007777:BackgroundColor=#2a3f5b:g" \ - -e "s:TitleBar=true:TitleBar=false:g" \ - -e "s:Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:g" \ - gdm.conf.orig > gdm.conf - - rm gdm.conf.orig - - cd ${S} - - # Support for new session stuff - rm -rf ${D}/etc/X11/gdm/Sessions - dosym ../Sessions /etc/X11/gdm/Sessions - - # Make sure the users environment are set properly - # (bash users only though :( ) - dosed "s:#!/bin/sh:#!/bin/bash --login:g" /etc/X11/gdm/PreSession/Default - - # Move Gentoo theme in - mv ${WORKDIR}/gentoo-emergence ${D}/usr/share/gdm/themes - - dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO -} - -pkg_preinst() { - #support for new session stuff - if [ -d ${ROOT}/etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ] - then - mv -f ${ROOT}/etc/X11/gdm/Sessions ${ROOT}/etc/X11/gdm/Sessions.old - fi -} - -pkg_postinst() { - gnome2_scrollkeeper_update - - # Attempt to restart GDM softly by use of the fifo. Wont work on older - # then 2.2.3.1 versions but should work nicely on later upgrades. - # FIXME: this is just way too complex - FIFOFILE="${ROOT}`grep '^ServAuthDir=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`" - if [ -z "${FIFOFILE}" ] - then - FIFOFILE=${ROOT}/var/lib/gdm/.gdmfifo - else - FIFOFILE=${FIFOFILE}/.gdmfifo - fi - PIDFILE="${ROOT}`grep '^PidFile=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`" - if [ -z "${PIDFILE}" ] - then - PIDFILE=${ROOT}/var/run/gdm.pid - fi - if [ -w ${FIFOFILE} ] - then - if [ -f ${PIDFILE} ] - then - if kill -0 `cat ${PIDFILE}` - then - (echo;echo SOFT_RESTART) >> ${FIFOFILE} - fi - fi - fi - - # Unmerge nukes sometimes - if [ ! -d ${ROOT}/var/lib/gdm ] - then - mkdir -p ${ROOT}/var/lib/gdm - chown gdm:gdm ${ROOT}/var/lib/gdm - chmod 0750 ${ROOT}/var/lib/gdm - fi - touch ${ROOT}/var/lib/gdm/.keep - - echo "" - einfo "To make GDM start at boot, edit /etc/rc.conf (or /etc/conf.d/basic)" - einfo "and then execute 'rc-update add xdm default'." -} - -pkg_postrm() { - gnome2_scrollkeeper_update - - echo "" - einfo "To remove GDM from startup please execute" - einfo "'rc-update del xdm default'" -} diff --git a/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild b/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild index 3f659d137d37..664b11c8cce9 100644 --- a/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild +++ b/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild,v 1.8 2004/04/17 09:18:06 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild,v 1.9 2004/04/28 12:29:57 foser Exp $ inherit eutils gnome2 @@ -50,6 +50,11 @@ src_unpack() { gdm.conf.in.orig > gdm.conf.in rm -f gdm.conf.in.orig + + cd ${S} + # fix gtk-2.4 build (#49185) + epatch ${FILESDIR}/${P}-gtk-2.4.patch + } src_compile() { diff --git a/gnome-base/gdm/gdm-2.4.4.7.ebuild b/gnome-base/gdm/gdm-2.4.4.7.ebuild deleted file mode 100644 index 77820c68d24b..000000000000 --- a/gnome-base/gdm/gdm-2.4.4.7.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.4.7.ebuild,v 1.4 2004/03/17 01:11:59 geoman Exp $ - -inherit gnome2 eutils - -DESCRIPTION="GNOME2 Display Manager" -HOMEPAGE="http://www.jirka.org/gdm.html" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips" -IUSE="tcpd xinerama selinux" -SRC_URI="${SRC_URI} - mirror://gentoo/gentoo-gdm-theme-r1.tar.bz2" -MY_V="`echo ${PV} |cut -b -5`" - -RDEPEND=">=sys-libs/pam-0.72 - >=x11-libs/gtk+-2 - >=gnome-base/libglade-2 - >=gnome-base/librsvg-2 - >=media-libs/libart_lgpl-2.3.11 - >=dev-libs/libxml2-2.4.12 - >=gnome-base/libgnome-2 - >=gnome-base/libgnomeui-2 - >=gnome-base/libgnomecanvas-2 - selinux? ( sys-libs/libselinux )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.29 - >=app-text/scrollkeeper-0.3.11 - tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" - -G2CONF="${G2CONF} \ - --sysconfdir=/etc/X11 \ - --with-pam-prefix=/etc \ - --with-xdmcp \ - `use_with tcpd tcp-wrappers` \ - `use_with xinerama` \ - `use_with selinux`" - -src_unpack() { - - unpack ${A} - - cd ${S} - # remove unneeded linker directive for selinux (#41022) - epatch ${FILESDIR}/${PN}-${MY_V}-selinux_remove_attr.patch - -} - -src_install() { - - gnome2_src_install PAM_PREFIX=${D}/etc sysconfdir=${D}/etc/X11 - - # gdm-binary should be gdm to work with our init (#5598) - rm -f ${D}/usr/bin/gdm - mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm - dosym /usr/bin/gdm /usr/bin/gdm-binary - - # log, etc. - dodir /var/lib/gdm - chown gdm:gdm ${D}/var/lib/gdm - chmod 750 ${D}/var/lib/gdm - - # use our own session script - rm -f ${D}/etc/X11/gdm/Xsession - exeinto /etc/X11/gdm - doexe ${FILESDIR}/${MY_V}/Xsession - - # We replace the pam stuff by our own - rm -f ${D}/etc/pam.d/gdm - - # pam startup - dodir /etc/pam.d - insinto /etc/pam.d - doins ${FILESDIR}/${MY_V}/pam.d/gdm - doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig - doins ${FILESDIR}/${MY_V}/pam.d/gdm-autologin - - # pam security - dodir /etc/security/console.apps - insinto /etc/security/console.apps - doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig - - # use graphical greeter local - dosed "s:#Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:" /etc/X11/gdm/gdm.conf - # use Gentoo theme - dosed "s:#GraphicalTheme=circles:GraphicalTheme=gentoo-cow:" /etc/X11/gdm/gdm.conf - - # Move Gentoo theme in - mv ${WORKDIR}/gentoo-cow ${D}/usr/share/gdm/themes - - dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO - -} - -pkg_postinst() { - - gnome2_pkg_postinst - - # Soft restart, assumes Gentoo defaults for file locations - FIFOFILE=/var/lib/gdm/.gdminfo - PIDFILE=/var/run/gdm.pid - if [ -w ${FIFOFILE} ] ; then - if [ -f ${PIDFILE} ] ; then - if [ kill -0 `cat ${PIDFILE}` ] ; then - (echo;echo SOFT_RESTART) >> ${FIFOFILE} - fi - fi - fi - - einfo "To make GDM start at boot, edit /etc/rc.conf" - einfo "and then execute 'rc-update add xdm default'." - -} - -pkg_postrm() { - - gnome2_pkg_postrm - - einfo "To remove GDM from startup please execute" - einfo "'rc-update del xdm default'" - -} |