update to 2.22.1

This switches to the gnome-2.22 release branch.

4 files changed, 36 insertions, 58 deletions

diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index 9092a220b28..65b19bd7150 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2008/04/12 22:43:14 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/15 17:59:15 drochner Exp $
 #
 
-DISTNAME=	gnome-control-center-2.20.3
-PKGREVISION=	2
+DISTNAME=	gnome-control-center-2.22.1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-control-center/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-control-center/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -25,18 +24,14 @@ CONFIGURE_ARGS+=	--with-gstreamer=0.10
 
 CPPFLAGS+=		-DDBUS_API_SUBJECT_TO_CHANGE
 
-PKGCONFIG_OVERRIDE+=	gnome-settings-daemon/gnome-settings-daemon.pc.in
+#PKGCONFIG_OVERRIDE+=	gnome-settings-daemon/gnome-settings-daemon.pc.in
 PKGCONFIG_OVERRIDE+=	libwindow-settings/gnome-window-settings-2.0.pc.in
 
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
 INSTALL_MAKE_FLAGS+=	menudir=${PREFIX}/share/examples/${PKGBASE}
 
-GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas
-GCONF_SCHEMAS+=	apps_gnome_settings_daemon_keybindings.schemas
-GCONF_SCHEMAS+=	apps_gnome_settings_daemon_screensaver.schemas
 GCONF_SCHEMAS+=	control-center.schemas
-GCONF_SCHEMAS+=	desktop_gnome_font_rendering.schemas
 GCONF_SCHEMAS+=	themus.schemas
 GCONF_SCHEMAS+=	fontilus.schemas
 
@@ -101,6 +96,7 @@ PLIST.evolution=	yes
 .include "../../x11/libxklavier/buildlink3.mk"
 .include "../../x11/libgnomekbd/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
+.include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/x11/gnome-control-center/PLIST b/x11/gnome-control-center/PLIST
index 2d8731f7003..4891f5bd2e7 100644
--- a/x11/gnome-control-center/PLIST
+++ b/x11/gnome-control-center/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/04/15 17:59:15 drochner Exp $
 ${PLIST.evolution}bin/gnome-about-me
-bin/gnome-accessibility-keyboard-properties
 bin/gnome-appearance-properties
 bin/gnome-at-mobility
 bin/gnome-at-properties
@@ -19,19 +18,15 @@ bin/gnome-thumbnail-font
 bin/gnome-typing-monitor
 bin/gnome-window-properties
 bin/themus-theme-applier
-include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
 lib/gnome-vfs-2.0/modules/libfont-method.la
 lib/gnome-vfs-2.0/modules/libtheme-method.la
 lib/libgnome-window-settings.la
-lib/nautilus/extensions-1.0/libnautilus-fontilus.la
-lib/nautilus/extensions-1.0/libnautilus-themus.la
-lib/pkgconfig/gnome-settings-daemon.pc
+lib/nautilus/extensions-2.0/libnautilus-fontilus.la
+lib/nautilus/extensions-2.0/libnautilus-themus.la
 lib/pkgconfig/gnome-window-settings-2.0.pc
 lib/window-manager-settings/libmetacity.la
-libexec/gnome-settings-daemon
-share/applications/accessibility-keyboard.desktop
 share/applications/at-properties.desktop
 share/applications/default-applications.desktop
 share/applications/display-properties.desktop
@@ -47,43 +42,29 @@ share/applications/keybinding.desktop
 share/applications/keyboard.desktop
 share/applications/themus-theme-applier.desktop
 share/applications/window-properties.desktop
-share/dbus-1/services/org.gnome.SettingsDaemon.service
 share/desktop-directories/font-method.directory
 share/desktop-directories/gnomecc.directory
 share/desktop-directories/theme-method.directory
 share/examples/gnome-control-center/font-method.conf
 share/examples/gnome-control-center/gnomecc.menu
 share/examples/gnome-control-center/theme-method.conf
-share/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
-share/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
-share/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 share/gconf/schemas/control-center.schemas
-share/gconf/schemas/desktop_gnome_font_rendering.schemas
 share/gconf/schemas/fontilus.schemas
 share/gconf/schemas/themus.schemas
-share/gnome-control-center/glade/acme.glade
 share/gnome-control-center/glade/appearance.glade
 share/gnome-control-center/glade/apply-font.glade
 share/gnome-control-center/glade/at-enable-dialog.glade
 ${PLIST.evolution}share/gnome-control-center/glade/gnome-about-me.glade
-share/gnome-control-center/glade/gnome-accessibility-keyboard-properties.glade
 share/gnome-control-center/glade/gnome-default-applications-properties.glade
 share/gnome-control-center/glade/gnome-keybinding-properties.glade
 share/gnome-control-center/glade/gnome-keyboard-properties.glade
 share/gnome-control-center/glade/gnome-mouse-properties.glade
 share/gnome-control-center/glade/gnome-network-preferences.glade
 share/gnome-control-center/glade/gnome-window-properties.glade
-share/gnome-control-center/glade/modmap-dialog.glade
 share/gnome-control-center/glade/sound-properties.glade
 share/gnome-control-center/gnome-default-applications.xml
 share/gnome-control-center/keybindings/00-multimedia-key.xml
 share/gnome-control-center/keybindings/01-desktop-key.xml
-share/gnome-control-center/pixmaps/accessibility-keyboard-bouncekey.png
-share/gnome-control-center/pixmaps/accessibility-keyboard-mousekey.png
-share/gnome-control-center/pixmaps/accessibility-keyboard-slowkey.png
-share/gnome-control-center/pixmaps/accessibility-keyboard-stickykey.png
-share/gnome-control-center/pixmaps/accessibility-keyboard-togglekey.png
-share/gnome-control-center/pixmaps/acme-eject.png
 share/gnome-control-center/pixmaps/at-startup.png
 share/gnome-control-center/pixmaps/at-support.png
 share/gnome-control-center/pixmaps/bar-disabled.png
@@ -97,18 +78,11 @@ ${PLIST.evolution}share/gnome-control-center/pixmaps/gnome-about-me-lock-open.pn
 ${PLIST.evolution}share/gnome-control-center/pixmaps/gnome-about-me-lock.png
 share/gnome-control-center/pixmaps/gtk-theme-thumbnailing.png
 share/gnome-control-center/pixmaps/icon-theme-thumbnailing.png
-share/gnome-control-center/pixmaps/keyboard-bell.png
-share/gnome-control-center/pixmaps/keyboard-cursor.png
-share/gnome-control-center/pixmaps/keyboard-repeat.png
-share/gnome-control-center/pixmaps/keyboard-volume.png
 share/gnome-control-center/pixmaps/mouse-cursor-normal-large.png
 share/gnome-control-center/pixmaps/mouse-cursor-normal.png
 share/gnome-control-center/pixmaps/mouse-cursor-white-large.png
 share/gnome-control-center/pixmaps/mouse-cursor-white.png
-share/gnome-control-center/pixmaps/mouse-left.png
-share/gnome-control-center/pixmaps/mouse-right.png
 share/gnome-control-center/pixmaps/ocean-stripes.png
-share/gnome-control-center/pixmaps/stop.png
 share/gnome-control-center/pixmaps/subpixel-bgr.png
 share/gnome-control-center/pixmaps/subpixel-rgb.png
 share/gnome-control-center/pixmaps/subpixel-vbgr.png
@@ -116,13 +90,6 @@ share/gnome-control-center/pixmaps/subpixel-vrgb.png
 share/gnome-control-center/pixmaps/theme-thumbnailing.png
 share/gnome-control-center/pixmaps/visual-bell.png
 share/gnome-control-center/pixmaps/window-theme-thumbnailing.png
-share/gnome-control-center/xrdb/Editres.ad
-share/gnome-control-center/xrdb/Emacs.ad
-share/gnome-control-center/xrdb/General.ad
-share/gnome-control-center/xrdb/Motif.ad
-share/gnome-control-center/xrdb/Tk.ad
-share/gnome-control-center/xrdb/Xaw.ad
-share/gnome/autostart/gnome-at-session.desktop
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
@@ -145,9 +112,11 @@ share/gnome/help/control-center/ca/control-center.xml
 share/gnome/help/control-center/en_GB/control-center.xml
 share/gnome/help/control-center/es/control-center.xml
 share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/it/control-center.xml
 share/gnome/help/control-center/ja/control-center.xml
 share/gnome/help/control-center/oc/control-center.xml
 share/gnome/help/control-center/pa/control-center.xml
+share/gnome/help/control-center/pl/control-center.xml
 share/gnome/help/control-center/pt/control-center.xml
 share/gnome/help/control-center/pt_BR/control-center.xml
 share/gnome/help/control-center/ru/control-center.xml
@@ -167,6 +136,8 @@ share/icons/hicolor/24x24/apps/gnome-sound-properties.png
 share/icons/hicolor/32x32/apps/gnome-display-properties.png
 share/icons/hicolor/32x32/apps/gnome-network-preferences.png
 share/icons/hicolor/32x32/apps/gnome-sound-properties.png
+share/icons/hicolor/48x48/apps/gnome-network-preferences.png
+share/icons/hicolor/48x48/apps/gnome-sound-properties.png
 share/icons/hicolor/48x48/apps/typing-monitor.png
 share/icons/hicolor/scalable/apps/gnome-display-properties.svg
 share/icons/hicolor/scalable/apps/gnome-network-preferences.svg
@@ -175,6 +146,7 @@ share/icons/hicolor/scalable/apps/typing-monitor.svg
 share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/be@latin/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -210,6 +182,7 @@ share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -246,8 +219,6 @@ share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/uz/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -261,9 +232,11 @@ share/omf/control-center/control-center-ca.omf
 share/omf/control-center/control-center-en_GB.omf
 share/omf/control-center/control-center-es.omf
 share/omf/control-center/control-center-fr.omf
+share/omf/control-center/control-center-it.omf
 share/omf/control-center/control-center-ja.omf
 share/omf/control-center/control-center-oc.omf
 share/omf/control-center/control-center-pa.omf
+share/omf/control-center/control-center-pl.omf
 share/omf/control-center/control-center-pt.omf
 share/omf/control-center/control-center-pt_BR.omf
 share/omf/control-center/control-center-ru.omf
@@ -273,7 +246,7 @@ share/omf/control-center/control-center-vi.omf
 share/omf/control-center/control-center-zh_CN.omf
 share/pkgconfig/gnome-keybindings.pc
 @dirrm share/omf/control-center
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @comment in shared-mime-info: @dirrm share/mime/packages
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
@@ -289,9 +262,11 @@ share/pkgconfig/gnome-keybindings.pc
 @dirrm share/gnome/help/control-center/ru
 @dirrm share/gnome/help/control-center/pt_BR
 @dirrm share/gnome/help/control-center/pt
+@dirrm share/gnome/help/control-center/pl
 @dirrm share/gnome/help/control-center/pa
 @dirrm share/gnome/help/control-center/oc
 @dirrm share/gnome/help/control-center/ja
+@dirrm share/gnome/help/control-center/it
 @dirrm share/gnome/help/control-center/fr
 @dirrm share/gnome/help/control-center/es
 @dirrm share/gnome/help/control-center/en_GB
@@ -300,19 +275,14 @@ share/pkgconfig/gnome-keybindings.pc
 @dirrm share/gnome/help/control-center
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome/cursor-fonts
-@dirrm share/gnome/autostart
-@dirrm share/gnome-control-center/xrdb
 @dirrm share/gnome-control-center/pixmaps
 @dirrm share/gnome-control-center/glade
 @comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf: @dirrm share/gconf/schemas
 @dirrm share/examples/gnome-control-center
 @comment in xdg-dirs: @dirrm share/desktop-directories
-@comment in dbus: @dirrm share/dbus-1/services
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/window-manager-settings
-@comment in nautilus: @dirrm lib/nautilus/extensions-1.0
+@comment in nautilus: @dirrm lib/nautilus
 @comment in gnome-vfs: @dirrm lib/gnome-vfs-2.0/modules
 @dirrm include/gnome-window-settings-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
diff --git a/x11/gnome-control-center/distinfo b/x11/gnome-control-center/distinfo
index f4650ac64c7..4dd8bac07a9 100644
--- a/x11/gnome-control-center/distinfo
+++ b/x11/gnome-control-center/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2008/01/11 13:31:18 drochner Exp $
+$NetBSD: distinfo,v 1.3 2008/04/15 17:59:15 drochner Exp $
 
-SHA1 (gnome-control-center-2.20.3.tar.bz2) = 57395df926f9fc79caa7dc94d55d22d55cfa15c0
-RMD160 (gnome-control-center-2.20.3.tar.bz2) = 96f56251c6a06315861dcd89a1c5f68ed47bd48f
-Size (gnome-control-center-2.20.3.tar.bz2) = 2259976 bytes
+SHA1 (gnome-control-center-2.22.1.tar.bz2) = d62a7cc6ce09e15e0040747a1c6eb9287d323562
+RMD160 (gnome-control-center-2.22.1.tar.bz2) = c51bf51f26594021b98bc5e82db97fac7d9a7bd8
+Size (gnome-control-center-2.22.1.tar.bz2) = 2174701 bytes
 SHA1 (patch-aa) = 377d07ac5071fa19063cd3ecd47c589c53b81b5a
 SHA1 (patch-ab) = c0561975640562546f612e252a9d239d6dbc695b
 SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d
+SHA1 (patch-ae) = 2a586a333522e967bc513d24ebd8ef907f4919c3
diff --git a/x11/gnome-control-center/patches/patch-ae b/x11/gnome-control-center/patches/patch-ae
new file mode 100644
index 00000000000..9fbda1d155c
--- /dev/null
+++ b/x11/gnome-control-center/patches/patch-ae
@@ -0,0 +1,11 @@
+$NetBSD: patch-ae,v 1.1 2008/04/15 17:59:15 drochner Exp $
+
+--- libslab/directory-tile.c.orig	2008-04-03 14:30:21.000000000 +0200
++++ libslab/directory-tile.c
+@@ -672,5 +672,5 @@ static void
+ disown_spawned_child (gpointer user_data)
+ {
+ 	setsid  ();
+-	setpgrp ();
++	setpgid (0, 0);
+ }