From 3d272740920a1868e8acfed76d6e4c67c331e101 Mon Sep 17 00:00:00 2001 From: kwm Date: Sat, 20 Nov 2010 15:37:08 +0000 Subject: Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this release can be found at http://library.gnome.org/misc/release-notes/2.32/ This will be the last release of the GNOME 2.x series, mainly a bugfix and bridge release to the first release of the GNOME 3.x series. This release features commits by avl, marcus, mezz and myself. The FreeBSD GNOME Team would like to thank the following contributors and testers for there help with this release: Zane C.B. romain@ Olaf Seibert DomiX Bapt jsa@ miwi@ Sergio de Almeida Lenzi Maxim Samsonov Kris Moore And pav@ for 2 exp-runs PR: ports/152255 ports/143260 ports/141033 ports/149629 ports/150350 ports/151523 With hat: gnome@ --- x11/gnome-panel/Makefile | 34 +++++++---- x11/gnome-panel/distinfo | 5 +- x11/gnome-panel/files/patch-po_ko.po | 29 --------- x11/gnome-panel/pkg-plist | 112 +++++++++++++++++++++++++---------- 4 files changed, 108 insertions(+), 72 deletions(-) delete mode 100644 x11/gnome-panel/files/patch-po_ko.po (limited to 'x11/gnome-panel') diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 9345359e5632..b23c8312eb8d 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome-panel/Makefile,v 1.5 2010/06/23 21:59:12 kwm Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.230 2010/11/17 13:01:32 kwm Exp $ # PORTNAME= gnome-panel -PORTVERSION= 2.30.2 -PORTREVISION?= 1 +PORTVERSION= 2.32.1 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,16 +21,16 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ - polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra USE_GETTEXT= yes +USE_XORG= ice sm x11 xau xrandr INSTALLS_OMF= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \ - libwnck gnomemenus gnomedocutils ltverhack referencehack \ - libbonoboui +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \ + gnomedocutils ltverhack referencehack librsvg2 WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes @@ -47,7 +47,8 @@ GCONF_SCHEMAS= clock.schemas fish.schemas \ panel-toplevel.schemas window-list.schemas \ workspace-switcher.schemas -OPTIONS= EVOLUTION "use the Evolution calendar if installed" on +OPTIONS= EVOLUTION "use the Evolution calendar if installed" on \ + BONOBO "Support for bonobo applets aka Gnome 2 applets" on .if defined(PACKAGE_BUILDING) .undef WITHOUT_GNOME @@ -58,11 +59,20 @@ WITH_GNOME= yes .if !defined(WITHOUT_EVOLUTION) && ${HAVE_GNOME:Mevolutiondataserver}!="" USE_GNOME+= evolutiondataserver -CONFIGURE_ARGS+=--enable-eds +#CONFIGURE_ARGS+=--enable-eds .else CONFIGURE_ARGS+=--disable-eds .endif +.if defined(WITH_BONOBO) +USE_GNOME+= libbonoboui +CONFIGURE_ARGS+=--enable-bonobo +PLIST_SUB+= BONOBO="" +.else +CONFIGURE_ARGS+=--disable-bonobo +PLIST_SUB+= BONOBO="@comment " +.endif + post-patch: @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -e \ @@ -71,6 +81,10 @@ post-patch: ${WRKSRC}/help/clock/Makefile.in \ ${WRKSRC}/help/fish/Makefile.in +post-install: + @${MKDIR} ${PREFIX}/lib/gnome-panel/modules + -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gnome-panel/modules + .include .endif diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 210adb38c35b..d0b90eeb508f 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/gnome-panel-2.30.2.tar.bz2) = 11b6db12223c70a218a2f4602b1683cc -SHA256 (gnome2/gnome-panel-2.30.2.tar.bz2) = f0171c55ecdf4970f819cce66de0db99bbe43832e8a284ea0dd0c89d7d12e7b6 -SIZE (gnome2/gnome-panel-2.30.2.tar.bz2) = 3125757 +SHA256 (gnome2/gnome-panel-2.32.1.tar.bz2) = 8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f +SIZE (gnome2/gnome-panel-2.32.1.tar.bz2) = 3132156 diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po deleted file mode 100644 index 7de508a0eba4..000000000000 --- a/x11/gnome-panel/files/patch-po_ko.po +++ /dev/null @@ -1,29 +0,0 @@ ---- po/ko.po.orig 2008-02-26 18:15:58.000000000 +0100 -+++ po/ko.po 2008-02-26 18:16:31.000000000 +0100 -@@ -95,7 +95,7 @@ msgstr "%H:%M" - #. * possible. - #: ../applets/clock/calendar-window.c:250 - msgid "%b %d" --msgstr "%b %e일" -+msgstr "%B %e일" - - #: ../applets/clock/calendar-window.c:765 - msgid "Tasks" -@@ -146,7 +146,7 @@ msgstr "%H:%M:%S" - #. - #: ../applets/clock/clock.c:443 - msgid "%a %b %e" --msgstr "%b %e일 (%a)" -+msgstr "%B %e일 (%a)" - - #. translators: reverse the order of these arguments - #. * if the time should come before the -@@ -207,7 +207,7 @@ msgstr "%p %I:%M" - - #: ../applets/clock/clock.c:1590 - msgid "%A, %B %d %Y" --msgstr "%Y년 %b %e일 %A" -+msgstr "%Y년 %B %e일 %A" - - #: ../applets/clock/clock.c:1665 - #, c-format diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 1d349e92627e..1f93a7f91a44 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -1,48 +1,67 @@ bin/gnome-desktop-item-edit bin/gnome-panel bin/panel-test-applets -etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf +%%BONOBO%%bin/panel-test-applets-bonobo @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true etc/gconf/schemas/panel-default-setup.entries @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true -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/libpanel-applet-2.a -lib/libpanel-applet-2.la -lib/libpanel-applet-2.so -lib/libpanel-applet-2.so.0 -libdata/bonobo/servers/GNOME_ClockApplet_Factory.server -libdata/bonobo/servers/GNOME_FishApplet_Factory.server -libdata/bonobo/servers/GNOME_NotificationAreaApplet.server -libdata/bonobo/servers/GNOME_Wncklet_Factory.server -libdata/pkgconfig/libpanelapplet-2.0.pc +%%BONOBO%%include/panel-2.0/GNOME_Panel.h +%%BONOBO%%include/panel-2.0/panel-applet-enums.h +%%BONOBO%%include/panel-2.0/panel-applet-gconf.h +%%BONOBO%%include/panel-2.0/panel-applet.h +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 +lib/girepository-1.0/PanelApplet-3.0.typelib +@exec mkdir -p %D/lib/gnome-panel/modules +%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.a +%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.la +%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.so +@exec %%LOCALBASE%%/bin/gio-querymodules %D/lib/gnome-panel/modules 2>1/dev/null || /usr/bin/true +@unexec /bin/rm -f %D/lib/gnome-panel/modules/giomodule.cache +%%BONOBO%%lib/libpanel-applet-2.a +%%BONOBO%%lib/libpanel-applet-2.la +%%BONOBO%%lib/libpanel-applet-2.so +%%BONOBO%%lib/libpanel-applet-2.so.0 +lib/libpanel-applet-3.a +lib/libpanel-applet-3.la +lib/libpanel-applet-3.so +lib/libpanel-applet-3.so.0 +%%BONOBO%%libdata/pkgconfig/libpanelapplet-2.0.pc +libdata/pkgconfig/libpanelapplet-3.0.pc libexec/clock-applet -libexec/fish-applet-2 -libexec/gnome-clock-applet-mechanism +libexec/fish-applet libexec/gnome-panel-add libexec/notification-area-applet libexec/wnck-applet share/applications/gnome-panel.desktop -share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service -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/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 +%%BONOBO%%share/gnome-2.0/ui/GNOME_Panel_Popup.xml +share/gir-1.0/PanelApplet-3.0.gir +%%DATADIR%%/applets/org.gnome.panel.ClockApplet.panel-applet +%%DATADIR%%/applets/org.gnome.panel.FishApplet.panel-applet +%%DATADIR%%/applets/org.gnome.panel.NotificationAreaApplet.panel-applet +%%DATADIR%%/applets/org.gnome.panel.Wncklet.panel-applet %%DATADIR%%/ui/clock.ui +%%DATADIR%%/ui/clock-menu.xml %%DATADIR%%/ui/fish.ui +%%DATADIR%%/ui/fish-menu.xml +%%DATADIR%%/ui/notification-area-menu.xml +%%BONOBO%%%%DATADIR%%/ui/panel-test-applets-bonobo.ui %%DATADIR%%/ui/panel-properties-dialog.ui %%DATADIR%%/ui/panel-run-dialog.ui +%%DATADIR%%/ui/showdesktop-menu.xml %%DATADIR%%/ui/panel-test-applets.ui %%DATADIR%%/ui/window-list.ui +%%DATADIR%%/ui/window-list-menu.xml +%%DATADIR%%/ui/window-menu-menu.xml %%DATADIR%%/ui/workspace-switcher.ui +%%DATADIR%%/ui/workspace-switcher-menu.xml %%DATADIR%%/pixmaps/clock-calendar-icon.png %%DATADIR%%/pixmaps/clock-face-large.svg %%DATADIR%%/pixmaps/clock-face-small-day.svg @@ -61,7 +80,6 @@ share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml %%DATADIR%%/pixmaps/monkey.png %%DATADIR%%/pixmaps/oldwanda.png %%DATADIR%%/pixmaps/wanda.png -%%DATADIR%%/pixmaps/world_map-960.png share/gnome-panelrc share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png @@ -126,6 +144,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 @@ -180,6 +201,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 @@ -189,6 +213,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 @@ -257,7 +284,7 @@ share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg share/icons/hicolor/scalable/apps/gnome-panel-window-menu.svg share/icons/hicolor/scalable/apps/gnome-panel-workspace-switcher.svg share/icons/hicolor/scalable/apps/gnome-panel.svg -share/idl/gnome-panel-2.0/GNOME_Panel.idl +%%BONOBO%%share/idl/gnome-panel-2.0/GNOME_Panel.idl share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo @@ -291,9 +318,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 @@ -306,6 +335,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 @@ -350,6 +380,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 @@ -383,6 +414,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 @@ -401,17 +433,18 @@ 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 -share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/omf/fish @dirrm share/omf/clock -@dirrm share/idl/gnome-panel-2.0 +%%BONOBO%%@dirrm share/idl/gnome-panel-2.0 @dirrm share/gnome/help/fish/zh_CN/figures @dirrm share/gnome/help/fish/zh_CN @dirrm share/gnome/help/fish/uk/figures @@ -420,12 +453,16 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/fish/th @dirrm share/gnome/help/fish/sv/figures @dirrm share/gnome/help/fish/sv +@dirrm share/gnome/help/fish/sl/figures +@dirrm share/gnome/help/fish/sl @dirrm share/gnome/help/fish/ru/figures @dirrm share/gnome/help/fish/ru @dirrm share/gnome/help/fish/oc/figures @dirrm share/gnome/help/fish/oc @dirrm share/gnome/help/fish/ko/figures @dirrm share/gnome/help/fish/ko +@dirrm share/gnome/help/fish/ja/figures +@dirrm share/gnome/help/fish/ja @dirrm share/gnome/help/fish/it/figures @dirrm share/gnome/help/fish/it @dirrm share/gnome/help/fish/fr/figures @@ -463,6 +500,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/clock/sv @dirrm share/gnome/help/clock/sr/figures @dirrm share/gnome/help/clock/sr +@dirrm share/gnome/help/clock/sl/figures +@dirrm share/gnome/help/clock/sl @dirrm share/gnome/help/clock/ru/figures @dirrm share/gnome/help/clock/ru @dirrm share/gnome/help/clock/pt_BR/figures @@ -508,9 +547,14 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/clock @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/ui +@dirrm %%DATADIR%%/applets @dirrm %%DATADIR%% @dirrmtry share/applications -@dirrm include/panel-2.0 +@dirrmtry lib/gnome-panel/modules +@dirrmtry lib/gnome-panel +@dirrm include/gnome-panel-3.0/libpanel-applet +@dirrm include/gnome-panel-3.0 +%%BONOBO%%@dirrm include/panel-2.0 @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -523,6 +567,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrmtry share/locale/xh @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES @dirrmtry share/locale/uz@cyrillic +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -555,12 +601,18 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/ig/LC_MESSAGES @dirrmtry share/locale/ig @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy @dirrmtry share/locale/ha/LC_MESSAGES @dirrmtry share/locale/ha +@dirrmtry share/locale/gv/LC_MESSAGES +@dirrmtry share/locale/gv +@dirrmtry share/locale/fy/LC_MESSAGES +@dirrmtry share/locale/fy @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur @dirrmtry share/locale/en@shaw/LC_MESSAGES -- cgit