diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-03-31 23:32:02 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-03-31 23:32:02 +0800 |
commit | 2c497490ae4f0075e5dabe3b0fee429f28e65fdf (patch) | |
tree | fb6c9078f68e9fd2f06f845fc65fc3823d55b09a /x11 | |
parent | 10edd5fae5efacfdaea831a409c8fa14e3d3d3fe (diff) | |
download | marcuscom-ports-2c497490ae4f0075e5dabe3b0fee429f28e65fdf.tar.gz marcuscom-ports-2c497490ae4f0075e5dabe3b0fee429f28e65fdf.tar.zst marcuscom-ports-2c497490ae4f0075e5dabe3b0fee429f28e65fdf.zip |
Add depend on at-spi2-core for libexec/at-spi2-registryd.
Fix autostart script to look for at-spi2-registeryd not at-spi-registeryd.
Fix small plist nit.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15672 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gdm3/Makefile | 5 | ||||
-rw-r--r-- | x11/gdm3/files/patch-data_greeter-autostart_at-spi-registryd-wrapper.desktop.in | 11 | ||||
-rw-r--r-- | x11/gdm3/pkg-install | 2 | ||||
-rw-r--r-- | x11/gdm3/pkg-plist | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile index 5ac60b83f..2cc12e9a9 100644 --- a/x11/gdm3/Makefile +++ b/x11/gdm3/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm3/Makefile,v 1.2 2011/03/23 15:30:18 kwm Exp $ +# $MCom: ports/x11/gdm3/Makefile,v 1.3 2011/03/28 07:05:09 kwm Exp $ # PORTNAME= gdm PORTVERSION= 2.91.94 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -30,6 +30,7 @@ LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity3 \ gnome-settings-daemon>=2.91.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \ gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \ + ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes USERS= gdm diff --git a/x11/gdm3/files/patch-data_greeter-autostart_at-spi-registryd-wrapper.desktop.in b/x11/gdm3/files/patch-data_greeter-autostart_at-spi-registryd-wrapper.desktop.in new file mode 100644 index 000000000..9072b6d52 --- /dev/null +++ b/x11/gdm3/files/patch-data_greeter-autostart_at-spi-registryd-wrapper.desktop.in @@ -0,0 +1,11 @@ +--- data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.orig 2011-03-31 16:27:11.000000000 +0200 ++++ data/greeter-autostart/at-spi-registryd-wrapper.desktop.in 2011-03-31 16:27:16.000000000 +0200 +@@ -1,7 +1,7 @@ + [Desktop Entry] + Type=Application + _Name=AT-SPI Registry Wrapper +-Exec=${exec_prefix}/libexec/at-spi-registryd ++Exec=${exec_prefix}/libexec/at-spi2-registryd + OnlyShowIn=GNOME; + AutostartCondition=GNOME /desktop/gnome/interface/accessibility + X-GNOME-Autostart-Phase=Initialization diff --git a/x11/gdm3/pkg-install b/x11/gdm3/pkg-install index 37802feab..771cc80c9 100644 --- a/x11/gdm3/pkg-install +++ b/x11/gdm3/pkg-install @@ -25,6 +25,8 @@ POST-INSTALL) ${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home ${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home ${CHMOD} 1770 ${PKG_PREFIX}/etc/gdm/home + ${MKDIR} ${PKG_PREFIX}/etc/gdm/home/.config + ${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home/.config install -o root -g wheel -m 444 ${PKG_PREFIX}/share/gdm/gconf.path ${PKG_PREFIX}/etc/gdm/home/.gconf.path gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --recursive-unset / gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --load ${PKG_PREFIX}/share/gdm/session-setup.entries diff --git a/x11/gdm3/pkg-plist b/x11/gdm3/pkg-plist index 32f0e28fa..63f553a0c 100644 --- a/x11/gdm3/pkg-plist +++ b/x11/gdm3/pkg-plist @@ -208,6 +208,8 @@ share/pixmaps/nohost.png @dirrm etc/gdm/PostLogin @dirrm etc/gdm/Init @unexec rm -rf %D/etc/gdm/home/.gconf* +@dirrmtry etc/gdm/home/.config/dconf +@dirrmtry etc/gdm/home/.config @dirrmtry etc/gdm/home @dirrmtry etc/gdm @dirrmtry etc/dm/Sessions |