cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gdm-3.2.1.

Browse Source 
Some stuffs were fixed but it's still BROKEN for now.
This commit is contained in:
ajacoutot 2011-10-19 08:13:04 +00:00
parent 5e448f75a8
commit 9d8f5ac053
9 changed files with 90 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
x11/gnome/gdm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.111 2011/10/16 19:23:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.112 2011/10/19 08:13:04 ajacoutot Exp $
BROKEN= greeter doesn't start; port to bsd_auth(3)
@ -7,8 +7,7 @@ SHARED_ONLY= Yes
COMMENT= GNOME display manager
GNOME_PROJECT= gdm
GNOME_VERSION= 3.2.0
REVISION= 0
GNOME_VERSION= 3.2.1
HOMEPAGE= http://projects.gnome.org/gdm/
@ -26,12 +25,11 @@ WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm accountsservice
WANTLIB += atk-1.0 c cairo cairo-gobject canberra canberra-gtk3
WANTLIB += crypto dbus-1 dbus-glib-1 drm execinfo expat ffi fontconfig
WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 gtk-3 ltdl m nspr4 nss3
WANTLIB += nssutil3 ogg pam pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs
WANTLIB += smime3 softokn3 sqlite3 ssl3 upower-glib util vorbis
WANTLIB += vorbisfile wrap xcb xcb-render xcb-shm xkbfile xklavier
WANTLIB += xml2 z
WANTLIB += gobject-2.0 gthread-2.0 gtk-3 ltdl m nspr4 nss3 nssutil3
WANTLIB += ogg pam pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 plc4 plds4 png pthread pthread-stubs smime3
WANTLIB += softokn3 sqlite3 ssl3 upower-glib util vorbis vorbisfile
WANTLIB += wrap xcb xcb-render xcb-shm xkbfile xklavier xml2 z
BUILD_DEPENDS= x11/gnome/zenity
@ -104,7 +102,11 @@ pre-configure:
perl -pi -e 's,/usr/local,${LOCALBASE},g' \
${WRKSRC}/daemon/gdm-session-worker.c
perl -pi -e 's,/bin/true,/usr/bin/true,g' \
${WRKSRC}/data/applications/mime-dummy-handler.desktop
${WRKSRC}/data/applications/mime-dummy-handler.desktop \
${WRKSRC}/configure \
${WRKSRC}/data/00-upstream-settings \
${WRKSRC}/data/upstream-settings \
${WRKSRC}/data/session-setup.entries
.for i in gdm-simple-greeter gnome-session-check-accelerated gnome-settings-daemon
perl -pi -e 's,/usr/libexec,${PREFIX},g' \
${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in

10
x11/gnome/gdm/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/gdm-3.2.0.tar.xz) = NIGUIKMXf+GOrCFUdi7Zlg==
RMD160 (gnome/gdm-3.2.0.tar.xz) = I763OvJdlHz7ma8TU7zKwyMP5cs=
SHA1 (gnome/gdm-3.2.0.tar.xz) = Jc3x5xp9ideZTVsb985Kb0jaU24=
SHA256 (gnome/gdm-3.2.0.tar.xz) = +Cf1UAgnrO+UrS1g8C7Eibw1y2OS2PSmDsgUWZwpkbc=
SIZE (gnome/gdm-3.2.0.tar.xz) = 1648892
MD5 (gnome/gdm-3.2.1.tar.xz) = SmMxh/J75o21ABq9IbIRtw==
RMD160 (gnome/gdm-3.2.1.tar.xz) = kkLQCq/GfWzmzO0UHC4Ee1dcpIU=
SHA1 (gnome/gdm-3.2.1.tar.xz) = 5CXUc+q3l3kb8FrGyutVyn1BSE0=
SHA256 (gnome/gdm-3.2.1.tar.xz) = +Y0AgZ0FGFsgvQPAL3uXymOmPKsRC5T63+j1jU1EdfA=
SIZE (gnome/gdm-3.2.1.tar.xz) = 1633480

18
x11/gnome/gdm/patches/patch-data_00-upstream-settings Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-data_00-upstream-settings,v 1.1 2011/10/19 08:13:04 ajacoutot Exp $
Our gnome-settings-daemon does not provide the
org.gnome.settings-daemon.plugins.orientation gschema because it depends
on gudev.
--- data/00-upstream-settings.orig Wed Oct 19 08:15:27 2011
+++ data/00-upstream-settings Wed Oct 19 08:15:36 2011
@@ -90,9 +90,6 @@ www=''
[org/gnome/settings-daemon/plugins/mouse]
active=false
-[org/gnome/settings-daemon/plugins/orientation]
-active=true
-
[org/gnome/settings-daemon/plugins/power]
active=true

16
x11/gnome/gdm/patches/patch-data_00-upstream-settings-locks Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-data_00-upstream-settings-locks,v 1.1 2011/10/19 08:13:04 ajacoutot Exp $
Our gnome-settings-daemon does not provide the
org.gnome.settings-daemon.plugins.orientation gschema because it depends
on gudev.
--- data/00-upstream-settings-locks.orig Wed Oct 19 08:15:42 2011
+++ data/00-upstream-settings-locks Wed Oct 19 08:15:48 2011
@@ -39,7 +39,6 @@
/org/gnome/settings-daemon/plugins/media-keys/stop
/org/gnome/settings-daemon/plugins/media-keys/www
/org/gnome/settings-daemon/plugins/mouse/active
-/org/gnome/settings-daemon/plugins/orientation/active
/org/gnome/settings-daemon/plugins/power/active
/org/gnome/settings-daemon/plugins/print-notifications/active
/org/gnome/settings-daemon/plugins/smartcard/active

10
x11/gnome/gdm/patches/patch-data_Xsession_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-data_Xsession_in,v 1.1 2011/09/12 07:39:21 ajacoutot Exp $
--- data/Xsession.in.orig Mon Mar 7 18:40:37 2011
+++ data/Xsession.in Thu Jun 16 15:03:29 2011
$OpenBSD: patch-data_Xsession_in,v 1.2 2011/10/19 08:13:04 ajacoutot Exp $
--- data/Xsession.in.orig Wed Oct 19 04:07:00 2011
+++ data/Xsession.in Wed Oct 19 07:45:12 2011
@@ -23,6 +23,8 @@
# based on:
# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
@ -10,7 +10,7 @@ $OpenBSD: patch-data_Xsession_in,v 1.1 2011/09/12 07:39:21 ajacoutot Exp $
command="$@"
# this will go into the .xsession-errors along with all other echo's
@@ -178,6 +180,9 @@ if [ "x$command" = "xdefault" ] ; then
@@ -180,6 +182,9 @@ if [ "x$command" = "xdefault" ] ; then
command="/etc/X11/xinit/Xclients"
elif [ -x /etc/X11/Xclients ]; then
command="/etc/X11/Xclients"
@ -20,7 +20,7 @@ $OpenBSD: patch-data_Xsession_in,v 1.1 2011/09/12 07:39:21 ajacoutot Exp $
else
if [ -n "$zenity" ] ; then
disptext=`gettextfunc "System has no Xclients file, so starting a failsafe xterm session. Windows will have focus only if the mouse pointer is above them. To get out of this mode type 'exit' in the window."`
@@ -189,12 +194,19 @@ if [ "x$command" = "xdefault" ] ; then
@@ -191,12 +196,19 @@ if [ "x$command" = "xdefault" ] ; then
fi
fi

10
x11/gnome/gdm/patches/patch-data_gdm-shell_session_in Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-data_gdm-shell_session_in,v 1.1 2011/10/19 08:13:04 ajacoutot Exp $
--- data/gdm-shell.session.in.orig Wed Oct 19 08:47:27 2011
+++ data/gdm-shell.session.in Wed Oct 19 08:48:10 2011
@@ -1,5 +1,5 @@
[GNOME Session]
Name=Display Manager
RequiredComponents=gnome-shell;gnome-settings-daemon;
-IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
+IsRunnableHelper=sh -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
FallbackSession=gdm-fallback

36
x11/gnome/gdm/patches/patch-data_make-dconf-override-db_sh
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-data_make-dconf-override-db_sh,v 1.1 2011/10/07 14:04:18 ajacoutot Exp $
Our gnome-settings-daemon does not provide the
org.gnome.settings-daemon.plugins.orientation gschema because it depends
on gudev.
--- data/make-dconf-override-db.sh.orig Fri Oct 7 15:16:29 2011
+++ data/make-dconf-override-db.sh Fri Oct 7 15:15:50 2011
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
set -e
-export TMPDIR=$(mktemp -d --tmpdir="$PWD")
+export TMPDIR=$(mktemp -d -p "$PWD")
export XDG_CONFIG_HOME="$TMPDIR/config"
export XDG_CACHE_HOME="$TMPDIR/cache"
mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME
@@ -15,7 +15,7 @@ gsettings set org.gnome.power-manager show-actions fal
gsettings set org.gnome.desktop.a11y.keyboard enable true
gsettings set org.gnome.desktop.background show-desktop-icons false
-gsettings set org.gnome.desktop.default-applications.terminal exec '"/bin/true"'
+gsettings set org.gnome.desktop.default-applications.terminal exec '"/usr/bin/true"'
gsettings set org.gnome.desktop.interface toolkit-accessibility true
gsettings set org.gnome.desktop.lockdown disable-application-handlers true
@@ -52,7 +52,6 @@ gsettings set org.gnome.settings-daemon.plugins.a11y-k
gsettings set org.gnome.settings-daemon.plugins.background active true
gsettings set org.gnome.settings-daemon.plugins.cursor active true
gsettings set org.gnome.settings-daemon.plugins.media-keys active true
-gsettings set org.gnome.settings-daemon.plugins.orientation active true
gsettings set org.gnome.settings-daemon.plugins.power active true
gsettings set org.gnome.settings-daemon.plugins.sound active true
gsettings set org.gnome.settings-daemon.plugins.xrandr active true

16
x11/gnome/gdm/patches/patch-data_upstream-settings Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-data_upstream-settings,v 1.1 2011/10/19 08:13:04 ajacoutot Exp $
Our gnome-settings-daemon does not provide the
org.gnome.settings-daemon.plugins.orientation gschema because it depends
on gudev.
--- data/upstream-settings.orig Wed Oct 19 08:15:58 2011
+++ data/upstream-settings Wed Oct 19 08:16:05 2011
@@ -29,7 +29,6 @@ org.gnome.settings-daemon.plugins.a11y-keyboard active
org.gnome.settings-daemon.plugins.background active=true
org.gnome.settings-daemon.plugins.cursor active=true
org.gnome.settings-daemon.plugins.media-keys active=true
-org.gnome.settings-daemon.plugins.orientation active=true
org.gnome.settings-daemon.plugins.power active=true
org.gnome.settings-daemon.plugins.sound active=true
org.gnome.settings-daemon.plugins.xrandr active=true

13
x11/gnome/gdm/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.34 2011/10/07 14:04:19 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.35 2011/10/19 08:13:04 ajacoutot Exp $
@newgroup _gdm:676
@newuser _gdm:676:_gdm:daemon:GNOME Display Manager:/var/db/gdm:/sbin/nologin
@extraunexec rm -rf /var/db/gdm/.ICEauthority
@ -49,6 +49,7 @@ lib/pkgconfig/gdmsimplegreeter.pc
@bin libexec/gdm-simple-greeter
@bin libexec/gdm-simple-slave
@bin libexec/gdm-smartcard-worker
libexec/gdm-update-dconf-db
@bin libexec/gdm-xdmcp-chooser-slave
sbin/gdm
@bin sbin/gdm-binary
@ -127,12 +128,13 @@ share/examples/gdm/dbus-1/system.d/gdm.conf
@sample ${SYSCONFDIR}/dbus-1/system.d/gdm.conf
share/examples/gdm/dconf/
share/examples/gdm/dconf/db/
share/examples/gdm/dconf/db/gdm
@sample ${SYSCONFDIR}/dconf/db/gdm
share/examples/gdm/dconf/db/gdm.d/
@sample ${SYSCONFDIR}/dconf/db/gdm.d/
share/examples/gdm/dconf/db/gdm.d/00-upstream-settings
@sample ${SYSCONFDIR}/dconf/db/gdm.d/00-upstream-settings
share/examples/gdm/dconf/db/gdm.d/locks/
@sample ${SYSCONFDIR}/dconf/db/gdm.d/locks/
share/examples/gdm/dconf/db/gdm.d/locks/00-upstream-settings-locks
share/examples/gdm/dconf/profile/
share/examples/gdm/dconf/profile/gdm
@sample ${SYSCONFDIR}/dconf/profile/gdm
@ -159,6 +161,7 @@ share/gdm/simple-greeter/extensions/smartcard/
share/gdm/simple-greeter/extensions/smartcard/page.ui
share/gdm/simple-greeter/extensions/unified/
share/gdm/simple-greeter/extensions/unified/page.ui
share/gdm/upstream-settings
share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
share/gnome-session/
share/gnome-session/sessions/
@ -343,10 +346,10 @@ ${SCHEMAS_INSTDIR}/gdm-simple-greeter.schemas
@sample /var/cache/gdm/
@mode 1770
@sample /var/gdm/
@mode
@group
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@mode
@group
@rcscript ${RCDIR}/gdm