diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2011-07-30 09:39:44 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2011-07-30 09:39:44 +0000 |
| commit | ca18c5b1d871a92954334d7e56906b51e1c2d086 (patch) | |
| tree | 69ab1e6d1c3aa62d8921d89f1d46c51f48b49f3a /net-im/telepathy-glib | |
| parent | 769329177b45b3221adba2ec0ddb4d734343d53e (diff) | |
| download | ports-ca18c5b1d871a92954334d7e56906b51e1c2d086.tar.gz ports-ca18c5b1d871a92954334d7e56906b51e1c2d086.zip | |
Build fixes with glib 2.28. gtk 2.24, gtkmm 2.24 and vala 0.12.
Notes
Notes:
svn path=/head/; revision=278564
Diffstat (limited to 'net-im/telepathy-glib')
| -rw-r--r-- | net-im/telepathy-glib/Makefile | 7 | ||||
| -rw-r--r-- | net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in | 22 | ||||
| -rw-r--r-- | net-im/telepathy-glib/pkg-plist | 4 |
3 files changed, 28 insertions, 5 deletions
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile index ff25c75aec3a..7273ab234f2d 100644 --- a/net-im/telepathy-glib/Makefile +++ b/net-im/telepathy-glib/Makefile @@ -7,6 +7,7 @@ PORTNAME= telepathy-glib PORTVERSION= 0.12.7 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ @@ -17,12 +18,12 @@ LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \ dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ - vapigen-0.10:${PORTSDIR}/lang/vala-vapigen \ + vapigen:${PORTSDIR}/lang/vala-vapigen \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} \ - vapigen-0.10:${PORTSDIR}/lang/vala-vapigen + vapigen:${PORTSDIR}/lang/vala-vapigen USE_AUTOTOOLS= libtool USE_GMAKE= yes @@ -35,7 +36,7 @@ CONFIGURE_ARGS= --enable-vala-bindings post-patch: @${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/telepathy-glib/Makefile.in - @${REINPLACE_CMD} -e 's|datarootdir)/vala/vapi|datarootdir)/vala-0.10/vapi|g' \ + @${REINPLACE_CMD} -e 's|datarootdir)/vala/vapi|datarootdir)/vala-0.12/vapi|g' \ ${WRKSRC}/vala/Makefile.in .include <bsd.port.mk> diff --git a/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in b/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in new file mode 100644 index 000000000000..d88266770456 --- /dev/null +++ b/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in @@ -0,0 +1,22 @@ +--- telepathy-glib/Makefile.in.orig 2011-07-22 13:41:13.000000000 +0200 ++++ telepathy-glib/Makefile.in 2011-07-22 14:00:23.000000000 +0200 +@@ -1649,7 +1649,7 @@ + @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \ + @HAVE_INTROSPECTION_TRUE@ --namespace TelepathyGLib \ + @HAVE_INTROSPECTION_TRUE@ --nsversion=0.12 \ +-@HAVE_INTROSPECTION_TRUE@ $(gi_identifier_prefix_arg)=Tp \ ++@HAVE_INTROSPECTION_TRUE@ --identifier-prefix=Tp \ + @HAVE_INTROSPECTION_TRUE@ -I$(top_builddir) \ + @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) \ + @HAVE_INTROSPECTION_TRUE@ --include=GLib-2.0 \ +@@ -1658,7 +1658,9 @@ + @HAVE_INTROSPECTION_TRUE@ --library=libtelepathy-glib.la \ + @HAVE_INTROSPECTION_TRUE@ --pkg gio-2.0 \ + @HAVE_INTROSPECTION_TRUE@ --pkg dbus-glib-1 \ +-@HAVE_INTROSPECTION_TRUE@ $(gi_warn_all_arg) \ ++@HAVE_INTROSPECTION_TRUE@ --pkg-export telepathy-glib \ ++@HAVE_INTROSPECTION_TRUE@ --c-include="telepathy-glib/telepathy-glib.h" \ ++@HAVE_INTROSPECTION_TRUE@ --warn-all \ + @HAVE_INTROSPECTION_TRUE@ --output _gen/$@.tmp \ + @HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_FILES) + @HAVE_INTROSPECTION_TRUE@ @xsltproc $(srcdir)/kludge.xsl _gen/$@.tmp > $@ diff --git a/net-im/telepathy-glib/pkg-plist b/net-im/telepathy-glib/pkg-plist index 6295b7ff9285..457fc925a6f1 100644 --- a/net-im/telepathy-glib/pkg-plist +++ b/net-im/telepathy-glib/pkg-plist @@ -236,8 +236,8 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-util.html share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp2 share/gtk-doc/html/telepathy-glib/up.png -share/vala-0.10/vapi/telepathy-glib.deps -share/vala-0.10/vapi/telepathy-glib.vapi +share/vala-0.12/vapi/telepathy-glib.deps +share/vala-0.12/vapi/telepathy-glib.vapi @dirrm share/gtk-doc/html/telepathy-glib @dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc |