From 0e68c15c2069589a5c6fd602e411c9f654176d43 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 4 May 2011 10:54:28 +0000 Subject: [PATCH] Disable the nautilus-sendto plugin for now, it doesn't work and forced us to use an ugly hack. --- x11/gnome/empathy/Makefile | 15 +++++++++------ .../patch-nautilus-sendto-plugin_Makefile_in | 17 ----------------- x11/gnome/empathy/pkg/PLIST | 7 +------ 3 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 x11/gnome/empathy/patches/patch-nautilus-sendto-plugin_Makefile_in diff --git a/x11/gnome/empathy/Makefile b/x11/gnome/empathy/Makefile index 8ce7c9a41cd..20ff6e68b87 100644 --- a/x11/gnome/empathy/Makefile +++ b/x11/gnome/empathy/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.66 2011/04/21 07:07:52 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.67 2011/05/04 10:54:28 ajacoutot Exp $ COMMENT= telepathy based messenger for GNOME GNOME_PROJECT= empathy GNOME_VERSION= 2.34.0 -REVISION= 1 +REVISION= 2 CATEGORIES= net @@ -25,7 +25,7 @@ MODULES= devel/gettext \ WANTLIB += GL ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm asn1 WANTLIB += atk-1.0 c cairo clutter-glx-1.0 com_err crypto dbus-1 -WANTLIB += dbus-glib-1 drm expat fontconfig freetype +WANTLIB += dbus-glib-1 drm expat fontconfig freetype gmp hogweed nettle WANTLIB += gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 unique-1.0 WANTLIB += gmodule-2.0 gnome-keyring gnutls gobject-2.0 WANTLIB += gpg-error gssapi gstbase-0.10 gstfarsight-0.10 gstinterfaces-0.10 @@ -40,8 +40,8 @@ WANTLIB += champlain-gtk-0.8 clutter-gtk-0.10 telepathy-farsight WANTLIB += telepathy-logger folks folks-telepathy gcr gp11 BUILD_DEPENDS= devel/iso-codes \ - x11/py-gtk2 \ - x11/gnome/nautilus-sendto + x11/py-gtk2 +#XXX see below x11/gnome/nautilus-sendto LIB_DEPENDS= audio/libcanberra,-gtk \ databases/evolution-data-server \ devel/json-glib \ @@ -75,13 +75,16 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --enable-location=Yes \ --enable-map=Yes\ --enable-webkit=no \ - --enable-nautilus-sendto \ --enable-control-center-embedding=no \ --with-connectivity=no \ --with-eds \ --with-ca-file=/etc/ssl/cert.pem \ --disable-Werror \ --enable-call=no +# XXX lots of 'libnstempathy.so: undefined symbol' at runtime +# revisit when telepathy-yell is moved out from empathy(?) +CONFIGURE_ARGS+= --disable-nautilus-sendto \ + CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_GROFF = Yes diff --git a/x11/gnome/empathy/patches/patch-nautilus-sendto-plugin_Makefile_in b/x11/gnome/empathy/patches/patch-nautilus-sendto-plugin_Makefile_in deleted file mode 100644 index 4cd3b0526d3..00000000000 --- a/x11/gnome/empathy/patches/patch-nautilus-sendto-plugin_Makefile_in +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-nautilus-sendto-plugin_Makefile_in,v 1.1 2011/04/05 18:58:09 jasper Exp $ - -Add ugly hack to allow multiple definitions of various functions. -This is needed because telepathy-yell is built out of the same tarball -as empathy for now. - ---- nautilus-sendto-plugin/Makefile.in.orig Tue Apr 5 19:40:05 2011 -+++ nautilus-sendto-plugin/Makefile.in Tue Apr 5 19:41:02 2011 -@@ -134,7 +134,7 @@ CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -Xlinker -zmuldefs - CONNMAN_CFLAGS = @CONNMAN_CFLAGS@ - CONNMAN_LIBS = @CONNMAN_LIBS@ - CONTROL_CENTER_EMBEDDING_CFLAGS = @CONTROL_CENTER_EMBEDDING_CFLAGS@ diff --git a/x11/gnome/empathy/pkg/PLIST b/x11/gnome/empathy/pkg/PLIST index e717096308b..5f0420d78f3 100644 --- a/x11/gnome/empathy/pkg/PLIST +++ b/x11/gnome/empathy/pkg/PLIST @@ -1,12 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.18 2011/04/05 18:58:09 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.19 2011/05/04 10:54:28 ajacoutot Exp $ @bin bin/empathy @bin bin/empathy-accounts @bin bin/empathy-debugger -lib/nautilus-sendto/ -lib/nautilus-sendto/plugins/ -@comment lib/nautilus-sendto/plugins/libnstempathy.a -@comment lib/nautilus-sendto/plugins/libnstempathy.la -lib/nautilus-sendto/plugins/libnstempathy.so @bin libexec/empathy-auth-client @bin libexec/empathy-av @man man/man1/empathy-accounts.1