diff options
author | drochner <drochner> | 2010-07-06 15:13:39 +0000 |
---|---|---|
committer | drochner <drochner> | 2010-07-06 15:13:39 +0000 |
commit | 8d189f72669a91cb113e2c9c00dcafdf55b5d599 (patch) | |
tree | 34295024f1b32175dec774f82999eb0d3015ed1e /x11 | |
parent | 85a4edff6a9ab89322ca319c197e1193988443c5 (diff) | |
download | pkgsrc-8d189f72669a91cb113e2c9c00dcafdf55b5d599.tar.gz |
update to 2.30.2
This switches to the gnome-2.30 release branch.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gnome-desktop/Makefile | 7 | ||||
-rw-r--r-- | x11/gnome-desktop/PLIST | 4 | ||||
-rw-r--r-- | x11/gnome-desktop/buildlink3.mk | 6 | ||||
-rw-r--r-- | x11/gnome-desktop/distinfo | 8 | ||||
-rw-r--r-- | x11/gnome-panel/Makefile | 8 | ||||
-rw-r--r-- | x11/gnome-panel/PLIST | 18 | ||||
-rw-r--r-- | x11/gnome-panel/distinfo | 10 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-af | 34 |
8 files changed, 55 insertions, 40 deletions
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 3baea25d981..77e5a2af6cc 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.100 2010/06/13 22:45:37 wiz Exp $ +# $NetBSD: Makefile,v 1.101 2010/07/06 15:15:05 drochner Exp $ # -DISTNAME= gnome-desktop-2.28.2 -PKGREVISION= 2 +DISTNAME= gnome-desktop-2.30.2 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop/2.28/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop/2.30/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST index 80cd24d5d91..454256fb7f9 100644 --- a/x11/gnome-desktop/PLIST +++ b/x11/gnome-desktop/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.40 2010/01/15 18:26:17 drochner Exp $ +@comment $NetBSD: PLIST,v 1.41 2010/07/06 15:15:05 drochner Exp $ bin/gnome-about include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h include/gnome-desktop-2.0/libgnome/gnome-desktop-utils.h @@ -52,6 +52,7 @@ share/gnome/help/gpl/fi/gpl.xml share/gnome/help/gpl/fr/gpl.xml share/gnome/help/gpl/hu/gpl.xml share/gnome/help/gpl/ko/gpl.xml +share/gnome/help/gpl/nds/gpl.xml share/gnome/help/gpl/oc/gpl.xml share/gnome/help/gpl/pa/gpl.xml share/gnome/help/gpl/sv/gpl.xml @@ -233,6 +234,7 @@ share/omf/gpl/gpl-fi.omf share/omf/gpl/gpl-fr.omf share/omf/gpl/gpl-hu.omf share/omf/gpl/gpl-ko.omf +share/omf/gpl/gpl-nds.omf share/omf/gpl/gpl-oc.omf share/omf/gpl/gpl-pa.omf share/omf/gpl/gpl-sv.omf diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk index 214edc9eaa6..a0569e6a524 100644 --- a/x11/gnome-desktop/buildlink3.mk +++ b/x11/gnome-desktop/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.30 2010/06/13 22:45:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2010/07/06 15:15:05 drochner Exp $ BUILDLINK_TREE+= gnome-desktop .if !defined(GNOME_DESKTOP_BUILDLINK3_MK) GNOME_DESKTOP_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gnome-desktop+= gnome-desktop>=2.25.3 -BUILDLINK_ABI_DEPENDS.gnome-desktop?= gnome-desktop>=2.28.2nb2 +BUILDLINK_API_DEPENDS.gnome-desktop+= gnome-desktop>=2.30.0 +BUILDLINK_ABI_DEPENDS.gnome-desktop?= gnome-desktop>=2.30.0 BUILDLINK_PKGSRCDIR.gnome-desktop?= ../../x11/gnome-desktop .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 62822c38724..e60ef2d4a04 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.49 2010/01/15 18:26:17 drochner Exp $ +$NetBSD: distinfo,v 1.50 2010/07/06 15:15:05 drochner Exp $ -SHA1 (gnome-desktop-2.28.2.tar.bz2) = 21c25d1747f6db87b2c8c8fab8090f160c638687 -RMD160 (gnome-desktop-2.28.2.tar.bz2) = 1d7291a38f981887c61564ad0ad90395b286b18f -Size (gnome-desktop-2.28.2.tar.bz2) = 1611325 bytes +SHA1 (gnome-desktop-2.30.2.tar.bz2) = 92ace7dd3c017a71c9ac90d2df486ebc2ba3d2ba +RMD160 (gnome-desktop-2.30.2.tar.bz2) = bcdcc3c0483cfb438b2ae30c8f8a840a39967dc5 +Size (gnome-desktop-2.30.2.tar.bz2) = 1665808 bytes SHA1 (patch-aa) = ca45f4cb5c1fabdb911034d1f32a823c5d0eb8f2 diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index d1d3bd7dc0f..ec42a4aa56a 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.120 2010/06/13 22:45:37 wiz Exp $ +# $NetBSD: Makefile,v 1.121 2010/07/06 15:17:03 drochner Exp $ # -DISTNAME= gnome-panel-2.28.0 -PKGREVISION= 3 +DISTNAME= gnome-panel-2.30.2 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.28/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.30/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= drochner@NetBSD.org @@ -77,4 +76,5 @@ BUILDLINK_API_DEPENDS.gnome-menus+= gnome-menus>=2.28.0 .include "../../x11/libX11/buildlink3.mk" BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libXt/buildlink3.mk" +.include "../../audio/libcanberra/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST index 2c1e08a45de..9f19afd5217 100644 --- a/x11/gnome-panel/PLIST +++ b/x11/gnome-panel/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.49 2009/10/22 17:29:42 drochner Exp $ +@comment $NetBSD: PLIST,v 1.50 2010/07/06 15:17:03 drochner Exp $ bin/gnome-desktop-item-edit bin/gnome-panel bin/panel-test-applets @@ -76,6 +76,9 @@ share/gnome/help/clock/ca/legal.xml share/gnome/help/clock/cs/clock.xml share/gnome/help/clock/cs/figures/clock_applet.png share/gnome/help/clock/cs/legal.xml +share/gnome/help/clock/da/clock.xml +share/gnome/help/clock/da/figures/clock_applet.png +share/gnome/help/clock/da/legal.xml share/gnome/help/clock/de/clock.xml share/gnome/help/clock/de/figures/clock_applet.png share/gnome/help/clock/de/legal.xml @@ -115,6 +118,9 @@ share/gnome/help/clock/oc/legal.xml share/gnome/help/clock/pa/clock.xml share/gnome/help/clock/pa/figures/clock_applet.png share/gnome/help/clock/pa/legal.xml +share/gnome/help/clock/pt/clock.xml +share/gnome/help/clock/pt/figures/clock_applet.png +share/gnome/help/clock/pt/legal.xml share/gnome/help/clock/pt_BR/clock.xml share/gnome/help/clock/pt_BR/figures/clock_applet.png share/gnome/help/clock/pt_BR/legal.xml @@ -136,6 +142,9 @@ share/gnome/help/clock/uk/legal.xml share/gnome/help/clock/zh_CN/clock.xml share/gnome/help/clock/zh_CN/figures/clock_applet.png share/gnome/help/clock/zh_CN/legal.xml +share/gnome/help/clock/zh_HK/clock.xml +share/gnome/help/clock/zh_HK/figures/clock_applet.png +share/gnome/help/clock/zh_HK/legal.xml share/gnome/help/clock/zh_TW/clock.xml share/gnome/help/clock/zh_TW/figures/clock_applet.png share/gnome/help/clock/zh_TW/legal.xml @@ -193,7 +202,6 @@ share/gnome/help/fish/uk/legal.xml share/gnome/help/fish/zh_CN/figures/fish_applet.png share/gnome/help/fish/zh_CN/fish.xml share/gnome/help/fish/zh_CN/legal.xml -share/gtk-doc/html/panel-applet/PanelApplet.html share/gtk-doc/html/panel-applet/applet-popups.html share/gtk-doc/html/panel-applet/applet-porting.html share/gtk-doc/html/panel-applet/applet-writing.html @@ -203,6 +211,7 @@ share/gtk-doc/html/panel-applet/index.sgml share/gtk-doc/html/panel-applet/left.png share/gtk-doc/html/panel-applet/multi-applets.html share/gtk-doc/html/panel-applet/panel-applet-Panel-Applet-GConf-Utilities.html +share/gtk-doc/html/panel-applet/panel-applet-panel-applet.html share/gtk-doc/html/panel-applet/panel-applet.devhelp share/gtk-doc/html/panel-applet/panel-applet.devhelp2 share/gtk-doc/html/panel-applet/panel-applet.html @@ -291,6 +300,7 @@ share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo share/locale/dz/LC_MESSAGES/gnome-panel-2.0.mo share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/en@shaw/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo @@ -333,6 +343,7 @@ share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/nds/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ne/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo @@ -375,6 +386,7 @@ share/omf/clock/clock-C.omf share/omf/clock/clock-ar.omf share/omf/clock/clock-ca.omf share/omf/clock/clock-cs.omf +share/omf/clock/clock-da.omf share/omf/clock/clock-de.omf share/omf/clock/clock-el.omf share/omf/clock/clock-en_GB.omf @@ -388,6 +400,7 @@ share/omf/clock/clock-ko.omf share/omf/clock/clock-nl.omf share/omf/clock/clock-oc.omf 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-sr.omf @@ -395,6 +408,7 @@ share/omf/clock/clock-sv.omf share/omf/clock/clock-th.omf share/omf/clock/clock-uk.omf share/omf/clock/clock-zh_CN.omf +share/omf/clock/clock-zh_HK.omf share/omf/clock/clock-zh_TW.omf share/omf/fish/fish-C.omf share/omf/fish/fish-ca.omf diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index a3e01f90c21..e95dd624f5f 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.59 2010/02/14 11:12:21 drochner Exp $ +$NetBSD: distinfo,v 1.60 2010/07/06 15:17:03 drochner Exp $ -SHA1 (gnome-panel-2.28.0.tar.bz2) = 667975e0f269b6b3320c04bd1bd705378c0f4927 -RMD160 (gnome-panel-2.28.0.tar.bz2) = b3c2025b47b9d6c74aba0a2961394d94f59c4381 -Size (gnome-panel-2.28.0.tar.bz2) = 2976766 bytes +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 (patch-ab) = 2bea1a4fe4b68b45988e2d1e88eeb488d14ac0e1 SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31 SHA1 (patch-ae) = d85575dc403c67a4fcb0818904ab9b0517f7b8e0 -SHA1 (patch-af) = ccdf18b16aad6f01d88d8d893e856f2c382b1c98 +SHA1 (patch-af) = 5be32f192c3955790e3e7cf23ab8aab300bd5233 diff --git a/x11/gnome-panel/patches/patch-af b/x11/gnome-panel/patches/patch-af index 4e46e383673..12200aa5db6 100644 --- a/x11/gnome-panel/patches/patch-af +++ b/x11/gnome-panel/patches/patch-af @@ -1,31 +1,31 @@ -$NetBSD: patch-af,v 1.6 2010/02/14 11:12:21 drochner Exp $ +$NetBSD: patch-af,v 1.7 2010/07/06 15:17:03 drochner Exp $ ---- po/it.po.orig 2009-09-08 00:08:42.000000000 +0000 +--- po/it.po.orig 2010-03-08 13:07:06.000000000 +0000 +++ po/it.po -@@ -93,7 +93,7 @@ msgstr "%l.%M %p" - #: ../applets/clock/calendar-window.c:307 ../applets/clock/clock.c:450 - #: ../applets/clock/clock.c:1574 ../applets/clock/clock-location-tile.c:480 +@@ -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 msgid "%H:%M" -msgstr "%-H.%M" +msgstr "%H.%M" - #. Translators: If the event did not start on the current day - #. * we will display the start date in the most abbreviated way -@@ -145,7 +145,7 @@ msgstr "%l.%M.%S %p" - # creava problemi in nautilus preferisco %-H - #: ../applets/clock/clock.c:450 ../applets/clock/clock.c:1572 + #. 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" + #. * format (eg, like in France: 20:10). + #: ../applets/clock/clock.c:450 ../applets/clock/clock.c:1582 msgid "%H:%M:%S" -msgstr "%-H.%M.%S" +msgstr "%H.%M.%S" - #. translators: replace %e with %d if, when the day of the - #. * month as a decimal number is a single digit, it -@@ -677,7 +677,7 @@ msgstr "%l.%M <small>%p (%A)</small>" - #. - #: ../applets/clock/clock-location-tile.c:462 + #. 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>" + #. * (the %A expands to the weekday). + #: ../applets/clock/clock-location-tile.c:461 msgid "%H:%M <small>(%A)</small>" -msgstr "%-H.%M <small>(%A)</small>" +msgstr "%H.%M <small>(%A)</small>" - #. translators: This is a strftime format string that is used for formatting - #. * the time that is displayed for locations in the popup. This string is used + #. Translators: This is a strftime format string. + #. * It is used to display the time in 12-hours format |