update to 2.32.1

This switches to the gnome-2.32 release branch.

5 files changed, 58 insertions, 49 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index e89ee4de896..c867c8dee06 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.124 2010/11/15 22:58:57 abs Exp $
+# $NetBSD: Makefile,v 1.125 2010/11/24 20:26:20 drochner Exp $
 #
 
-DISTNAME=		gnome-panel-2.30.2
-PKGREVISION=		3
+DISTNAME=		gnome-panel-2.32.1
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.30/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.32/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		drochner@NetBSD.org
diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST
index 9f19afd5217..2dbf1e1dce4 100644
--- a/x11/gnome-panel/PLIST
+++ b/x11/gnome-panel/PLIST
@@ -1,24 +1,31 @@
-@comment $NetBSD: PLIST,v 1.50 2010/07/06 15:17:03 drochner Exp $
+@comment $NetBSD: PLIST,v 1.51 2010/11/24 20:26:20 drochner Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/panel-test-applets
+bin/panel-test-applets-bonobo
+include/gnome-panel-3.0/libpanel-applet/panel-applet-enums.h
+include/gnome-panel-3.0/libpanel-applet/panel-applet-gconf.h
+include/gnome-panel-3.0/libpanel-applet/panel-applet.h
 include/panel-2.0/GNOME_Panel.h
 include/panel-2.0/panel-applet-enums.h
 include/panel-2.0/panel-applet-gconf.h
 include/panel-2.0/panel-applet.h
-lib/bonobo/servers/GNOME_ClockApplet_Factory.server
-lib/bonobo/servers/GNOME_FishApplet_Factory.server
-lib/bonobo/servers/GNOME_NotificationAreaApplet.server
-lib/bonobo/servers/GNOME_Wncklet_Factory.server
+lib/gnome-panel/modules/libpanel-applets-bonobo.la
 lib/libpanel-applet-2.la
+lib/libpanel-applet-3.la
 lib/pkgconfig/libpanelapplet-2.0.pc
+lib/pkgconfig/libpanelapplet-3.0.pc
 libexec/clock-applet
-libexec/fish-applet-2
+libexec/fish-applet
 libexec/gnome-panel-add
 libexec/notification-area-applet
 libexec/wnck-applet
 man/man1/gnome-panel.1
 share/applications/gnome-panel.desktop
+share/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
 share/gconf/schemas/clock.schemas
 share/gconf/schemas/fish.schemas
 share/gconf/schemas/panel-compatibility.schemas
@@ -29,14 +36,11 @@ share/gconf/schemas/panel-object.schemas
 share/gconf/schemas/panel-toplevel.schemas
 share/gconf/schemas/window-list.schemas
 share/gconf/schemas/workspace-switcher.schemas
-share/gnome-2.0/ui/GNOME_ClockApplet.xml
-share/gnome-2.0/ui/GNOME_FishApplet.xml
-share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
 share/gnome-2.0/ui/GNOME_Panel_Popup.xml
-share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
-share/gnome-2.0/ui/GNOME_WindowListApplet.xml
-share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
-share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
+share/gnome-panel/applets/org.gnome.panel.ClockApplet.panel-applet
+share/gnome-panel/applets/org.gnome.panel.FishApplet.panel-applet
+share/gnome-panel/applets/org.gnome.panel.NotificationAreaApplet.panel-applet
+share/gnome-panel/applets/org.gnome.panel.Wncklet.panel-applet
 share/gnome-panel/pixmaps/clock-calendar-icon.png
 share/gnome-panel/pixmaps/clock-face-large.svg
 share/gnome-panel/pixmaps/clock-face-small-day.svg
@@ -55,13 +59,20 @@ share/gnome-panel/pixmaps/gnome-gegl2.png
 share/gnome-panel/pixmaps/monkey.png
 share/gnome-panel/pixmaps/oldwanda.png
 share/gnome-panel/pixmaps/wanda.png
-share/gnome-panel/pixmaps/world_map-960.png
+share/gnome-panel/ui/clock-menu.xml
 share/gnome-panel/ui/clock.ui
+share/gnome-panel/ui/fish-menu.xml
 share/gnome-panel/ui/fish.ui
+share/gnome-panel/ui/notification-area-menu.xml
 share/gnome-panel/ui/panel-properties-dialog.ui
 share/gnome-panel/ui/panel-run-dialog.ui
+share/gnome-panel/ui/panel-test-applets-bonobo.ui
 share/gnome-panel/ui/panel-test-applets.ui
+share/gnome-panel/ui/showdesktop-menu.xml
+share/gnome-panel/ui/window-list-menu.xml
 share/gnome-panel/ui/window-list.ui
+share/gnome-panel/ui/window-menu-menu.xml
+share/gnome-panel/ui/workspace-switcher-menu.xml
 share/gnome-panel/ui/workspace-switcher.ui
 share/gnome-panelrc
 share/gnome/help/clock/C/clock.xml
@@ -127,6 +138,9 @@ share/gnome/help/clock/pt_BR/legal.xml
 share/gnome/help/clock/ru/clock.xml
 share/gnome/help/clock/ru/figures/clock_applet.png
 share/gnome/help/clock/ru/legal.xml
+share/gnome/help/clock/sl/clock.xml
+share/gnome/help/clock/sl/figures/clock_applet.png
+share/gnome/help/clock/sl/legal.xml
 share/gnome/help/clock/sr/clock.xml
 share/gnome/help/clock/sr/figures/clock_applet.png
 share/gnome/help/clock/sr/legal.xml
@@ -181,6 +195,9 @@ share/gnome/help/fish/fr/legal.xml
 share/gnome/help/fish/it/figures/fish_applet.png
 share/gnome/help/fish/it/fish.xml
 share/gnome/help/fish/it/legal.xml
+share/gnome/help/fish/ja/figures/fish_applet.png
+share/gnome/help/fish/ja/fish.xml
+share/gnome/help/fish/ja/legal.xml
 share/gnome/help/fish/ko/figures/fish_applet.png
 share/gnome/help/fish/ko/fish.xml
 share/gnome/help/fish/ko/legal.xml
@@ -190,6 +207,9 @@ share/gnome/help/fish/oc/legal.xml
 share/gnome/help/fish/ru/figures/fish_applet.png
 share/gnome/help/fish/ru/fish.xml
 share/gnome/help/fish/ru/legal.xml
+share/gnome/help/fish/sl/figures/fish_applet.png
+share/gnome/help/fish/sl/fish.xml
+share/gnome/help/fish/sl/legal.xml
 share/gnome/help/fish/sv/figures/fish_applet.png
 share/gnome/help/fish/sv/fish.xml
 share/gnome/help/fish/sv/legal.xml
@@ -311,9 +331,11 @@ share/locale/fa/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fur/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/fy/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gu/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/gv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ha/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
@@ -326,6 +348,7 @@ share/locale/is/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/kk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/kn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo
@@ -370,6 +393,7 @@ share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/uz/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/uz@cyrillic/LC_MESSAGES/gnome-panel-2.0.mo
@@ -403,6 +427,7 @@ share/omf/clock/clock-pa.omf
 share/omf/clock/clock-pt.omf
 share/omf/clock/clock-pt_BR.omf
 share/omf/clock/clock-ru.omf
+share/omf/clock/clock-sl.omf
 share/omf/clock/clock-sr.omf
 share/omf/clock/clock-sv.omf
 share/omf/clock/clock-th.omf
@@ -421,13 +446,12 @@ share/omf/fish/fish-eu.omf
 share/omf/fish/fish-fi.omf
 share/omf/fish/fish-fr.omf
 share/omf/fish/fish-it.omf
+share/omf/fish/fish-ja.omf
 share/omf/fish/fish-ko.omf
 share/omf/fish/fish-oc.omf
 share/omf/fish/fish-ru.omf
+share/omf/fish/fish-sl.omf
 share/omf/fish/fish-sv.omf
 share/omf/fish/fish-th.omf
 share/omf/fish/fish-uk.omf
 share/omf/fish/fish-zh_CN.omf
-@pkgdir share/polkit-1/actions
-@pkgdir share/examples/gnome-panel
-@pkgdir share/dbus-1/system-services
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index e95dd624f5f..6cd99fbf907 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.60 2010/07/06 15:17:03 drochner Exp $
+$NetBSD: distinfo,v 1.61 2010/11/24 20:26:20 drochner Exp $
 
-SHA1 (gnome-panel-2.30.2.tar.bz2) = 4be902269d4dd4af1e988d522ae613946890ec0a
-RMD160 (gnome-panel-2.30.2.tar.bz2) = b5828e0235a6fb5faa011179ff8fcc0574bf3c6b
-Size (gnome-panel-2.30.2.tar.bz2) = 3125757 bytes
-SHA1 (patch-aa) = b2e88627fe7ead48c946baf276ecc99fc17e906a
+SHA1 (gnome-panel-2.32.1.tar.bz2) = 561ec56307854b5cbd6b0d0a0b7f9e0e6c2a0127
+RMD160 (gnome-panel-2.32.1.tar.bz2) = 03a440cee7e219b42a0375ae2d2d53fbd17b604b
+Size (gnome-panel-2.32.1.tar.bz2) = 3132156 bytes
 SHA1 (patch-ab) = 2bea1a4fe4b68b45988e2d1e88eeb488d14ac0e1
 SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31
 SHA1 (patch-ae) = d85575dc403c67a4fcb0818904ab9b0517f7b8e0
-SHA1 (patch-af) = 5be32f192c3955790e3e7cf23ab8aab300bd5233
+SHA1 (patch-af) = ca6947149c9cb2557814da51122fe5ce202469b1
diff --git a/x11/gnome-panel/patches/patch-aa b/x11/gnome-panel/patches/patch-aa
deleted file mode 100644
index db75281e4eb..00000000000
--- a/x11/gnome-panel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2009/10/22 17:29:42 drochner Exp $
-
---- applets/clock/Makefile.in.orig	2009-09-21 18:36:46.000000000 +0200
-+++ applets/clock/Makefile.in
-@@ -571,7 +571,7 @@ schemasdir = $(GCONF_SCHEMA_FILE_DIR)
- schemas_in_files = clock.schemas.in
- schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
- dbus_servicesdir = $(datadir)/dbus-1/system-services
--dbus_confdir = $(sysconfdir)/dbus-1/system.d
-+dbus_confdir = $(datadir)/examples/gnome-panel
- polkitdir = $(datadir)/polkit-1/actions
- dbus_services_in_files = org.gnome.ClockApplet.Mechanism.service.in
- polkit_in_files = org.gnome.clockapplet.mechanism.policy.in
diff --git a/x11/gnome-panel/patches/patch-af b/x11/gnome-panel/patches/patch-af
index 12200aa5db6..69c5a2a3a4d 100644
--- a/x11/gnome-panel/patches/patch-af
+++ b/x11/gnome-panel/patches/patch-af
@@ -1,28 +1,28 @@
-$NetBSD: patch-af,v 1.7 2010/07/06 15:17:03 drochner Exp $
+$NetBSD: patch-af,v 1.8 2010/11/24 20:26:21 drochner Exp $
 
---- po/it.po.orig	2010-03-08 13:07:06.000000000 +0000
+--- po/it.po.orig	2010-09-07 22:46:05.000000000 +0000
 +++ po/it.po
-@@ -101,7 +101,7 @@ msgstr "%l.%M %p"
- #: ../applets/clock/calendar-window.c:308 ../applets/clock/clock.c:450
- #: ../applets/clock/clock.c:1588 ../applets/clock/clock-location-tile.c:476
+@@ -53,7 +53,7 @@ msgstr "%l.%M %p"
+ #: ../applets/clock/clock.c:1591 ../applets/clock/clock-location-tile.c:480
+ #: ../applets/clock/clock-location-tile.c:527
  msgid "%H:%M"
 -msgstr "%-H.%M"
 +msgstr "%H.%M"
  
  #. Translators: This is a strftime format string.
  #. * It is used to display the start date of an appointment, in
-@@ -163,7 +163,7 @@ msgstr "%l.%M.%S %p"
+@@ -115,7 +115,7 @@ msgstr "%l.%M.%S %p"
  #. * format (eg, like in France: 20:10).
- #: ../applets/clock/clock.c:450 ../applets/clock/clock.c:1582
+ #: ../applets/clock/clock.c:449 ../applets/clock/clock.c:1585
  msgid "%H:%M:%S"
 -msgstr "%-H.%M.%S"
 +msgstr "%H.%M.%S"
  
  #. Translators: This is a strftime format string.
  #. * It is used to display the date. Replace %e with %d if, when
-@@ -707,7 +707,7 @@ msgstr "%l.%M <small>%p (%A)</small>"
+@@ -706,7 +706,7 @@ msgstr "%l.%M <small>%p (%A)</small>"
  #. * (the %A expands to the weekday).
- #: ../applets/clock/clock-location-tile.c:461
+ #: ../applets/clock/clock-location-tile.c:465
  msgid "%H:%M <small>(%A)</small>"
 -msgstr "%-H.%M <small>(%A)</small>"
 +msgstr "%H.%M <small>(%A)</small>"