Fix build with latest libgnomekbd

Obtained from:	Gnome SVN


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9881 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 105 insertions, 0 deletions

diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
new file mode 100644
index 000000000..69c01de97
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
@@ -0,0 +1,15 @@
+--- capplets/about-me/gnome-about-me-password.c.orig	Sun Jun 11 04:50:31 2006
++++ capplets/about-me/gnome-about-me-password.c	Tue Jun 13 00:02:27 2006
+@@ -52,6 +52,12 @@
+ #include <signal.h>
+ #endif
+ 
++#if __FreeBSD__
++#include <sys/types.h>
++#include <libutil.h>
++#include <signal.h>
++#endif
++
+ #include "capplet-util.h"
+ #include "eel-alert-dialog.h"
+ 
diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
new file mode 100644
index 000000000..5f5eb4bc1
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
@@ -0,0 +1,20 @@
+--- capplets/common/gnome-theme-info.c.orig	2007-08-27 04:09:06.000000000 -0400
++++ capplets/common/gnome-theme-info.c	2007-09-20 15:24:56.000000000 -0400
+@@ -1845,7 +1845,7 @@ read_cursor_fonts (void)
+     theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL);
+     g_free (filename);
+ 
+-    theme_info->name = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL);
++    theme_info->name = g_build_filename (INSTALL_PREFIX, "share", builtins[i][0], NULL);
+     theme_info->path = g_strdup (theme_info->name);
+ 
+     if (!strcmp (theme_info->path, cursor_font))
+@@ -1974,7 +1974,7 @@ gnome_theme_init (gboolean *monitor_not_
+   gnome_vfs_uri_unref (top_theme_dir_uri);
+ 
+   /* The weird /usr/share/icons */
+-  top_theme_dir_uri = gnome_vfs_uri_new ("/usr/share/icons");
++  top_theme_dir_uri = gnome_vfs_uri_new ("%%LOCALBASE%%/lib/X11/icons");
+   if (!gnome_vfs_uri_exists (top_theme_dir_uri))
+     gnome_vfs_make_directory_for_uri (top_theme_dir_uri, 0775);
+   result = add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL);
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
new file mode 100644
index 000000000..6527e6758
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Feb 13 07:51:47 2007
++++ configure	Tue Feb 13 07:51:47 2007
+@@ -22302,6 +22302,7 @@
+ if test "${gt_cv_func_ngettext_libc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  LIBS="-lintl $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-keyboard-xkb.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-keyboard-xkb.c
new file mode 100644
index 000000000..76c847540
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-keyboard-xkb.c
@@ -0,0 +1,27 @@
+--- gnome-settings-daemon/gnome-settings-keyboard-xkb.c.orig	2007-10-29 08:19:27.351818736 -0400
++++ gnome-settings-daemon/gnome-settings-keyboard-xkb.c	2007-10-29 08:19:52.087524252 -0400
+@@ -35,7 +35,6 @@
+ #include <string.h>
+ #include <time.h>
+ 
+-#include <libgnomekbd/gkbd-config-registry.h>
+ #include <libgnomekbd/gkbd-desktop-config.h>
+ #include <libgnomekbd/gkbd-keyboard-config.h>
+ 
+@@ -392,7 +391,6 @@
+ void
+ gnome_settings_keyboard_xkb_init (GConfClient * client)
+ {
+-	GObject *reg = NULL;
+ #ifdef GSDKX
+ 	xkl_set_debug_level (200);
+ 	logfile = fopen ("/tmp/gsdkx.log", "a");
+@@ -425,8 +423,6 @@
+ 					 XKLL_MANAGE_LAYOUTS |
+ 					 XKLL_MANAGE_WINDOW_STATES);
+ 
+-		reg =
+-		    g_object_new (gkbd_config_registry_get_type (), NULL);
+ 	}
+ }
+ 
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
new file mode 100644
index 000000000..2664fcf8e
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
@@ -0,0 +1,24 @@
+--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	2007-09-18 05:32:43.000000000 -0400
++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	2007-10-28 13:45:28.000000000 -0400
+@@ -610,8 +610,11 @@
+ 	if ((command != NULL) && (strcmp (command, "") != 0))
+ 		execute (acme, command, FALSE, FALSE);
+ 	else
++#if __FreeBSD__
++		execute (acme, "cdcontrol eject", FALSE, FALSE);
++#else
+ 		execute (acme, "eject -T", FALSE, FALSE);
+-
++#endif
+ 	g_free (command);
+ }
+ 
+@@ -708,7 +711,7 @@
+ 		do_mail_action (acme);
+ 		break;
+ 	case SLEEP_KEY:
+-		do_sleep_action ("apm", "xset dpms force off");
++		do_sleep_action ("zzz", "xset dpms force off");
+ 		break;
+ 	case SCREENSAVER_KEY:
+ 		if ((cmd = g_find_program_in_path ("gnome-screensaver-command")))
diff --git a/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c b/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
new file mode 100644
index 000000000..86acdbe0c
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
@@ -0,0 +1,9 @@
+--- libslab/directory-tile.c.orig	Mon Mar 12 16:33:35 2007
++++ libslab/directory-tile.c	Mon Mar 12 16:35:48 2007
+@@ -644,5 +644,5 @@ static void
+ disown_spawned_child (gpointer user_data)
+ {
+ 	setsid  ();
+-	setpgrp ();
++	setpgrp (0, 0);
+ }