From 0ad22761fe80d616192d36fa8bbe18da61d472a7 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 23 Apr 2010 12:41:46 +0000 Subject: [PATCH] - update telepathy-glib to 0.11.3 --- net/telepathy/telepathy-glib/Makefile | 20 +++++--- net/telepathy/telepathy-glib/distinfo | 10 ++-- .../telepathy-glib/patches/patch-configure | 27 ++++++++++ .../telepathy-glib/patches/patch-configure_ac | 12 ----- .../patch-telepathy-glib_telepathy-glib_pc_in | 8 +-- .../patch-tools_glib-errors-str-gen_py | 14 ----- net/telepathy/telepathy-glib/pkg/PLIST | 51 ++++++++++++++++++- 7 files changed, 98 insertions(+), 44 deletions(-) create mode 100644 net/telepathy/telepathy-glib/patches/patch-configure delete mode 100644 net/telepathy/telepathy-glib/patches/patch-configure_ac delete mode 100644 net/telepathy/telepathy-glib/patches/patch-tools_glib-errors-str-gen_py diff --git a/net/telepathy/telepathy-glib/Makefile b/net/telepathy/telepathy-glib/Makefile index 04550c03d47..dbb13db2813 100644 --- a/net/telepathy/telepathy-glib/Makefile +++ b/net/telepathy/telepathy-glib/Makefile @@ -1,25 +1,29 @@ -# $OpenBSD: Makefile,v 1.15 2009/06/02 04:44:22 jasper Exp $ +# $OpenBSD: Makefile,v 1.16 2010/04/23 12:41:46 jasper Exp $ COMMENT= flexible communications framework, glib bindings -DISTNAME= telepathy-glib-0.7.31 -SHARED_LIBS += telepathy-glib 4.0 # .25.0 +DISTNAME= telepathy-glib-0.11.3 +SHARED_LIBS += telepathy-glib 6.0 # .35.1 MASTER_SITES= ${MASTER_SITES_TELEPATHY:=telepathy-glib/} -WANTLIB= dbus-1 glib-2.0 gobject-2.0 pcre +WANTLIB += dbus-1 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 pcre MODULES= devel/gettext \ lang/python -BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::textproc/libxslt +MODPY_RUNDEP= No + +BUILD_DEPENDS= ::textproc/libxslt LIB_DEPENDS= dbus-glib-1::x11/dbus-glib USE_GMAKE= Yes USE_LIBTOOL= Yes -CONFIGURE_STYLE= gnu autoconf -AUTOCONF_VERSION= 2.61 +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +#CONFIGURE_ARGS+= --enable-backtrace (add -llibexecinfo) +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" pre-configure: ${SUBST_CMD} ${WRKSRC}/configure \ diff --git a/net/telepathy/telepathy-glib/distinfo b/net/telepathy/telepathy-glib/distinfo index ac5e4f06c48..1e81bd1e407 100644 --- a/net/telepathy/telepathy-glib/distinfo +++ b/net/telepathy/telepathy-glib/distinfo @@ -1,5 +1,5 @@ -MD5 (telepathy-glib-0.7.31.tar.gz) = Qs63Cqy+kY5kyPMZavxcgQ== -RMD160 (telepathy-glib-0.7.31.tar.gz) = XN+K/RCZdeq+Dgrsku/aG5qFTOs= -SHA1 (telepathy-glib-0.7.31.tar.gz) = obdnUxYugLFd7t7KXFUT4fbnwSc= -SHA256 (telepathy-glib-0.7.31.tar.gz) = izRNlEw27ZAiwVFuCXKo3ml+uideNP8+Wa8xDSFn69k= -SIZE (telepathy-glib-0.7.31.tar.gz) = 2574808 +MD5 (telepathy-glib-0.11.3.tar.gz) = 9C7hNwhYCzt4A0PM7px/LA== +RMD160 (telepathy-glib-0.11.3.tar.gz) = fA7rXWBj4JU3xj+5GVBEVEn+ii8= +SHA1 (telepathy-glib-0.11.3.tar.gz) = 1LzcMqikkjLCERgDSDmz7UqvsN8= +SHA256 (telepathy-glib-0.11.3.tar.gz) = Uouc/mtNotGuAyFo5BDT09ZKD01+poNP/nMaADve8Fw= +SIZE (telepathy-glib-0.11.3.tar.gz) = 2048374 diff --git a/net/telepathy/telepathy-glib/patches/patch-configure b/net/telepathy/telepathy-glib/patches/patch-configure new file mode 100644 index 00000000000..5c60441fea3 --- /dev/null +++ b/net/telepathy/telepathy-glib/patches/patch-configure @@ -0,0 +1,27 @@ +$OpenBSD: patch-configure,v 1.4 2010/04/23 12:41:46 jasper Exp $ +--- configure.orig Tue Apr 20 17:11:43 2010 ++++ configure Thu Apr 22 16:13:18 2010 +@@ -2542,14 +2542,6 @@ echo timestamp > conftest.file + # name. Accept space and tab only in the latter. + am_lf=' + ' +-case `pwd` in +- *[\\\"\#\$\&\'\`$am_lf]*) +- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; +-esac +-case $srcdir in +- *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; +-esac + + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a +@@ -11999,7 +11991,7 @@ if test "${am_cv_pathless_PYTHON+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +- for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do ++ for am_cv_pathless_PYTHON in python${MODPY_VERSION}; do + test "$am_cv_pathless_PYTHON" = none && break + prog="import sys + # split strings by '.' and convert to numeric. Append some zeros diff --git a/net/telepathy/telepathy-glib/patches/patch-configure_ac b/net/telepathy/telepathy-glib/patches/patch-configure_ac deleted file mode 100644 index 749a070bcb3..00000000000 --- a/net/telepathy/telepathy-glib/patches/patch-configure_ac +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.7 2009/06/02 04:44:22 jasper Exp $ ---- configure.ac.orig Sun May 31 15:12:02 2009 -+++ configure.ac Sun May 31 15:12:26 2009 -@@ -174,7 +174,7 @@ AC_CHECK_PROGS([XSLTPROC], [xsltproc]) - if test -z "$XSLTPROC"; then - AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) - fi --AM_PATH_PYTHON([2.3]) -+AM_PATH_PYTHON([${MODPY_VERSION}]) - - dnl glibc backtrace functions - AC_CHECK_FUNCS(backtrace backtrace_symbols_fd) diff --git a/net/telepathy/telepathy-glib/patches/patch-telepathy-glib_telepathy-glib_pc_in b/net/telepathy/telepathy-glib/patches/patch-telepathy-glib_telepathy-glib_pc_in index 0cea16c5e77..0a84c4fcd12 100644 --- a/net/telepathy/telepathy-glib/patches/patch-telepathy-glib_telepathy-glib_pc_in +++ b/net/telepathy/telepathy-glib/patches/patch-telepathy-glib_telepathy-glib_pc_in @@ -1,14 +1,14 @@ -$OpenBSD: patch-telepathy-glib_telepathy-glib_pc_in,v 1.1 2008/10/27 00:00:34 jasper Exp $ +$OpenBSD: patch-telepathy-glib_telepathy-glib_pc_in,v 1.2 2010/04/23 12:41:46 jasper Exp $ Our pkg-config(1) does not install it's own .pc file. ---- telepathy-glib/telepathy-glib.pc.in.orig Sun Oct 26 13:26:19 2008 -+++ telepathy-glib/telepathy-glib.pc.in Sun Oct 26 13:26:25 2008 +--- telepathy-glib/telepathy-glib.pc.in.orig Thu Apr 22 15:49:56 2010 ++++ telepathy-glib/telepathy-glib.pc.in Thu Apr 22 15:50:03 2010 @@ -6,7 +6,6 @@ includedir=@includedir@ Name: Telepathy-GLib Description: GLib utility library for the Telepathy framework Version: @VERSION@ -Requires: pkg-config >= 0.21 - Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 + Requires.private: dbus-glib-1 >= 0.82, glib-2.0 >= 2.22, gobject-2.0 >= 2.22, gio-2.0 >= 2.22 Libs: -L${libdir} -ltelepathy-glib Cflags: -I${includedir}/telepathy-1.0 diff --git a/net/telepathy/telepathy-glib/patches/patch-tools_glib-errors-str-gen_py b/net/telepathy/telepathy-glib/patches/patch-tools_glib-errors-str-gen_py deleted file mode 100644 index c6f2c8772c3..00000000000 --- a/net/telepathy/telepathy-glib/patches/patch-tools_glib-errors-str-gen_py +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-tools_glib-errors-str-gen_py,v 1.1 2009/06/02 04:44:22 jasper Exp $ - -Fix a /usr/local/include/telepathy-1.0/telepathy-glib/_gen/error-str.h:301:4: no newline at end of file - ---- tools/glib-errors-str-gen.py.orig Mon Jun 1 22:23:52 2009 -+++ tools/glib-errors-str-gen.py Mon Jun 1 22:24:33 2009 -@@ -55,6 +55,7 @@ class Generator(object): - self.h("/* Work around a gtkdoc bug where it doesn't see the last") - self.h(" * definition in the file unless there's misc after it") - self.h(" */") -+ self.h('') - - self.b(' default:') - self.b(' g_return_val_if_reached (NULL);') diff --git a/net/telepathy/telepathy-glib/pkg/PLIST b/net/telepathy/telepathy-glib/pkg/PLIST index cd6cfe617a6..a0deb901e31 100644 --- a/net/telepathy/telepathy-glib/pkg/PLIST +++ b/net/telepathy/telepathy-glib/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2009/06/02 04:44:22 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.8 2010/04/23 12:41:46 jasper Exp $ include/telepathy-1.0/ include/telepathy-1.0/telepathy-glib/ include/telepathy-1.0/telepathy-glib/_gen/ @@ -6,37 +6,60 @@ include/telepathy-1.0/telepathy-glib/_gen/error-str.h include/telepathy-1.0/telepathy-glib/_gen/gtypes.h include/telepathy-1.0/telepathy-glib/_gen/telepathy-enums.h include/telepathy-1.0/telepathy-glib/_gen/telepathy-interfaces.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-account-manager.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-account.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-dispatcher.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-request.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-client.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-connection-manager.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-connection.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-dbus-daemon.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-generic.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-media-session-handler.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-media-stream-handler.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account-manager.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-dispatch-operation.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-dispatcher.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-request.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-client.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-connection-manager.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-connection.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-debug.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-generic.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-media-session-handler.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-media-stream-handler.h +include/telepathy-1.0/telepathy-glib/account-manager.h +include/telepathy-1.0/telepathy-glib/account.h include/telepathy-1.0/telepathy-glib/base-connection-manager.h include/telepathy-1.0/telepathy-glib/base-connection.h +include/telepathy-1.0/telepathy-glib/capabilities.h +include/telepathy-1.0/telepathy-glib/channel-dispatch-operation.h +include/telepathy-1.0/telepathy-glib/channel-dispatcher.h include/telepathy-1.0/telepathy-glib/channel-factory-iface.h include/telepathy-1.0/telepathy-glib/channel-iface.h include/telepathy-1.0/telepathy-glib/channel-manager.h +include/telepathy-1.0/telepathy-glib/channel-request.h include/telepathy-1.0/telepathy-glib/channel.h +include/telepathy-1.0/telepathy-glib/client.h include/telepathy-1.0/telepathy-glib/connection-manager.h include/telepathy-1.0/telepathy-glib/connection.h include/telepathy-1.0/telepathy-glib/contact.h include/telepathy-1.0/telepathy-glib/contacts-mixin.h +include/telepathy-1.0/telepathy-glib/dbus-daemon.h include/telepathy-1.0/telepathy-glib/dbus-properties-mixin.h include/telepathy-1.0/telepathy-glib/dbus.h include/telepathy-1.0/telepathy-glib/debug-ansi.h +include/telepathy-1.0/telepathy-glib/debug-sender.h include/telepathy-1.0/telepathy-glib/debug.h include/telepathy-1.0/telepathy-glib/defs.h include/telepathy-1.0/telepathy-glib/enums.h include/telepathy-1.0/telepathy-glib/errors.h include/telepathy-1.0/telepathy-glib/exportable-channel.h +include/telepathy-1.0/telepathy-glib/gnio-util.h include/telepathy-1.0/telepathy-glib/group-mixin.h include/telepathy-1.0/telepathy-glib/gtypes.h include/telepathy-1.0/telepathy-glib/handle-repo-dynamic.h @@ -53,14 +76,23 @@ include/telepathy-1.0/telepathy-glib/properties-mixin.h include/telepathy-1.0/telepathy-glib/proxy-subclass.h include/telepathy-1.0/telepathy-glib/proxy.h include/telepathy-1.0/telepathy-glib/run.h +include/telepathy-1.0/telepathy-glib/svc-account-manager.h +include/telepathy-1.0/telepathy-glib/svc-account.h +include/telepathy-1.0/telepathy-glib/svc-channel-dispatch-operation.h +include/telepathy-1.0/telepathy-glib/svc-channel-dispatcher.h +include/telepathy-1.0/telepathy-glib/svc-channel-request.h include/telepathy-1.0/telepathy-glib/svc-channel.h +include/telepathy-1.0/telepathy-glib/svc-client.h include/telepathy-1.0/telepathy-glib/svc-connection-manager.h include/telepathy-1.0/telepathy-glib/svc-connection.h +include/telepathy-1.0/telepathy-glib/svc-debug.h include/telepathy-1.0/telepathy-glib/svc-generic.h include/telepathy-1.0/telepathy-glib/svc-media-interfaces.h include/telepathy-1.0/telepathy-glib/svc-properties-interface.h +include/telepathy-1.0/telepathy-glib/telepathy-glib.h include/telepathy-1.0/telepathy-glib/text-mixin.h include/telepathy-1.0/telepathy-glib/util.h +include/telepathy-1.0/telepathy-glib/verify.h lib/libtelepathy-glib.a lib/libtelepathy-glib.la @lib lib/libtelepathy-glib.so.${LIBtelepathy-glib_VERSION} @@ -74,6 +106,7 @@ share/gtk-doc/html/telepathy-glib/TpChannelManager.html share/gtk-doc/html/telepathy-glib/TpDynamicHandleRepo.html share/gtk-doc/html/telepathy-glib/TpExportableChannel.html share/gtk-doc/html/telepathy-glib/TpStaticHandleRepo.html +share/gtk-doc/html/telepathy-glib/annotation-glossary.html share/gtk-doc/html/telepathy-glib/ch-client.html share/gtk-doc/html/telepathy-glib/ch-dbus.html share/gtk-doc/html/telepathy-glib/ch-protocol.html @@ -95,15 +128,22 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-TpMessageMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPresenceMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPropertiesMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpTextMixin.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-account-manager.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-account.html share/gtk-doc/html/telepathy-glib/telepathy-glib-asv.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-capabilities.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatch-operation.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatcher.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-file-transfer.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-group.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-media.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-request.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-roomlist.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-text.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tube.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tubes.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-client.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-aliasing.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-avatars.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-caps.html @@ -117,10 +157,12 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-contact.html share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus-properties-mixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus.html share/gtk-doc/html/telepathy-glib/telepathy-glib-debug-ansi.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-debug-sender.html share/gtk-doc/html/telepathy-glib/telepathy-glib-debug.html share/gtk-doc/html/telepathy-glib/telepathy-glib-defs.html share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html share/gtk-doc/html/telepathy-glib/telepathy-glib-errors.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-gnio-util.html share/gtk-doc/html/telepathy-glib/telepathy-glib-gtypes.html share/gtk-doc/html/telepathy-glib/telepathy-glib-handle-repo.html share/gtk-doc/html/telepathy-glib/telepathy-glib-handle.html @@ -131,17 +173,24 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy-subclass.html share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy-tp-properties.html share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy.html share/gtk-doc/html/telepathy-glib/telepathy-glib-run.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account-manager.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-contactlist.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatch-operation.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatcher.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-file-transfer.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-group.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-media.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-request.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-roomlist.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-text.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-tube.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-tubes.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-client.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-connection-manager.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-connection.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-debug.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-generic.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-media-interfaces.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc.html