diff options
-rw-r--r-- | chat/empathy/Makefile | 19 | ||||
-rw-r--r-- | chat/empathy/PLIST | 261 | ||||
-rw-r--r-- | chat/empathy/distinfo | 12 | ||||
-rw-r--r-- | chat/empathy/patches/patch-aa | 13 | ||||
-rw-r--r-- | chat/empathy/patches/patch-ab | 13 | ||||
-rw-r--r-- | chat/empathy/patches/patch-ac | 13 | ||||
-rw-r--r-- | chat/empathy/patches/patch-ad | 24 |
7 files changed, 311 insertions, 44 deletions
diff --git a/chat/empathy/Makefile b/chat/empathy/Makefile index 438be4b9104..01a79356f3e 100644 --- a/chat/empathy/Makefile +++ b/chat/empathy/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2011/02/21 15:51:44 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2011/04/05 18:27:08 drochner Exp $ -DISTNAME= empathy-2.30.3 -PKGREVISION= 2 +DISTNAME= empathy-2.34.0 CATEGORIES= chat gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/empathy/2.30/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/empathy/2.34/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://live.gnome.org/Empathy @@ -17,24 +16,30 @@ USE_TOOLS+= gawk gmake intltool msgfmt pkg-config USE_TOOLS+= autoconf USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes +CONFIGURE_ENV+= YELL_CFLAGS=-I${WRKSRC}/telepathy-yell +CONFIGURE_ENV+= \ + YELL_LIBS="-L${WRKSRC}/telepathy-yell/telepathy-yell -ltelepathy-yell" BUILDLINK_TRANSFORM+= rm:-Werror -GCONF_SCHEMAS+= empathy.schemas - # notyet #CONFIGURE_ARGS+= --enable-meego +BUILD_DEPENDS+= gsed-[0-9]*:../../textproc/gsed + .include "../../audio/libcanberra/buildlink3.mk" .include "../../chat/telepathy-farsight/buildlink3.mk" .include "../../chat/telepathy-glib/buildlink3.mk" -.include "../../devel/GConf/schemas.mk" +.include "../../chat/telepathy-logger/buildlink3.mk" +.include "../../chat/libfolks/buildlink3.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 .include "../../devel/glib2/buildlink3.mk" +.include "../../devel/glib2/schemas.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../lang/python/application.mk" BUILDLINK_API_DEPENDS.enchant+= enchant>=1.2.0 .include "../../mail/evolution-data-server/buildlink3.mk" +.include "../../security/gnome-keyring/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/libnotify/buildlink3.mk" diff --git a/chat/empathy/PLIST b/chat/empathy/PLIST index 4b7cfa7dba9..abf4e89af15 100644 --- a/chat/empathy/PLIST +++ b/chat/empathy/PLIST @@ -1,10 +1,17 @@ -@comment $NetBSD: PLIST,v 1.6 2010/11/29 15:18:31 drochner Exp $ +@comment $NetBSD: PLIST,v 1.7 2011/04/05 18:27:08 drochner Exp $ bin/empathy bin/empathy-accounts bin/empathy-debugger +libexec/empathy-auth-client +libexec/empathy-av +man/man1/empathy-accounts.1 man/man1/empathy.1 +share/GConf/gsettings/empathy.convert share/applications/empathy-accounts.desktop share/applications/empathy.desktop +share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service +share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Auth.service +share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Call.service share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service share/empathy/Template.html share/empathy/codec-preferences @@ -26,14 +33,15 @@ share/empathy/empathy-chat-window.ui share/empathy/empathy-chat.ui share/empathy/empathy-chatroom-manager.dtd share/empathy/empathy-chatrooms-window.ui +share/empathy/empathy-contact-blocking-dialog.ui share/empathy/empathy-contact-dialogs.ui share/empathy/empathy-contact-groups.dtd share/empathy/empathy-contact-selector-dialog.ui share/empathy/empathy-contact-widget.ui share/empathy/empathy-ft-manager.ui share/empathy/empathy-import-dialog.ui +share/empathy/empathy-individual-widget.ui share/empathy/empathy-irc-networks.dtd -share/empathy/empathy-log-manager.xsl share/empathy/empathy-log-window.ui share/empathy/empathy-main-window.ui share/empathy/empathy-new-chatroom-dialog.ui @@ -64,13 +72,13 @@ share/empathy/icons/hicolor/16x16/apps/im-silc.png share/empathy/icons/hicolor/16x16/apps/im-sip.png share/empathy/icons/hicolor/16x16/apps/im-yahoo.png share/empathy/icons/hicolor/16x16/apps/im-zephyr.png -share/empathy/icons/hicolor/16x16/status/empathy-available.png -share/empathy/icons/hicolor/16x16/status/empathy-away.png -share/empathy/icons/hicolor/16x16/status/empathy-busy.png -share/empathy/icons/hicolor/16x16/status/empathy-extended-away.png -share/empathy/icons/hicolor/16x16/status/empathy-offline.png share/empathy/icons/hicolor/16x16/status/empathy-pending.png share/empathy/icons/hicolor/16x16/status/im-message.png +share/empathy/icons/hicolor/16x16/status/user-available.png +share/empathy/icons/hicolor/16x16/status/user-away.png +share/empathy/icons/hicolor/16x16/status/user-busy.png +share/empathy/icons/hicolor/16x16/status/user-idle.png +share/empathy/icons/hicolor/16x16/status/user-offline.png share/empathy/icons/hicolor/16x16/status/user-typing.png share/empathy/icons/hicolor/22x22/actions/im-message-new.png share/empathy/icons/hicolor/22x22/apps/im-aim.png @@ -94,12 +102,13 @@ share/empathy/icons/hicolor/22x22/apps/im-silc.png share/empathy/icons/hicolor/22x22/apps/im-sip.png share/empathy/icons/hicolor/22x22/apps/im-yahoo.png share/empathy/icons/hicolor/22x22/apps/im-zephyr.png -share/empathy/icons/hicolor/22x22/status/empathy-available.png -share/empathy/icons/hicolor/22x22/status/empathy-away.png -share/empathy/icons/hicolor/22x22/status/empathy-busy.png -share/empathy/icons/hicolor/22x22/status/empathy-extended-away.png -share/empathy/icons/hicolor/22x22/status/empathy-offline.png share/empathy/icons/hicolor/22x22/status/empathy-pending.png +share/empathy/icons/hicolor/22x22/status/im-message.png +share/empathy/icons/hicolor/22x22/status/user-available.png +share/empathy/icons/hicolor/22x22/status/user-away.png +share/empathy/icons/hicolor/22x22/status/user-busy.png +share/empathy/icons/hicolor/22x22/status/user-idle.png +share/empathy/icons/hicolor/22x22/status/user-offline.png share/empathy/icons/hicolor/24x24/actions/im-message-new.png share/empathy/icons/hicolor/24x24/apps/im-aim.png share/empathy/icons/hicolor/24x24/apps/im-ekiga.png @@ -121,12 +130,12 @@ share/empathy/icons/hicolor/24x24/apps/im-silc.png share/empathy/icons/hicolor/24x24/apps/im-sip.png share/empathy/icons/hicolor/24x24/apps/im-yahoo.png share/empathy/icons/hicolor/24x24/apps/im-zephyr.png -share/empathy/icons/hicolor/24x24/status/empathy-available.png -share/empathy/icons/hicolor/24x24/status/empathy-away.png -share/empathy/icons/hicolor/24x24/status/empathy-busy.png -share/empathy/icons/hicolor/24x24/status/empathy-extended-away.png -share/empathy/icons/hicolor/24x24/status/empathy-offline.png share/empathy/icons/hicolor/24x24/status/empathy-pending.png +share/empathy/icons/hicolor/24x24/status/user-available.png +share/empathy/icons/hicolor/24x24/status/user-away.png +share/empathy/icons/hicolor/24x24/status/user-busy.png +share/empathy/icons/hicolor/24x24/status/user-idle.png +share/empathy/icons/hicolor/24x24/status/user-offline.png share/empathy/icons/hicolor/32x32/apps/im-aim.png share/empathy/icons/hicolor/32x32/apps/im-ekiga.png share/empathy/icons/hicolor/32x32/apps/im-gadugadu.png @@ -147,12 +156,12 @@ share/empathy/icons/hicolor/32x32/apps/im-silc.png share/empathy/icons/hicolor/32x32/apps/im-sip.png share/empathy/icons/hicolor/32x32/apps/im-yahoo.png share/empathy/icons/hicolor/32x32/apps/im-zephyr.png -share/empathy/icons/hicolor/32x32/status/empathy-available.png -share/empathy/icons/hicolor/32x32/status/empathy-away.png -share/empathy/icons/hicolor/32x32/status/empathy-busy.png -share/empathy/icons/hicolor/32x32/status/empathy-extended-away.png -share/empathy/icons/hicolor/32x32/status/empathy-offline.png share/empathy/icons/hicolor/32x32/status/empathy-pending.png +share/empathy/icons/hicolor/32x32/status/user-available.png +share/empathy/icons/hicolor/32x32/status/user-away.png +share/empathy/icons/hicolor/32x32/status/user-busy.png +share/empathy/icons/hicolor/32x32/status/user-idle.png +share/empathy/icons/hicolor/32x32/status/user-offline.png share/empathy/icons/hicolor/48x48/apps/im-aim.png share/empathy/icons/hicolor/48x48/apps/im-ekiga.png share/empathy/icons/hicolor/48x48/apps/im-facebook.png @@ -174,12 +183,12 @@ share/empathy/icons/hicolor/48x48/apps/im-silc.png share/empathy/icons/hicolor/48x48/apps/im-sip.png share/empathy/icons/hicolor/48x48/apps/im-yahoo.png share/empathy/icons/hicolor/48x48/apps/im-zephyr.png -share/empathy/icons/hicolor/48x48/status/empathy-available.png -share/empathy/icons/hicolor/48x48/status/empathy-away.png -share/empathy/icons/hicolor/48x48/status/empathy-busy.png -share/empathy/icons/hicolor/48x48/status/empathy-extended-away.png -share/empathy/icons/hicolor/48x48/status/empathy-offline.png share/empathy/icons/hicolor/48x48/status/empathy-pending.png +share/empathy/icons/hicolor/48x48/status/user-available.png +share/empathy/icons/hicolor/48x48/status/user-away.png +share/empathy/icons/hicolor/48x48/status/user-busy.png +share/empathy/icons/hicolor/48x48/status/user-idle.png +share/empathy/icons/hicolor/48x48/status/user-offline.png share/empathy/icons/hicolor/scalable/apps/im-aim.svg share/empathy/icons/hicolor/scalable/apps/im-ekiga.svg share/empathy/icons/hicolor/scalable/apps/im-gadugadu.svg @@ -200,14 +209,14 @@ share/empathy/icons/hicolor/scalable/apps/im-silc.svg share/empathy/icons/hicolor/scalable/apps/im-sip.svg share/empathy/icons/hicolor/scalable/apps/im-yahoo.svg share/empathy/icons/hicolor/scalable/apps/im-zephyr.svg -share/empathy/icons/hicolor/scalable/status/empathy-available.svg -share/empathy/icons/hicolor/scalable/status/empathy-away.svg -share/empathy/icons/hicolor/scalable/status/empathy-busy.svg -share/empathy/icons/hicolor/scalable/status/empathy-extended-away.svg -share/empathy/icons/hicolor/scalable/status/empathy-offline.svg share/empathy/icons/hicolor/scalable/status/empathy-pending.svg +share/empathy/icons/hicolor/scalable/status/user-available.svg +share/empathy/icons/hicolor/scalable/status/user-away.svg +share/empathy/icons/hicolor/scalable/status/user-busy.svg +share/empathy/icons/hicolor/scalable/status/user-idle.svg +share/empathy/icons/hicolor/scalable/status/user-offline.svg share/empathy/irc-networks.xml -share/gconf/schemas/empathy.schemas +share/glib-2.0/schemas/org.gnome.Empathy.gschema.xml share/gnome/help/empathy/C/account-irc.page share/gnome/help/empathy/C/account-jabber.page share/gnome/help/empathy/C/accounts-window.page @@ -249,6 +258,7 @@ share/gnome/help/empathy/C/irc-nick-password.page share/gnome/help/empathy/C/irc-send-file.page share/gnome/help/empathy/C/irc-start-conversation.page share/gnome/help/empathy/C/license.page +share/gnome/help/empathy/C/link-contacts.page share/gnome/help/empathy/C/prev-conv.page share/gnome/help/empathy/C/prob-conn-acctdisabled.page share/gnome/help/empathy/C/prob-conn-auth.page @@ -304,6 +314,7 @@ share/gnome/help/empathy/ca/irc-nick-password.page share/gnome/help/empathy/ca/irc-send-file.page share/gnome/help/empathy/ca/irc-start-conversation.page share/gnome/help/empathy/ca/license.page +share/gnome/help/empathy/ca/link-contacts.page share/gnome/help/empathy/ca/prev-conv.page share/gnome/help/empathy/ca/prob-conn-acctdisabled.page share/gnome/help/empathy/ca/prob-conn-auth.page @@ -359,6 +370,7 @@ share/gnome/help/empathy/cs/irc-nick-password.page share/gnome/help/empathy/cs/irc-send-file.page share/gnome/help/empathy/cs/irc-start-conversation.page share/gnome/help/empathy/cs/license.page +share/gnome/help/empathy/cs/link-contacts.page share/gnome/help/empathy/cs/prev-conv.page share/gnome/help/empathy/cs/prob-conn-acctdisabled.page share/gnome/help/empathy/cs/prob-conn-auth.page @@ -414,6 +426,7 @@ share/gnome/help/empathy/de/irc-nick-password.page share/gnome/help/empathy/de/irc-send-file.page share/gnome/help/empathy/de/irc-start-conversation.page share/gnome/help/empathy/de/license.page +share/gnome/help/empathy/de/link-contacts.page share/gnome/help/empathy/de/prev-conv.page share/gnome/help/empathy/de/prob-conn-acctdisabled.page share/gnome/help/empathy/de/prob-conn-auth.page @@ -469,6 +482,7 @@ share/gnome/help/empathy/el/irc-nick-password.page share/gnome/help/empathy/el/irc-send-file.page share/gnome/help/empathy/el/irc-start-conversation.page share/gnome/help/empathy/el/license.page +share/gnome/help/empathy/el/link-contacts.page share/gnome/help/empathy/el/prev-conv.page share/gnome/help/empathy/el/prob-conn-acctdisabled.page share/gnome/help/empathy/el/prob-conn-auth.page @@ -524,6 +538,7 @@ share/gnome/help/empathy/en_GB/irc-nick-password.page share/gnome/help/empathy/en_GB/irc-send-file.page share/gnome/help/empathy/en_GB/irc-start-conversation.page share/gnome/help/empathy/en_GB/license.page +share/gnome/help/empathy/en_GB/link-contacts.page share/gnome/help/empathy/en_GB/prev-conv.page share/gnome/help/empathy/en_GB/prob-conn-acctdisabled.page share/gnome/help/empathy/en_GB/prob-conn-auth.page @@ -579,6 +594,7 @@ share/gnome/help/empathy/es/irc-nick-password.page share/gnome/help/empathy/es/irc-send-file.page share/gnome/help/empathy/es/irc-start-conversation.page share/gnome/help/empathy/es/license.page +share/gnome/help/empathy/es/link-contacts.page share/gnome/help/empathy/es/prev-conv.page share/gnome/help/empathy/es/prob-conn-acctdisabled.page share/gnome/help/empathy/es/prob-conn-auth.page @@ -634,6 +650,7 @@ share/gnome/help/empathy/fi/irc-nick-password.page share/gnome/help/empathy/fi/irc-send-file.page share/gnome/help/empathy/fi/irc-start-conversation.page share/gnome/help/empathy/fi/license.page +share/gnome/help/empathy/fi/link-contacts.page share/gnome/help/empathy/fi/prev-conv.page share/gnome/help/empathy/fi/prob-conn-acctdisabled.page share/gnome/help/empathy/fi/prob-conn-auth.page @@ -689,6 +706,7 @@ share/gnome/help/empathy/fr/irc-nick-password.page share/gnome/help/empathy/fr/irc-send-file.page share/gnome/help/empathy/fr/irc-start-conversation.page share/gnome/help/empathy/fr/license.page +share/gnome/help/empathy/fr/link-contacts.page share/gnome/help/empathy/fr/prev-conv.page share/gnome/help/empathy/fr/prob-conn-acctdisabled.page share/gnome/help/empathy/fr/prob-conn-auth.page @@ -703,6 +721,118 @@ share/gnome/help/empathy/fr/set-custom-status.page share/gnome/help/empathy/fr/share-desktop.page share/gnome/help/empathy/fr/status-icons.page share/gnome/help/empathy/fr/video-call.page +share/gnome/help/empathy/gl/account-irc.page +share/gnome/help/empathy/gl/account-jabber.page +share/gnome/help/empathy/gl/accounts-window.page +share/gnome/help/empathy/gl/add-account.page +share/gnome/help/empathy/gl/add-contact.page +share/gnome/help/empathy/gl/audio-call.page +share/gnome/help/empathy/gl/audio-video.page +share/gnome/help/empathy/gl/change-status.page +share/gnome/help/empathy/gl/create-account.page +share/gnome/help/empathy/gl/disable-account.page +share/gnome/help/empathy/gl/favorite-rooms.page +share/gnome/help/empathy/gl/figures/audio-input-microphone.png +share/gnome/help/empathy/gl/figures/available.png +share/gnome/help/empathy/gl/figures/away.png +share/gnome/help/empathy/gl/figures/busy.png +share/gnome/help/empathy/gl/figures/camera-web.png +share/gnome/help/empathy/gl/figures/empathy-logo.png +share/gnome/help/empathy/gl/figures/empathy-main-window.png +share/gnome/help/empathy/gl/figures/gtk-add.png +share/gnome/help/empathy/gl/figures/gtk-edit.png +share/gnome/help/empathy/gl/figures/gtk-remove.png +share/gnome/help/empathy/gl/figures/offline.png +share/gnome/help/empathy/gl/geolocation-not-showing.page +share/gnome/help/empathy/gl/geolocation-privacy.page +share/gnome/help/empathy/gl/geolocation-supported.page +share/gnome/help/empathy/gl/geolocation-turn.page +share/gnome/help/empathy/gl/geolocation-what-is.page +share/gnome/help/empathy/gl/geolocation.page +share/gnome/help/empathy/gl/group-conversations.page +share/gnome/help/empathy/gl/hide-contacts.page +share/gnome/help/empathy/gl/import-account.page +share/gnome/help/empathy/gl/index.page +share/gnome/help/empathy/gl/introduction.page +share/gnome/help/empathy/gl/irc-commands.page +share/gnome/help/empathy/gl/irc-join-pwd.page +share/gnome/help/empathy/gl/irc-join-room.page +share/gnome/help/empathy/gl/irc-manage.page +share/gnome/help/empathy/gl/irc-nick-password.page +share/gnome/help/empathy/gl/irc-send-file.page +share/gnome/help/empathy/gl/irc-start-conversation.page +share/gnome/help/empathy/gl/license.page +share/gnome/help/empathy/gl/link-contacts.page +share/gnome/help/empathy/gl/prev-conv.page +share/gnome/help/empathy/gl/prob-conn-acctdisabled.page +share/gnome/help/empathy/gl/prob-conn-auth.page +share/gnome/help/empathy/gl/prob-conn-name.page +share/gnome/help/empathy/gl/prob-conn-neterror.page +share/gnome/help/empathy/gl/prob-conn.page +share/gnome/help/empathy/gl/remove-account.page +share/gnome/help/empathy/gl/salut-protocol.page +share/gnome/help/empathy/gl/send-file.page +share/gnome/help/empathy/gl/send-message.page +share/gnome/help/empathy/gl/set-custom-status.page +share/gnome/help/empathy/gl/share-desktop.page +share/gnome/help/empathy/gl/status-icons.page +share/gnome/help/empathy/gl/video-call.page +share/gnome/help/empathy/hu/account-irc.page +share/gnome/help/empathy/hu/account-jabber.page +share/gnome/help/empathy/hu/accounts-window.page +share/gnome/help/empathy/hu/add-account.page +share/gnome/help/empathy/hu/add-contact.page +share/gnome/help/empathy/hu/audio-call.page +share/gnome/help/empathy/hu/audio-video.page +share/gnome/help/empathy/hu/change-status.page +share/gnome/help/empathy/hu/create-account.page +share/gnome/help/empathy/hu/disable-account.page +share/gnome/help/empathy/hu/favorite-rooms.page +share/gnome/help/empathy/hu/figures/audio-input-microphone.png +share/gnome/help/empathy/hu/figures/available.png +share/gnome/help/empathy/hu/figures/away.png +share/gnome/help/empathy/hu/figures/busy.png +share/gnome/help/empathy/hu/figures/camera-web.png +share/gnome/help/empathy/hu/figures/empathy-logo.png +share/gnome/help/empathy/hu/figures/empathy-main-window.png +share/gnome/help/empathy/hu/figures/gtk-add.png +share/gnome/help/empathy/hu/figures/gtk-edit.png +share/gnome/help/empathy/hu/figures/gtk-remove.png +share/gnome/help/empathy/hu/figures/offline.png +share/gnome/help/empathy/hu/geolocation-not-showing.page +share/gnome/help/empathy/hu/geolocation-privacy.page +share/gnome/help/empathy/hu/geolocation-supported.page +share/gnome/help/empathy/hu/geolocation-turn.page +share/gnome/help/empathy/hu/geolocation-what-is.page +share/gnome/help/empathy/hu/geolocation.page +share/gnome/help/empathy/hu/group-conversations.page +share/gnome/help/empathy/hu/hide-contacts.page +share/gnome/help/empathy/hu/import-account.page +share/gnome/help/empathy/hu/index.page +share/gnome/help/empathy/hu/introduction.page +share/gnome/help/empathy/hu/irc-commands.page +share/gnome/help/empathy/hu/irc-join-pwd.page +share/gnome/help/empathy/hu/irc-join-room.page +share/gnome/help/empathy/hu/irc-manage.page +share/gnome/help/empathy/hu/irc-nick-password.page +share/gnome/help/empathy/hu/irc-send-file.page +share/gnome/help/empathy/hu/irc-start-conversation.page +share/gnome/help/empathy/hu/license.page +share/gnome/help/empathy/hu/link-contacts.page +share/gnome/help/empathy/hu/prev-conv.page +share/gnome/help/empathy/hu/prob-conn-acctdisabled.page +share/gnome/help/empathy/hu/prob-conn-auth.page +share/gnome/help/empathy/hu/prob-conn-name.page +share/gnome/help/empathy/hu/prob-conn-neterror.page +share/gnome/help/empathy/hu/prob-conn.page +share/gnome/help/empathy/hu/remove-account.page +share/gnome/help/empathy/hu/salut-protocol.page +share/gnome/help/empathy/hu/send-file.page +share/gnome/help/empathy/hu/send-message.page +share/gnome/help/empathy/hu/set-custom-status.page +share/gnome/help/empathy/hu/share-desktop.page +share/gnome/help/empathy/hu/status-icons.page +share/gnome/help/empathy/hu/video-call.page share/gnome/help/empathy/it/account-irc.page share/gnome/help/empathy/it/account-jabber.page share/gnome/help/empathy/it/accounts-window.page @@ -744,6 +874,7 @@ share/gnome/help/empathy/it/irc-nick-password.page share/gnome/help/empathy/it/irc-send-file.page share/gnome/help/empathy/it/irc-start-conversation.page share/gnome/help/empathy/it/license.page +share/gnome/help/empathy/it/link-contacts.page share/gnome/help/empathy/it/prev-conv.page share/gnome/help/empathy/it/prob-conn-acctdisabled.page share/gnome/help/empathy/it/prob-conn-auth.page @@ -799,6 +930,7 @@ share/gnome/help/empathy/ru/irc-nick-password.page share/gnome/help/empathy/ru/irc-send-file.page share/gnome/help/empathy/ru/irc-start-conversation.page share/gnome/help/empathy/ru/license.page +share/gnome/help/empathy/ru/link-contacts.page share/gnome/help/empathy/ru/prev-conv.page share/gnome/help/empathy/ru/prob-conn-acctdisabled.page share/gnome/help/empathy/ru/prob-conn-auth.page @@ -854,6 +986,7 @@ share/gnome/help/empathy/sv/irc-nick-password.page share/gnome/help/empathy/sv/irc-send-file.page share/gnome/help/empathy/sv/irc-start-conversation.page share/gnome/help/empathy/sv/license.page +share/gnome/help/empathy/sv/link-contacts.page share/gnome/help/empathy/sv/prev-conv.page share/gnome/help/empathy/sv/prob-conn-acctdisabled.page share/gnome/help/empathy/sv/prob-conn-auth.page @@ -868,12 +1001,70 @@ share/gnome/help/empathy/sv/set-custom-status.page share/gnome/help/empathy/sv/share-desktop.page share/gnome/help/empathy/sv/status-icons.page share/gnome/help/empathy/sv/video-call.page +share/gnome/help/empathy/zh_CN/account-irc.page +share/gnome/help/empathy/zh_CN/account-jabber.page +share/gnome/help/empathy/zh_CN/accounts-window.page +share/gnome/help/empathy/zh_CN/add-account.page +share/gnome/help/empathy/zh_CN/add-contact.page +share/gnome/help/empathy/zh_CN/audio-call.page +share/gnome/help/empathy/zh_CN/audio-video.page +share/gnome/help/empathy/zh_CN/change-status.page +share/gnome/help/empathy/zh_CN/create-account.page +share/gnome/help/empathy/zh_CN/disable-account.page +share/gnome/help/empathy/zh_CN/favorite-rooms.page +share/gnome/help/empathy/zh_CN/figures/audio-input-microphone.png +share/gnome/help/empathy/zh_CN/figures/available.png +share/gnome/help/empathy/zh_CN/figures/away.png +share/gnome/help/empathy/zh_CN/figures/busy.png +share/gnome/help/empathy/zh_CN/figures/camera-web.png +share/gnome/help/empathy/zh_CN/figures/empathy-logo.png +share/gnome/help/empathy/zh_CN/figures/empathy-main-window.png +share/gnome/help/empathy/zh_CN/figures/gtk-add.png +share/gnome/help/empathy/zh_CN/figures/gtk-edit.png +share/gnome/help/empathy/zh_CN/figures/gtk-remove.png +share/gnome/help/empathy/zh_CN/figures/offline.png +share/gnome/help/empathy/zh_CN/geolocation-not-showing.page +share/gnome/help/empathy/zh_CN/geolocation-privacy.page +share/gnome/help/empathy/zh_CN/geolocation-supported.page +share/gnome/help/empathy/zh_CN/geolocation-turn.page +share/gnome/help/empathy/zh_CN/geolocation-what-is.page +share/gnome/help/empathy/zh_CN/geolocation.page +share/gnome/help/empathy/zh_CN/group-conversations.page +share/gnome/help/empathy/zh_CN/hide-contacts.page +share/gnome/help/empathy/zh_CN/import-account.page +share/gnome/help/empathy/zh_CN/index.page +share/gnome/help/empathy/zh_CN/introduction.page +share/gnome/help/empathy/zh_CN/irc-commands.page +share/gnome/help/empathy/zh_CN/irc-join-pwd.page +share/gnome/help/empathy/zh_CN/irc-join-room.page +share/gnome/help/empathy/zh_CN/irc-manage.page +share/gnome/help/empathy/zh_CN/irc-nick-password.page +share/gnome/help/empathy/zh_CN/irc-send-file.page +share/gnome/help/empathy/zh_CN/irc-start-conversation.page +share/gnome/help/empathy/zh_CN/license.page +share/gnome/help/empathy/zh_CN/link-contacts.page +share/gnome/help/empathy/zh_CN/prev-conv.page +share/gnome/help/empathy/zh_CN/prob-conn-acctdisabled.page +share/gnome/help/empathy/zh_CN/prob-conn-auth.page +share/gnome/help/empathy/zh_CN/prob-conn-name.page +share/gnome/help/empathy/zh_CN/prob-conn-neterror.page +share/gnome/help/empathy/zh_CN/prob-conn.page +share/gnome/help/empathy/zh_CN/remove-account.page +share/gnome/help/empathy/zh_CN/salut-protocol.page +share/gnome/help/empathy/zh_CN/send-file.page +share/gnome/help/empathy/zh_CN/send-message.page +share/gnome/help/empathy/zh_CN/set-custom-status.page +share/gnome/help/empathy/zh_CN/share-desktop.page +share/gnome/help/empathy/zh_CN/status-icons.page +share/gnome/help/empathy/zh_CN/video-call.page share/icons/hicolor/16x16/apps/empathy.png share/icons/hicolor/22x22/apps/empathy.png share/icons/hicolor/24x24/apps/empathy.png +share/icons/hicolor/256x256/apps/empathy.png share/icons/hicolor/32x32/apps/empathy.png share/icons/hicolor/48x48/apps/empathy.png share/icons/hicolor/scalable/apps/empathy.svg +share/locale/an/LC_MESSAGES/empathy.mo share/locale/ar/LC_MESSAGES/empathy.mo share/locale/as/LC_MESSAGES/empathy.mo share/locale/ast/LC_MESSAGES/empathy.mo @@ -912,6 +1103,7 @@ share/locale/hu/LC_MESSAGES/empathy.mo share/locale/id/LC_MESSAGES/empathy.mo share/locale/it/LC_MESSAGES/empathy.mo share/locale/ja/LC_MESSAGES/empathy.mo +share/locale/kk/LC_MESSAGES/empathy.mo share/locale/kn/LC_MESSAGES/empathy.mo share/locale/ko/LC_MESSAGES/empathy.mo share/locale/ku/LC_MESSAGES/empathy.mo @@ -950,4 +1142,7 @@ share/locale/vi/LC_MESSAGES/empathy.mo share/locale/zh_CN/LC_MESSAGES/empathy.mo share/locale/zh_HK/LC_MESSAGES/empathy.mo share/locale/zh_TW/LC_MESSAGES/empathy.mo +share/telepathy/clients/Empathy.AudioVideo.client +share/telepathy/clients/Empathy.Auth.client +share/telepathy/clients/Empathy.Call.client share/telepathy/clients/Empathy.client diff --git a/chat/empathy/distinfo b/chat/empathy/distinfo index 886eb0dde87..af154fbe39d 100644 --- a/chat/empathy/distinfo +++ b/chat/empathy/distinfo @@ -1,5 +1,9 @@ -$NetBSD: distinfo,v 1.8 2010/11/29 15:18:31 drochner Exp $ +$NetBSD: distinfo,v 1.9 2011/04/05 18:27:08 drochner Exp $ -SHA1 (empathy-2.30.3.tar.gz) = 228ddfebe0b476eef182c8b2a70049e4ac986c9e -RMD160 (empathy-2.30.3.tar.gz) = b7a3510c256711f2db84a330eea1860cb06c8323 -Size (empathy-2.30.3.tar.gz) = 4038433 bytes +SHA1 (empathy-2.34.0.tar.gz) = 533be910844e92e24be7232d2d122e9dc8b2267f +RMD160 (empathy-2.34.0.tar.gz) = dfff9212f8c7f5d1c745a4b6bd3f6dbaf4ef02ab +Size (empathy-2.34.0.tar.gz) = 5085101 bytes +SHA1 (patch-aa) = ee11360640dcf6a4dd54339ddf63d1aca9d8a7ae +SHA1 (patch-ab) = faab0ef087905b61eb676f5ae91df3f6ac4b06df +SHA1 (patch-ac) = 0f99ad2c0498ad849ec3a3f6dcfe760d7e158a6c +SHA1 (patch-ad) = 0df9f0f04447930e311913ab0e7fc13d5470cdf3 diff --git a/chat/empathy/patches/patch-aa b/chat/empathy/patches/patch-aa new file mode 100644 index 00000000000..20bff09252d --- /dev/null +++ b/chat/empathy/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.4 2011/04/05 18:27:08 drochner Exp $ + +--- src/empathy-chat-window.c.orig 2011-03-24 15:15:16.000000000 +0000 ++++ src/empathy-chat-window.c +@@ -1325,7 +1325,7 @@ chat_window_show_or_update_notification + to an existing notification with the same title. + In this way the previous message will not be lost: the new + message will appear below it, in the same notification */ +- notification = notify_notification_new (header, escaped, NULL); ++ notification = notify_notification_new (header, escaped, NULL, NULL); + + if (priv->notification == NULL) { + priv->notification = notification; diff --git a/chat/empathy/patches/patch-ab b/chat/empathy/patches/patch-ab new file mode 100644 index 00000000000..de1be1329d6 --- /dev/null +++ b/chat/empathy/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2011/04/05 18:27:08 drochner Exp $ + +--- src/empathy-call-observer.c.orig 2011-03-24 15:15:16.000000000 +0000 ++++ src/empathy-call-observer.c +@@ -135,7 +135,7 @@ get_contact_cb (TpConnection *connection + _("%s just tried to call you, but you were in another call."), + tp_contact_get_alias (contact)); + +- notification = notify_notification_new (summary, body, NULL); ++ notification = notify_notification_new (summary, body, NULL, NULL); + + emp_contact = empathy_contact_dup_from_tp_contact (contact); + pixbuf = empathy_notify_manager_get_pixbuf_for_notification ( diff --git a/chat/empathy/patches/patch-ac b/chat/empathy/patches/patch-ac new file mode 100644 index 00000000000..c175191f25d --- /dev/null +++ b/chat/empathy/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2011/04/05 18:27:08 drochner Exp $ + +--- src/empathy-status-icon.c.orig 2011-03-24 15:15:16.000000000 +0000 ++++ src/empathy-status-icon.c +@@ -241,7 +241,7 @@ status_icon_update_notification (Empathy + In this way the previous message will not be lost: the new + message will appear below it, in the same notification */ + notification = notify_notification_new +- (priv->event->header, message_esc, NULL); ++ (priv->event->header, message_esc, NULL, NULL); + + if (priv->notification == NULL) { + priv->notification = notification; diff --git a/chat/empathy/patches/patch-ad b/chat/empathy/patches/patch-ad new file mode 100644 index 00000000000..fda922d24f1 --- /dev/null +++ b/chat/empathy/patches/patch-ad @@ -0,0 +1,24 @@ +$NetBSD: patch-ad,v 1.1 2011/04/05 18:27:08 drochner Exp $ + +--- configure.orig 2011-03-24 15:18:52.000000000 +0000 ++++ configure +@@ -2659,7 +2659,7 @@ GSTREAMER_REQUIRED=0.10.32 + GTK_REQUIRED=2.22.0 + KEYRING_REQUIRED=2.26.0 + LIBCANBERRA_GTK_REQUIRED=0.4 +-LIBNOTIFY_REQUIRED=0.7.0 ++LIBNOTIFY_REQUIRED=0.4.0 + TELEPATHY_FARSIGHT_REQUIRED=0.0.14 + TELEPATHY_GLIB_REQUIRED=0.14.1 + TELEPATHY_LOGGER=0.2.0 +@@ -13553,8 +13553,8 @@ install-data-am: install-gsettings-schem + .SECONDARY: $(gsettings_SCHEMAS) + + gsettings__base_list = \ +- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ +- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" ++ gsed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ ++ gsed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" + + install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) + @$(NORMAL_INSTALL) |