UPdate to 3.1.91.

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

4 files changed, 40 insertions, 10 deletions

diff --git a/sysutils/gnome-control-center3/files/patch-panels_info_Makefile.in b/sysutils/gnome-control-center3/files/patch-panels_info_Makefile.in
new file mode 100644
index 000000000..e9301462a
--- /dev/null
+++ b/sysutils/gnome-control-center3/files/patch-panels_info_Makefile.in
@@ -0,0 +1,11 @@
+--- panels/info/Makefile.in.orig	2011-09-17 14:54:25.000000000 +0200
++++ panels/info/Makefile.in	2011-09-17 14:54:44.000000000 +0200
+@@ -775,7 +775,7 @@
+ 	uninstall-dist_uiDATA
+ 
+ 
+-all-local: check-local
++all-local:
+ 
+ check-local: test-hostname
+ 	$(builddir)/test-hostname $(srcdir)/hostnames-test.txt > /dev/null
diff --git a/sysutils/gnome-control-center3/files/patch-panels_info_cc-info-panel.c b/sysutils/gnome-control-center3/files/patch-panels_info_cc-info-panel.c
index de992ccaa..736466217 100644
--- a/sysutils/gnome-control-center3/files/patch-panels_info_cc-info-panel.c
+++ b/sysutils/gnome-control-center3/files/patch-panels_info_cc-info-panel.c
@@ -1,15 +1,15 @@
---- panels/info/cc-info-panel.c.orig	2011-02-02 20:05:49.000000000 +0100
-+++ panels/info/cc-info-panel.c	2011-02-02 20:06:21.000000000 +0100
-@@ -21,7 +21,12 @@
+--- panels/info/cc-info-panel.c.orig	2011-08-29 16:08:11.000000000 +0200
++++ panels/info/cc-info-panel.c	2011-09-17 14:35:53.000000000 +0200
+@@ -23,7 +23,12 @@
  
  #include "cc-info-panel.h"
  
-+#ifdef __FreeBSD__
++#ifdef __linux__
+ #include <sys/vfs.h>
++#else
 +#include <sys/param.h>
 +#include <sys/mount.h>
-+#else
- #include <sys/vfs.h>
 +#endif
+ #include <polkit/polkit.h>
  
  #include <glib.h>
- #include <glib/gi18n.h>
diff --git a/sysutils/gnome-control-center3/files/patch-panels_region_gnome-region-panel-formats.c b/sysutils/gnome-control-center3/files/patch-panels_region_gnome-region-panel-formats.c
new file mode 100644
index 000000000..f20d005a3
--- /dev/null
+++ b/sysutils/gnome-control-center3/files/patch-panels_region_gnome-region-panel-formats.c
@@ -0,0 +1,19 @@
+--- panels/region/gnome-region-panel-formats.c.orig	2011-09-17 14:42:28.000000000 +0200
++++ panels/region/gnome-region-panel-formats.c	2011-09-17 14:46:49.000000000 +0200
+@@ -131,6 +131,8 @@ update_examples_cb (GtkTreeSelection *se
+ 	setlocale (LC_MONETARY, locale);
+ 	g_free (locale);
+ 
++// FreeBSD doesn't have LC_MEASUREMENT (yet)
++#if 0
+ 	/* Display measurement */
+ 	locale = g_strdup (setlocale (LC_MEASUREMENT, NULL));
+ 	setlocale (LC_MEASUREMENT, active_id);
+@@ -143,6 +145,7 @@ update_examples_cb (GtkTreeSelection *se
+ 
+ 	setlocale (LC_MEASUREMENT, locale);
+ 	g_free (locale);
++#endif
+         g_free (active_id);
+ }
+ 
diff --git a/sysutils/gnome-control-center3/files/patch-panels_user-accounts_um-account-dialog.c b/sysutils/gnome-control-center3/files/patch-panels_user-accounts_um-utils.c
index 82c112019..b52aa9a1f 100644
--- a/sysutils/gnome-control-center3/files/patch-panels_user-accounts_um-account-dialog.c
+++ b/sysutils/gnome-control-center3/files/patch-panels_user-accounts_um-utils.c
@@ -1,6 +1,6 @@
---- panels/user-accounts/um-account-dialog.c.orig	2011-01-21 09:07:21.000000000 +0100
-+++ panels/user-accounts/um-account-dialog.c	2011-01-21 09:16:37.000000000 +0100
-@@ -24,7 +24,16 @@
+--- panels/user-accounts/um-utils.c.orig	2011-09-17 14:55:58.000000000 +0200
++++ panels/user-accounts/um-utils.c	2011-09-17 14:57:01.000000000 +0200
+@@ -25,7 +25,16 @@
  #include <stdlib.h>
  #include <sys/types.h>
  #include <pwd.h>