diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-05-28 15:16:35 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-05-28 15:16:35 +0800 |
| commit | 1d11290aa4f7fd95b5c6fedb5663cce7ceace39f (patch) | |
| tree | 430a12a1b373c5658e963d120b6701136ade3102 | |
| parent | eeb3005741e11e50f44331fc593a1eb3ff6011a8 (diff) | |
| download | marcuscom-ports-1d11290aa4f7fd95b5c6fedb5663cce7ceace39f.tar marcuscom-ports-1d11290aa4f7fd95b5c6fedb5663cce7ceace39f.tar.gz marcuscom-ports-1d11290aa4f7fd95b5c6fedb5663cce7ceace39f.tar.bz2 marcuscom-ports-1d11290aa4f7fd95b5c6fedb5663cce7ceace39f.tar.lz marcuscom-ports-1d11290aa4f7fd95b5c6fedb5663cce7ceace39f.tar.xz marcuscom-ports-1d11290aa4f7fd95b5c6fedb5663cce7ceace39f.tar.zst marcuscom-ports-1d11290aa4f7fd95b5c6fedb5663cce7ceace39f.zip | |
Add USES=libtool
Don't start ssh-agent when loading gnome-session. [1]
Obtained from: openbsd [1]
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19700 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gdm/Makefile | 7 | ||||
| -rw-r--r-- | x11/gdm/files/patch-data_Xsession.in | 21 | ||||
| -rw-r--r-- | x11/gdm/pkg-plist | 2 |
3 files changed, 26 insertions, 4 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 41a12bce3..909b2a0ac 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -4,6 +4,7 @@ PORTNAME= gdm PORTVERSION= 3.12.2 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -44,7 +45,7 @@ USE_XORG= dmx dmxproto INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes -USES= gettext gmake pathfix pkgconfig tar:xz +USES= gettext gmake libtool pathfix pkgconfig tar:xz USE_GNOME= dconf gnomehier gnomeprefix intlhack introspection librsvg2 GNU_CONFIGURE= yes GLIB_SCHEMAS= org.gnome.login-screen.gschema.xml @@ -70,6 +71,7 @@ CONFIGURE_ARGS= --disable-static \ CONFIGURE_ARGS+=--with-default-pam-config=redhat CPPFLAGS+= -I${LOCALBASE}/include -DHAS_SA_LEN LDFLAGS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip SUB_FILES+= gdm-launch-environment \ gdm-password \ @@ -149,8 +151,7 @@ post-install: @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \ | /usr/bin/fmt 75 79 > ${PKGMESSAGE} - - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdm.so.1 +# @${RMDIR} ${STAGEDIR}/var/run/gdm # logwtmp lives here. .if ${OSVERSION} < 900000 diff --git a/x11/gdm/files/patch-data_Xsession.in b/x11/gdm/files/patch-data_Xsession.in new file mode 100644 index 000000000..9675cb2af --- /dev/null +++ b/x11/gdm/files/patch-data_Xsession.in @@ -0,0 +1,21 @@ +--- data/Xsession.in.orig 2014-05-08 18:53:58.000000000 +0200 ++++ data/Xsession.in 2014-05-08 18:54:21.000000000 +0200 +@@ -184,6 +184,10 @@ + fi + fi + ++# Do not start ssh-agent(1) in case we run gnome-session (gnome-keyring ++# already provides the functionality of an SSH agent), see: ++# https://bugzilla.redhat.com/show_bug.cgi?id=441123 ++if [ "x$command" != "xgnome-session" ]; then + # add ssh-agent if found + sshagent="`gdmwhich ssh-agent`" + if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then +@@ -191,6 +195,7 @@ + elif [ -z "$sshagent" ] ; then + echo "$0: ssh-agent not found!" + fi ++fi + + echo "$0: Setup done, will execute: $command" + diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index 0944f40ef..0f000cc75 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -17,9 +17,9 @@ include/gdm/gdm-client-glue.h include/gdm/gdm-client.h include/gdm/gdm-sessions.h include/gdm/gdm-user-switching.h -lib/libgdm.la lib/libgdm.so lib/libgdm.so.1 +lib/libgdm.so.1.0.0 lib/girepository-1.0/Gdm-1.0.typelib libdata/pkgconfig/gdm.pc libexec/gdm-host-chooser |