diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-01-24 19:49:52 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-01-24 19:49:52 +0800 |
| commit | 8d7ce9306bfa4214367ca0e9e8c844e61d1ed880 (patch) | |
| tree | e859d4284119c2bd38bf8461b751212dfc94c47a /x11/gnome-session | |
| parent | 0ad7c884ff9e4fcf3d62ecbc7c6930dd430b8ef9 (diff) | |
| download | marcuscom-ports-8d7ce9306bfa4214367ca0e9e8c844e61d1ed880.tar.gz marcuscom-ports-8d7ce9306bfa4214367ca0e9e8c844e61d1ed880.tar.zst marcuscom-ports-8d7ce9306bfa4214367ca0e9e8c844e61d1ed880.zip | |
gconf-sanity-check got removed from gconf2. Replace it with gconftool-2 code.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17202 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-session')
| -rw-r--r-- | x11/gnome-session/Makefile | 4 | ||||
| -rw-r--r-- | x11/gnome-session/files/patch-gnome-session_gsm-gconf.c | 29 |
2 files changed, 32 insertions, 1 deletions
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 936f3b440..9fe909103 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-session/Makefile,v 1.191 2011/04/25 22:02:03 mezz Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.192 2012/09/03 16:28:29 mezz Exp $ # PORTNAME= gnome-session @@ -36,6 +36,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gconf2 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docbook-docs +# us gconftool-2 instead of sanity-check because that got removed from gconf2. +CONFIGURE_ENV= ac_cv_path_GCONF_SANITY_CHECK=${LOCALBASE}/bin/gconftool-2 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-gconf.c b/x11/gnome-session/files/patch-gnome-session_gsm-gconf.c new file mode 100644 index 000000000..8955091af --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_gsm-gconf.c @@ -0,0 +1,29 @@ +--- gnome-session/gsm-gconf.c.orig 2010-02-09 14:22:01.000000000 +0100 ++++ gnome-session/gsm-gconf.c 2013-01-24 12:52:40.000000000 +0100 +@@ -46,20 +46,23 @@ + gsm_gconf_init (void) + { + GError *error = NULL; +- char *argv[2]; ++ char *argv[3]; + + /* Run gconf-sanity-check. As a side effect, this will cause gconfd + * to be started. (We do this asynchronously so that other GSM + * initialization can happen in parallel.) + */ + ++ /* run gconftool-2 --spawn instead of removed gconf-sanity-check. */ ++ + argv[0] = GCONF_SANITY_CHECK; +- argv[1] = NULL; ++ argv[1] = "--spawn"; ++ argv[2] = NULL; + + g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, + unset_display_setup, NULL, &gsc_pid, &error); + if (error != NULL) { +- g_warning ("Failed to run gconf-sanity-check-2: %s\n", ++ g_warning ("Failed to run gconftool-2: %s\n", + error->message); + g_error_free (error); + |