- update to empathy-3.6.0

x11/gnome/empathy/Makefile

@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.103 2012/09/29 10:10:45 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.104 2012/09/30 19:17:52 jasper Exp $
 
 COMMENT= 		Telepathy based messenger for GNOME
 
 GNOME_PROJECT=		empathy
-GNOME_VERSION=		3.4.2
+GNOME_VERSION=		3.6.0
-REVISION=		6
+
+SHARED_LIBS +=	empathy              0.0      # unknown
+SHARED_LIBS +=	empathy-gtk          0.0      # unknown
 
 CATEGORIES=		net
 
@@ -16,34 +18,33 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm asn1
-WANTLIB += atk-1.0 c cairo cairo-gobject camel-1.2 canberra canberra-gtk3
-WANTLIB += com_err crypto dbus-1 dbus-glib-1 drm ebook-1.2 edataserver-1.2
-WANTLIB += enchant execinfo expat ffi folks folks-telepathy fontconfig
-WANTLIB += freetype gailutil-3 gck-1 gconf-2 gcr-3 gcr-base-3
-WANTLIB += gcrypt gdbm gdk-3 gdk_pixbuf-2.0 gee geoclue gio-2.0
-WANTLIB += glib-2.0 gmodule-2.0 gmp gnome-keyring gnutls goa-1.0
-WANTLIB += gobject-2.0 gpg-error gssapi gstapp-0.10 gstaudio-0.10
-WANTLIB += gstbase-0.10 gstfft-0.10 gstinterfaces-0.10
-WANTLIB += gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10 gthread-2.0
-WANTLIB += gtk-3 hogweed icudata icui18n icuuc javascriptcoregtk-3.0
-WANTLIB += jpeg json krb5 ltdl m mission-control-plugins nettle
-WANTLIB += notify nspr4 nss3 ogg orc-0.4 p11-kit pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread pthread-stubs
-WANTLIB += pulse pulse-mainloop-glib smime3 sndfile softokn3 soup-2.4
-WANTLIB += sqlite3 ssl3 stdc++ tasn1 telepathy-farstream telepathy-glib
-WANTLIB += telepathy-logger vorbis vorbisfile webkitgtk-3.0 xcb
-WANTLIB += xcb-render xcb-shm xml2 xslt z farstream-0.1
-WANTLIB += champlain-0.12 champlain-gtk-0.12 clutter-1.0 clutter-gst-1.0
-WANTLIB += clutter-gtk-1.0 cogl cogl-pango gsttag-0.10
-WANTLIB += json-glib-1.0 soup-gnome-2.4 memphis-0.2
-
 MODULES=		devel/dconf \
 			devel/gettext \
 			lang/python \
 			x11/gnome
 
+WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm atk-1.0
+WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject canberra
+WANTLIB += canberra-gtk3 champlain-0.12 champlain-gtk-0.12 clutter-1.0
+WANTLIB += clutter-gst-2.0 clutter-gtk-1.0 cogl cogl-pango dbus-1
+WANTLIB += dbus-glib-1 drm enchant execinfo expat farstream-0.2
+WANTLIB += ffi folks folks-telepathy fontconfig freetype gailutil-3
+WANTLIB += gck-1 gcr-3 gcr-base-3 gcrypt gdbm gdk-3 gdk_pixbuf-2.0
+WANTLIB += gee geoclue gio-2.0 glib-2.0 gmodule-2.0 gmp gnome-keyring
+WANTLIB += gnutls goa-1.0 gobject-2.0 gpg-error gstapp-0.10 gstaudio-0.10
+WANTLIB += gstaudio-1.0 gstbase-0.10 gstbase-1.0 gstfft-0.10 gstinterfaces-0.10
+WANTLIB += gstpbutils-0.10 gstreamer-0.10 gstreamer-1.0 gsttag-1.0
+WANTLIB += gstvideo-0.10 gstvideo-1.0 gthread-2.0 gtk-3 harfbuzz
+WANTLIB += hogweed icudata icui18n icule icuuc javascriptcoregtk-3.0
+WANTLIB += jpeg json json-glib-1.0 ltdl m memphis-0.2 mission-control-plugins
+WANTLIB += nettle notify ogg orc-0.4 p11-kit pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
+WANTLIB += pulse pulse-mainloop-glib secret-1 sndfile soup-2.4
+WANTLIB += soup-gnome-2.4 sqlite3 stdc++ tasn1 telepathy-farstream
+WANTLIB += telepathy-glib telepathy-logger vorbis vorbisfile webkitgtk-3.0
+WANTLIB += xcb xcb-render xcb-shm xml2 xslt z zeitgeist-1.0
+
 BUILD_DEPENDS=		devel/gsettings-desktop-schemas \
 			devel/iso-codes \
 			x11/gnome/nautilus-sendto
@@ -51,9 +52,9 @@ LIB_DEPENDS=		audio/libcanberra,-gtk3 \
 			audio/pulseaudio>=2.0 \
 			geo/geoclue \
 			geo/libchamplain>=0.12.2 \
-			graphics/clutter/clutter-gst>=1.6.0 \
+			graphics/clutter/clutter-gst>=1.9.92 \
 			net/telepathy/folks \
-			net/telepathy/telepathy-farstream \
+			net/telepathy/telepathy-farstream>=0.6.0 \
 			net/telepathy/telepathy-logger \
 			textproc/enchant \
 			x11/gnome/gcr \
@@ -68,7 +69,7 @@ RUN_DEPENDS=		devel/gsettings-desktop-schemas \
 			x11/gnome/icon-theme
 
 # gst-pulse (src/empathy-audio-sink.c)
-#RUN_DEPENDS +=		multimedia/gstreamer1/plugins-good,-pulse
+RUN_DEPENDS +=		multimedia/gstreamer1/plugins-good,-pulse
 
 MODGNOME_DESKTOP_FILE=	Yes
 MODGNOME_ICON_CACHE=	Yes
@@ -88,7 +89,8 @@ CONFIGURE_ARGS +=	--disable-geocode
 CONFIGURE_ARGS+=	--without-connectivity
 
 post-install:
-	rm ${PREFIX}/lib/mission-control-plugins.0/*.{a,la}
+	#XXX: Disabled until M-C is updated to >= 5.13.1
-	rm ${PREFIX}/lib/lib/nautilus-sendto/plugins/*.{a,la}
+	#rm ${PREFIX}/lib/mission-control-plugins.0/*.{a,la}
+	rm ${PREFIX}/lib/nautilus-sendto/plugins/*.{a,la}
 
 .include <bsd.port.mk>

x11/gnome/empathy/distinfo

@@ -1,2 +1,2 @@
-SHA256 (gnome/empathy-3.4.2.tar.xz) = 5ok2gR1SwLVBnJOoeoFCmwn5RNP2zWXrFVTmx9SJ3jI=
+SHA256 (gnome/empathy-3.6.0.tar.xz) = a9c3EIRvNpvEH6D4iz3WDQP5JCcCtqjDVoHJ5cmehEE=
-SIZE (gnome/empathy-3.4.2.tar.xz) = 3432860
+SIZE (gnome/empathy-3.6.0.tar.xz) = 3424032

x11/gnome/empathy/patches/patch-configure

@@ -1,10 +1,10 @@
-$OpenBSD: patch-configure,v 1.4 2012/09/11 08:29:33 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.5 2012/09/30 19:17:52 jasper Exp $
 
 Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
 
---- configure.orig	Mon May 14 13:24:27 2012
+--- configure.orig	Tue Sep 25 08:56:54 2012
-+++ configure	Tue Sep 11 10:15:36 2012
++++ configure	Sun Sep 30 19:00:36 2012
-@@ -15148,6 +15148,9 @@ else
+@@ -15521,6 +15521,9 @@ else
  fi
  
      ;;

x11/gnome/empathy/pkg/PLIST

@@ -1,7 +1,16 @@
-@comment $OpenBSD: PLIST,v 1.27 2012/09/29 10:10:45 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.28 2012/09/30 19:17:52 jasper Exp $
 @bin bin/empathy
 @bin bin/empathy-accounts
 @bin bin/empathy-debugger
+lib/empathy/
+lib/empathy/lib${FULLPKGNAME}.so
+lib/empathy/libempathy-gtk-3.6.0.so
+lib/empathy/libempathy-gtk.a
+lib/empathy/libempathy-gtk.la
+lib/empathy/libempathy-gtk.so
+lib/empathy/libempathy.a
+lib/empathy/libempathy.la
+lib/empathy/libempathy.so
 lib/mission-control-plugins.0/
 lib/mission-control-plugins.0/mcp-account-manager-goa.so
 lib/nautilus-sendto/
@@ -13,7 +22,42 @@ lib/nautilus-sendto/plugins/libnstempathy.so
 @man man/man1/empathy-accounts.1
 @man man/man1/empathy.1
 share/GConf/gsettings/empathy.convert
-share/applications/empathy-accounts.desktop
+share/adium/
+share/adium/message-styles/
+share/adium/message-styles/Boxes.AdiumMessageStyle/
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Info.plist
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Status.html
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Variants/
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Variants/Blue.css
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Variants/Clean.css
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/Variants/Simple.css
+share/adium/message-styles/Boxes.AdiumMessageStyle/Contents/Resources/main.css
+share/adium/message-styles/Classic.AdiumMessageStyle/
+share/adium/message-styles/Classic.AdiumMessageStyle/Contents/
+share/adium/message-styles/Classic.AdiumMessageStyle/Contents/Info.plist
+share/adium/message-styles/Classic.AdiumMessageStyle/Contents/Resources/
+share/adium/message-styles/Classic.AdiumMessageStyle/Contents/Resources/Content.html
+share/adium/message-styles/Classic.AdiumMessageStyle/Contents/Resources/Status.html
+share/adium/message-styles/Classic.AdiumMessageStyle/Contents/Resources/main.css
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Info.plist
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Images/
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Images/corners.png
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Images/horizontal.png
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Images/nipple.png
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Images/vertical.png
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Status.html
+share/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css
 share/applications/empathy.desktop
 share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Auth.service
 share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Call.service
@@ -40,7 +84,6 @@ 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-widget.ui
 share/empathy/empathy-ft-manager.ui
@@ -49,7 +92,6 @@ share/empathy/empathy-individual-widget.ui
 share/empathy/empathy-irc-networks.dtd
 share/empathy/empathy-log-window.html
 share/empathy/empathy-log-window.ui
-share/empathy/empathy-map-view.ui
 share/empathy/empathy-new-chatroom-dialog.ui
 share/empathy/empathy-preferences.ui
 share/empathy/empathy-roster-window-menubar.ui
@@ -58,7 +100,7 @@ share/empathy/empathy-search-bar.ui
 share/empathy/empathy-status-icon.ui
 share/empathy/empathy-status-preset-dialog.ui
 share/empathy/empathy-status-presets.dtd
-share/empathy/empathy-streamed-media-window.ui
+share/empathy/empathy.css
 share/empathy/icons/
 share/empathy/icons/hicolor/
 share/empathy/icons/hicolor/16x16/
@@ -249,8 +291,6 @@ share/empathy/icons/hicolor/scalable/status/user-idle.svg
 share/empathy/icons/hicolor/scalable/status/user-offline.svg
 share/empathy/irc-networks.xml
 share/glib-2.0/schemas/org.gnome.Empathy.gschema.xml
-share/help/
-share/help/C/
 share/help/C/empathy/
 share/help/C/empathy/account-irc.page
 share/help/C/empathy/account-jabber.page
@@ -309,7 +349,6 @@ share/help/C/empathy/set-custom-status.page
 share/help/C/empathy/share-desktop.page
 share/help/C/empathy/status-icons.page
 share/help/C/empathy/video-call.page
-share/help/ca/
 share/help/ca/empathy/
 share/help/ca/empathy/account-irc.page
 share/help/ca/empathy/account-jabber.page
@@ -368,7 +407,6 @@ share/help/ca/empathy/set-custom-status.page
 share/help/ca/empathy/share-desktop.page
 share/help/ca/empathy/status-icons.page
 share/help/ca/empathy/video-call.page
-share/help/cs/
 share/help/cs/empathy/
 share/help/cs/empathy/account-irc.page
 share/help/cs/empathy/account-jabber.page
@@ -427,7 +465,6 @@ share/help/cs/empathy/set-custom-status.page
 share/help/cs/empathy/share-desktop.page
 share/help/cs/empathy/status-icons.page
 share/help/cs/empathy/video-call.page
-share/help/de/
 share/help/de/empathy/
 share/help/de/empathy/account-irc.page
 share/help/de/empathy/account-jabber.page
@@ -486,7 +523,6 @@ share/help/de/empathy/set-custom-status.page
 share/help/de/empathy/share-desktop.page
 share/help/de/empathy/status-icons.page
 share/help/de/empathy/video-call.page
-share/help/el/
 share/help/el/empathy/
 share/help/el/empathy/account-irc.page
 share/help/el/empathy/account-jabber.page
@@ -604,7 +640,6 @@ share/help/en_GB/empathy/set-custom-status.page
 share/help/en_GB/empathy/share-desktop.page
 share/help/en_GB/empathy/status-icons.page
 share/help/en_GB/empathy/video-call.page
-share/help/es/
 share/help/es/empathy/
 share/help/es/empathy/account-irc.page
 share/help/es/empathy/account-jabber.page
@@ -663,7 +698,6 @@ share/help/es/empathy/set-custom-status.page
 share/help/es/empathy/share-desktop.page
 share/help/es/empathy/status-icons.page
 share/help/es/empathy/video-call.page
-share/help/eu/
 share/help/eu/empathy/
 share/help/eu/empathy/account-irc.page
 share/help/eu/empathy/account-jabber.page
@@ -722,7 +756,6 @@ share/help/eu/empathy/set-custom-status.page
 share/help/eu/empathy/share-desktop.page
 share/help/eu/empathy/status-icons.page
 share/help/eu/empathy/video-call.page
-share/help/fi/
 share/help/fi/empathy/
 share/help/fi/empathy/account-irc.page
 share/help/fi/empathy/account-jabber.page
@@ -781,7 +814,6 @@ share/help/fi/empathy/set-custom-status.page
 share/help/fi/empathy/share-desktop.page
 share/help/fi/empathy/status-icons.page
 share/help/fi/empathy/video-call.page
-share/help/fr/
 share/help/fr/empathy/
 share/help/fr/empathy/account-irc.page
 share/help/fr/empathy/account-jabber.page
@@ -840,7 +872,6 @@ share/help/fr/empathy/set-custom-status.page
 share/help/fr/empathy/share-desktop.page
 share/help/fr/empathy/status-icons.page
 share/help/fr/empathy/video-call.page
-share/help/gl/
 share/help/gl/empathy/
 share/help/gl/empathy/account-irc.page
 share/help/gl/empathy/account-jabber.page
@@ -899,7 +930,6 @@ share/help/gl/empathy/set-custom-status.page
 share/help/gl/empathy/share-desktop.page
 share/help/gl/empathy/status-icons.page
 share/help/gl/empathy/video-call.page
-share/help/hu/
 share/help/hu/empathy/
 share/help/hu/empathy/account-irc.page
 share/help/hu/empathy/account-jabber.page
@@ -1135,7 +1165,6 @@ share/help/lv/empathy/set-custom-status.page
 share/help/lv/empathy/share-desktop.page
 share/help/lv/empathy/status-icons.page
 share/help/lv/empathy/video-call.page
-share/help/pl/
 share/help/pl/empathy/
 share/help/pl/empathy/account-irc.page
 share/help/pl/empathy/account-jabber.page
@@ -1253,7 +1282,6 @@ share/help/ru/empathy/set-custom-status.page
 share/help/ru/empathy/share-desktop.page
 share/help/ru/empathy/status-icons.page
 share/help/ru/empathy/video-call.page
-share/help/sl/
 share/help/sl/empathy/
 share/help/sl/empathy/account-irc.page
 share/help/sl/empathy/account-jabber.page
@@ -1312,7 +1340,6 @@ share/help/sl/empathy/set-custom-status.page
 share/help/sl/empathy/share-desktop.page
 share/help/sl/empathy/status-icons.page
 share/help/sl/empathy/video-call.page
-share/help/sv/
 share/help/sv/empathy/
 share/help/sv/empathy/account-irc.page
 share/help/sv/empathy/account-jabber.page
@@ -1430,7 +1457,6 @@ share/help/te/empathy/set-custom-status.page
 share/help/te/empathy/share-desktop.page
 share/help/te/empathy/status-icons.page
 share/help/te/empathy/video-call.page
-share/help/zh_CN/
 share/help/zh_CN/empathy/
 share/help/zh_CN/empathy/account-irc.page
 share/help/zh_CN/empathy/account-jabber.page