summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS2
-rw-r--r--configure.ac4
-rw-r--r--m4/introspection.m410
-rw-r--r--telepathy-glib/introspection.am64
-rw-r--r--telepathy-glib/kludge.xsl25
5 files changed, 41 insertions, 64 deletions
diff --git a/NEWS b/NEWS
index 785b0ef2..615da2de 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-telepathy-glib 0.16.1 (UNRELEASED)
+telepathy-glib 0.17.0 (UNRELEASED)
==================================
…
diff --git a/configure.ac b/configure.ac
index 40716bfd..fd775084 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_PREREQ([2.59])
m4_define([tp_glib_major_version], [0])
m4_define([tp_glib_minor_version], [16])
-m4_define([tp_glib_micro_version], [0])
+m4_define([tp_glib_micro_version], [999])
m4_define([tp_glib_nano_version], [1])
# If library source has changed since last release, increment revision
@@ -59,7 +59,7 @@ PKG_PROG_PKG_CONFIG([0.21])
GTK_DOC_CHECK([1.17],[--flavour no-tmpl])
-GOBJECT_INTROSPECTION_CHECK([0.9.6])
+GOBJECT_INTROSPECTION_CHECK([0.10.8])
LT_CURRENT=tp_glib_lt_current
LT_REVISION=tp_glib_lt_revision
diff --git a/m4/introspection.m4 b/m4/introspection.m4
index bb3a0dac..589721c5 100644
--- a/m4/introspection.m4
+++ b/m4/introspection.m4
@@ -21,7 +21,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
],[dnl
AC_ARG_ENABLE(introspection,
AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
- [Enable introspection for this build]),,
+ [Enable introspection for this build]),,
[enable_introspection=auto])
])dnl
@@ -42,7 +42,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
[auto],[dnl
PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
],dnl
- [dnl
+ [dnl
AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
])dnl
@@ -59,12 +59,18 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
fi
AC_SUBST(INTROSPECTION_SCANNER)
AC_SUBST(INTROSPECTION_COMPILER)
AC_SUBST(INTROSPECTION_GENERATE)
AC_SUBST(INTROSPECTION_GIRDIR)
AC_SUBST(INTROSPECTION_TYPELIBDIR)
+ AC_SUBST(INTROSPECTION_CFLAGS)
+ AC_SUBST(INTROSPECTION_LIBS)
+ AC_SUBST(INTROSPECTION_MAKEFILE)
AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
])
diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am
index b31e298d..ce1ed381 100644
--- a/telepathy-glib/introspection.am
+++ b/telepathy-glib/introspection.am
@@ -7,8 +7,12 @@ introspection_extra_dist = \
if HAVE_INTROSPECTION
+include $(INTROSPECTION_MAKEFILE)
+
+INTROSPECTION_GIRS = TelepathyGLib-0.12.gir
+
# /!\ Order matters, see https://bugzilla.gnome.org/show_bug.cgi?id=660629
-INTROSPECTION_FILES = \
+TelepathyGLib_0_12_gir_FILES = \
$(srcdir)/proxy.c _gen/proxy-introspectable.h \
$(srcdir)/account.c $(srcdir)/account.h \
$(srcdir)/account-channel-request.c $(srcdir)/account-channel-request.h \
@@ -69,46 +73,38 @@ INTROSPECTION_FILES = \
_gen/telepathy-interfaces.h \
$(NULL)
+TelepathyGLib_0_12_gir_NAMESPACE = TelepathyGLib
+TelepathyGLib_0_12_gir_VERSION = 0.12
+TelepathyGLib_0_12_gir_LIBS = libtelepathy-glib.la
+TelepathyGLib_0_12_gir_EXPORT_PACKAGES = telepathy-glib
+
+TelepathyGLib_0_12_gir_SCANNERFLAGS = \
+ --identifier-prefix=Tp \
+ -I$(top_builddir) \
+ -I$(top_srcdir) \
+ --c-include="telepathy-glib/telepathy-glib.h" \
+ --warn-all \
+ $(NULL)
+
+TelepathyGLib_0_12_gir_INCLUDES = \
+ GLib-2.0 \
+ Gio-2.0 \
+ $(NULL)
+
+TelepathyGLib_0_12_gir_PACKAGES = \
+ gio-2.0 \
+ dbus-glib-1 \
+ $(NULL)
+
_gen/proxy-introspectable.h: proxy.h introspection.am
@$(mkdir_p) _gen
$(AM_V_GEN)sed -e 's/gpointer self/TpProxy *self/' < $< > $@
-TelepathyGLib-0.12.gir: $(INTROSPECTION_SCANNER) \
- libtelepathy-glib.la \
- $(srcdir)/kludge.xsl \
- $(INTROSPECTION_FILES)
- $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
- --namespace TelepathyGLib \
- --nsversion=0.12 \
- --identifier-prefix=Tp \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- --include=GLib-2.0 \
- --include=Gio-2.0 \
- --libtool="$(top_builddir)/libtool" \
- --library=libtelepathy-glib.la \
- --pkg gio-2.0 \
- --pkg dbus-glib-1 \
- --pkg-export telepathy-glib \
- --c-include="telepathy-glib/telepathy-glib.h" \
- --warn-all \
- --output _gen/$@.tmp \
- $(INTROSPECTION_FILES)
- @xsltproc $(srcdir)/kludge.xsl _gen/$@.tmp > $@
- @rm -f _gen/$@.tmp
-
girdir = $(datadir)/gir-1.0
-gir_DATA = TelepathyGLib-0.12.gir
-
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
- $(AM_V_GEN)$(top_builddir)/libtool --mode=execute \
- $(INTROSPECTION_COMPILER) \
- --includedir=$(srcdir) \
- --includedir=. \
- $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+dist_gir_DATA = TelepathyGLib-0.12.gir
typelibsdir = $(libdir)/girepository-1.0/
-typelibs_DATA = $(gir_DATA:.gir=.typelib)
+typelibs_DATA = $(dist_gir_DATA:.gir=.typelib)
CLEANFILES += \
$(gir_DATA) \
diff --git a/telepathy-glib/kludge.xsl b/telepathy-glib/kludge.xsl
deleted file mode 100644
index ab220ab4..00000000
--- a/telepathy-glib/kludge.xsl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- remove some items from the GIR
-
- Tips from http://www.xmlplease.com/xsltidentity -->
-
-<xsl:stylesheet xmlns:gi="http://www.gtk.org/introspection/core/1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
-
- <xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="gi:alias[@name='IntSet' or @name='IntSetIter' or
- @name='IntSetFastIter']">
- <xsl:message>Kludged around GNOME Bug #629668</xsl:message>
- </xsl:template>
-
- <xsl:template match="gi:field[@name='dbus_connection']">
- <xsl:message>Kludged around GNOME Bug #616375</xsl:message>
- </xsl:template>
-
-</xsl:stylesheet>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 18:39:43 +0000