From 735c815eaa4578bcdbcd33779d93e5b8249e27d0 Mon Sep 17 00:00:00 2001
From: DongHun Kwak
Date: Thu, 27 Oct 2016 14:34:43 +0900
Subject: [PATCH] Imported Upstream version 1.49.1
Change-Id: I5b03d454056070ccd078e98c7c32b1edf085c990
Signed-off-by: DongHun Kwak
---
Makefile-tools.am | 10 +-
Makefile.in | 54 +-
aclocal.m4 | 4 +-
build-aux/config.guess | 34 +-
build-aux/config.sub | 22 +-
build-aux/install-sh | 23 +-
build-aux/ltmain.sh | 37 +-
build/Makefile.in | 1 -
build/win32/Makefile.in | 1 -
build/win32/gi-tests-msvc.mak | 2 +-
build/win32/gipc.py | 59 +
build/win32/introspection-msvc.mak | 7 +-
build/win32/pc_base.py | 55 +-
build/win32/vs10/Makefile.in | 1 -
build/win32/vs10/gi-install.props | 7 +-
build/win32/vs10/gi-install.propsin | 7 +-
build/win32/vs10/gi-version-paths.props | 2 +-
build/win32/vs11/Makefile.in | 1 -
build/win32/vs11/gi-install.props | 7 +-
build/win32/vs11/gi-version-paths.props | 2 +-
build/win32/vs12/Makefile.in | 1 -
build/win32/vs12/gi-install.props | 7 +-
build/win32/vs12/gi-version-paths.props | 2 +-
build/win32/vs14/Makefile.in | 1 -
build/win32/vs14/gi-install.props | 7 +-
build/win32/vs14/gi-version-paths.props | 2 +-
build/win32/vs9/Makefile.in | 1 -
build/win32/vs9/gi-install.vcproj | 8 +-
build/win32/vs9/gi-install.vsprops | 5 +
build/win32/vs9/gi-install.vspropsin | 5 +
build/win32/vs9/gi-version-paths.vsprops | 2 +-
config.h.win32 | 6 +-
configure | 81 +-
configure.ac | 6 +-
docs/Makefile.in | 1 -
docs/reference/Makefile.in | 1 -
docs/reference/html/GIRepository.html | 204 +--
docs/reference/html/annotation-glossary.html | 4 +-
docs/reference/html/api-index-1-29-0.html | 4 +-
docs/reference/html/api-index-1-29-17.html | 4 +-
docs/reference/html/api-index-1-30-1.html | 4 +-
docs/reference/html/api-index-1-34.html | 4 +-
docs/reference/html/api-index-1-35-8.html | 4 +-
docs/reference/html/api-index-deprecated.html | 4 +-
docs/reference/html/api-index-full.html | 4 +-
docs/reference/html/ch01.html | 4 +-
docs/reference/html/ch03.html | 4 +-
docs/reference/html/gi-GIArgInfo.html | 58 +-
docs/reference/html/gi-GIBaseInfo.html | 48 +-
docs/reference/html/gi-GICallableInfo.html | 70 +-
docs/reference/html/gi-GICallbackInfo.html | 4 +-
docs/reference/html/gi-GIConstantInfo.html | 8 +-
docs/reference/html/gi-GIEnumInfo.html | 28 +-
docs/reference/html/gi-GIFieldInfo.html | 28 +-
docs/reference/html/gi-GIFunctionInfo.html | 40 +-
docs/reference/html/gi-GIInterfaceInfo.html | 60 +-
docs/reference/html/gi-GIObjectInfo.html | 118 +-
docs/reference/html/gi-GIPropertyInfo.html | 10 +-
docs/reference/html/gi-GIRegisteredTypeInfo.html | 24 +-
docs/reference/html/gi-GISignalInfo.html | 20 +-
docs/reference/html/gi-GIStructInfo.html | 38 +-
docs/reference/html/gi-GITypeInfo.html | 40 +-
docs/reference/html/gi-GITypelib.html | 594 +++----
docs/reference/html/gi-GIUnionInfo.html | 38 +-
docs/reference/html/gi-GIVFuncInfo.html | 48 +-
docs/reference/html/gi-GIValueInfo.html | 4 +-
docs/reference/html/gi-building.html | 4 +-
docs/reference/html/gi-common-types.html | 60 +-
docs/reference/html/gi-gir-reference.html | 4 +-
docs/reference/html/gi-girffi.html | 32 +-
docs/reference/html/gi-gitypelib.html | 46 +-
docs/reference/html/gi-programming.html | 4 +-
docs/reference/html/gi-struct-hierarchy.html | 4 +-
docs/reference/html/gi-typelib.html | 4 +-
docs/reference/html/gi.html | 4 +-
docs/reference/html/index.html | 6 +-
docs/reference/html/overview.html | 4 +-
docs/reference/html/overview.png | Bin 112776 -> 0 bytes
docs/reference/version.xml | 2 +-
gir/gio-2.0.c | 1726 +++++++++++++++++++-
gir/glib-2.0.c | 636 ++++++--
gir/gobject-2.0.c | 6 +-
girepository/gdump.c | 9 +-
girepository/gicallableinfo.c | 4 +-
girepository/girepository.c | 32 +-
giscanner/ast.py | 3 +-
gobject-introspection-1.0.pc | 4 +-
gobject-introspection-no-export-1.0.pc | 4 +-
m4/libtool.m4 | 32 +-
scannerlexer.c | 449 +++--
scannerparser.c | 314 ++--
scannerparser.h | 2 +-
tests/Makefile.in | 1 -
tests/gi-tester | 8 +-
tests/offsets/Makefile.in | 1 -
tests/repository/Makefile.in | 1 -
tests/scanner/Makefile.in | 1 -
.../Regress.AnonymousUnionAndStruct-None.page | 14 +
.../Regress.AnonymousUnionAndStruct-x.page | 14 +
.../Regress.AnonymousUnionAndStruct.page | 35 +
.../Regress.AnonymousUnionAndStruct-x.page | 18 +
.../Regress.AnonymousUnionAndStruct.page | 42 +
.../Regress.AnonymousUnionAndStruct-None.page | 14 +
.../Regress.AnonymousUnionAndStruct-x.page | 14 +
.../Regress.AnonymousUnionAndStruct.page | 40 +
tests/scanner/Regress-1.0-expected.gir | 22 +
tests/scanner/annotationparser/Makefile.in | 1 -
tests/scanner/regress.h | 13 +
tests/warn/Makefile.in | 1 -
tools/g-ir-inspect.c | 133 ++
110 files changed, 4091 insertions(+), 1671 deletions(-)
delete mode 100644 docs/reference/html/overview.png
create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnonymousUnionAndStruct-None.page
create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnonymousUnionAndStruct-x.page
create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnonymousUnionAndStruct.page
create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnonymousUnionAndStruct-x.page
create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnonymousUnionAndStruct.page
create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnonymousUnionAndStruct-None.page
create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnonymousUnionAndStruct-x.page
create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnonymousUnionAndStruct.page
create mode 100644 tools/g-ir-inspect.c
diff --git a/Makefile-tools.am b/Makefile-tools.am
index dbd264c..9529373 100644
--- a/Makefile-tools.am
+++ b/Makefile-tools.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS += g-ir-compiler g-ir-generate
+bin_PROGRAMS += g-ir-compiler g-ir-generate g-ir-inspect
bin_SCRIPTS += g-ir-scanner g-ir-annotation-tool
if BUILD_DOCTOOL
@@ -40,8 +40,14 @@ g_ir_generate_LDADD = \
libgirepository-1.0.la \
$(GIREPO_LIBS)
+g_ir_inspect_SOURCES = tools/g-ir-inspect.c
+g_ir_inspect_CFLAGS = $(GIO_CFLAGS) -I$(top_srcdir)/girepository
+g_ir_inspect_LDADD = \
+ libgirepository-1.0.la \
+ $(GIREPO_LIBS)
+
GCOVSOURCES = \
$(g_ir_compiler_SOURCES) \
$(g_ir_generate_SOURCES)
-CLEANFILES += g-ir-scanner g-ir-annotation-tool g-ir-doc-tool
+CLEANFILES += g-ir-scanner g-ir-annotation-tool g-ir-doc-tool g-ir-inspect
diff --git a/Makefile.in b/Makefile.in
index 96279f0..6bf0273 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -173,7 +173,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
check_PROGRAMS =
-bin_PROGRAMS = g-ir-compiler$(EXEEXT) g-ir-generate$(EXEEXT)
+bin_PROGRAMS = g-ir-compiler$(EXEEXT) g-ir-generate$(EXEEXT) \
+ g-ir-inspect$(EXEEXT)
noinst_PROGRAMS = $(am__EXEEXT_1) glib-print$(EXEEXT)
EXTRA_PROGRAMS = cmph-bdz-test$(EXEEXT) gthash-test$(EXEEXT)
TESTS = cmph-bdz-test$(EXEEXT) gthash-test$(EXEEXT)
@@ -359,6 +360,13 @@ g_ir_generate_DEPENDENCIES = libgirepository-internals.la \
g_ir_generate_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(g_ir_generate_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_g_ir_inspect_OBJECTS = g_ir_inspect-g-ir-inspect.$(OBJEXT)
+g_ir_inspect_OBJECTS = $(am_g_ir_inspect_OBJECTS)
+g_ir_inspect_DEPENDENCIES = libgirepository-1.0.la \
+ $(am__DEPENDENCIES_1)
+g_ir_inspect_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(g_ir_inspect_CFLAGS) \
+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
am__gi_dump_types_SOURCES_DIST = girepository/gdump.c \
girepository/gi-dump-types.c
@OS_WIN32_FALSE@am_gi_dump_types_OBJECTS = \
@@ -444,16 +452,16 @@ SOURCES = $(_giscanner_la_SOURCES) $(libcmph_la_SOURCES) \
$(libgirepository_internals_la_SOURCES) \
$(libgiscanner_la_SOURCES) $(cmph_bdz_test_SOURCES) \
$(g_ir_compiler_SOURCES) $(g_ir_generate_SOURCES) \
- $(gi_dump_types_SOURCES) $(glib_print_SOURCES) \
- $(gthash_test_SOURCES)
+ $(g_ir_inspect_SOURCES) $(gi_dump_types_SOURCES) \
+ $(glib_print_SOURCES) $(gthash_test_SOURCES)
DIST_SOURCES = $(_giscanner_la_SOURCES) $(libcmph_la_SOURCES) \
$(libgirepository_1_0_la_SOURCES) \
$(libgirepository_gthash_la_SOURCES) \
$(libgirepository_internals_la_SOURCES) \
$(libgiscanner_la_SOURCES) $(cmph_bdz_test_SOURCES) \
$(g_ir_compiler_SOURCES) $(g_ir_generate_SOURCES) \
- $(am__gi_dump_types_SOURCES_DIST) $(glib_print_SOURCES) \
- $(gthash_test_SOURCES)
+ $(g_ir_inspect_SOURCES) $(am__gi_dump_types_SOURCES_DIST) \
+ $(glib_print_SOURCES) $(gthash_test_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
@@ -922,7 +930,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -948,7 +955,7 @@ BUILT_SOURCES = scannerparser.c scannerparser.h scannerlexer.c \
scannerlexer.h gir/cairo-1.0.gir
CLEANFILES = $(BUILT_SOURCES) cmph-bdz-test libcmph.la gthash-test \
gir/cairo-1.0.gir $(BUILT_GIRSOURCES) $(typelibs_DATA) \
- g-ir-scanner g-ir-annotation-tool g-ir-doc-tool
+ g-ir-scanner g-ir-annotation-tool g-ir-doc-tool g-ir-inspect
INTROSPECTION_GIRS = $(BUILT_GIRSOURCES)
check_LTLIBRARIES =
bin_SCRIPTS = g-ir-scanner g-ir-annotation-tool $(am__append_5)
@@ -1489,6 +1496,12 @@ g_ir_generate_LDADD = \
libgirepository-1.0.la \
$(GIREPO_LIBS)
+g_ir_inspect_SOURCES = tools/g-ir-inspect.c
+g_ir_inspect_CFLAGS = $(GIO_CFLAGS) -I$(top_srcdir)/girepository
+g_ir_inspect_LDADD = \
+ libgirepository-1.0.la \
+ $(GIREPO_LIBS)
+
GCOVSOURCES = \
$(g_ir_compiler_SOURCES) \
$(g_ir_generate_SOURCES)
@@ -1806,6 +1819,10 @@ g-ir-generate$(EXEEXT): $(g_ir_generate_OBJECTS) $(g_ir_generate_DEPENDENCIES) $
@rm -f g-ir-generate$(EXEEXT)
$(AM_V_CCLD)$(g_ir_generate_LINK) $(g_ir_generate_OBJECTS) $(g_ir_generate_LDADD) $(LIBS)
+g-ir-inspect$(EXEEXT): $(g_ir_inspect_OBJECTS) $(g_ir_inspect_DEPENDENCIES) $(EXTRA_g_ir_inspect_DEPENDENCIES)
+ @rm -f g-ir-inspect$(EXEEXT)
+ $(AM_V_CCLD)$(g_ir_inspect_LINK) $(g_ir_inspect_OBJECTS) $(g_ir_inspect_LDADD) $(LIBS)
+
gi-dump-types$(EXEEXT): $(gi_dump_types_OBJECTS) $(gi_dump_types_DEPENDENCIES) $(EXTRA_gi_dump_types_DEPENDENCIES)
@rm -f gi-dump-types$(EXEEXT)
$(AM_V_CCLD)$(gi_dump_types_LINK) $(gi_dump_types_OBJECTS) $(gi_dump_types_LDADD) $(LIBS)
@@ -1863,6 +1880,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmph_bdz_test-cmph-bdz-test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_ir_compiler-compiler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_ir_generate-generate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_ir_inspect-g-ir-inspect.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gi_dump_types-gdump.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gi_dump_types-gi-dump-types.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glib_print-glib-print.Po@am__quote@
@@ -2363,6 +2381,20 @@ g_ir_generate-generate.obj: tools/generate.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(g_ir_generate_CPPFLAGS) $(CPPFLAGS) $(g_ir_generate_CFLAGS) $(CFLAGS) -c -o g_ir_generate-generate.obj `if test -f 'tools/generate.c'; then $(CYGPATH_W) 'tools/generate.c'; else $(CYGPATH_W) '$(srcdir)/tools/generate.c'; fi`
+g_ir_inspect-g-ir-inspect.o: tools/g-ir-inspect.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -MT g_ir_inspect-g-ir-inspect.o -MD -MP -MF $(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo -c -o g_ir_inspect-g-ir-inspect.o `test -f 'tools/g-ir-inspect.c' || echo '$(srcdir)/'`tools/g-ir-inspect.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo $(DEPDIR)/g_ir_inspect-g-ir-inspect.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tools/g-ir-inspect.c' object='g_ir_inspect-g-ir-inspect.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -c -o g_ir_inspect-g-ir-inspect.o `test -f 'tools/g-ir-inspect.c' || echo '$(srcdir)/'`tools/g-ir-inspect.c
+
+g_ir_inspect-g-ir-inspect.obj: tools/g-ir-inspect.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -MT g_ir_inspect-g-ir-inspect.obj -MD -MP -MF $(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo -c -o g_ir_inspect-g-ir-inspect.obj `if test -f 'tools/g-ir-inspect.c'; then $(CYGPATH_W) 'tools/g-ir-inspect.c'; else $(CYGPATH_W) '$(srcdir)/tools/g-ir-inspect.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g_ir_inspect-g-ir-inspect.Tpo $(DEPDIR)/g_ir_inspect-g-ir-inspect.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tools/g-ir-inspect.c' object='g_ir_inspect-g-ir-inspect.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(g_ir_inspect_CFLAGS) $(CFLAGS) -c -o g_ir_inspect-g-ir-inspect.obj `if test -f 'tools/g-ir-inspect.c'; then $(CYGPATH_W) 'tools/g-ir-inspect.c'; else $(CYGPATH_W) '$(srcdir)/tools/g-ir-inspect.c'; fi`
+
gi_dump_types-gdump.o: girepository/gdump.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gi_dump_types_CFLAGS) $(CFLAGS) -MT gi_dump_types-gdump.o -MD -MP -MF $(DEPDIR)/gi_dump_types-gdump.Tpo -c -o gi_dump_types-gdump.o `test -f 'girepository/gdump.c' || echo '$(srcdir)/'`girepository/gdump.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gi_dump_types-gdump.Tpo $(DEPDIR)/gi_dump_types-gdump.Po
@@ -3109,7 +3141,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -3134,7 +3166,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -3152,7 +3184,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -3162,7 +3194,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff --git a/aclocal.m4 b/aclocal.m4
index 02a4590..6c52c41 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29)
+dnl serial 11 (pkg-config-0.29.1)
dnl
dnl Copyright © 2004 Scott James Remnant .
dnl Copyright © 2012-2015 Dan Nicholson
@@ -63,7 +63,7 @@ dnl
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29])
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 1659250..dbfb978 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2015-08-20'
+timestamp='2015-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -168,27 +168,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
- /sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || \
- echo unknown)`
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
- earmv*)
- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine=${arch}${endian}-unknown
- ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
case "${UNAME_MACHINE_ARCH}" in
- arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
@@ -204,13 +197,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
os=netbsd
;;
esac
- # Determine ABI tags.
- case "${UNAME_MACHINE_ARCH}" in
- earm*)
- expr='s/^earmv[0-9]/-eabi/;s/eb$//'
- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
- ;;
- esac
# The OS release
# Debian GNU/NetBSD machines have a different userland, and
# thus, need a distinct triplet. However, they do not need
@@ -221,13 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}${abi}"
+ echo "${machine}-${os}${release}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -249,9 +235,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
- *:Sortix:*:*)
- echo ${UNAME_MACHINE}-unknown-sortix
- exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -950,9 +933,6 @@ EOF
crisv32:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
- e2k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -1041,7 +1021,7 @@ EOF
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 1acc966..6467c95 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2015-08-20'
+timestamp='2015-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
@@ -255,12 +255,11 @@ case $basic_machine in
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
- | ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
- | e2k | epiphany \
+ | epiphany \
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
@@ -306,7 +305,7 @@ case $basic_machine in
| riscv32 | riscv64 \
| rl78 | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -377,13 +376,12 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
- | ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
- | e2k-* | elxsi-* \
+ | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -430,13 +428,12 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
@@ -521,9 +518,6 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
- asmjs)
- basic_machine=asmjs-unknown
- ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -1031,7 +1025,7 @@ case $basic_machine in
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
@@ -1379,7 +1373,7 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* | -cloudabi* | -sortix* \
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff --git a/build-aux/install-sh b/build-aux/install-sh
index 59990a1..0b0fdcb 100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2014-09-12.12; # UTC
+scriptversion=2013-12-25.23; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -324,41 +324,34 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
- # $RANDOM is not portable (e.g. dash); use it when possible to
- # lower collision chance
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
- # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
- # create the $tmpdir first (and fail if unsuccessful) to make sure
- # that nobody tries to guess the $tmpdir name.
if (umask $mkdir_umask &&
- $mkdirprog $mkdir_mode "$tmpdir" &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- test_tmpdir="$tmpdir/a"
- ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+ rmdir "$tmpdir/d" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
fi
trap '' 0;;
esac;;
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
index 147d758..0f0a2da 100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-0.1"
+VERSION=2.4.6
package_revision=2.4.6
@@ -2073,7 +2073,7 @@ include the following information:
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
Report bugs to .
-GNU libtool home page: .
+GNU libtool home page: .
General help using GNU software: ."
exit 0
}
@@ -7272,13 +7272,10 @@ func_mode_link ()
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
- # -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
- # -fsanitize=* Clang/GCC memory and address sanitizer
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
- -specs=*|-fsanitize=*)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
@@ -7571,10 +7568,7 @@ func_mode_link ()
case $pass in
dlopen) libs=$dlfiles ;;
dlpreopen) libs=$dlprefiles ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test lib,dlpreopen = "$linkmode,$pass"; then
@@ -7893,19 +7887,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
elif test prog != "$linkmode" && test lib != "$linkmode"; then
func_fatal_error "'$lib' is not a convenience library"
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
continue
fi # $pass = conv
@@ -8829,9 +8823,6 @@ func_mode_link ()
revision=$number_minor
lt_irix_increment=no
;;
- *)
- func_fatal_configuration "$modename: unknown library version type '$version_type'"
- ;;
esac
;;
no)
diff --git a/build/Makefile.in b/build/Makefile.in
index c687e22..90cb58f 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -353,7 +353,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
index 75a6a65..09f061c 100644
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -353,7 +353,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/build/win32/gi-tests-msvc.mak b/build/win32/gi-tests-msvc.mak
index ba25a00..5b26c00 100644
--- a/build/win32/gi-tests-msvc.mak
+++ b/build/win32/gi-tests-msvc.mak
@@ -20,7 +20,7 @@ LDFLAGS = /link $(LDFLAGS_ARCH) $(BASE_GLIB_LIBS) /DEBUG /opt:noref
LDFLAGS_DLL = /link $(LDFLAGS_ARCH) /DLL /out:$@ /implib:$*-$(GI_APIVERSION).lib $(BASE_GLIB_LIBS) /DEBUG /opt:noref
# Special CFLAGS for Regress test
-REGRESS_CFLAGS = -DREGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f" -DREGRESS_SOME_CHAR='c'
+REGRESS_CFLAGS = /I$(PREFIX)\include\cairo /DREGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f" /DREGRESS_SOME_CHAR='c'
# The test .gir's for G-I that are built
built_test_girs = \
diff --git a/build/win32/gipc.py b/build/win32/gipc.py
index 281f07f..9fd066c 100644
--- a/build/win32/gipc.py
+++ b/build/win32/gipc.py
@@ -38,5 +38,64 @@ def main(argv):
base_pc.srcdir + '/gobject-introspection-no-export-1.0.pc',
pkg_replace_items)
+ # Generate a generic .pc file for Cairo, that is just sufficient for our purposes
+ cairo_version = '1.14.6' # Use the latest stable version, for now.
+ cairo_pc = open(base_pc.srcdir + '/cairo.pc', 'w')
+ cairo_pc.write('prefix=' + base_pc.prefix + '\n')
+ cairo_pc.write('exec_prefix=${prefix}\n')
+ cairo_pc.write('libdir=${prefix}/lib\n')
+ cairo_pc.write('includedir=${prefix}/include\n\n')
+ cairo_pc.write('Name: cairo\n')
+ cairo_pc.write('Description: generic cairo pkg-config file\n')
+ cairo_pc.write('Version: ' + cairo_version + '\n\n')
+ cairo_pc.write('Requires.private:\n')
+ cairo_pc.write('Libs: -L${libdir} -lcairo\n')
+ cairo_pc.write('Libs.private:\n')
+ cairo_pc.write('Cflags: -I${includedir}\n')
+ cairo_pc.close()
+
+ # Generate a generic .pc file for Cairo-Win32, that is just sufficient for our
+ # purposes
+ # Just make a copy of the cairo.pc we just generated and replace the items as needed
+ cairo_win32_replace_items = \
+ {'generic cairo pkg-config file': 'generic cairo-win32 pkg-config file'}
+ replace_multi(base_pc.srcdir + '/cairo.pc',
+ base_pc.srcdir + '/cairo-win32.pc',
+ cairo_win32_replace_items)
+
+ # Generate a generic .pc file for Cairo-GObject, that is just sufficient for our
+ # purposes
+ # Just make a copy of the cairo.pc we just generated and replace the items as needed
+ cairo_gobject_replace_items = \
+ {'Requires.private:': 'Requires.private: gobject-2.0,glib-2.0',
+ 'generic cairo pkg-config file': 'generic cairo-gobject pkg-config file',
+ '-lcairo': '-lcairo-gobject'}
+ replace_multi(base_pc.srcdir + '/cairo.pc',
+ base_pc.srcdir + '/cairo-gobject.pc',
+ cairo_gobject_replace_items)
+
+ # Generate a generic .pc file for libxml2, that is just sufficient for our purposes
+ libxml2_version = '2.9.3' # Use the latest stable version, for now.
+ libxml2_replace_items = \
+ {'Name: cairo': 'Name: libXML',
+ 'Version: ' + cairo_version: 'Version: ' + libxml2_version,
+ 'generic cairo pkg-config file': 'generic libXML2 pkg-config file',
+ '-lcairo': '-llibxml2',
+ 'Cflags: -I${includedir}': 'Cflags: -I${includedir}/libxml2'}
+ replace_multi(base_pc.srcdir + '/cairo.pc',
+ base_pc.srcdir + '/libxml-2.0.pc',
+ libxml2_replace_items)
+
+ # Generate a generic .pc file for freetype2, that is just sufficient for our purposes
+ ft2_version = '2.6.3' # Use the latest stable version, for now.
+ ft2_replace_items = \
+ {'Name: cairo': 'Name: FreeType 2',
+ 'Version: ' + cairo_version: 'Version: ' + ft2_version,
+ 'generic cairo pkg-config file': 'generic FreeType2 pkg-config file',
+ '-lcairo': '-lfreetype'}
+ replace_multi(base_pc.srcdir + '/cairo.pc',
+ base_pc.srcdir + '/freetype2.pc',
+ ft2_replace_items)
+
if __name__ == '__main__':
sys.exit(main(sys.argv))
diff --git a/build/win32/introspection-msvc.mak b/build/win32/introspection-msvc.mak
index f6fff49..8739844 100644
--- a/build/win32/introspection-msvc.mak
+++ b/build/win32/introspection-msvc.mak
@@ -37,6 +37,11 @@ PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig;$(PKG_CONFIG_PATH)
PYTHON=python
!endif
+# Path to the pkg-config tool, if not already in the PATH
+!if "$(PKG_CONFIG)" == ""
+PKG_CONFIG=pkg-config
+!endif
+
# Don't change anything following this line!
GIR_SUBDIR = share\gir-1.0
@@ -56,7 +61,7 @@ ERROR_MSG =
BUILD_INTROSPECTION = TRUE
!if ![set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)] \
- && ![pkg-config --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x] \
+ && ![$(PKG_CONFIG) --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x] \
&& ![setlocal] \
&& ![set file="pkgconfig.x"] \
&& ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize] \
diff --git a/build/win32/pc_base.py b/build/win32/pc_base.py
index 80f9884..587ba83 100644
--- a/build/win32/pc_base.py
+++ b/build/win32/pc_base.py
@@ -26,17 +26,18 @@ class BasePCItems:
self.top_srcdir = self.srcdir + '\\..\\..'
self.version = ''
- def setup(self, argv):
- parser = argparse.ArgumentParser(description='Setup basic .pc file info')
+ def setup(self, argv, parser=None):
+ if parser is None:
+ parser = argparse.ArgumentParser(description='Setup basic .pc file info')
parser.add_argument('--prefix', help='prefix of the installed library',
required=True)
- parser.add_argument('--exec-prefix',
+ parser.add_argument('--exec-prefix',
help='prefix of the installed programs, \
if different from the prefix')
- parser.add_argument('--includedir',
+ parser.add_argument('--includedir',
help='includedir of the installed library, \
if different from ${prefix}/include')
- parser.add_argument('--libdir',
+ parser.add_argument('--libdir',
help='libdir of the installed library, \
if different from ${prefix}/lib')
parser.add_argument('--version', help='Version of the package',
@@ -49,15 +50,27 @@ class BasePCItems:
if not os.path.exists(args.prefix):
raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix)
+ # use absolute paths for prefix
+ self.prefix = os.path.abspath(args.prefix).replace('\\','/')
+
# check and setup the exec_prefix
if getattr(args, 'exec_prefix', None) is None:
- input_exec_prefix = args.prefix
+ exec_prefix_use_shorthand = True
+ self.exec_prefix = '${prefix}'
else:
- input_exec_prefix = args.exec_prefix
- if not os.path.exists(input_exec_prefix):
- raise SystemExit('Specified exec-prefix \'%s\' is invalid' %
- input_exec_prefix)
-
+ if args.exec_prefix.startswith('${prefix}'):
+ exec_prefix_use_shorthand = True
+ input_exec_prefix = args.prefix + args.exec_prefix[len('${prefix}'):]
+ else:
+ exec_prefix_use_shorthand = False
+ input_exec_prefix = args.exec_prefix
+ if not os.path.exists(input_exec_prefix):
+ raise SystemExit('Specified exec_prefix \'%s\' is invalid' %
+ args.exec_prefix)
+ if exec_prefix_use_shorthand is True:
+ self.exec_prefix = args.exec_prefix.replace('\\','/')
+ else:
+ self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/')
# check and setup the includedir
if getattr(args, 'includedir', None) is None:
@@ -67,8 +80,12 @@ class BasePCItems:
includedir_use_shorthand = True
input_includedir = args.prefix + args.includedir[len('${prefix}'):]
else:
- includedir_use_shorthand = False
- input_includedir = args.includedir
+ if args.includedir.startswith('${exec_prefix}'):
+ includedir_use_shorthand = True
+ input_includedir = input_exec_prefix + args.includedir[len('${exec_prefix}'):]
+ else:
+ includedir_use_shorthand = False
+ input_includedir = args.includedir
if not os.path.exists(input_includedir):
raise SystemExit('Specified includedir \'%s\' is invalid' %
args.includedir)
@@ -85,8 +102,12 @@ class BasePCItems:
libdir_use_shorthand = True
input_libdir = args.prefix + args.libdir[len('${prefix}'):]
else:
- libdir_use_shorthand = False
- input_libdir = args.libdir
+ if args.libdir.startswith('${exec_prefix}'):
+ libdir_use_shorthand = True
+ input_libdir = input_exec_prefix + args.libdir[len('${exec_prefix}'):]
+ else:
+ libdir_use_shorthand = False
+ input_libdir = args.libdir
if not os.path.exists(input_libdir):
raise SystemExit('Specified libdir \'%s\' is invalid' %
args.libdir)
@@ -95,10 +116,6 @@ class BasePCItems:
else:
self.libdir = os.path.abspath(input_libdir).replace('\\','/')
- # use absolute paths for prefix and exec_prefix
- self.prefix = os.path.abspath(args.prefix).replace('\\','/')
- self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/')
-
# setup dictionary for replacing items in *.pc.in
self.base_replace_items.update({'@VERSION@': self.version})
self.base_replace_items.update({'@prefix@': self.prefix})
diff --git a/build/win32/vs10/Makefile.in b/build/win32/vs10/Makefile.in
index 88dcdf2..63794f0 100644
--- a/build/win32/vs10/Makefile.in
+++ b/build/win32/vs10/Makefile.in
@@ -294,7 +294,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/build/win32/vs10/gi-install.props b/build/win32/vs10/gi-install.props
index ef39814..66c3826 100644
--- a/build/win32/vs10/gi-install.props
+++ b/build/win32/vs10/gi-install.props
@@ -160,8 +160,13 @@ copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
mkdir $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-win32.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-gobject.pc $(CopyDir)\lib\pkgconfig
+copy ..\libxml-2.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\freetype2.pc $(CopyDir)\lib\pkgconfig
- ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc
+ ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc
$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)
$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)
diff --git a/build/win32/vs10/gi-install.propsin b/build/win32/vs10/gi-install.propsin
index 1b11298..a8b53f9 100644
--- a/build/win32/vs10/gi-install.propsin
+++ b/build/win32/vs10/gi-install.propsin
@@ -73,8 +73,13 @@ copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
mkdir $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-win32.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-gobject.pc $(CopyDir)\lib\pkgconfig
+copy ..\libxml-2.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\freetype2.pc $(CopyDir)\lib\pkgconfig
- ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc
+ ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc
$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)
$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)
diff --git a/build/win32/vs10/gi-version-paths.props b/build/win32/vs10/gi-version-paths.props
index 69a101b..b41ac1c 100644
--- a/build/win32/vs10/gi-version-paths.props
+++ b/build/win32/vs10/gi-version-paths.props
@@ -10,7 +10,7 @@
$(PythonDir).x64
PYTHON=$(PythonDir)\python.exe
PYTHON=$(PythonDirX64)\python.exe
- 1.48.0
+ 1.49.1
$(SolutionDir)\..\..\..
1.0
$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)
diff --git a/build/win32/vs11/Makefile.in b/build/win32/vs11/Makefile.in
index 41015fc..6b1e1fa 100644
--- a/build/win32/vs11/Makefile.in
+++ b/build/win32/vs11/Makefile.in
@@ -309,7 +309,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/build/win32/vs11/gi-install.props b/build/win32/vs11/gi-install.props
index ef39814..66c3826 100644
--- a/build/win32/vs11/gi-install.props
+++ b/build/win32/vs11/gi-install.props
@@ -160,8 +160,13 @@ copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
mkdir $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-win32.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-gobject.pc $(CopyDir)\lib\pkgconfig
+copy ..\libxml-2.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\freetype2.pc $(CopyDir)\lib\pkgconfig
- ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc
+ ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc
$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)
$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)
diff --git a/build/win32/vs11/gi-version-paths.props b/build/win32/vs11/gi-version-paths.props
index a725ceb..ee5c885 100644
--- a/build/win32/vs11/gi-version-paths.props
+++ b/build/win32/vs11/gi-version-paths.props
@@ -10,7 +10,7 @@
$(PythonDir).x64
PYTHON=$(PythonDir)\python.exe
PYTHON=$(PythonDirX64)\python.exe
- 1.48.0
+ 1.49.1
$(SolutionDir)\..\..\..
1.0
$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)
diff --git a/build/win32/vs12/Makefile.in b/build/win32/vs12/Makefile.in
index 2e865a8..4da4292 100644
--- a/build/win32/vs12/Makefile.in
+++ b/build/win32/vs12/Makefile.in
@@ -309,7 +309,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/build/win32/vs12/gi-install.props b/build/win32/vs12/gi-install.props
index ef39814..66c3826 100644
--- a/build/win32/vs12/gi-install.props
+++ b/build/win32/vs12/gi-install.props
@@ -160,8 +160,13 @@ copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
mkdir $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-win32.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-gobject.pc $(CopyDir)\lib\pkgconfig
+copy ..\libxml-2.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\freetype2.pc $(CopyDir)\lib\pkgconfig
- ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc
+ ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc
$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)
$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)
diff --git a/build/win32/vs12/gi-version-paths.props b/build/win32/vs12/gi-version-paths.props
index 977d97e..702885f 100644
--- a/build/win32/vs12/gi-version-paths.props
+++ b/build/win32/vs12/gi-version-paths.props
@@ -10,7 +10,7 @@
$(PythonDir).x64
PYTHON=$(PythonDir)\python.exe
PYTHON=$(PythonDirX64)\python.exe
- 1.48.0
+ 1.49.1
$(SolutionDir)\..\..\..
1.0
$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)
diff --git a/build/win32/vs14/Makefile.in b/build/win32/vs14/Makefile.in
index df6fa0a..bd3a7d5 100644
--- a/build/win32/vs14/Makefile.in
+++ b/build/win32/vs14/Makefile.in
@@ -309,7 +309,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/build/win32/vs14/gi-install.props b/build/win32/vs14/gi-install.props
index ef39814..66c3826 100644
--- a/build/win32/vs14/gi-install.props
+++ b/build/win32/vs14/gi-install.props
@@ -160,8 +160,13 @@ copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
mkdir $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-win32.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-gobject.pc $(CopyDir)\lib\pkgconfig
+copy ..\libxml-2.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\freetype2.pc $(CopyDir)\lib\pkgconfig
- ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc
+ ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc
$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)
$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)
diff --git a/build/win32/vs14/gi-version-paths.props b/build/win32/vs14/gi-version-paths.props
index 938ea65..20cea15 100644
--- a/build/win32/vs14/gi-version-paths.props
+++ b/build/win32/vs14/gi-version-paths.props
@@ -10,7 +10,7 @@
$(PythonDir).x64
PYTHON=$(PythonDir)\python.exe
PYTHON=$(PythonDirX64)\python.exe
- 1.48.0
+ 1.49.1
$(SolutionDir)\..\..\..
1.0
$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)
diff --git a/build/win32/vs9/Makefile.in b/build/win32/vs9/Makefile.in
index a5c4729..ee78e10 100644
--- a/build/win32/vs9/Makefile.in
+++ b/build/win32/vs9/Makefile.in
@@ -294,7 +294,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/build/win32/vs9/gi-install.vcproj b/build/win32/vs9/gi-install.vcproj
index 212bf54..5fd191c 100644
--- a/build/win32/vs9/gi-install.vcproj
+++ b/build/win32/vs9/gi-install.vcproj
@@ -86,7 +86,7 @@
Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GIGenPC)"
- Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
+ Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc"
/>
@@ -94,7 +94,7 @@
Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GIGenPC)"
- Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
+ Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc"
/>
@@ -102,7 +102,7 @@
Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GIGenPCX64)"
- Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
+ Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc"
/>
@@ -110,7 +110,7 @@
Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GIGenPCX64)"
- Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
+ Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc"
/>
diff --git a/build/win32/vs9/gi-install.vsprops b/build/win32/vs9/gi-install.vsprops
index 39ac7be..d9a324f 100644
--- a/build/win32/vs9/gi-install.vsprops
+++ b/build/win32/vs9/gi-install.vsprops
@@ -162,6 +162,11 @@ copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
mkdir $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-win32.pc $(CopyDir)\lib\pkgconfig
+copy ..\cairo-gobject.pc $(CopyDir)\lib\pkgconfig
+copy ..\libxml-2.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\freetype2.pc $(CopyDir)\lib\pkgconfig
"
/>
.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gobject-introspection'
PACKAGE_TARNAME='gobject-introspection'
-PACKAGE_VERSION='1.48.0'
-PACKAGE_STRING='gobject-introspection 1.48.0'
+PACKAGE_VERSION='1.49.1'
+PACKAGE_STRING='gobject-introspection 1.49.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection'
PACKAGE_URL=''
@@ -817,7 +817,6 @@ infodir
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -933,7 +932,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1186,15 +1184,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1332,7 +1321,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1445,7 +1434,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gobject-introspection 1.48.0 to adapt to many kinds of systems.
+\`configure' configures gobject-introspection 1.49.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1485,7 +1474,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1517,7 +1505,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gobject-introspection 1.48.0:";;
+ short | recursive ) echo "Configuration of gobject-introspection 1.49.1:";;
esac
cat <<\_ACEOF
@@ -1679,7 +1667,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gobject-introspection configure 1.48.0
+gobject-introspection configure 1.49.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2231,7 +2219,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gobject-introspection $as_me 1.48.0, which was
+It was created by gobject-introspection $as_me 1.49.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3099,7 +3087,7 @@ fi
# Define the identity of the package.
PACKAGE='gobject-introspection'
- VERSION='1.48.0'
+ VERSION='1.49.1'
cat >>confdefs.h <<_ACEOF
@@ -3373,7 +3361,7 @@ AM_BACKSLASH='\'
# Used in docs/reference/version.xml
-GI_VERSION=1.48.0
+GI_VERSION=1.49.1
# Check for Win32
@@ -5748,7 +5736,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -9441,9 +9429,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd* | bitrig*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- link_all_deplibs=no
- ;;
esac
ld_shlibs=yes
@@ -9698,7 +9683,7 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -10368,7 +10353,6 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
if test yes = "$lt_cv_irix_exported_symbol"; then
archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
- link_all_deplibs=no
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -10390,7 +10374,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -11485,6 +11469,9 @@ fi
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -11493,7 +11480,7 @@ fi
# appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -11505,18 +11492,6 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -13156,12 +13131,12 @@ if test -n "$GLIB_CFLAGS"; then
pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.48.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.48.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.49.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.49.4") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.48.0" 2>/dev/null`
+ pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.49.4" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13173,12 +13148,12 @@ if test -n "$GLIB_LIBS"; then
pkg_cv_GLIB_LIBS="$GLIB_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.48.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.48.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.49.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.49.4") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.48.0" 2>/dev/null`
+ pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.49.4" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13199,14 +13174,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.48.0" 2>&1`
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.49.4" 2>&1`
else
- GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.48.0" 2>&1`
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.49.4" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (glib-2.0 >= 2.48.0) were not met:
+ as_fn_error $? "Package requirements (glib-2.0 >= 2.49.4) were not met:
$GLIB_PKG_ERRORS
@@ -16046,7 +16021,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gobject-introspection $as_me 1.48.0, which was
+This file was extended by gobject-introspection $as_me 1.49.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16112,7 +16087,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gobject-introspection config.status 1.48.0
+gobject-introspection config.status 1.49.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 6c91fa5..0d837b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
dnl the gi version number
m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 48)
-m4_define(gi_micro_version, 0)
+m4_define(gi_minor_version, 49)
+m4_define(gi_micro_version, 1)
m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
AC_PREREQ([2.63])
@@ -128,7 +128,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
AC_SUBST(GIR_DIR)
AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation])
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.48.0])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.49.4])
PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
PKG_CHECK_MODULES(GIO, [gio-2.0])
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 283da6c..b22ebe8 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -353,7 +353,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in
index 7ff2e29..0a98eb3 100644
--- a/docs/reference/Makefile.in
+++ b/docs/reference/Makefile.in
@@ -300,7 +300,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/docs/reference/html/GIRepository.html b/docs/reference/html/GIRepository.html
index 7715b1f..e0755a7 100644
--- a/docs/reference/html/GIRepository.html
+++ b/docs/reference/html/GIRepository.html
@@ -8,7 +8,7 @@
-
+
@@ -50,7 +50,7 @@
-gchar  **
+gchar  **
g_irepository_get_dependencies  ()
@@ -58,7 +58,7 @@
-gchar  **
+gchar  **
g_irepository_get_immediate_dependencies  ()
@@ -66,7 +66,7 @@
-gchar  **
+gchar  **
g_irepository_get_loaded_namespaces  ()
@@ -74,7 +74,7 @@
-gint
+gint
g_irepository_get_n_infos  ()
@@ -90,7 +90,7 @@
-GOptionGroup  *
+GOptionGroup  *
g_irepository_get_option_group  ()
@@ -98,7 +98,7 @@
-GList  *
+GList  *
g_irepository_enumerate_versions  ()
@@ -122,7 +122,7 @@
-GSList  *
+GSList  *
g_irepository_get_search_path  ()
@@ -136,7 +136,7 @@
-const gchar  *
+ const gchar  *
g_irepository_get_typelib_path  ()
@@ -144,7 +144,7 @@
-gboolean
+gboolean
g_irepository_is_registered  ()
@@ -167,21 +167,21 @@
-const gchar  *
+ const gchar  *
g_irepository_get_c_prefix  ()
-const gchar  *
+ const gchar  *
g_irepository_get_shared_library  ()
-const gchar  *
+ const gchar  *
g_irepository_get_version  ()
@@ -213,7 +213,7 @@
-gboolean
+gboolean
g_irepository_dump  ()
@@ -259,7 +259,7 @@
Object Hierarchy
-
GObject
+ GObject
â°ââ GIRepository
@@ -285,7 +285,7 @@ particular process, but this function is provided in the unlikely
eventuality that it would become possible, and as a convenience for
higher level language bindings to conform to the GObject method
call conventions.
-All methods on GIRepository also accept NULL
as an instance
+
All methods on GIRepository also accept NULL
as an instance
parameter to mean this default repository, which is usually more
convenient for C.
@@ -297,9 +297,9 @@ convenient for C.
g_irepository_get_dependencies ()
-
gchar  **
+gchar  **
g_irepository_get_dependencies (GIRepository *repository
,
- const gchar *namespace_
);
+ const gchar *namespace_
);
Return an array of all (transitive) versioned dependencies for
namespace_
. Returned strings are of the form
@@ -321,7 +321,7 @@ such as
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -343,10 +343,10 @@ dependencies.
g_irepository_get_immediate_dependencies ()
-
gchar  **
+gchar  **
g_irepository_get_immediate_dependencies
(GIRepository *repository
,
- const gchar *namespace_
);
+ const gchar *namespace_
);
Return an array of the immediate versioned dependencies for namespace_
.
Returned strings are of the form namespace-version
.
@@ -367,7 +367,7 @@ such as
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[nullable ]
@@ -390,7 +390,7 @@ dependencies.
g_irepository_get_loaded_namespaces ()
-
gchar  **
+gchar  **
g_irepository_get_loaded_namespaces (GIRepository *repository
);
Return the list of currently loaded namespaces.
@@ -403,7 +403,7 @@ g_irepository_get_loaded_namespaces (
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -418,9 +418,9 @@ process-global default
g_irepository_get_n_infos ()
-gint
+gint
g_irepository_get_n_infos (GIRepository *repository
,
- const gchar *namespace_
);
+ const gchar *namespace_
);
This function returns the number of metadata entries in
given namespace namespace_
. The namespace must have
@@ -436,7 +436,7 @@ already been loaded before calling this function.
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -458,8 +458,8 @@ process-global default g_irepository_get_info ()
GIBaseInfo  *
g_irepository_get_info (GIRepository *repository
,
- const gchar *namespace_
,
- gint index
);
+ const gchar *namespace_
,
+ gint index
);
This function returns a particular metadata entry in the
given namespace namespace_
. The namespace must have
@@ -477,7 +477,7 @@ entries.
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -503,7 +503,7 @@ process-global default
g_irepository_get_option_group ()
-GOptionGroup  *
+GOptionGroup  *
g_irepository_get_option_group (void
);
Obtain the option group for girepository, it's used
by the dumper and for programs that wants to provide
@@ -518,9 +518,9 @@ introspection information
g_irepository_enumerate_versions ()
-
GList  *
+GList  *
g_irepository_enumerate_versions (GIRepository *repository
,
- const gchar *namespace_
);
+ const gchar *namespace_
);
Obtain an unordered list of versions (either currently loaded or
available) for namespace_
in this repository
@@ -536,7 +536,7 @@ available) for namespace_
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -616,14 +616,14 @@ search path.
g_irepository_get_search_path ()
-
GSList  *
+GSList  *
g_irepository_get_search_path (void
);
Returns the current search path GIRepository will use when loading
typelib files. The list is internal to GIRespository and should not
be freed, nor should its string elements.
Returns
-
GSList of strings.
+
GSList of strings.
[element-type filename][transfer none ]
@@ -634,7 +634,7 @@ be freed, nor should its string elements.
g_irepository_load_typelib (GIRepository *repository
,
GITypelib *typelib
,
GIRepositoryLoadFlags flags
,
- GError **error
);
+ GError **error
);
TODO
Parameters
@@ -647,7 +647,7 @@ g_irepository_load_typelib (
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -673,9 +673,9 @@ process-global default
g_irepository_get_typelib_path ()
-const gchar  *
+const gchar  *
g_irepository_get_typelib_path (GIRepository *repository
,
- const gchar *namespace_
);
+ const gchar *namespace_
);
If namespace namespace_
is loaded, return the full path to the
.typelib file it was loaded from. If the typelib for
@@ -693,7 +693,7 @@ the special string "<builtin>".
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -707,16 +707,16 @@ process-global default
Returns
- Filesystem path (or $lt;builtin$gt;) if successful, NULL
if namespace is not loaded
+ Filesystem path (or $lt;builtin$gt;) if successful, NULL
if namespace is not loaded
g_irepository_is_registered ()
-
gboolean
+gboolean
g_irepository_is_registered (GIRepository *repository
,
- const gchar *namespace_
,
- const gchar *version
);
+ const gchar *namespace_
,
+ const gchar *version
);
Check whether a particular namespace (and optionally, a specific
version thereof) is currently loaded. This function is likely to
only be useful in unusual circumstances; in order to act upon
@@ -734,7 +734,7 @@ quickly as this function will if it has already been loaded.
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -745,7 +745,7 @@ process-global default version
- Required version, may be NULL
for latest.
+ Required version, may be NULL
for latest.
[allow-none ]
@@ -753,7 +753,7 @@ process-global default
Returns
-
TRUE
if namespace-version is loaded, FALSE
otherwise
+
TRUE
if namespace-version is loaded, FALSE
otherwise
@@ -761,10 +761,10 @@ process-global default g_irepository_require ()
GITypelib  *
g_irepository_require (GIRepository *repository
,
- const gchar *namespace_
,
- const gchar *version
,
+ const gchar *namespace_
,
+ const gchar *version
,
GIRepositoryLoadFlags flags
,
- GError **error
);
+ GError **error
);
Force the namespace namespace_
to be loaded if it isn't already.
If namespace_
@@ -785,7 +785,7 @@ not specified, the latest will be used.
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -796,7 +796,7 @@ process-global default version
- Version of namespace, may be NULL
for latest.
+ Version of namespace, may be NULL
for latest.
[allow-none ]
@@ -806,7 +806,7 @@ process-global default error
-a GError .
+a GError .
Â
@@ -814,7 +814,7 @@ process-global default
Returns
- a pointer to the GITypelib if successful, NULL
otherwise.
+ a pointer to the GITypelib if successful, NULL
otherwise.
[transfer none ]
@@ -823,11 +823,11 @@ process-global default g_irepository_require_private ()
GITypelib  *
g_irepository_require_private (GIRepository *repository
,
- const gchar *typelib_dir
,
- const gchar *namespace_
,
- const gchar *version
,
+ const gchar *typelib_dir
,
+ const gchar *namespace_
,
+ const gchar *version
,
GIRepositoryLoadFlags flags
,
- GError **error
);
+ GError **error
);
Force the namespace namespace_
to be loaded if it isn't already.
If namespace_
@@ -848,7 +848,7 @@ not specified, the latest will be used.
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -864,7 +864,7 @@ process-global default version
- Version of namespace, may be NULL
for latest.
+ Version of namespace, may be NULL
for latest.
[allow-none ]
@@ -874,7 +874,7 @@ process-global default error
-a GError .
+a GError .
Â
@@ -882,19 +882,19 @@ process-global default
Returns
-
a pointer to the GITypelib if successful, NULL
otherwise.
+
a pointer to the GITypelib if successful, NULL
otherwise.
[transfer none ]
g_irepository_get_c_prefix ()
-
const gchar  *
+const gchar  *
g_irepository_get_c_prefix (GIRepository *repository
,
- const gchar *namespace_
);
+ const gchar *namespace_
);
This function returns the "C prefix", or the C level namespace
associated with the given introspection namespace. Each C symbol
-starts with this prefix, as well each GType in the library.
+starts with this prefix, as well each
GType in the library.
Note: The namespace must have already been loaded using a function
such as g_irepository_require()
before calling this function.
@@ -908,7 +908,7 @@ such as
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -922,20 +922,20 @@ process-global default
Returns
-
C namespace prefix, or NULL
if none associated
+
C namespace prefix, or NULL
if none associated
g_irepository_get_shared_library ()
-
const gchar  *
+const gchar  *
g_irepository_get_shared_library (GIRepository *repository
,
- const gchar *namespace_
);
+ const gchar *namespace_
);
This function returns a comma-separated list of paths to the
shared C libraries associated with the given namespace namespace_
.
There may be no shared library path associated, in which case this
-function will return NULL
.
+function will return
NULL
.
Note: The namespace must have already been loaded using a function
such as g_irepository_require()
before calling this function.
@@ -949,7 +949,7 @@ such as
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -964,15 +964,15 @@ process-global default
Returns
Comma-separated list of paths to shared libraries,
-or NULL
if none are associated
+or
NULL
if none are associated
g_irepository_get_version ()
-
const gchar  *
+const gchar  *
g_irepository_get_version (GIRepository *repository
,
- const gchar *namespace_
);
+ const gchar *namespace_
);
This function returns the loaded version associated with the given
namespace namespace_
.
@@ -989,7 +989,7 @@ such as
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -1011,8 +1011,8 @@ process-global default
g_irepository_find_by_gtype ()
GIBaseInfo  *
g_irepository_find_by_gtype (GIRepository *repository
,
- GType gtype
);
-
Searches all loaded namespaces for a particular GType . Note that
+ GType gtype
);
+
Searches all loaded namespaces for a particular GType . Note that
in order to locate the metadata, the namespace corresponding to
the type must first have been loaded. There is currently no
mechanism for determining the namespace which corresponds to an
@@ -1029,7 +1029,7 @@ when you know the GType to originate from be from a loaded namespace.
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -1044,7 +1044,7 @@ process-global default
Returns
GIBaseInfo representing metadata about type
-, or NULL
.
+, or NULL
.
[transfer full ]
@@ -1053,8 +1053,8 @@ process-global default g_irepository_find_by_error_domain ()
GIEnumInfo  *
g_irepository_find_by_error_domain (GIRepository *repository
,
- GQuark domain
);
-Searches for the enum type corresponding to the given GError
+ GQuark domain
);
+
Searches for the enum type corresponding to the given GError
domain. Before calling this function for a particular namespace,
you must call g_irepository_require()
once to load the namespace, or
otherwise ensure the namespace has already been loaded.
@@ -1069,13 +1069,13 @@ otherwise ensure the namespace has already been loaded.
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
domain
-a GError domain
+a GError domain
Â
@@ -1085,7 +1085,7 @@ process-global default
Returns
GIEnumInfo representing metadata about domain
's
-enum type, or NULL
.
+enum type, or
NULL
.
[transfer full ]
Since: 1.29.17
@@ -1095,8 +1095,8 @@ enum type, or
g_irepository_find_by_name ()
GIBaseInfo  *
g_irepository_find_by_name (GIRepository *repository
,
- const gchar *namespace_
,
- const gchar *name
);
+ const gchar *namespace_
,
+ const gchar *name
);
Searches for a particular entry in a namespace. Before calling
this function for a particular namespace, you must call
g_irepository_require()
once to load the namespace, or otherwise
@@ -1112,7 +1112,7 @@ ensure the namespace has already been loaded.
repository
- A GIRepository or NULL
for the singleton
+
A GIRepository or NULL
for the singleton
process-global default GIRepository .
[allow-none ]
@@ -1132,16 +1132,16 @@ process-global default
Returns
GIBaseInfo representing metadata about name
-, or NULL
.
+, or NULL
.
[transfer full ]
g_irepository_dump ()
-
gboolean
+gboolean
g_irepository_dump (const char *arg
,
- GError **error
);
+ GError **error
);
Argument specified is a comma-separated pair of filenames; i.e. of
the form "input.txt,output.xml". The input file should be a
UTF-8 Unix-line-ending text file, with each line containing either
@@ -1166,7 +1166,7 @@ overwrite its contents.
error
-a GError
+a GError
Â
@@ -1174,19 +1174,19 @@ overwrite its contents.
Returns
-
TRUE
on success, FALSE
on error
+
TRUE
on success, FALSE
on error
gi_cclosure_marshal_generic ()
void
-gi_cclosure_marshal_generic (GClosure *closure
,
- GValue *return_gvalue
,
- guint n_param_values
,
- const GValue *param_values
,
- gpointer invocation_hint
,
- gpointer marshal_data
);
+gi_cclosure_marshal_generic (
GClosure *closure
,
+
GValue *return_gvalue
,
+
guint n_param_values
,
+
const GValue *param_values
,
+
gpointer invocation_hint
,
+
gpointer marshal_data
);
TODO
Parameters
@@ -1268,13 +1268,13 @@ accessed using the provided API.
#define G_IREPOSITORY_ERROR (g_irepository_error_quark ())
Error domain for GIRepository . Errors in this domain will be from the
-GIRepositoryError enumeration. See GError for more information on
+GIRepositoryError enumeration. See GError for more information on
error domains.