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

- fix gnome-session startup with latest dbus

Browse Source 
spotted by robert@
fix suggested by jasper@
This commit is contained in:
ajacoutot 2008-10-28 13:44:32 +00:00
parent 0d0058d80f
commit 0f12677dff
2 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/session/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.46 2008/10/14 12:41:51 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.47 2008/10/28 13:44:32 ajacoutot Exp $
COMMENT= GNOME session COMMENT= GNOME session
GNOME_PROJECT= gnome-session GNOME_PROJECT= gnome-session
GNOME_VERSION= 2.20.3 GNOME_VERSION= 2.20.3
PKGNAME= ${DISTNAME}p14 PKGNAME= ${DISTNAME}p15
CATEGORIES= x11 CATEGORIES= x11
# GPLv2/LGPL # GPLv2/LGPL

35
x11/gnome/session/patches/patch-gnome-session_gsm-dbus_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-gnome-session_gsm-dbus_c,v 1.1 2007/05/18 14:11:32 jasper Exp $
--- gnome-session/gsm-dbus.c.orig Mon Mar 12 20:48:31 2007
+++ gnome-session/gsm-dbus.c Tue May 15 21:41:08 2007
@@ -281,6 +281,7 @@ start_parent (int address_fd, int pid_fd, pid_t child)
int exitstat;
unsigned long tmp_num;
ssize_t bytes;
+ int i;
g_assert (child > 0);
@@ -326,14 +327,17 @@ start_parent (int address_fd, int pid_fd, pid_t child)
/*
* Fetch dbus-daemon pid.
*/
- bytes = read_line (pid_fd, pid_str, sizeof (pid_str));
- if (bytes == -1 || bytes == 0)
+ for (i = 0; i < 2; i++)
{
- close (address_fd);
- close (pid_fd);
+ bytes = read_line (pid_fd, pid_str, sizeof (pid_str));
+ if (bytes == -1 || bytes == 0)
+ {
+ close (address_fd);
+ close (pid_fd);
- g_printerr ("Failed to get dbus-daemon's pid\n");
- return;
+ g_printerr ("Failed to get dbus-daemon's pid\n");
+ return;
+ }
}
close (address_fd);