Add gnomecontrolcenter2, and chase the libxklavier shared lib version.

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

6 files changed, 100 insertions, 0 deletions

diff --git a/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in
new file mode 100644
index 000000000..5a6b0ba8f
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in
@@ -0,0 +1,11 @@
+--- capplets/desktop-links/Makefile.in.orig	Tue Dec 30 15:55:28 2003
++++ capplets/desktop-links/Makefile.in	Tue Dec 30 15:55:49 2003
+@@ -190,7 +190,7 @@
+ 
+ pixmaps_pre = $(capplets:=-capplet.png)
+ pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
+-pixmapsdir = $(datadir)/icons/gnome/48x48/apps
++pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
+ 
+ desktop_files = $(capplets:=.desktop)
+ desktop_in_files = $(desktop_files:.desktop=.desktop.in)
diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
new file mode 100644
index 000000000..9c487d7b8
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -0,0 +1,29 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig	Sat Nov  2 13:40:22 2002
++++ capplets/mouse/gnome-mouse-properties.c	Sun Dec 22 16:33:36 2002
+@@ -591,7 +591,7 @@
+ 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL);
+ 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ 	g_free (filename);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL);
+ 
+ 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
+@@ -612,7 +612,7 @@
+ 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL);
+ 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ 	g_free (filename);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL);
+ 
+ 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
+@@ -633,7 +633,7 @@
+ 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL);
+ 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ 	g_free (filename);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
+ 
+ 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
new file mode 100644
index 000000000..44a777897
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -0,0 +1,27 @@
+--- configure.orig	Thu Mar 11 03:09:48 2004
++++ configure	Thu Mar 11 03:12:25 2004
+@@ -21373,6 +21373,7 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  LIBS="-lintl $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21461,6 +21462,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++LIBS="-lintl $LIBS"
+  have_ngettext=yes
+ fi
+ done
+@@ -26257,7 +26259,7 @@
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
++#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
+ _ACEOF
+ 
+ GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
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..f66b82c9f
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
@@ -0,0 +1,11 @@
+--- 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 @@
+ 		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:
+ 		execute ("xscreensaver-command -lock", FALSE);
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c
new file mode 100644
index 000000000..95bbf2ea4
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c
@@ -0,0 +1,11 @@
+--- libwindow-settings/gnome-wm-manager.c.orig	Mon Nov 11 00:42:08 2002
++++ libwindow-settings/gnome-wm-manager.c	Mon Nov 11 00:43:26 2002
+@@ -227,7 +227,7 @@
+ 
+         done_scan = TRUE;
+         
+-        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
++        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
+         scan_wm_directory (tempdir, FALSE);
+         g_free (tempdir);
+         
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c
new file mode 100644
index 000000000..149d59a9b
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c
@@ -0,0 +1,11 @@
+--- 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);
+