Update to 2.11.90.

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

5 files changed, 17 insertions, 28 deletions

diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c
index 98c92bb99..0d1f85f32 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c
@@ -1,6 +1,6 @@
---- capplets/about-me/gnome-about-me.c.orig	Tue Jul  5 14:17:38 2005
-+++ capplets/about-me/gnome-about-me.c	Tue Jul  5 14:20:06 2005
-@@ -260,12 +260,10 @@ about_me_focus_out (GtkWidget *widget, G
+--- capplets/about-me/gnome-about-me.c.orig	Wed Jul 27 13:45:17 2005
++++ capplets/about-me/gnome-about-me.c	Wed Jul 27 13:47:09 2005
+@@ -258,12 +258,10 @@
  static char *
  get_user_login (void)
  {
@@ -16,7 +16,7 @@
  }
  
  /*
-@@ -655,6 +653,7 @@ about_me_setup_dialog (void)
+@@ -664,6 +662,7 @@
  	struct passwd *pwent;
  	char *user = NULL;
  	gchar *str;
@@ -24,7 +24,7 @@
  
  	me = g_new0 (GnomeAboutMe, 1);
  
-@@ -711,7 +710,6 @@ about_me_setup_dialog (void)
+@@ -733,7 +732,6 @@
  				_("Unknown login ID, the user database might be corrupted"));
  		return ;
  	}
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
index 78449651b..ab7180f75 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
@@ -1,6 +1,6 @@
---- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Sun May 22 22:57:24 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Sun May 22 22:58:27 2005
-@@ -243,11 +243,12 @@ xkb_options_add_group (const XklConfigIt
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jul 27 13:48:58 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Jul 27 13:49:37 2005
+@@ -265,11 +265,12 @@
                                           GladeXML * dialog)
  {
    GtkWidget *expander, *align, *vbox;
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in
index 52a627fb2..15281344b 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-settings-daemon/actions/Makefile.in.orig	Mon Dec 20 19:19:31 2004
-+++ gnome-settings-daemon/actions/Makefile.in	Mon Dec 20 19:20:45 2004
-@@ -296,7 +296,7 @@
+--- gnome-settings-daemon/actions/Makefile.in.orig	Wed Jul 27 13:38:40 2005
++++ gnome-settings-daemon/actions/Makefile.in	Wed Jul 27 13:38:59 2005
+@@ -375,7 +375,7 @@
+ libacme_la_LIBADD = $(am__append_3) $(am__append_6)
  Datadir = $(datadir)/control-center-2.0/interfaces/
  Data_DATA = acme.glade
- 
 -pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
 +pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
  pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png
- 
  EXTRA_DIST = \
+ 	acme-volume-alsa.c acme-volume-alsa.h	\
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
index f66b82c9f..ed30cddab 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
@@ -1,6 +1,6 @@
---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	Thu Oct 14 15:44:21 2004
-+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	Thu Oct 14 15:44:38 2004
-@@ -813,7 +813,7 @@
+--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	Wed Jul 27 13:52:13 2005
++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	Wed Jul 27 13:52:32 2005
+@@ -828,7 +828,7 @@
  		do_mail_action (acme);
  		break;
  	case SLEEP_KEY:
@@ -8,4 +8,4 @@
 +		do_sleep_action ("zzz", "xset dpms force off");
  		break;
  	case SCREENSAVER_KEY:
- 		execute ("xscreensaver-command -lock", FALSE);
+ 		if ((cmd = g_find_program_in_path ("gnome-screensaver-command")))
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c
deleted file mode 100644
index 149d59a9b..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwindow-settings/wm-list.c.orig	Tue Oct  8 17:43:12 2002
-+++ libwindow-settings/wm-list.c	Tue Oct  8 17:43:25 2002
-@@ -251,7 +251,7 @@
-         gchar *name;
- 	GConfClient *client;
- 	
--        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
-+        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
-         wm_list_read_dir (tempdir, FALSE);
-         g_free (tempdir);
-