1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-25 09:34:11 +00:00
freebsd-ports/devel/gconf/files/patch-gconf::gconf-internals.c
Joe Marcus Clarke e5fbb8095a Make gconf find gconfd-2 after its move to ${PREFIX}/libexec. This fixes
some compatibility problems between GNOME 1 and GNOME 2.

Reported by:	Adam Weinberger <adam@vectors.cx>
Tested by:	Adam Weinberger <adam@vectors.cx>
Approved by:	portmgr (sobomax)
2002-09-27 06:05:21 +00:00

22 lines
694 B
C

--- gconf/gconf-internals.c.orig Thu Mar 14 22:39:51 2002
+++ gconf/gconf-internals.c Fri Sep 27 00:37:23 2002
@@ -28,6 +28,9 @@
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
@@ -3040,6 +3043,8 @@
if (gconf_file_exists (GCONF_BINDIR"/gconfd-2"))
argv[0] = g_strconcat (GCONF_BINDIR, "/gconfd-2", NULL);
+ else if (gconf_file_exists (GCONF_PREFIX"/libexec/gconfd-2"))
+ argv[0] = g_strconcat (GCONF_PREFIX, "/libexec/gconfd-2", NULL);
else
argv[0] = g_strconcat (GCONF_BINDIR, "/" GCONFD, NULL);