diff -Nru dbus-glib-0.100.2/aclocal.m4 dbus-glib-0.102/aclocal.m4 --- dbus-glib-0.100.2/aclocal.m4 2013-02-25 12:20:13.000000000 +0000 +++ dbus-glib-0.102/aclocal.m4 2014-02-12 13:39:23.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, [m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. 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'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) @@ -180,25 +180,22 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.6], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -214,24 +211,22 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.6])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -250,7 +245,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -276,22 +271,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -310,16 +302,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -329,7 +319,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -342,12 +332,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -355,8 +346,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -396,16 +387,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -414,8 +405,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -423,7 +414,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -471,7 +462,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -481,9 +472,13 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -498,20 +493,18 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -524,7 +517,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -536,21 +529,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -568,7 +559,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -576,32 +567,23 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -614,7 +596,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -643,31 +625,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -678,34 +669,78 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -727,15 +762,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -749,16 +781,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -775,20 +805,17 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -799,10 +826,11 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -810,18 +838,14 @@ ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -839,7 +863,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -866,15 +890,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -882,11 +903,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -899,54 +919,22 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -956,7 +944,7 @@ # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -970,24 +958,82 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -998,32 +1044,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# 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 # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1033,31 +1087,50 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) dnl do not support nested variable expansions. dnl See automake bug#9928 and bug#10237. am_make=${MAKE-make} @@ -1075,7 +1148,7 @@ am_cv_make_support_nested_variables=no fi]) if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. + dnl Using '$V' instead of '$(V)' breaks IRIX make. AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else @@ -1092,44 +1165,40 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1143,18 +1212,16 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1164,76 +1231,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -Nru dbus-glib-0.100.2/ChangeLog dbus-glib-0.102/ChangeLog --- dbus-glib-0.100.2/ChangeLog 2013-02-25 12:24:40.000000000 +0000 +++ dbus-glib-0.102/ChangeLog 2014-02-12 13:41:12.000000000 +0000 @@ -1,24 +1,438 @@ +commit 397e8297d433547c9bf4150ddd2b9e0b4c39628c +Author: Simon McVittie +Date: 2014-02-12 13:39:09 +0000 + + update NEWS, release 0.102 + + NEWS | 17 ++++++++++++++--- + configure.ac | 2 +- + 2 files changed, 15 insertions(+), 4 deletions(-) + +commit f53a35e5d20a2c0010718e7bfd863fc09ff9b1a7 +Author: Simon McVittie +Date: 2014-02-12 13:32:29 +0000 + + ignore more Automake droppings + + .gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit ee0f90d5d619ef53f30edbbeb19c7b6a5055a84b +Author: Simon McVittie +Date: 2014-01-14 11:22:34 +0000 + + dbus-binding-tool: check for valid interface, member and property + names + + Properties are currently allowed to be arbitrary UTF-8 since this + matches + dbus-glib's runtime behaviour, although ideally new interfaces should + use the more restrictive member naming rules (leading to names like + MyProperty) for interop with QtDBus. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=7909 + Reviewed-by: Cosimo Alfarano + + dbus/dbus-gidl.c | 11 +++++++++++ + dbus/dbus-gparser.c | 36 +++++++++++++++++++++++++++++++++++- + 2 files changed, 46 insertions(+), 1 deletion(-) + +commit f1311ce39c6bcab1e25de20eb684bb78cce56e59 +Author: Xavier Claessens +Date: 2013-11-19 16:41:50 -0500 + + dbus_g_value_build_g_variant(): Fix NULL string case + + g_variant_new_string(NULL) is not accepted. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71811 + Reviewed-by: Simon McVittie + + dbus/dbus-gtype-specialized.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit e0edaf682056f487b315c3d8236a06ac8c156b8d +Author: Xavier Claessens +Date: 2013-11-19 16:16:33 -0500 + + dbus_g_value_build_g_variant(): Fix NULL strv case + + g_variant_new_strv(NULL, -1) is not accepted, but (NULL, 0) is good. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71811 + Reviewed-by: Simon McVittie + + dbus/dbus-gtype-specialized.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 2b1b3c4f6c271a64f6767c2cbd9f5713d0bdedaf +Author: Simon McVittie +Date: 2012-12-04 18:13:10 +0000 + + Fix yet another leak, this one caused by poor documentation (#29195) + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/core/error-mapping.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit b78ab1e3f845ae075afe8880c96568506135506c +Author: Simon McVittie +Date: 2011-09-22 13:51:13 +0100 + + Add a list of Valgrind suppressions for false-positives + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + tools/dbus-glib-tests.supp | 64 ++++++++++ + tools/dbus-glib.supp | 297 + +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 361 insertions(+) + +commit 30a03399929cf943449968d537499c63019d36b3 +Author: Simon McVittie +Date: 2012-12-04 17:56:24 +0000 + + Add infrastructure for running tests under valgrind + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + Makefile.am | 3 +++ + test/Makefile.am | 4 ++++ + test/core/Makefile.am | 16 ++++++++++++++++ + test/interfaces/Makefile.am | 16 ++++++++++++++++ + 4 files changed, 39 insertions(+) + +commit 45869f2d43de75c3fef4b3f5978f096296797257 +Author: Simon McVittie +Date: 2011-09-22 19:06:29 +0100 + + test-dbus-glib: free numerous leaked objects, and clean up more + thoroughly + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/core/test-dbus-glib.c | 30 ++++++++++++++++++++++++++---- + 1 file changed, 26 insertions(+), 4 deletions(-) + +commit 27b65f054da59f2ce660af6b1c3ecdc2647c07bd +Author: Simon McVittie +Date: 2011-09-22 19:04:23 +0100 + + Separate the test for shared-bus equivalence into its own binary + + When valgrinding tests it's useful to avoid using the shared bus, + which + cannot be closed. Move all the essential shared-bus use into a + test which + can be treated specially. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + .gitignore | 1 + + test/core/Makefile.am | 6 +- + test/core/run-test.sh | 1 + + test/core/shared-bus.c | 135 + +++++++++++++++++++++++++++++++++++++++++++++ + test/core/test-dbus-glib.c | 5 -- + 5 files changed, 142 insertions(+), 6 deletions(-) + +commit f3538c4210447c572aa82cb2eb0305ef7f70b2b3 +Author: Simon McVittie +Date: 2011-09-22 18:32:35 +0100 + + test-types: use a private bus, and close it afterwards + + This frees more of the memory. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/core/test-types.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 72e865d96b266cc8c9c0586fff2a36382b23d7ec +Author: Simon McVittie +Date: 2011-09-22 18:32:09 +0100 + + registrations test: run the connections to completion and call + dbus_shutdown + + This frees more of the memory. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/core/registrations.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 48e799e7184722047c4944ab16dc37751cc89227 +Author: Simon McVittie +Date: 2011-09-22 18:31:40 +0100 + + 30574 test: use a private bus so we can free it more thoroughly + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/core/30574.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit ce8f21c62064a3ccd3bfd2d01444e017312ab1d3 +Author: Simon McVittie +Date: 2011-09-22 18:31:12 +0100 + + test-variant-recursion: use a private bus so we can free it more + thoroughly + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/core/test-variant-recursion.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit 021d157ba43702b05973cbd96fafcf6ec3b96ece +Author: Simon McVittie +Date: 2011-09-22 18:29:27 +0100 + + test-variant-recursion: free our GValues and the output string + correctly + + Previously, if we'd freed the GValues, it would have crashed, because + g_value_take_boxed on a value of type G_TYPE_VALUE requires that + the inner + GValue was g_malloc'd individually, but we were allocating them as a + block. This only "worked" because *none* of them were freed... + + The returned string was also leaked; free it too, but only on success. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/core/test-variant-recursion.c | 45 + ++++++++++++++++++++++---------------- + 1 file changed, 26 insertions(+), 19 deletions(-) + +commit 8f7fbad772460e1ec9509de481bd572a7a9233d0 +Author: Simon McVittie +Date: 2011-09-22 18:25:37 +0100 + + registrations test: bin some unused variables + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/core/registrations.c | 3 --- + 1 file changed, 3 deletions(-) + +commit dacf9d5d09b104469c1b30c6efd4107d03ce79bc +Author: Simon McVittie +Date: 2011-09-22 13:50:40 +0100 + + interfaces test: don't call an undefined function on failure, just + use set -e + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/interfaces/run-test.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 79d817e8c11f9dd45f83da30f864f31641e05ac0 +Author: Simon McVittie +Date: 2011-09-22 13:50:11 +0100 + + test-client: wait for disconnection, to get more state freed + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/interfaces/test-client.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit 230751f4e63a65294739087ea994bafb320ca3f6 +Author: Simon McVittie +Date: 2011-09-22 13:49:05 +0100 + + test-client: don't leak NodeInfo and one proxy + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/interfaces/test-client.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 15afdc4c10720c31a4142db66845e806244310a8 +Author: Simon McVittie +Date: 2011-05-12 12:41:05 +0100 + + 30574 test: don't leak two messages and a pending call per run + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 + Signed-off-by: Simon McVittie + + test/core/30574.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit f210a9025fb17b91902b3815411f26eaad4597e7 +Author: Simon McVittie +Date: 2013-02-15 12:00:41 +0000 + + Add a regression test for CVE-2013-0292 + + Inspired by Sebastian Krahmer's 'darklena.c', which used + this bug to exploit pam_fprintd. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68603 + Signed-off-by: Simon McVittie + + test/core/Makefile.am | 4 + + test/core/proxy-noc.c | 264 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 268 insertions(+) + +commit d5e48a022b7da2d073df22775f8aeab98a82f693 +Author: Simon McVittie +Date: 2013-02-18 13:46:23 +0000 + + Update HACKING for current status + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68602 + Signed-off-by: Simon McVittie + + HACKING | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit e1f1926c6b67726206c4c199781831e82553aae9 +Author: Simon McVittie +Date: 2013-10-21 12:24:52 +0100 + + Bring back NEWS + + I'm the only one who does dbus-glib releases these days, and I find it + easier to track changes as we go along than to construct a change + list during the release process. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68602 + Signed-off-by: Simon McVittie + + NEWS | 372 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 368 insertions(+), 4 deletions(-) + +commit f1fc0540d861c7fad17a7d9917db7ff1ddedaa46 +Author: Simon McVittie +Date: 2013-02-18 11:35:47 +0000 + + README: replace with a deprecation warning + + Most of the README was really about libdbus anyway. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68602 + Signed-off-by: Simon McVittie + + README | 33 +++++---------------------------- + 1 file changed, 5 insertions(+), 28 deletions(-) + +commit 725105b4534e90db01adc7cddc88420a419333fd +Author: Simon McVittie +Date: 2013-08-27 13:16:51 +0100 + + Avoid underlinking internal library libdbus-gtool.la + + Anything that links libdbus-gtool needs to pull in GLib/GObject, + and the order matters (things that libdbus-gtool depends on must + appear after libdbus-gtool itself). libtool understands this, but + only if you tell it the full dependencies. + + This broke compilation of test-dbus-glib.exe when cross-compiling + for 32-bit Windows with mingw-w64 (GNU tuple: i686-w64-mingw32). + + The linking order used here for dependencies is "lowest in the stack + first", as recommended by the GStreamer documentation. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68601 + Signed-off-by: Simon McVittie + + dbus/Makefile.am | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit a466946c5ef882ff4710c624b2f33b3ff81a5ea9 +Author: Simon McVittie +Date: 2013-08-27 12:23:00 +0100 + + tests: fix under-linking + + The test for errors uses dbus_set_error() so it should link -ldbus-1. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68601 + Signed-off-by: Simon McVittie + + test/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 9cd58adf12ec11069947032c01e8d12fde9d34fd +Merge: 75c61e7 02b44f8 +Author: Simon McVittie +Date: 2013-02-25 12:56:34 +0000 + + Merge tag 'dbus-glib_0.100.2' + + dbus-glib_0.100.2 + + Conflicts: + configure.ac + +commit 75c61e7d357fac288d4591d32536d395f50ad8bc +Author: Marko Lindqvist +Date: 2013-02-25 12:40:11 +0000 + + use AC_CONFIG_HEADERS, not AM_CONFIG_HEADER + + Automake-1.13 removed long obsolete AM_CONFIG_HEADER completely + and + errors out upon seeing it. + + [commit message added -smcv] + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59003 + Reviewed-by: Simon McVittie + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 02b44f8427ea48463d7b9f2a9f7099be7643b60d Author: Simon McVittie -Date: 2013-02-25 12:24:35 +0000 +Date: 2013-02-25 12:24:35 +0000 0.102: respin tarball - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +commit f2d10073a23987c9eef3a6384faa0f7813108936 +Merge: ee85b07 78f3e95 +Author: Simon McVittie +Date: 2013-02-15 17:13:33 +0000 + + Merge tag 'dbus-glib_0.100.1' + commit 78f3e953e4a05a1126874dd2ca6cec5777a15b3b Author: Simon McVittie -Date: 2013-02-15 12:37:04 +0000 +Date: 2013-02-15 12:37:04 +0000 0.100.1 point release - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 166978a09cf5edff4028e670b6074215a4c75eca Author: Colin Walters -Date: 2013-02-14 10:19:34 -0500 +Date: 2013-02-14 10:19:34 -0500 CVE-2013-0292: dbus-gproxy: Verify sender of NameOwnerChanged signals to be o.f.DBus @@ -39,30 +453,414 @@ Signed-off-by: Simon McVittie Reviewed-by: Simon McVittie - dbus/dbus-gproxy.c | 7 ++++--- + dbus/dbus-gproxy.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) +commit ee85b071fb51efb9f9a48d4a658cbefefd14544a +Author: Simon McVittie +Date: 2011-04-20 16:15:20 +0100 + + Add a feature test for fd.o #23633, non-default main context + + [rebased and added to run-test.sh -dbcw] + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=23633 + + .gitignore | 1 + + test/core/Makefile.am | 7 ++ + test/core/private.c | 268 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + test/core/run-test.sh | 1 + + 4 files changed, 277 insertions(+) + +commit a90fe0f1d742579b6bcc07980551969c556c184b +Author: Simon McVittie +Date: 2012-11-19 16:12:32 +0000 + + test-profile: exit a bit more gracefully + + We close the connection to ourselves, resulting in libdbus shooting us + in the head unless we ask it not to. Nice to see how thoroughly this + code has been tested... + + For future reference, it can be tested like this: + + DBUS_TOP_BUILDDIR=$(pwd) ./test/core/run-test.sh profile + + (or substitute the real absolute top build directory, if out-of-tree). + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Signed-off-by: Simon McVittie + Reviewed-by: Dan Williams + + test/core/test-profile.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit fac9b965fb65352641521d380b1428702015012b +Author: Simon McVittie +Date: 2012-11-19 16:09:14 +0000 + + test-profile: actually initialize GLib, if required + + It's alarming how often the phrase "I'm amazed this ever worked" comes + up while maintaining dbus-glib. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Signed-off-by: Simon McVittie + Reviewed-by: Dan Williams + + test/core/test-profile.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit e4a163431f2cd26959c9f46e573fc200c5b9fd3d +Author: Simon McVittie +Date: 2012-11-19 15:55:53 +0000 + + Remove check for abstract sockets, not relevant to dbus-glib + + test-profile.c was its only use, and all it was used for was to listen + on an abstract or path-based socket, matching what D-Bus would do, + when obtaining comparative performance figures for D-Bus vs. + plain Unix sockets. + + test-profile.c isn't normally run, only works on Unix, and + the check for abstract sockets was broken on current glibc (fd.o + #29895), + leading to us using the non-abstract code path anyway, so this clearly + wasn't very important. I'm tempted to delete test-profile.c entirely, + but until then, let's just make it use path-based sockets. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Signed-off-by: Simon McVittie + Reviewed-by: Dan Williams + + Android.mk | 1 - + configure.ac | 67 + ------------------------------------------------ + test/core/test-profile.c | 20 +-------------- + 3 files changed, 1 insertion(+), 87 deletions(-) + +commit bed0713c0a67b7bd558285b748ff212a3dfdd003 +Author: Dan Williams +Date: 2012-10-07 10:55:50 -0500 + + Add DBusGMethodInvocation accessor for the DBusGConnection + + If you're using two connections, say a shared connection and a private + connection that uses DBusServer, there's no way to figure out which + DBusConnection a method invocation originates from, and thus no way + to do access control based on that. + + Private bus setup done with eg: + + void new_conn_func(DBusServer *s, DBusConnection *conn, gpointer + to_export) + { + DBusGConnection *gconn; + + /* set access control, eg with + dbus_connection_set_unix_user_function() */ + dbus_connection_setup_with_g_main(conn, NULL); + + gconn = dbus_connection_get_g_connection(conn); + dbus_g_connection_register_object(gconn, "/foo", G_OBJECT + (to_export)); + } + + void start_server(GObject *to_export) + { + DBusServer *s; + + s = dbus_server_listen("unix:path=/var/foo", NULL); + dbus_server_setup_with_g_main (s, NULL); + dbus_server_set_new_connection_function (s, new_conn_func, + to_export); + } + + Reviewed-by: Simon McVittie + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55729 + + dbus/dbus-glib.h | 2 ++ + dbus/dbus-gobject.c | 16 ++++++++++++++++ + 2 files changed, 18 insertions(+) + +commit f9056cf5fe5ce67ad0b530c9af1977860231dde2 +Author: Dan Williams +Date: 2012-10-07 11:09:10 -0500 + + Add dbus_g_connection_open_private() for private D-Bus sockets + + Like dbus_g_connection_open() but for private bus sockets, calling + dbus_connection_open_private() and ensuring the dbus-glib types are + initialized. + + Reviewed-by: Simon McVittie + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55730 + + dbus/dbus-glib.h | 3 +++ + dbus/dbus-gmain.c | 43 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 46 insertions(+) + +commit 2e1ba392a29107c9bf9413113aff7b98a963da21 +Author: Simon McVittie +Date: 2011-06-20 12:36:36 +0100 + + Remove declaration of _dbus_gutils_test, which does not exist + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + dbus/dbus-gtest.h | 1 - + 1 file changed, 1 deletion(-) + +commit 107bc996d95f0068f7c6144c713819aa1b77c203 +Author: Simon McVittie +Date: 2011-11-03 12:36:04 +0000 + + Flatten _dbus_gmain_test into _dbus_gvalue_test + + It actually only tests _dbus_gtype_from_signature and related things, + and has nothing to do with main loop integration. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + dbus/dbus-gmain.c | 42 ------------------------------------------ + dbus/dbus-gtest.c | 4 ---- + dbus/dbus-gtest.h | 1 - + dbus/dbus-gvalue.c | 27 +++++++++++++++++++++++++++ + 4 files changed, 27 insertions(+), 47 deletions(-) + +commit fc3d2bffd9cbac6002c5aa8c6369129e51dfcf6e +Author: Simon McVittie +Date: 2011-06-20 12:28:38 +0100 + + Move _dbus_gvalue_utils_test into a separate binary, it only uses + public API + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + .gitignore | 1 + + dbus/dbus-gtest.c | 4 - + dbus/dbus-gtest.h | 1 - + dbus/dbus-gvalue-utils.c | 394 -------------------------------------- + test/Makefile.am | 2 + + test/specialized-types.c | 489 + +++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 492 insertions(+), 399 deletions(-) + +commit 2a339b850872094d6ebf3c42c6704105ce96a10d +Author: Simon McVittie +Date: 2011-06-20 11:44:37 +0100 + + _dbus_gvalue_utils_test: don't call private API + + dbus_g_type_specialized_init should be, and is, sufficient. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + dbus/dbus-gvalue-utils.c | 1 - + 1 file changed, 1 deletion(-) + +commit 0ae4c0d0c3acc63bdf97dde0c29625ff03889856 +Author: Simon McVittie +Date: 2011-06-20 11:42:36 +0100 + + Use more modern assertions in errors test + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + test/errors.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 18a6eb96849b1931f478bfba0823f0c5a7d24fbe +Author: Simon McVittie +Date: 2011-11-03 12:22:43 +0000 + + Turn _dbus_glib_test into a standalone test case, since it only + tests public API + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + .gitignore | 1 + + dbus/dbus-glib.c | 29 -------------------- + dbus/dbus-gtest.c | 4 --- + dbus/dbus-gtest.h | 1 - + test/Makefile.am | 37 +++++++++++++++++++++----- + test/errors.c | 79 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 111 insertions(+), 40 deletions(-) + +commit 82c724ab629d7aaea7f7461c375407ac41c0c09a +Author: Simon McVittie +Date: 2011-06-20 11:29:50 +0100 + + Remove --with-socket-dir, use /tmp for its only use + + test-profile.c is not run by default anyway, and it hard-codes the + use of Unix + sockets which isn't portable off Unix. If you have Unix sockets + but not + /tmp, then your platform has worse problems than inability to run + all dbus-glib tests. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + configure.ac | 9 --------- + test/core/test-profile.c | 3 +-- + 2 files changed, 1 insertion(+), 11 deletions(-) + +commit 61081c7ed819a844e26837688347182721922d57 +Author: Simon McVittie +Date: 2011-06-20 11:25:49 +0100 + + Move AC_ARG_ENABLE for checks/assertions closer to where it takes + effect + + The command line is parsed early on anyway. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + configure.ac | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit 8459facc2c5d7f36849b93e40df81a415f5c40b8 +Author: Simon McVittie +Date: 2011-06-20 11:23:20 +0100 + + Remove remnants of DBUS_DISABLE_CHECKS + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +commit aaddc6c50d961a78e63145a1f40ada28a0fe5109 +Author: Simon McVittie +Date: 2011-06-20 11:22:41 +0100 + + Remove remnants of DBUS_DISABLE_ASSERT + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + configure.ac | 1 - + test/core/test-profile.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit 39a1c14556d4f89ae9bd1d63155ee622afe89bfb +Author: Simon McVittie +Date: 2011-06-20 11:21:36 +0100 + + Remove unused support for "verbose mode" + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + configure.ac | 12 ------------ + test/core/test-profile.c | 6 +----- + 2 files changed, 1 insertion(+), 17 deletions(-) + +commit 7ee9f5c9b91c0f3e196bf47e96ec7cc01c0c7509 +Author: Simon McVittie +Date: 2011-06-17 12:29:17 +0100 + + Use standard autotools @abs_top_builddir@ to replace + TEST_SERVICE_BINARY etc. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + configure.ac | 20 + -------------------- + test/core/Makefile.am | 2 +- + test/data/valid-service-files/debug-echo.service.in | 2 +- + test/data/valid-service-files/debug-glib.service.in | 2 +- + .../valid-service-files/interfaces-test.service.in | 2 +- + test/interfaces/Makefile.am | 2 +- + 6 files changed, 5 insertions(+), 25 deletions(-) + +commit 23ad1e98c62fd31adf06dd1f138be3853855f4a7 +Author: Simon McVittie +Date: 2011-06-17 12:28:06 +0100 + + Remove EXPANDED_LOCALSTATEDIR etc., no longer needed + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 + Reviewed-by: Dan Williams + + configure.ac | 55 ------------------------------------------------------- + 1 file changed, 55 deletions(-) + +commit 1a61c71e4037ebea5db7dc2f0fdceae764e47e17 +Author: Simon McVittie +Date: 2012-06-28 12:54:02 +0100 + + my_object_unsafe_disable_legacy_property_access: have the right + signature + + I'm amazed this ever worked. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51511 + Signed-off-by: Simon McVittie + Reviewed-by: Colin Walters + + test/core/my-object.c | 6 ++++-- + test/core/my-object.h | 3 ++- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit e2ae8f0d14f90162121387173db514dbd4c6ce50 +Author: Simon McVittie +Date: 2012-06-25 21:28:34 +0100 + + Development version + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 807b93bbef4cefd101a7c9456916554a550b6110 +Author: Simon McVittie +Date: 2011-09-30 16:18:29 +0100 + + Fix documentation upload target for recent gtk-doc + + It previously said docs/ not doc/ (which should have been changed when + copying this target from Telepathy); and now that gtk-doc builds + in the + builddir, we need to copy HTML from there, not from the srcdir. + + Signed-off-by: Simon McVittie + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit c6cbdf9ed99f82983dd529319475dd02c53ad2aa Author: Simon McVittie -Date: 2012-06-25 18:23:30 +0100 +Date: 2012-06-25 18:23:30 +0100 Fix builds without tests - test/manual/Makefile.am | 5 +++++ + test/manual/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) commit a0dd0c8c240896a5dd205c1dbc51924b9d41f833 Author: Simon McVittie -Date: 2012-06-25 17:26:48 +0100 +Date: 2012-06-25 17:26:48 +0100 Prepare version 0.100 - configure.ac | 4 ++-- + configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8b7e4a1c4ae055864e26db4addbcc2dc38ee6963 Author: Simon McVittie -Date: 2012-04-16 12:11:38 +0100 +Date: 2012-04-16 12:11:38 +0100 Fix two crashes when dbus_g_proxy_new_for_peer is used on a bus @@ -83,48 +881,48 @@ Signed-off-by: Simon McVittie Reviewed-by: Will Thompson - .gitignore | 1 + - dbus/dbus-gproxy.c | 5 +- - test/core/Makefile.am | 3 + - test/core/peer-on-bus.c | 148 - +++++++++++++++++++++++++++++++++++++++++++++++ - test/core/run-test.sh | 1 + + .gitignore | 1 + + dbus/dbus-gproxy.c | 5 +- + test/core/Makefile.am | 3 + + test/core/peer-on-bus.c | 148 + ++++++++++++++++++++++++++++++++++++++++++++++++ + test/core/run-test.sh | 1 + 5 files changed, 156 insertions(+), 2 deletions(-) commit 82d45d15088d206f1e1f024215e95301fa04e92c Author: Simon McVittie -Date: 2012-04-16 12:10:37 +0100 +Date: 2012-04-16 12:10:37 +0100 Add a utility function to tear down a private connection in tests Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41126 Reviewed-by: Will Thompson - configure.ac | 1 + - test/Makefile.am | 4 +-- - test/core/Makefile.am | 4 ++- - test/interfaces/Makefile.am | 4 ++- - test/lib/Makefile.am | 19 ++++++++++++ - test/lib/util.c | 69 - +++++++++++++++++++++++++++++++++++++++++++ - test/lib/util.h | 32 ++++++++++++++++++++ + configure.ac | 1 + + test/Makefile.am | 4 +-- + test/core/Makefile.am | 4 ++- + test/interfaces/Makefile.am | 4 ++- + test/lib/Makefile.am | 19 +++++++++++++ + test/lib/util.c | 69 + +++++++++++++++++++++++++++++++++++++++++++++ + test/lib/util.h | 32 +++++++++++++++++++++ 7 files changed, 129 insertions(+), 4 deletions(-) commit 403c5bf4d98fcba83caa94aee96da27128bbf9c8 Author: Matthias Klose -Date: 2012-06-25 17:11:45 +0100 +Date: 2012-06-25 17:11:45 +0100 Fix build error with -Werror=format-security Origin: vendor, Ubuntu Reviewed-by: Simon McVittie - dbus/dbus-gobject.c | 2 +- + dbus/dbus-gobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ae0ed3e435c550c3fae1a86a1c3cb42da319dff2 Author: Simon McVittie -Date: 2011-09-28 17:42:44 +0100 +Date: 2011-09-28 17:42:44 +0100 Move use of 0 as an error domain into the invalid-usage test @@ -134,13 +932,13 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151 Reviewed-by: Will Thompson - test/core/error-mapping.c | 26 -------------------------- - test/manual/invalid-usage.c | 25 +++++++++++++++++++++++++ + test/core/error-mapping.c | 26 -------------------------- + test/manual/invalid-usage.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 26 deletions(-) commit 92c613b8f429a4fe6c762805f1a4f3588511e6a7 Author: Simon McVittie -Date: 2011-09-28 17:35:42 +0100 +Date: 2011-09-28 17:35:42 +0100 Add a manual test for various invalid behaviour @@ -153,17 +951,17 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151 Reviewed-by: Will Thompson - .gitignore | 1 + - configure.ac | 1 + - test/Makefile.am | 4 +- - test/manual/Makefile.am | 27 ++++ - test/manual/invalid-usage.c | 295 - +++++++++++++++++++++++++++++++++++++++++++ + .gitignore | 1 + + configure.ac | 1 + + test/Makefile.am | 4 +- + test/manual/Makefile.am | 27 ++++ + test/manual/invalid-usage.c | 295 + ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 326 insertions(+), 2 deletions(-) commit 539bd92b8703134057c039f965ff7a5b5434c3a7 Author: Simon McVittie -Date: 2011-09-28 17:41:35 +0100 +Date: 2011-09-28 17:41:35 +0100 Remove tests in test-dbus-glib which basically just test error mapping @@ -178,15 +976,15 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151 Reviewed-by: Will Thompson - test/core/my-object.c | 36 ------------------------------- - test/core/test-dbus-glib.c | 45 - --------------------------------------- - test/core/test-service-glib.xml | 9 -------- + test/core/my-object.c | 36 --------------------------------- + test/core/test-dbus-glib.c | 45 + ----------------------------------------- + test/core/test-service-glib.xml | 9 --------- 3 files changed, 90 deletions(-) commit b0dc0f419b641f4ab8fdd8eaf69f4ed4c2d61159 Author: Simon McVittie -Date: 2011-09-28 14:56:45 +0100 +Date: 2011-09-28 14:56:45 +0100 Add a new test for error mapping @@ -194,16 +992,16 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151 Reviewed-by: Will Thompson - .gitignore | 1 + - test/core/Makefile.am | 7 + - test/core/error-mapping.c | 327 - +++++++++++++++++++++++++++++++++++++++++++++ - test/core/run-test.sh | 1 + + .gitignore | 1 + + test/core/Makefile.am | 7 + + test/core/error-mapping.c | 327 + ++++++++++++++++++++++++++++++++++++++++++++++ + test/core/run-test.sh | 1 + 4 files changed, 336 insertions(+) commit 5aa25d4f3c44e7f46e95b8d8de64bf63f2c7c42e Author: Simon McVittie -Date: 2011-09-28 17:23:18 +0100 +Date: 2011-09-28 17:23:18 +0100 MyObject: make ThrowError, AsyncThrowError throw a caller-specified error @@ -222,14 +1020,14 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151 Reviewed-by: Will Thompson - test/core/my-object.c | 49 + test/core/my-object.c | 49 +++++++++++++++++++++++++++++++++++-------------- - test/core/my-object.h | 5 +++++ + test/core/my-object.h | 5 +++++ 2 files changed, 40 insertions(+), 14 deletions(-) commit df3949806818ba0eab495fcaad2c7f3ad38007c7 Author: Simon McVittie -Date: 2011-09-28 16:14:52 +0100 +Date: 2011-09-28 16:14:52 +0100 test-dbus-glib.c isn't GTest yet, but add bug numbers anyway @@ -237,12 +1035,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151 Reviewed-by: Will Thompson - test/core/test-dbus-glib.c | 4 ++++ + test/core/test-dbus-glib.c | 4 ++++ 1 file changed, 4 insertions(+) commit ead4ef065f700a4b586e78400789a7a18c856cc4 Author: Simon McVittie -Date: 2011-09-28 14:57:02 +0100 +Date: 2011-09-28 14:57:02 +0100 Add copyright/licensing information to test-dbus-glib @@ -254,12 +1052,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151 Reviewed-by: Will Thompson - test/core/test-dbus-glib.c | 26 ++++++++++++++++++++++++++ + test/core/test-dbus-glib.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) commit 309bce6d7965037bc6f1827715d2372ae19c98d5 Author: Simon McVittie -Date: 2011-09-28 13:23:29 +0100 +Date: 2011-09-28 13:23:29 +0100 Form a valid D-Bus error name if an unmapped error has a negative code @@ -267,12 +1065,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151 Reviewed-by: Will Thompson - dbus/dbus-gobject.c | 3 ++- + dbus/dbus-gobject.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit ffd32e448a76045696d81a82fec9aeac7dd5e64b Author: Simon McVittie -Date: 2011-09-28 12:20:16 +0100 +Date: 2011-09-28 12:20:16 +0100 If an error code is out of range for its domain, warn about it @@ -280,12 +1078,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151 Reviewed-by: Will Thompson - dbus/dbus-gobject.c | 10 +++++++++- + dbus/dbus-gobject.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit a31371cb5852c485b85926125988c0a170a640ca Author: David Woodhouse -Date: 2011-09-28 12:16:01 +0100 +Date: 2011-09-28 12:16:01 +0100 Don't crash in gerror_domaincode_to_dbus_error_name if code is out of range @@ -293,12 +1091,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151 Reviewed-by: Simon McVittie - dbus/dbus-gobject.c | 3 ++- + dbus/dbus-gobject.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 86ba4b0b8591b882803be1a064df4c213349fba0 Author: Simon McVittie -Date: 2011-09-22 18:25:02 +0100 +Date: 2011-09-22 18:25:02 +0100 dbus_g_value_parse_variant: fix several GVariant ref leaks @@ -310,67 +1108,67 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41125 Reviewed-by: Jonny Lamb - dbus/dbus-gvalue-parse-variant.c | 56 - ++++++++++++++++++++++++++------------ + dbus/dbus-gvalue-parse-variant.c | 56 + +++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 18 deletions(-) commit 51222609f1af2eda0c223881dda3985435c3ad3f Author: Colin Walters -Date: 2012-01-08 11:29:33 -0500 +Date: 2012-01-08 11:29:33 -0500 test-service-glib: Fix build with GLib 2.30 Only can be included directly. - test/core/test-service-glib.c | 1 - + test/core/test-service-glib.c | 1 - 1 file changed, 1 deletion(-) commit 0215b0af4c95c9b9fc79ada5b99882f1261e2644 Author: Colin Walters -Date: 2012-01-08 11:28:10 -0500 +Date: 2012-01-08 11:28:10 -0500 autogen.sh: Honor NOCONFIGURE=1 environment variable http://people.gnome.org/~walters/docs/build-api.txt - autogen.sh | 24 ++++++++++++++---------- + autogen.sh | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) commit 6a8daa9569a4a6c2610758b122f46f181ce52448 Author: Derek Foreman -Date: 2011-04-20 12:14:23 -0400 +Date: 2011-04-20 12:14:23 -0400 Support building on Android Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42532 - .gitignore | 1 + - Android.mk | 35 +++++++++++++++++++++++++++++++++++ - dbus/Makefile.am | 9 +++++++++ + .gitignore | 1 + + Android.mk | 35 +++++++++++++++++++++++++++++++++++ + dbus/Makefile.am | 9 +++++++++ 3 files changed, 45 insertions(+) commit dfdb0de78563a01c3d722e1de83d85e90163feaa Author: Simon McVittie -Date: 2011-09-30 16:12:29 +0100 +Date: 2011-09-30 16:12:29 +0100 Micro version - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f669a4aa6c7caaf6cbf9395ed14a1a357c4f6004 Author: Simon McVittie -Date: 2011-09-30 12:06:50 +0100 +Date: 2011-09-30 12:06:50 +0100 Prepare 0.98 - configure.ac | 4 ++-- + configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1803b6cf35876247bb3e577bec9be8eed8b1b825 Author: Simon McVittie -Date: 2011-08-17 19:28:04 +0100 +Date: 2011-08-17 19:28:04 +0100 invoke_object_method: simplify how we return @@ -380,12 +1178,12 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767 - dbus/dbus-gobject.c | 5 +---- + dbus/dbus-gobject.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit 83bdd09f6124289dd19556da9334906f28064838 Author: Simon McVittie -Date: 2011-08-17 19:26:46 +0100 +Date: 2011-08-17 19:26:46 +0100 dbus-gobject: centralize death-by-OOM and use oom() instead of goto @@ -396,12 +1194,12 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767 - dbus/dbus-gobject.c | 37 +++++++++++++++++++------------------ + dbus/dbus-gobject.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) commit 705761ad983392c311c3e66c3ddf7e44e0efbc6f Author: Simon McVittie -Date: 2011-09-27 18:42:33 +0100 +Date: 2011-09-27 18:42:33 +0100 Fix various minor documentation bugs @@ -410,20 +1208,20 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-glib.c | 2 +- - dbus/dbus-glib.h | 2 +- - dbus/dbus-gmain.c | 10 +++++----- - dbus/dbus-gobject.c | 33 + dbus/dbus-glib.c | 2 +- + dbus/dbus-glib.h | 2 +- + dbus/dbus-gmain.c | 10 +++++----- + dbus/dbus-gobject.c | 33 +++++++++++++++++++-------------- - dbus/dbus-gproxy.c | 33 + dbus/dbus-gproxy.c | 33 ++++++++++++++++++++++++++++----- - dbus/dbus-gvalue.c | 2 +- - doc/reference/dbus-glib-sections.txt | 6 +++++- + dbus/dbus-gvalue.c | 2 +- + doc/reference/dbus-glib-sections.txt | 6 +++++- 7 files changed, 60 insertions(+), 28 deletions(-) commit 0d058307cb914fa61e809b9e0500ac139e286ec6 Author: Simon McVittie -Date: 2011-09-27 17:47:03 +0100 +Date: 2011-09-27 17:47:03 +0100 specialized types: improve documentation and document more things @@ -432,15 +1230,15 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-gtype-specialized.c | 436 - +++++++++++++++++++++++++++++----- - dbus/dbus-gtype-specialized.h | 6 +- - doc/reference/dbus-glib-sections.txt | 1 + + dbus/dbus-gtype-specialized.c | 436 + ++++++++++++++++++++++++++++++----- + dbus/dbus-gtype-specialized.h | 6 +- + doc/reference/dbus-glib-sections.txt | 1 + 3 files changed, 388 insertions(+), 55 deletions(-) commit b3af6fdb643f9293d156c95860270a997b9f6843 Author: Simon McVittie -Date: 2011-09-27 17:50:07 +0100 +Date: 2011-09-27 17:50:07 +0100 dbus_g_type_collection_value_iterate, etc.: check that the type is suitable @@ -454,12 +1252,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-gtype-specialized.c | 29 +++++++++++++++++++++++++---- + dbus/dbus-gtype-specialized.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) commit 3183d79b119d0296924602f19d9fc2a58a7bd597 Author: Simon McVittie -Date: 2011-09-27 17:47:46 +0100 +Date: 2011-09-27 17:47:46 +0100 dbus_g_type_collection_get_fixed: check preconditions on the type and vtable @@ -473,12 +1271,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-gtype-specialized.c | 14 ++++++++++---- + dbus/dbus-gtype-specialized.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) commit 7fcaf6c8c6d0e6ade0e8d5460b5311b564a24d3f Author: Simon McVittie -Date: 2011-09-27 17:41:36 +0100 +Date: 2011-09-27 17:41:36 +0100 dbus-gtype-specialized: warn if vtables have missing callbacks @@ -492,12 +1290,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-gtype-specialized.c | 19 ++++++++++++++++++- + dbus/dbus-gtype-specialized.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) commit 58ed26382bf23fe9fb592d38b5be2c2c7b2e77e2 Author: Simon McVittie -Date: 2011-05-31 16:17:10 +0100 +Date: 2011-05-31 16:17:10 +0100 Tidy up docs for DBusGError and its pseudo-methods @@ -512,14 +1310,14 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-glib.c | 33 + dbus/dbus-glib.c | 33 ++++++++++++++++++--------------- - doc/reference/dbus-glib-sections.txt | 1 - + doc/reference/dbus-glib-sections.txt | 1 - 2 files changed, 18 insertions(+), 16 deletions(-) commit 4b6482d5987095b474c9582e7415bf94a154d9b4 Author: Simon McVittie -Date: 2011-09-27 16:25:21 +0100 +Date: 2011-09-27 16:25:21 +0100 Make gtk-doc DOC_SOURCE_DIR absolute, fixing out-of-tree docs @@ -533,13 +1331,13 @@ Signed-off-by: Simon McVittie Reviewed-by: Will Thompson - doc/reference/Makefile.am | 51 - +++++++++++++++++++++++++++++++++------------ + doc/reference/Makefile.am | 51 + +++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 13 deletions(-) commit 83471e869e464c63063e9e254bc8c40b25de03b7 Author: Simon McVittie -Date: 2011-05-31 16:04:29 +0100 +Date: 2011-05-31 16:04:29 +0100 DBusGProxy: be more pedantic about boolean returns @@ -555,12 +1353,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: NB#218973 - dbus/dbus-gproxy.c | 10 +++++----- + dbus/dbus-gproxy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit c6aa1d7dbdf04501495e4a3b4cfe6e7d808af6dd Author: Simon McVittie -Date: 2011-05-31 15:57:44 +0100 +Date: 2011-05-31 15:57:44 +0100 DBusGProxy: misc documentation tidying @@ -569,14 +1367,14 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-gproxy.c | 37 - +++++++++++++++++++++++++--------- - doc/reference/dbus-glib-sections.txt | 4 ++++ + dbus/dbus-gproxy.c | 37 + +++++++++++++++++++++++++++--------- + doc/reference/dbus-glib-sections.txt | 4 ++++ 2 files changed, 32 insertions(+), 9 deletions(-) commit c568ace5ee6a9c13f748d876d69ad50234b2bc78 Author: Simon McVittie -Date: 2011-05-31 15:57:15 +0100 +Date: 2011-05-31 15:57:15 +0100 DBusGProxy: make argument names in declaration, definition and docs consistent @@ -586,14 +1384,14 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-glib.h | 8 +++---- - dbus/dbus-gproxy.c | 59 - +++++++++++++++++++++++++--------------------------- + dbus/dbus-glib.h | 8 ++++---- + dbus/dbus-gproxy.c | 59 + ++++++++++++++++++++++++++---------------------------- 2 files changed, 32 insertions(+), 35 deletions(-) commit dc766e475f3a42872edbd9c3bcc98714dde8bff7 Author: Simon McVittie -Date: 2011-05-31 15:55:47 +0100 +Date: 2011-05-31 15:55:47 +0100 DBusGProxy: mark struct contents as private @@ -602,12 +1400,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-glib.h | 2 ++ + dbus/dbus-glib.h | 2 ++ 1 file changed, 2 insertions(+) commit 9d1cce7c64662733f0b48e52e4d5a1e805a3e246 Author: Simon McVittie -Date: 2011-05-31 15:40:40 +0100 +Date: 2011-05-31 15:40:40 +0100 Remove declaration of dbus_pending_call_get_g_type, which doesn't exist @@ -617,13 +1415,13 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-glib-lowlevel.h | 8 -------- - doc/reference/dbus-glib-sections.txt | 2 -- + dbus/dbus-glib-lowlevel.h | 8 -------- + doc/reference/dbus-glib-sections.txt | 2 -- 2 files changed, 10 deletions(-) commit 35e049459945a22b87cc61c05bd903790f05cf40 Author: Simon McVittie -Date: 2011-05-31 16:17:34 +0100 +Date: 2011-05-31 16:17:34 +0100 Add DBUS_TYPE_CONNECTION, DBUS_TYPE_MESSAGE to the docs, and document them better @@ -633,13 +1431,13 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-glib.c | 15 +++++++++++---- - doc/reference/dbus-glib-sections.txt | 2 +- + dbus/dbus-glib.c | 15 +++++++++++---- + doc/reference/dbus-glib-sections.txt | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) commit 43a4bf8b038c08d6b8c565495cbf69433bc2dcc6 Author: Simon McVittie -Date: 2011-05-31 16:15:43 +0100 +Date: 2011-05-31 16:15:43 +0100 Tidy up docs for DBusGMessage @@ -654,13 +1452,13 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-glib.c | 28 ++++++++++++++++++---------- - doc/reference/dbus-glib-sections.txt | 2 +- + dbus/dbus-glib.c | 28 ++++++++++++++++++---------- + doc/reference/dbus-glib-sections.txt | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) commit 53ac9ee390e173f8e63f276d8c7e211e4fadca4b Author: Simon McVittie -Date: 2011-03-29 16:34:38 +0100 +Date: 2011-03-29 16:34:38 +0100 Clean up docs for DBusGConnection @@ -674,13 +1472,13 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - dbus/dbus-glib.c | 26 +++++++++++++++++--------- - doc/reference/dbus-glib-sections.txt | 2 +- + dbus/dbus-glib.c | 26 +++++++++++++++++--------- + doc/reference/dbus-glib-sections.txt | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) commit be937e037a6c076cf650bb79aba9c1138da39511 Author: Simon McVittie -Date: 2011-03-29 16:42:19 +0100 +Date: 2011-03-29 16:42:19 +0100 Ignore non-API source files correctly @@ -691,12 +1489,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - doc/reference/Makefile.am | 17 ++++++++++------- + doc/reference/Makefile.am | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit 053d41e56050706b512562f13b9ebde7dac3c60b Author: Simon McVittie -Date: 2011-03-29 16:42:44 +0100 +Date: 2011-03-29 16:42:44 +0100 Remove stray empty subsection @@ -705,12 +1503,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - doc/reference/dbus-glib-sections.txt | 3 --- + doc/reference/dbus-glib-sections.txt | 3 --- 1 file changed, 3 deletions(-) commit 3d02f22d475286db8160604755ee85d24b133005 Author: Simon McVittie -Date: 2011-05-31 16:13:24 +0100 +Date: 2011-05-31 16:13:24 +0100 Mention which header to include in the gtk-doc @@ -719,12 +1517,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - doc/reference/dbus-glib-sections.txt | 8 ++++++++ + doc/reference/dbus-glib-sections.txt | 8 ++++++++ 1 file changed, 8 insertions(+) commit 30b6a106ed590c0fd97a783998a19779002e65d8 Author: Simon McVittie -Date: 2011-05-31 16:13:07 +0100 +Date: 2011-05-31 16:13:07 +0100 Add some missing symbols to the docs @@ -733,30 +1531,30 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793 Bug-NB: related to NB#218973 - doc/reference/dbus-glib-sections.txt | 6 ++++++ + doc/reference/dbus-glib-sections.txt | 6 ++++++ 1 file changed, 6 insertions(+) commit a4bc263721fc5a80a78c6b551f35d281c22694ff Author: Simon McVittie -Date: 2011-09-21 18:14:46 +0100 +Date: 2011-09-21 18:14:46 +0100 Micro version - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 80e37faeac62a4694514410ec17c2ab4a75d50e6 Author: Simon McVittie -Date: 2011-09-21 17:36:11 +0100 +Date: 2011-09-21 17:36:11 +0100 dbus-glib 0.96 - configure.ac | 4 ++-- + configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 4bc172fd5f31123ee883c4027e729b38c2777d7d Author: Simon McVittie -Date: 2011-04-05 17:43:15 +0100 +Date: 2011-04-05 17:43:15 +0100 test-dbus-glib: make lose() abort, and make lose_gerror() more informative @@ -764,12 +1562,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - test/core/test-dbus-glib.c | 21 ++++----------------- + test/core/test-dbus-glib.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) commit 9e97f9744e7ffeb04a105087da6143931195ce77 Author: Simon McVittie -Date: 2011-04-05 16:25:15 +0100 +Date: 2011-04-05 16:25:15 +0100 get_all_object_properties: if _dbus_gvalue_marshal fails, bail out @@ -781,24 +1579,24 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 27 +++++++++++++++++++++++++-- + dbus/dbus-gobject.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) commit bfd1c05174b86c9dfcf1b22a4fa0b2c552dfc902 Author: Simon McVittie -Date: 2011-04-05 18:02:47 +0100 +Date: 2011-04-05 18:02:47 +0100 get_all_object_properties: note which operations can only fail via OOM Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 12 ++++++++++++ + dbus/dbus-gobject.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 30198a2368c9cd19db4b8f595bfad7a719ada7e9 Author: Simon McVittie -Date: 2011-04-05 16:21:12 +0100 +Date: 2011-04-05 16:21:12 +0100 get_all_object_properties: skip invalidly-named properties, with a critical @@ -806,12 +1604,12 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 9 +++++++++ + dbus/dbus-gobject.c | 9 +++++++++ 1 file changed, 9 insertions(+) commit a2a3315ac9747dcc7dda860ceb1d1f94ab56d29b Author: Simon McVittie -Date: 2011-08-17 19:15:05 +0100 +Date: 2011-08-17 19:15:05 +0100 dbus-gobject: add and use connection_send_or_die to check for OOM @@ -820,7 +1618,7 @@ Conflicts: dbus/dbus-gobject.c - dbus/dbus-gobject.c | 40 +++++++++++++++++++++++++--------------- + dbus/dbus-gobject.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) commit 22262581b0956f69f321b9e2eb702e3f15b49823 @@ -839,7 +1637,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 4 ++++ + dbus/dbus-gobject.c | 4 ++++ 1 file changed, 4 insertions(+) commit cccf1e6672fba6b649fe02082c2f087cdf022dcd @@ -851,7 +1649,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 14 ++++++++++++++ + dbus/dbus-gobject.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit d09dfcb130be0a17f337bd198a9fb43aab7dfa28 @@ -863,7 +1661,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 8 +++++--- + dbus/dbus-gobject.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 7b92ac1bfd1e50e842549dbb14b845478d114652 @@ -875,7 +1673,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 13 ++++++------- + dbus/dbus-gobject.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) commit b5b27e4ca0d8ca250fa7649bcf2613e8d889a722 @@ -909,7 +1707,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 20 ++++++++++++++------ + dbus/dbus-gobject.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) commit e5cf2be0e03af4df19618076015cc2a6556ca5d4 @@ -921,7 +1719,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 5 +++++ + dbus/dbus-gobject.c | 5 +++++ 1 file changed, 5 insertions(+) commit d3aa6c7942cce0cf7b602c6b0854488938f0548e @@ -937,7 +1735,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 33 +++++++++++++++++++++++---------- + dbus/dbus-gobject.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) commit 98b3b3f323fd4001be0630c3e0a1dc4fb83cdeab @@ -949,8 +1747,8 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 69 - ++++++++++++++++++++++++++++++++------------------- + dbus/dbus-gobject.c | 69 + +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 26 deletions(-) commit 6293849bf0469ce8d6d122b38db5091c21304a30 @@ -964,7 +1762,7 @@ Conflicts: dbus/dbus-gobject.c - dbus/dbus-gobject.c | 6 +++--- + dbus/dbus-gobject.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 8ec3166b6a40508a91144efedc10dcb32964498e @@ -977,8 +1775,8 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 83 - +++++++++++++++++++++++++++++++-------------------- + dbus/dbus-gobject.c | 83 + ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 33 deletions(-) commit 7a1abf5243fe5b7adf7211fd7d8c82851f448192 @@ -999,8 +1797,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 47 - ++++++++++++++++++++++++++++++++++++----------- + dbus/dbus-gobject.c | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) commit 4ba637e2ae32b2daf224265c22cc8b43cf0a0bbf @@ -1015,7 +1812,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 9 +++++++-- + dbus/dbus-gobject.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit cd7e9a1c6dd0eef6e867cac80339a38758d0cd6f @@ -1027,7 +1824,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 6 ++++++ + dbus/dbus-gobject.c | 6 ++++++ 1 file changed, 6 insertions(+) commit c239a810543bde85dd458012612874cdc81a4151 @@ -1043,7 +1840,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 4 +++- + dbus/dbus-gobject.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 480c480b024a77dd8f4efecdb6639d45de9767ce @@ -1055,7 +1852,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 40 ++++++++++++++++++++++++++++++++++++++++ + dbus/dbus-gobject.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) commit 36b55c3aac5de873a69c9bd0fbe003200a03ba32 @@ -1074,7 +1871,7 @@ Bug-NB: NB#116862 Reviewed-by: Cosimo Alfarano - dbus/dbus-gproxy.c | 10 ++++++---- + dbus/dbus-gproxy.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit 18705c42ca6b6a583b64451055eec4dad3aaa3b4 @@ -1086,10 +1883,10 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38406 Reviewed-by: Cosimo Alfarano - .gitignore | 1 + - test/core/Makefile.am | 7 ++ - test/core/proxy-peer.c | 274 - ++++++++++++++++++++++++++++++++++++++++++++++++ + .gitignore | 1 + + test/core/Makefile.am | 7 ++ + test/core/proxy-peer.c | 274 + +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 282 insertions(+) commit 5d800ca9352b40354a0f4a905c1c0b111b81f030 @@ -1104,10 +1901,10 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38406 Reviewed-by: Cosimo Alfarano - test/core/Makefile.am | 4 +++- - test/core/my-object.c | 12 ++++++++++++ - test/core/my-object.h | 1 + - test/core/test-dbus-glib.c | 11 ++++------- + test/core/Makefile.am | 4 +++- + test/core/my-object.c | 12 ++++++++++++ + test/core/my-object.h | 1 + + test/core/test-dbus-glib.c | 11 ++++------- 4 files changed, 20 insertions(+), 8 deletions(-) commit 70e09208ab13812037b3cf133df312aacd24d036 @@ -1129,8 +1926,8 @@ Bug-NB: NB#180486 (CID-34419 to CID-34424 inclusive) Reviewed-by: Cosimo Alfarano - dbus/dbus-gproxy.c | 93 - +++++++++++++++++++++++++++++++++++++--------------- + dbus/dbus-gproxy.c | 93 + ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 66 insertions(+), 27 deletions(-) commit 2731a2f7f824f9c1cd11dd14e88ff1e0875f280b @@ -1148,7 +1945,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38406 Reviewed-by: Cosimo Alfarano - dbus/dbus-gproxy.c | 15 +++------------ + dbus/dbus-gproxy.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) commit 1b38cecf7bbdb8a99ef13616b8c661dfb0bc060f @@ -1173,7 +1970,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38406 Reviewed-by: Cosimo Alfarano - dbus/dbus-gproxy.c | 16 ++++++++++++++++ + dbus/dbus-gproxy.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) commit af31c9c21efeec8a38c73de24d82a2038d80f74e @@ -1196,7 +1993,7 @@ Reviewed-by: Vivek Dasmohapatra - test/core/registrations.c | 28 +++++++++++++++++++++++++--- + test/core/registrations.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) commit 6d06dd358b22057dca1808c1432e620998202c41 @@ -1208,7 +2005,7 @@ Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39475 - dbus/dbus-glib-tool.c | 2 +- + dbus/dbus-glib-tool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e294ba3e579db1c12158ce95ad6ff34391cf571a @@ -1223,7 +2020,7 @@ Bug-NB: NB#180486 Reviewed-by: Cosimo Alfarano - dbus/dbus-gobject.c | 8 +++++++- + dbus/dbus-gobject.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit cce0887278ae105f010d35636fc5f6d654c2d41f @@ -1237,7 +2034,7 @@ Bug-NB: NB#180486 CID-643 Reviewed-by: Simon McVittie - dbus/dbus-gparser.c | 3 --- + dbus/dbus-gparser.c | 3 --- 1 file changed, 3 deletions(-) commit f446cb80f91b4cf584883b47477295d07dd32eac @@ -1249,8 +2046,8 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36428 Reviewed-by: Simon McVittie - dbus/dbus-binding-tool-glib.c | 1 - - dbus/dbus-gproxy.c | 1 - + dbus/dbus-binding-tool-glib.c | 1 - + dbus/dbus-gproxy.c | 1 - 2 files changed, 2 deletions(-) commit 2a85bd434e6d8dba9615a53d288a0a72d6b5e0cf @@ -1262,11 +2059,11 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37852 Reviewed-by: Colin Walters - test/core/my-object.c | 17 ++++++++++ - test/core/my-object.h | 2 ++ - test/core/registrations.c | 68 - +++++++++++++++++++++++++++++++++++++++ - test/core/test-service-glib.xml | 4 +++ + test/core/my-object.c | 17 +++++++++++ + test/core/my-object.h | 2 ++ + test/core/registrations.c | 68 + +++++++++++++++++++++++++++++++++++++++++ + test/core/test-service-glib.xml | 4 +++ 4 files changed, 91 insertions(+) commit 3e0828f57c3925ea9b63d22ab82d991a0fea0536 @@ -1284,7 +2081,7 @@ Tested-by: Michael Biebl Reviewed-by: Colin Walters - dbus/dbus-gobject.c | 8 ++++---- + dbus/dbus-gobject.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit f534276eb20d8035566a206d1e38fd651a1eeab9 @@ -1297,7 +2094,7 @@ Reviewed-by: Colin Walters - test/core/registrations.c | 4 ++-- + test/core/registrations.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 867d670daad983f8b4416528e69d3ad2e0596e88 @@ -1306,7 +2103,7 @@ 0.95 - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 469df67525a9e5363644ac730ac8ec7580a8ebe0 @@ -1315,7 +2112,7 @@ Prepare 0.94 release - configure.ac | 7 ++++--- + configure.ac | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 5a780af947f0141f4e0524aaf62fdd06abe6cd5f @@ -1334,7 +2131,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35952 Reviewed-by: Will Thompson - dbus/dbus-binding-tool-glib.c | 15 +++++++++++++++ + dbus/dbus-binding-tool-glib.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) commit a8605cf4c6c9dbc4a933dd744d339744e0102765 @@ -1345,7 +2142,7 @@ Reviewed-by: Will Thompson - dbus/dbus-glib-tool.c | 3 ++- + dbus/dbus-glib-tool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 0c162cc63b073a9f50dd11ea99db72fe95a16064 @@ -1357,12 +2154,12 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10890 - Doxyfile.in | 180 - -------------------------------------------------------- - Makefile.am | 2 - - README | 1 - - configure.ac | 34 +---------- - doc/api/README | 3 - + Doxyfile.in | 180 + --------------------------------------------------------- + Makefile.am | 2 - + README | 1 - + configure.ac | 34 +---------- + doc/api/README | 3 - 5 files changed, 1 insertion(+), 219 deletions(-) commit 6e20efb5c4c094915d2b6e86c3cab486a0562a95 @@ -1374,10 +2171,10 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10890 - dbus/dbus-glib.h | 4 ++-- - dbus/dbus-gloader-expat.c | 2 +- - dbus/dbus-gproxy.c | 2 +- - dbus/dbus-gtest.c | 2 +- + dbus/dbus-glib.h | 4 ++-- + dbus/dbus-gloader-expat.c | 2 +- + dbus/dbus-gproxy.c | 2 +- + dbus/dbus-gtest.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) commit 1472d195bd201d219aab5bc4b31d80d8340cee5c @@ -1389,17 +2186,17 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10890 - dbus/dbus-gidl.c | 4 ---- - dbus/dbus-gidl.h | 4 ---- - dbus/dbus-glib.c | 3 +-- - dbus/dbus-gmain.c | 22 +++------------------- - dbus/dbus-gobject.c | 3 +-- - dbus/dbus-gparser.c | 4 ---- - dbus/dbus-gproxy.c | 26 ++------------------------ - dbus/dbus-gthread.c | 6 ------ - dbus/dbus-gutils.c | 4 ---- - dbus/dbus-gutils.h | 4 ---- - dbus/dbus-gvalue.c | 5 +---- + dbus/dbus-gidl.c | 4 ---- + dbus/dbus-gidl.h | 4 ---- + dbus/dbus-glib.c | 3 +-- + dbus/dbus-gmain.c | 22 +++------------------- + dbus/dbus-gobject.c | 3 +-- + dbus/dbus-gparser.c | 4 ---- + dbus/dbus-gproxy.c | 26 ++------------------------ + dbus/dbus-gthread.c | 6 ------ + dbus/dbus-gutils.c | 4 ---- + dbus/dbus-gutils.h | 4 ---- + dbus/dbus-gvalue.c | 5 +---- 11 files changed, 8 insertions(+), 77 deletions(-) commit 4c3a346d296789cf3a81f6cc98f64d84ea892247 @@ -1411,7 +2208,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37790 - dbus/dbus-gproxy.c | 17 ----------------- + dbus/dbus-gproxy.c | 17 ----------------- 1 file changed, 17 deletions(-) commit cded5996b02ff937a73654788d1f3a7ca46ca0a9 @@ -1423,8 +2220,8 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37790 - dbus/dbus-gtest.c | 6 +----- - dbus/dbus-gutils.c | 17 ----------------- + dbus/dbus-gtest.c | 6 +----- + dbus/dbus-gutils.c | 17 ----------------- 2 files changed, 1 insertion(+), 22 deletions(-) commit d81722def291666a3c557a18d66be061f8f55e31 @@ -1436,7 +2233,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37790 - dbus/dbus-gidl.c | 17 ----------------- + dbus/dbus-gidl.c | 17 ----------------- 1 file changed, 17 deletions(-) commit 1f371d3c75a5c2e9979350380e4243e3c445e093 @@ -1448,7 +2245,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37790 Reviewed-by: Will Thompson - dbus/dbus-glib-tool.c | 48 + dbus/dbus-glib-tool.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) @@ -1466,8 +2263,8 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37812 Reviewed-by: Will Thompson - dbus/dbus-glib-tool.c | 78 - ++++++++++++++++++++++++++++++++++++------------- + dbus/dbus-glib-tool.c | 78 + ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 20 deletions(-) commit d5b9aa101d61bcd2321f0266fa638b644e4cba96 @@ -1479,7 +2276,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37789 - configure.ac | 1 - + configure.ac | 1 - 1 file changed, 1 deletion(-) commit 601b51279e7fbb08ff6ce8c98eaf4bcee21d46a5 @@ -1491,7 +2288,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37789 - configure.ac | 10 ---------- + configure.ac | 10 ---------- 1 file changed, 10 deletions(-) commit 1a966d070e71378590fb0b64c5ec7a2e250d397b @@ -1506,11 +2303,11 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37789 - .gitignore | 4 ---- - configure.ac | 2 -- - dbus/Makefile.am | 16 ++-------------- - dbus/make-dbus-glib-error-enum.sh | 2 -- - dbus/make-dbus-glib-error-switch.sh | 2 -- + .gitignore | 4 ---- + configure.ac | 2 -- + dbus/Makefile.am | 16 ++-------------- + dbus/make-dbus-glib-error-enum.sh | 2 -- + dbus/make-dbus-glib-error-switch.sh | 2 -- 5 files changed, 2 insertions(+), 24 deletions(-) commit 98d7cb8c869b53686a742fb48d1f189c74ff1484 @@ -1532,7 +2329,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37789 - configure.ac | 12 +++--------- + configure.ac | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) commit b00d53dd647cf456ddb67c1dfdf44a8d56be90b4 @@ -1544,7 +2341,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37789 - .gitignore | 2 ++ + .gitignore | 2 ++ 1 file changed, 2 insertions(+) commit bd92f266609fef162b6028fd249250b0ab9ae689 @@ -1564,13 +2361,13 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36428 - configure.ac | 25 +----------------- - dbus/dbus-binding-tool-glib.c | 8 +++--- - dbus/dbus-glib-tool.c | 35 ++++++++++---------------- - dbus/dbus-gparser.c | 56 - +++++++++++++++++++---------------------- - dbus/dbus-gproxy.c | 8 +++--- - dbus/dbus-gvalue.c | 41 +++++++++++++++--------------- + configure.ac | 25 +------------------ + dbus/dbus-binding-tool-glib.c | 8 +++---- + dbus/dbus-glib-tool.c | 35 ++++++++++----------------- + dbus/dbus-gparser.c | 56 + ++++++++++++++++++++----------------------- + dbus/dbus-gproxy.c | 8 +++---- + dbus/dbus-gvalue.c | 41 ++++++++++++++++--------------- 6 files changed, 68 insertions(+), 105 deletions(-) commit c37bd4357d50d1cd683ef04f05ee427c9a0f7e9f @@ -1585,8 +2382,8 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36428 - dbus/dbus-glib.c | 5 ----- - dbus/dbus-gmain.c | 4 ---- + dbus/dbus-glib.c | 5 ----- + dbus/dbus-gmain.c | 4 ---- 2 files changed, 9 deletions(-) commit e8a4f0496d0eec10fc9c76e0ef20e761bb2256c6 @@ -1607,7 +2404,7 @@ Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37795 - dbus/dbus-gobject.c | 15 ++++++++++----- + dbus/dbus-gobject.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) commit eeb1c50aa03a95c39487e9331107142f27412958 @@ -1619,7 +2416,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=22854 Reviewed-by: Guillaume Desmottes - HACKING | 1 + + HACKING | 1 + 1 file changed, 1 insertion(+) commit 9e2031148fd0ee114ec67c681d2b9bcfd84cdaa4 @@ -1634,8 +2431,8 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=26952 Reviewed-by: Guillaume Desmottes - HACKING | 3 ++- - Makefile.am | 12 ++++++++++++ + HACKING | 3 ++- + Makefile.am | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) commit 61f48c290176c007ff0aef6ca4d752491763e4b0 @@ -1654,7 +2451,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37060 Reviewed-by: Guillaume Desmottes - configure.ac | 17 ++++------------- + configure.ac | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) commit 0f320c5224fe39df44648ac75ecce9e0a01079d0 @@ -1666,10 +2463,10 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37060 Reviewed-by: Guillaume Desmottes - dbus/Makefile.am | 3 ++- - dbus/dbus-gmarshal.c | 7 +++++-- - dbus/examples/statemachine/Makefile.am | 4 +++- - test/core/Makefile.am | 4 +++- + dbus/Makefile.am | 3 ++- + dbus/dbus-gmarshal.c | 7 +++++-- + dbus/examples/statemachine/Makefile.am | 4 +++- + test/core/Makefile.am | 4 +++- 4 files changed, 13 insertions(+), 5 deletions(-) commit f91828abb160e44b53a32823516d55d8a5d634bc @@ -1681,34 +2478,34 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37060 Reviewed-by: Guillaume Desmottes - dbus/dbus-gidl.c | 2 ++ - dbus/dbus-gloader-expat.c | 2 ++ - dbus/dbus-gparser.c | 3 +++ - dbus/dbus-gproxy.c | 3 +++ - dbus/dbus-gthread.c | 2 ++ - dbus/dbus-gtype-specialized.c | 2 ++ - dbus/dbus-gvalue-parse-variant.c | 2 ++ - dbus/examples/example-client.c | 2 ++ - dbus/examples/example-service.c | 2 ++ - dbus/examples/example-signal-emitter.c | 2 ++ - dbus/examples/example-signal-recipient.c | 2 ++ - dbus/examples/statemachine/statemachine-client.c | 2 ++ - dbus/examples/statemachine/statemachine-server.c | 2 ++ - dbus/examples/statemachine/statemachine.c | 2 ++ - test/core/30574.c | 2 ++ - test/core/peer-client.c | 2 ++ - test/core/peer-server.c | 2 ++ - test/core/test-dbus-glib.c | 2 ++ - test/core/test-gvariant.c | 2 ++ - test/core/test-service-glib.c | 2 ++ - test/core/test-thread-client.c | 2 ++ - test/core/test-thread-server.c | 2 ++ - test/core/test-types.c | 2 ++ - test/core/test-variant-recursion.c | 2 ++ - test/interfaces/test-client.c | 2 ++ - test/interfaces/test-objects.c | 2 ++ - test/interfaces/test-server.c | 2 ++ - test/test-service.c | 2 ++ + dbus/dbus-gidl.c | 2 ++ + dbus/dbus-gloader-expat.c | 2 ++ + dbus/dbus-gparser.c | 3 +++ + dbus/dbus-gproxy.c | 3 +++ + dbus/dbus-gthread.c | 2 ++ + dbus/dbus-gtype-specialized.c | 2 ++ + dbus/dbus-gvalue-parse-variant.c | 2 ++ + dbus/examples/example-client.c | 2 ++ + dbus/examples/example-service.c | 2 ++ + dbus/examples/example-signal-emitter.c | 2 ++ + dbus/examples/example-signal-recipient.c | 2 ++ + dbus/examples/statemachine/statemachine-client.c | 2 ++ + dbus/examples/statemachine/statemachine-server.c | 2 ++ + dbus/examples/statemachine/statemachine.c | 2 ++ + test/core/30574.c | 2 ++ + test/core/peer-client.c | 2 ++ + test/core/peer-server.c | 2 ++ + test/core/test-dbus-glib.c | 2 ++ + test/core/test-gvariant.c | 2 ++ + test/core/test-service-glib.c | 2 ++ + test/core/test-thread-client.c | 2 ++ + test/core/test-thread-server.c | 2 ++ + test/core/test-types.c | 2 ++ + test/core/test-variant-recursion.c | 2 ++ + test/interfaces/test-client.c | 2 ++ + test/interfaces/test-objects.c | 2 ++ + test/interfaces/test-server.c | 2 ++ + test/test-service.c | 2 ++ 28 files changed, 58 insertions(+) commit 6d6d9a61e47f5bc28b5d61ae0d6cb072a81b5569 @@ -1720,7 +2517,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36216 Reviewed-by: Guillaume Desmottes - dbus/dbus-gproxy.c | 5 ++++- + dbus/dbus-gproxy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 52f4e09d49551f3a8ece6578a6cb6e016c03a9d8 @@ -1732,7 +2529,7 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811 - dbus/dbus-gobject.c | 29 ++++++++++++++++++++++++++--- + dbus/dbus-gobject.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) commit 6a61c922cedad9f5af5c32a0d783e9fbd53f3487 @@ -1754,8 +2551,8 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811 - dbus/dbus-gobject.c | 89 - ++++++++++++++++++++++++++++++++++----------------- + dbus/dbus-gobject.c | 89 + +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 30 deletions(-) commit f07cf89fd36aebe5bd32f9e7cff13b5697365917 @@ -1770,8 +2567,8 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811 - test/core/registrations.c | 64 - +++++++++++++++++++++++++++++++++++++++++++++ + test/core/registrations.c | 64 + +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) commit c3c6f8365f5074f3f59b66c5b4ece1feb214be23 @@ -1797,8 +2594,7 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811 - dbus/dbus-gobject.c | 48 - ++++++++++++++++-------------------------------- + dbus/dbus-gobject.c | 48 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) commit 323d5adb48f8630024f2b22172f10684508bd2a8 @@ -1814,7 +2610,7 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811 - dbus/dbus-gobject.c | 20 +++++++++----------- + dbus/dbus-gobject.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) commit c9961279c5ac667d4ddca98cbd3a3dfb4f1d8705 @@ -1829,8 +2625,8 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811 - dbus/dbus-gobject.c | 77 - ++++++++++++++++++++++++++++++++++----------------- + dbus/dbus-gobject.c | 77 + +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 26 deletions(-) commit 357fef2267d4243435e0d26ae659d21bd6bcde96 @@ -1847,7 +2643,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27598 Reviewed-by: Robert Ancell - test/interfaces/valid-annotations.xml | 10 ++++++++-- + test/interfaces/valid-annotations.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit b04f6b33224973cefec959a9fe0f7de655b93d0e @@ -1859,11 +2655,11 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27598 Reviewed-by: Robert Ancell - .gitignore | 2 ++ - test/interfaces/Makefile.am | 7 ++++++- - test/interfaces/invalid-annotated-node.xml | 8 ++++++++ - test/interfaces/invalid-nested-annotation.xml | 8 ++++++++ - test/interfaces/run-test.sh | 20 +++++++++++++++++++- + .gitignore | 2 ++ + test/interfaces/Makefile.am | 7 ++++++- + test/interfaces/invalid-annotated-node.xml | 8 ++++++++ + test/interfaces/invalid-nested-annotation.xml | 8 ++++++++ + test/interfaces/run-test.sh | 20 +++++++++++++++++++- 5 files changed, 43 insertions(+), 2 deletions(-) commit e4a25a148703ef7ff13e5d87276b5d6fc395a57d @@ -1875,8 +2671,8 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27598 Reviewed-by: Robert Ancell - test/interfaces/Makefile.am | 20 ++++++++++++++++++-- - test/interfaces/valid-annotations.xml | 21 +++++++++++++++++++++ + test/interfaces/Makefile.am | 20 ++++++++++++++++++-- + test/interfaces/valid-annotations.xml | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) commit ac53fc025df08f12532fa7e3e69208db16151935 @@ -1889,7 +2685,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27598 Reviewed-by: Robert Ancell - .gitignore | 19 ++++++------------- + .gitignore | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) commit b1338486f0ce5df460e9af67f3738f6a0f829840 @@ -1901,7 +2697,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27598 Reviewed-by: Robert Ancell - dbus/dbus-gparser.c | 4 ++-- + dbus/dbus-gparser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 160842c85f808a4815d005dd39a0d9419aa06788 @@ -1915,7 +2711,7 @@ Reviewed-by: Simon McVittie Reviewed-by: Robert Ancell - dbus/dbus-gparser.c | 1 - + dbus/dbus-gparser.c | 1 - 1 file changed, 1 deletion(-) commit dcbebd2ee2941136a2e04868da08777c985e0117 @@ -1927,7 +2723,7 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32087 - test/core/registrations.c | 9 +++++---- + test/core/registrations.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 818b90092102e4fe6d2addfe77ee5a86d50e31c5 @@ -1943,7 +2739,7 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32087 - dbus/dbus-gobject.c | 8 ++++++-- + dbus/dbus-gobject.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 6b29f7f317df7d96a94ac910306508452be9130c @@ -1955,8 +2751,8 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32087 - test/core/registrations.c | 101 - +++++++++++++++++++++++++++++++++++++++++++++ + test/core/registrations.c | 101 + ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) commit 17d5dcf86c766075400aff5d2aa3fe8e599fb715 @@ -1968,7 +2764,7 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32087 - dbus/dbus-gobject.c | 23 +++++------------------ + dbus/dbus-gobject.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) commit 7f041871c3e5d023ee9cb77609bf0b69ebdbde34 @@ -1980,7 +2776,7 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36793 - test/core/registrations.c | 24 ++++++++++++++++++++++++ + test/core/registrations.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) commit 43f9dda46e9279b4489b6bd1efa0e5f9eb825a48 @@ -1998,7 +2794,7 @@ Reviewed-by: Cosimo Alfarano Reviewed-by: Sjoerd Simons - dbus/dbus-gobject.c | 12 ++++++++---- + dbus/dbus-gobject.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 4da28a6c49cecb902544d9152a693105d320cdac @@ -2014,7 +2810,7 @@ Reviewed-by: Cosimo Alfarano Reviewed-by: Sjoerd Simons - dbus/dbus-gobject.c | 6 +++--- + dbus/dbus-gobject.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit da740bfd88850c858d1cee079c8d261a79e2c75e @@ -2030,11 +2826,11 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36793 - test/core/5688.c | 81 - --------------------------------------------- - test/core/Makefile.am | 9 ----- - test/core/registrations.c | 73 ++++++++++++++++++++++++++++++++++++---- - test/core/run-test.sh | 1 - + test/core/5688.c | 81 + ----------------------------------------------- + test/core/Makefile.am | 9 ------ + test/core/registrations.c | 73 ++++++++++++++++++++++++++++++++++++++---- + test/core/run-test.sh | 1 - 4 files changed, 67 insertions(+), 97 deletions(-) commit 0692c5995ea4a7013b4ab605cd76aca49239168d @@ -2049,8 +2845,8 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36793 - test/core/registrations.c | 74 - ++++++++++++++++++++++++++++++++------------- + test/core/registrations.c | 74 + +++++++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 21 deletions(-) commit 002feb57cfcfeb439be1ace875a67ad540fed950 @@ -2062,13 +2858,13 @@ Reviewed-by: Cosimo Alfarano Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36793 - .gitignore | 2 +- - test/core/Makefile.am | 6 ++-- - test/core/registrations.c | 71 - +++++++++++++++++++++++++++++++++++++++++++++ - test/core/run-test.sh | 2 +- - test/core/unregister.c | 71 - --------------------------------------------- + .gitignore | 2 +- + test/core/Makefile.am | 6 ++-- + test/core/registrations.c | 71 + +++++++++++++++++++++++++++++++++++++++++++++++ + test/core/run-test.sh | 2 +- + test/core/unregister.c | 71 + ----------------------------------------------- 5 files changed, 76 insertions(+), 76 deletions(-) commit 15d9f31812b07439558e615d4d9bdfccaa33dbd5 @@ -2081,7 +2877,7 @@ Bug: http://bugs.freedesktop.org/show_bug.cgi?id=35115 Reviewed-by: Simon McVittie - dbus/dbus-gmain.c | 16 +++++----------- + dbus/dbus-gmain.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) commit a1a9a6f973f64e543c3d43b01bd6ef0963f8bf16 @@ -2096,7 +2892,7 @@ Reviewed-by: Colin Walters Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062 - test/test-service.c | 3 +-- + test/test-service.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 6c1e9559094be37bf66731b9f09fffcb1a19e8e5 @@ -2111,7 +2907,7 @@ Reviewed-by: Colin Walters Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062 - dbus/dbus-gvalue.c | 10 ++++++++++ + dbus/dbus-gvalue.c | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 324122a9f0bc859bb424d9026019e9077cda4015 @@ -2125,7 +2921,7 @@ Reviewed-by: Colin Walters Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062 - dbus/dbus-gvalue.c | 3 --- + dbus/dbus-gvalue.c | 3 --- 1 file changed, 3 deletions(-) commit 341043e2d776cbd6faaf5b8d6a54a46920bb094c @@ -2139,7 +2935,7 @@ Reviewed-by: Colin Walters Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062 - dbus/dbus-gvalue.c | 6 ------ + dbus/dbus-gvalue.c | 6 ------ 1 file changed, 6 deletions(-) commit 1ea2eee4623cace2e852f1c16b1b1ce23035d037 @@ -2154,7 +2950,7 @@ Reviewed-by: Colin Walters Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062 - dbus/dbus-gvalue.c | 2 -- + dbus/dbus-gvalue.c | 2 -- 1 file changed, 2 deletions(-) commit f8a7ccf024a19caa54d6f79cd9d62a63a9b36c5b @@ -2168,7 +2964,7 @@ Reviewed-by: Colin Walters Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062 - dbus/dbus-bash-completion-helper.c | 8 +------- + dbus/dbus-bash-completion-helper.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) commit 09d85a945760d06447aea09a38ea99d0dc54de2a @@ -2180,8 +2976,8 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=23616 - configure.ac | 2 +- - dbus/dbus-gproxy.c | 29 ++++++++++++++++++++--------- + configure.ac | 2 +- + dbus/dbus-gproxy.c | 29 ++++++++++++++++++++--------- 2 files changed, 21 insertions(+), 10 deletions(-) commit f2b445d0d931f3f680cefe0141e62abeafda9742 @@ -2193,7 +2989,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=23616 - dbus/dbus-gproxy.c | 2 ++ + dbus/dbus-gproxy.c | 2 ++ 1 file changed, 2 insertions(+) commit 811089dae49c2f47d0f15fd7e9c180674f484391 @@ -2208,7 +3004,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=23616 - dbus/dbus-gproxy.c | 5 +++++ + dbus/dbus-gproxy.c | 5 +++++ 1 file changed, 5 insertions(+) commit af3d48b10042616ac7ecceed5af8ddaeecc093f5 @@ -2220,7 +3016,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=23616 - dbus/dbus-gproxy.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + dbus/dbus-gproxy.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) commit 63bd85823fd3039e88176105434c7bbdeae71e84 @@ -2233,7 +3029,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=23616 - dbus/dbus-gproxy.c | 2 +- + dbus/dbus-gproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 97de5501c2ebb29e4e32822bae0e45c88140bffd @@ -2245,8 +3041,8 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33646 Reviewed-by: Simon McVittie - dbus/dbus-gproxy.c | 109 - +++++++++++++++++++++++++++++++++++++++------------- + dbus/dbus-gproxy.c | 109 + ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 82 insertions(+), 27 deletions(-) commit bc0497ea0c5ac65abc3658a31c95f9b0e15680f3 @@ -2270,7 +3066,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36216 - dbus/dbus-gproxy.c | 6 +++--- + dbus/dbus-gproxy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit f5008cc76e0b466c4730e331857bc041aced5e94 @@ -2282,7 +3078,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gproxy.c | 10 ++++++---- + dbus/dbus-gproxy.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit 25c4b24a0d8490a7ba667b9944ce9b1c0808878a @@ -2297,7 +3093,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gproxy.c | 3 +++ + dbus/dbus-gproxy.c | 3 +++ 1 file changed, 3 insertions(+) commit 35d1d8479031393f86fe668d2a1f64325b5dd1be @@ -2309,7 +3105,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gproxy.c | 19 ++++++++++--------- + dbus/dbus-gproxy.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) commit 3a0e477ed6648bcb99711976fd51f4c0394000c6 @@ -2325,7 +3121,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gproxy.c | 3 ++- + dbus/dbus-gproxy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit d0332f9862c3af18161f58444f35c7d03d9fb067 @@ -2341,7 +3137,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gproxy.c | 4 +++- + dbus/dbus-gproxy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit cd0da3f56873c5399b6247791df16acd3f4a73b1 @@ -2357,7 +3153,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gproxy.c | 16 ++++++++++++---- + dbus/dbus-gproxy.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit 8b75efc7941ac789605128d48f82168da18bb9fd @@ -2372,7 +3168,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 7 +------ + dbus/dbus-gvalue.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) commit 7729c5a4ee9c1bba0fe3f35d840c542303e26a1a @@ -2387,7 +3183,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 9 ++++++++- + dbus/dbus-gvalue.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 73c1dc8031df7c9de0ab321f02cc5bedc49be7c1 @@ -2401,7 +3197,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 3 ++- + dbus/dbus-gvalue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit ca88a4f4adffccc1be8ddc0835d640f36d42f9fc @@ -2413,7 +3209,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 7 ++++--- + dbus/dbus-gvalue.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 7228321ddafc88e12406ca49406dfaa80240be9d @@ -2426,7 +3222,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 14 +++++++------- + dbus/dbus-gvalue.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 9e8bed2ec229e48df0b1c63560b183f46d33bffd @@ -2442,7 +3238,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 4 +++- + dbus/dbus-gvalue.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 385180d3b1975afce823d4aa9aa5daf82fa09b5a @@ -2454,7 +3250,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 5 ++++- + dbus/dbus-gvalue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 72c21e4e4cac8092c1dcf8348fdf3955cb01229c @@ -2466,7 +3262,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 15 ++++++++------- + dbus/dbus-gvalue.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit 48cf1b8b147d80265e2ab23b257d5c96ca260db9 @@ -2482,7 +3278,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 11 +++++++++-- + dbus/dbus-gvalue.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit c827cd5b160b59246305526eac6154006f8bb8d5 @@ -2497,7 +3293,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 5 ++++- + dbus/dbus-gvalue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 98e5da6a6363b68042503e8e01819dc86ec7781e @@ -2511,7 +3307,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 10 +++++----- + dbus/dbus-gvalue.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 5d90b996ad4e9ee927d25fc692c8b08baa2a36b4 @@ -2526,7 +3322,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 8 +++++--- + dbus/dbus-gvalue.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit f57e4e33838062e98d39764202fdcd60b709362d @@ -2542,7 +3338,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 7 +++++-- + dbus/dbus-gvalue.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 15bf1a2ef4d8b3e37b056cc893a844706fc714dc @@ -2560,7 +3356,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 8 +------- + dbus/dbus-gvalue.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) commit d1093f2c3413285c839cdbbca0c848b0d071cb62 @@ -2572,7 +3368,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 5 ++++- + dbus/dbus-gvalue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 782412b65a1364f8736e15217aa853083c962935 @@ -2587,7 +3383,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 18 ++++++++++++------ + dbus/dbus-gvalue.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) commit a2c276a49fa9efb8336db74db60dc1bcd2f0e8d6 @@ -2600,7 +3396,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 5 ++++- + dbus/dbus-gvalue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 94a501e0e69cf912c7f6a5250fdea0ec5fe673c7 @@ -2618,7 +3414,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gvalue.c | 31 +++++++++++++++++++------------ + dbus/dbus-gvalue.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) commit 41b2fd28a833995c8ccab1a690c0e3925572488b @@ -2630,8 +3426,8 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - dbus/dbus-gobject.c | 2 +- - dbus/dbus-gproxy.c | 6 +++--- + dbus/dbus-gobject.c | 2 +- + dbus/dbus-gproxy.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) commit 367a58bc081d451ff90262ae96b7d78ea74f3d11 @@ -2643,7 +3439,7 @@ Reviewed-by: Will Thompson Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0f782b478a784ac890741e5d84fd741a26d49510 @@ -2670,7 +3466,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33145 Reviewed-by: Colin Walters - configure.ac | 6 +----- + configure.ac | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) commit ab2a98bd3ae0c59f198e82cba2c81095a47fa58d @@ -2682,7 +3478,7 @@ Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34282 - dbus/Makefile.am | 2 +- + dbus/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit af0c64037673d598a6842fb344b5f3dad80ab821 @@ -2694,7 +3490,7 @@ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=22667 — thanks to Daniel Macks for the bug report! - doc/reference/dbus-glib-docs.sgml | 13 ++++++++----- + doc/reference/dbus-glib-docs.sgml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) commit 04e11da48a6c2a75bebb5ece31cf86508203dd02 @@ -2706,10 +3502,10 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30274 Reviewed-by: Will Thompson - test/core/my-object.c | 15 +++++++++++++++ - test/core/my-object.h | 3 ++- - test/core/test-dbus-glib.c | 11 +++++++++++ - test/core/test-service-glib.xml | 3 +++ + test/core/my-object.c | 15 +++++++++++++++ + test/core/my-object.h | 3 ++- + test/core/test-dbus-glib.c | 11 +++++++++++ + test/core/test-service-glib.xml | 3 +++ 4 files changed, 31 insertions(+), 1 deletion(-) commit 2d987890c3ba2fd8efc92f8b75da88904ce425f9 @@ -2734,8 +3530,8 @@ Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=254192 Reviewed-by: Colin Walters - test/core/run-test.sh | 2 +- - test/interfaces/run-test.sh | 2 +- + test/core/run-test.sh | 2 +- + test/interfaces/run-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 6708c68cc9c312ffea600d0020425412ba242ddb @@ -2748,8 +3544,8 @@ Bug-NB: NB#180486 Reviewed-by: Simon McVittie - dbus/dbus-binding-tool-glib.c | 134 - ++++++++++++++++++++--------------------- + dbus/dbus-binding-tool-glib.c | 134 + +++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 67 deletions(-) commit f1b8944a93a22d342f744526f5c47e80e394579f @@ -2762,7 +3558,7 @@ Bug-NB: NB#180486 Reviewed-by: Simon McVittie - dbus/dbus-binding-tool-glib.c | 27 +++++++++++++-------------- + dbus/dbus-binding-tool-glib.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) commit 4cd1f54f4db5759db3781da4645cebcd4143e9a4 @@ -2776,7 +3572,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30274 Reviewed-by: Simon McVittie - dbus/dbus-gobject.c | 9 +++++---- + dbus/dbus-gobject.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit d4780b527f5112acf015c0e57c9911e939b16f99 @@ -2788,7 +3584,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29884 Reviewed-by: Simon McVittie - dbus/dbus-gmain.c | 3 ++- + dbus/dbus-gmain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit c7b83e5b3bf7291b75399eed3f01ecea0c98702f @@ -2801,7 +3597,7 @@ Origin: vendor, Maemo Reviewed-by: Simon McVittie - test/core/test-dbus-glib.c | 3 +++ + test/core/test-dbus-glib.c | 3 +++ 1 file changed, 3 insertions(+) commit 7e157ee379de430fce9874291701c0c6666d2c2d @@ -2810,7 +3606,7 @@ Bump version to 0.93 for development - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a12d06317591f954542d5ddbe1a1d3cad10a8156 @@ -2819,7 +3615,7 @@ Release version 0.92 - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cb7a627ea838ae453d1401679a2b97acd95ba327 @@ -2834,7 +3630,7 @@ had this dependency, but I didn't notice. - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c12efeeb7d9eb76eeae049528cee09c331551a5e @@ -2843,7 +3639,7 @@ Bump version to 0.91 for development - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4d4a1e266727de9ed1cba2707006435a389cac90 @@ -2852,7 +3648,7 @@ HACKING: Fix release URL; be honest about NEWS - HACKING | 8 ++++---- + HACKING | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit b3c18c486dbb1fd2c6221d26fd64719d73ff4200 @@ -2864,7 +3660,7 @@ This seems to be some kind of leftover from the now-deleted lcov stuff. - Makefile.am | 2 +- + Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ccd31bb39e496ba511e888d793b15bfaa22894f0 @@ -2873,7 +3669,7 @@ Release version 0.90 - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 65fb5802295ff28970ac1e3f0d5adaa6927a5773 @@ -2885,7 +3681,7 @@ This fixes running `make check` without first running `make`, since subdirs of test/ depend on the binaries in that directory. - test/Makefile.am | 2 +- + test/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 22df79e0c1373b696adbbaf2791195f0a8b5fb0f @@ -2915,12 +3711,12 @@ Fixes: Signed-off-by: Will Thompson - .gitignore | 1 + - dbus/dbus-gmain.c | 7 ++-- - test/core/30574.c | 96 - +++++++++++++++++++++++++++++++++++++++++++++++++ - test/core/Makefile.am | 4 +++ - test/core/run-test.sh | 1 + + .gitignore | 1 + + dbus/dbus-gmain.c | 7 ++-- + test/core/30574.c | 96 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + test/core/Makefile.am | 4 +++ + test/core/run-test.sh | 1 + 5 files changed, 106 insertions(+), 3 deletions(-) commit 8f0936de52b62b025385182406e5ea5795503d76 @@ -2950,7 +3746,7 @@ copy arrays of 'o', 'g' from GVariant without constructing a format string programmatically - dbus/dbus-gvalue-parse-variant.c | 5 ++--- + dbus/dbus-gvalue-parse-variant.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 869c180e12c68ed06fe973c58f26cffbf4a3cec9 @@ -2959,7 +3755,7 @@ output unhandled GVariantClass as ASCII if possible - dbus/dbus-gvalue-parse-variant.c | 5 +++-- + dbus/dbus-gvalue-parse-variant.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 42192c5bc0517d747aa83e9ce82e0208c3426aab @@ -2968,7 +3764,7 @@ Add dbus_g_value_parse_g_variant to gtkdoc - doc/reference/dbus-glib-sections.txt | 1 + + doc/reference/dbus-glib-sections.txt | 1 + 1 file changed, 1 insertion(+) commit f3b4a2d82994f0013f14fffbd3fedd8cd45cf7da @@ -2978,7 +3774,7 @@ dbus_g_value_parse_variant_by_type: talk about GVariant, not GDBus, in docs - dbus/dbus-gvalue-parse-variant.c | 4 ++-- + dbus/dbus-gvalue-parse-variant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit bc207d10cace8051ff7b2ddf51176030c0d40d17 @@ -2987,7 +3783,7 @@ Adjust syntax to avoid relying on array/pointer duality - dbus/dbus-gvalue-parse-variant.c | 4 ++-- + dbus/dbus-gvalue-parse-variant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a66176ecd5eab86d62e23c393c90dfda4d9ca354 @@ -2997,7 +3793,7 @@ dbus_g_value_basic_array_parse_variant: allow the fast path to be taken - dbus/dbus-gvalue-parse-variant.c | 2 +- + dbus/dbus-gvalue-parse-variant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b9c4c4bf00321ab1fb092514c6b1312d82a098c3 @@ -3010,8 +3806,8 @@ out various round-trip conversions. - test/core/test-gvariant.c | 283 - +++++++++++++++++++++++++++++++++++++++++++++ + test/core/test-gvariant.c | 283 + ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) commit 817e1fc7c50ccde3643c20ed837dce00bc16a885 @@ -3025,8 +3821,8 @@ mirrors dbus_g_value_build_g_variant itself, which just returns the type. - dbus/dbus-gtype-specialized.c | 114 - ++++++++++++++++++++++++++++++++++++++++- + dbus/dbus-gtype-specialized.c | 114 + +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 112 insertions(+), 2 deletions(-) commit 53d4457fb5bd71467acb1fbca7ecd80d8e39e189 @@ -3039,7 +3835,7 @@ This is highly non-obvious, and tripped me up while writing dbus_g_value_parse_g_variant. - dbus/dbus-gtype-specialized.c | 4 ++-- + dbus/dbus-gtype-specialized.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 26e1c1d86b6e583ac326674ab8b886673f7c1f90 @@ -3054,11 +3850,11 @@ translate them into GValue for transmission over dbus-glib, as a transition mechanism. - dbus/Makefile.am | 2 + - dbus/dbus-glib.h | 2 + - dbus/dbus-gvalue-parse-variant.c | 525 - ++++++++++++++++++++++++++++++++++++++ - dbus/dbus-gvalue-parse-variant.h | 39 +++ + dbus/Makefile.am | 2 + + dbus/dbus-glib.h | 2 + + dbus/dbus-gvalue-parse-variant.c | 525 + +++++++++++++++++++++++++++++++++++++++ + dbus/dbus-gvalue-parse-variant.h | 39 +++ 4 files changed, 568 insertions(+) commit abe6ee06e30f71187aeaed2c8804cbcc6692d8cc @@ -3067,9 +3863,9 @@ replace remnants of gcov support with lcov.am from telepathy-glib - .gitignore | 4 ++++ - Makefile.am | 27 +-------------------------- - tools/lcov.am | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + .gitignore | 4 ++++ + Makefile.am | 27 +-------------------------- + tools/lcov.am | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 26 deletions(-) commit b4362df4d4b9ccd3246f102f7990dbda426f1b8c @@ -3090,8 +3886,8 @@ Test dbus_g_value_build_g_variant for various fixed arrays - test/core/test-gvariant.c | 217 - +++++++++++++++++++++++++++++++++++++++++++++ + test/core/test-gvariant.c | 217 + ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 217 insertions(+) commit 75161c695e8d9729ead8543b1297202eee1894f9 @@ -3100,7 +3896,7 @@ Actually run test/core/test-gvariant - test/core/run-test.sh | 1 + + test/core/run-test.sh | 1 + 1 file changed, 1 insertion(+) commit 48b2b580c4d6fdcd9db83db7acebb0ea4be6fff9 @@ -3111,8 +3907,8 @@ This is necessary to have dbus_g_value_build_g_variant work on them. - dbus/dbus-gvalue-utils.c | 162 - +++++++++++++++++++++++++++++++++++++++++++++- + dbus/dbus-gvalue-utils.c | 162 + ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 160 insertions(+), 2 deletions(-) commit 0ab27bb2b7c3f944348e6368069ffbfcfc2bcb5a @@ -3121,7 +3917,7 @@ Free looked up function name in dbus binding tool - dbus/dbus-binding-tool-glib.c | 11 +++++++---- + dbus/dbus-binding-tool-glib.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 5784ee8f24334e634e91b8761dfa956f97a0d2ba @@ -3130,7 +3926,7 @@ Always free method_c_name in dbus binding tool - dbus/dbus-binding-tool-glib.c | 11 +++++++++-- + dbus/dbus-binding-tool-glib.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit 4acce76d97825721c1792417994e592542f4d3d9 @@ -3139,7 +3935,7 @@ Free path string after emission in in statemachine server example - dbus/examples/statemachine/statemachine-server.c | 1 + + dbus/examples/statemachine/statemachine-server.c | 1 + 1 file changed, 1 insertion(+) commit ddb48ae24e40c8636b85555e8d288e2a33cadd44 @@ -3148,7 +3944,7 @@ Plug leak of expected_str in threaded server test - test/core/test-thread-server.c | 1 + + test/core/test-thread-server.c | 1 + 1 file changed, 1 insertion(+) commit a07afee00e091a11dc9eefd775288a32f0e49e2d @@ -3157,7 +3953,7 @@ Dereference main loop once variant recursion test is done - test/core/test-variant-recursion.c | 2 ++ + test/core/test-variant-recursion.c | 2 ++ 1 file changed, 2 insertions(+) commit ffe66eb93737eb5ac699b8acba7781a5f77bdab6 @@ -3166,7 +3962,7 @@ Remove unused method attribute variables in introspect_interfaces - dbus/dbus-gobject.c | 4 ---- + dbus/dbus-gobject.c | 4 ---- 1 file changed, 4 deletions(-) commit afd098718e36b8ce51f565447f429d807bab3785 @@ -3175,10 +3971,10 @@ Add DBusGObjectPath, DBusGSignature typedefs - dbus/dbus-glib.h | 2 ++ - dbus/dbus-gvalue.c | 44 - ++++++++++++++++++++++++++++++---- - doc/reference/dbus-glib-sections.txt | 4 +++- + dbus/dbus-glib.h | 2 ++ + dbus/dbus-gvalue.c | 44 + ++++++++++++++++++++++++++++++++---- + doc/reference/dbus-glib-sections.txt | 4 +++- 3 files changed, 45 insertions(+), 5 deletions(-) commit 8318613e6b186bd9e5c8a844c58beebf47426116 @@ -3187,7 +3983,7 @@ configure: Release 0.88 - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 510bdcd63ae4e588a5cb72727696d5ad7fd5298b @@ -3214,14 +4010,14 @@ service may disable this by calling dbus_glib_global_set_disable_legacy_property_access(). - dbus/dbus-binding-tool-glib.c | 53 +++++-- - dbus/dbus-glib.h | 2 + - dbus/dbus-gobject.c | 293 - +++++++++++++++++++++++++++++++++------ - test/core/my-object.c | 63 ++++++++- - test/core/my-object.h | 5 + - test/core/test-dbus-glib.c | 252 +++++++++++++++++++++++++++++++-- - test/core/test-service-glib.xml | 5 + + dbus/dbus-binding-tool-glib.c | 53 ++++++-- + dbus/dbus-glib.h | 2 + + dbus/dbus-gobject.c | 293 + ++++++++++++++++++++++++++++++++++------ + test/core/my-object.c | 63 ++++++++- + test/core/my-object.h | 5 + + test/core/test-dbus-glib.c | 252 ++++++++++++++++++++++++++++++++-- + test/core/test-service-glib.xml | 5 + 7 files changed, 601 insertions(+), 72 deletions(-) commit f0668d71d63f97c1c429dad165a30d3aadbdfa0f @@ -3238,11 +4034,11 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29274 Reviewed-by: Colin Walters - dbus/examples/Makefile.am | 8 ++++---- - dbus/examples/statemachine/Makefile.am | 6 ++++-- - test/core/Makefile.am | 32 + dbus/examples/Makefile.am | 8 ++++---- + dbus/examples/statemachine/Makefile.am | 6 ++++-- + test/core/Makefile.am | 32 +++++++++++++------------------- - test/interfaces/Makefile.am | 8 ++++---- + test/interfaces/Makefile.am | 8 ++++---- 4 files changed, 25 insertions(+), 29 deletions(-) commit ccf4a4d8c82b7309af7f3fb23144690acbf8e38c @@ -3251,7 +4047,7 @@ Add various tests etc. to .gitignore - .gitignore | 7 +++++++ + .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) commit dcc9c8f2dede482614b885eace06f2dedaf2a736 @@ -3260,7 +4056,7 @@ Add Libtool m4 to .gitignore - .gitignore | 5 +++++ + .gitignore | 5 +++++ 1 file changed, 5 insertions(+) commit 9440209e203cccef158904800ea623568637a71e @@ -3280,7 +4076,7 @@ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=29214 - dbus/dbus-gproxy.c | 6 +++--- + dbus/dbus-gproxy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 077d445078663e3ee6f93beacc14d866504148bf @@ -3289,8 +4085,8 @@ Support DBUS_TYPE_G_SIGNATURE - dbus/dbus-gtype-specialized.c | 2 ++ - test/core/test-gvariant.c | 21 +++++++++++++++++++++ + dbus/dbus-gtype-specialized.c | 2 ++ + test/core/test-gvariant.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) commit 13f7c51344111ca5266e790d2f4863fab770bfd8 @@ -3299,8 +4095,8 @@ Test test_g_variant_equivalent itself - test/core/test-gvariant.c | 144 - +++++++++++++++++++++++++++++++++++++++++++++ + test/core/test-gvariant.c | 144 + ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) commit 90b5e06797f2c9c5ed8918d22de35d5093bc3bd1 @@ -3312,8 +4108,8 @@ Makes up for the limitations of g_variant_equal() - test/core/test-gvariant.c | 114 - +++++++++++++++++++++++++++++++++++++++++---- + test/core/test-gvariant.c | 114 + ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 106 insertions(+), 8 deletions(-) commit 5456dc1f10544505a61f2608f646256e28b0047a @@ -3322,9 +4118,9 @@ Tests for GValue-to-GVariant - test/core/Makefile.am | 7 +- - test/core/test-gvariant.c | 191 - +++++++++++++++++++++++++++++++++++++++++++++ + test/core/Makefile.am | 7 +- + test/core/test-gvariant.c | 191 + ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+), 1 deletion(-) commit 5cc0676c83ee678069886daad5fc5487f098686e @@ -3333,10 +4129,10 @@ fd.o #28715: Add dbus_g_value_build_g_variant() - dbus/dbus-gtype-specialized.c | 127 - ++++++++++++++++++++++++++++++++++ - dbus/dbus-gtype-specialized.h | 2 + - doc/reference/dbus-glib-sections.txt | 1 + + dbus/dbus-gtype-specialized.c | 127 + +++++++++++++++++++++++++++++++++++ + dbus/dbus-gtype-specialized.h | 2 + + doc/reference/dbus-glib-sections.txt | 1 + 3 files changed, 130 insertions(+) commit 5ed147db0808e5f4ef50dfd6011419c44255ea6c @@ -3345,7 +4141,7 @@ Bumping required GLib to 2.24 for GVariant - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7f054d7bce4b2ea74e5268f2cf65c467773ee14f @@ -3359,7 +4155,7 @@ shadow property we free the uscore converted one and then return it immediately after. - dbus/dbus-gobject.c | 3 ++- + dbus/dbus-gobject.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit e6b6e27dc2d6e3abae88d9a773a1e4c016e58aa3 @@ -3370,7 +4166,7 @@ Reviewed-by: Will Thompson - dbus/dbus-gobject.c | 30 +++++++++++++++++++++++++----- + dbus/dbus-gobject.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) commit 451183c140f7d6b42fdff3a6c190ef93d860c5fc @@ -3389,7 +4185,7 @@ Put the G_OS_WIN32 check where it can be defined. - test/core/test-profile.c | 5 +++-- + test/core/test-profile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit fb7cb9f10e08eaf3887b2a63a7fa59510e40b5d2 @@ -3399,8 +4195,8 @@ Fix linking of tests. On windows, undefined symbols are not allowed and symbol lookup is sequencial - test/core/Makefile.am | 2 +- - test/interfaces/Makefile.am | 2 +- + test/core/Makefile.am | 2 +- + test/interfaces/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit fadbedfbbf512d69611a80a0cd4698e3b5d579ea @@ -3409,8 +4205,8 @@ Use EXEEXT so that we satisfy dependencies when cross-compiling - test/core/Makefile.am | 6 +++--- - test/interfaces/Makefile.am | 20 ++++++++++---------- + test/core/Makefile.am | 6 +++--- + test/interfaces/Makefile.am | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) commit f0abb1f78d4e4764119b57d2b6f3b5fa57d8fdfb @@ -3427,11 +4223,11 @@ Signed-off-by: Colin Walters - dbus/dbus-gobject.c | 17 +++++++++++------ - test/core/my-object.c | 12 ++++++++++++ - test/core/my-object.h | 1 + - test/core/test-dbus-glib.c | 8 ++++++++ - test/core/test-service-glib.xml | 3 +++ + dbus/dbus-gobject.c | 17 +++++++++++------ + test/core/my-object.c | 12 ++++++++++++ + test/core/my-object.h | 1 + + test/core/test-dbus-glib.c | 8 ++++++++ + test/core/test-service-glib.xml | 3 +++ 5 files changed, 35 insertions(+), 6 deletions(-) commit 47adc3b17f20a78230c5c34e635fc30bb7afbde2 @@ -3442,7 +4238,7 @@ It uses Unix sockets, and overall isn't very interesting anyways. - test/core/test-profile.c | 13 +++++++++++-- + test/core/test-profile.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit 16deb341b52421695b81ebe8c91c81f47eb173f3 @@ -3453,8 +4249,8 @@ This causes problems on Windows. - dbus/dbus-gidl.h | 2 +- - dbus/dbus-glib.h | 6 +++--- + dbus/dbus-gidl.h | 2 +- + dbus/dbus-glib.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) commit 354ed0897ae0e815e95a7eb931de6ba35325121c @@ -3466,7 +4262,7 @@ This is what GLib uses; see the Autoconf manual for the full explanation of the train wreck. - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit af0ec6795ea64d6498b83f30ecd94adc4e935e7e @@ -3480,7 +4276,7 @@ since it's perfectly valid to have the same one on two different connections. - dbus/dbus-gobject.c | 2 +- + dbus/dbus-gobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fc7114a536571688d48ede025f1357c0e467c879 @@ -3492,7 +4288,7 @@ Reviewed-by: Will Thompson Reviewed-by: Simon McVittie - doc/reference/dbus-glib-sections.txt | 9 +++++++++ + doc/reference/dbus-glib-sections.txt | 9 +++++++++ 1 file changed, 9 insertions(+) commit 8df3281e536557cfd6b4056a9c95102d57596179 @@ -3501,7 +4297,7 @@ [configure] Release 0.86 - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 551d86f7fe0e7f2304f57baa7a406c935182b06a @@ -3510,7 +4306,7 @@ core: performance optimization for object info lookup - dbus/dbus-gobject.c | 31 ++++++++++++++++++------------- + dbus/dbus-gobject.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) commit ed73cb2f32c411a3306c6dfe2ae541aea249f200 @@ -3526,17 +4322,17 @@ the interface to register "shadow" properties on a per-interface basis which redirect the lookup of the property name. - dbus/dbus-glib.h | 4 + - dbus/dbus-gobject.c | 160 +++++++++++++++++++++++++---- - test/interfaces/Makefile.am | 24 ++++- - test/interfaces/test-client.c | 186 - +++++++++++++++++++++++++++++++++ - test/interfaces/test-dup-prop-a.xml | 6 ++ - test/interfaces/test-dup-prop-b.xml | 6 ++ - test/interfaces/test-dup-prop.c | 192 - +++++++++++++++++++++++++++++++++++ - test/interfaces/test-dup-prop.h | 60 +++++++++++ - test/interfaces/test-server.c | 8 ++ + dbus/dbus-glib.h | 4 + + dbus/dbus-gobject.c | 160 ++++++++++++++++++++++++++---- + test/interfaces/Makefile.am | 24 ++++- + test/interfaces/test-client.c | 186 + ++++++++++++++++++++++++++++++++++ + test/interfaces/test-dup-prop-a.xml | 6 ++ + test/interfaces/test-dup-prop-b.xml | 6 ++ + test/interfaces/test-dup-prop.c | 192 + ++++++++++++++++++++++++++++++++++++ + test/interfaces/test-dup-prop.h | 60 +++++++++++ + test/interfaces/test-server.c | 8 ++ 9 files changed, 627 insertions(+), 19 deletions(-) commit c1bbf6fb1b7c6e2a743c8a7353cddea52d42fa2d @@ -3545,7 +4341,7 @@ [dbus-gobject.c] Trivial compiler warning fixes - dbus/dbus-gobject.c | 3 +-- + dbus/dbus-gobject.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit b52c16b495632bd945328ca858533d5660106bdf @@ -3554,7 +4350,8 @@ Remove dbus-glib-undeclared.txt from git; it's a generated file - 0 files changed + doc/reference/dbus-glib-undeclared.txt | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) commit 7b029451dac1fdd14da4e558cc995fb7f5263d04 Author: Colin Walters @@ -3562,7 +4359,7 @@ [configure.ac] Use AM_SILENT_RULES if available - configure.ac | 2 ++ + configure.ac | 2 ++ 1 file changed, 2 insertions(+) commit db026859406ce768d71d4ccf850e8be56b52998c @@ -3573,7 +4370,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=26981 - dbus/dbus-gobject.c | 4 ++++ + dbus/dbus-gobject.c | 4 ++++ 1 file changed, 4 insertions(+) commit 3902ac5a13a7510b8411b1147d0cce5711cf4168 @@ -3586,7 +4383,7 @@ in gtk-doc - dbus/dbus-gobject.c | 6 +++--- + dbus/dbus-gobject.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 3d69cfeab177e79b4ecfe1b4284a5bd840fd11e7 @@ -3601,11 +4398,11 @@ Based on an original patch from Neil Roberts - dbus/dbus-gobject.c | 21 ++++++++++++++++++--- - test/core/my-object.c | 13 +++++++++++++ - test/core/my-object.h | 4 +++- - test/core/test-dbus-glib.c | 7 +++++++ - test/core/test-service-glib.xml | 3 +++ + dbus/dbus-gobject.c | 21 ++++++++++++++++++--- + test/core/my-object.c | 13 +++++++++++++ + test/core/my-object.h | 4 +++- + test/core/test-dbus-glib.c | 7 +++++++ + test/core/test-service-glib.xml | 3 +++ 5 files changed, 44 insertions(+), 4 deletions(-) commit 4538adc1fe903d1ce71ca24590df9bdac7c4a50e @@ -3620,7 +4417,7 @@ This incorrectly uppercased the first character in error names: https://bugzilla.redhat.com/show_bug.cgi?id=569631 - dbus/dbus-gobject.c | 13 ++----------- + dbus/dbus-gobject.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) commit 2d85761286e96df3490426af1e20e7b553448092 @@ -3631,8 +4428,8 @@ It's autogenerated by gtk-doc, so shouldn't be in git. - doc/reference/dbus-glib-undocumented.txt | 60 - ------------------------------ + doc/reference/dbus-glib-undocumented.txt | 60 + -------------------------------- 1 file changed, 60 deletions(-) commit 9637ed9f0c66982a06048b18ccf983881643e456 @@ -3644,7 +4441,7 @@ We were just taking the enumeration nick and appending to the DBus error name, but since these can contain '-' we need to squash. - dbus/dbus-gobject.c | 13 +++++++++++-- + dbus/dbus-gobject.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit d039ca66f85955788e2d58294c249579bed9cc03 @@ -3653,7 +4450,7 @@ Release 0.84 - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f1c3f7bf585d6010c84491372b0a6f0ae3b1432a @@ -3670,9 +4467,9 @@ Also, add a (very simple) test case which just uses a private connection for the default main context. - dbus/dbus-glib.h | 1 + - dbus/dbus-gmain.c | 4 +++- - test/core/test-dbus-glib.c | 21 +++++++++++++++++++++ + dbus/dbus-glib.h | 1 + + dbus/dbus-gmain.c | 4 +++- + test/core/test-dbus-glib.c | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) commit 87c645ed17d6fef350e8c26e322ecde566a27d42 @@ -3683,7 +4480,7 @@ commit c4a5653e0402f876a1824c33a19e69991ee46a27 was missing a "break;" - dbus/dbus-gvalue.c | 1 + + dbus/dbus-gvalue.c | 1 + 1 file changed, 1 insertion(+) commit e6cd65545ee5cd2eeb5ccc21d5bfe8e8ac286d95 @@ -3692,7 +4489,7 @@ Add note about non-maintenance of NEWS - NEWS | 7 +++++++ + NEWS | 7 +++++++ 1 file changed, 7 insertions(+) commit c4a5653e0402f876a1824c33a19e69991ee46a27 @@ -3719,7 +4516,7 @@ Signed-off-by: Andres Salomon - dbus/dbus-gvalue.c | 3 +-- + dbus/dbus-gvalue.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit b976413f896f2d5a0be9449fc77a716f2e67cc96 @@ -3728,7 +4525,7 @@ Fix bad NAME in dbus-binding-tool man page - doc/dbus-binding-tool.1 | 2 +- + doc/dbus-binding-tool.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 34636b12c62523b9db789b0fbeb3a86782debf10 @@ -3744,11 +4541,11 @@ capability to update dbus-glib. - Makefile.am | 1 + - configure.ac | 12 -------- - dbus-bus-introspect.xml | 77 - +++++++++++++++++++++++++++++++++++++++++++++++ - tools/Makefile.am | 15 ++------- + Makefile.am | 1 + + configure.ac | 12 -------- + dbus-bus-introspect.xml | 77 + +++++++++++++++++++++++++++++++++++++++++++++++++ + tools/Makefile.am | 15 ++-------- 4 files changed, 81 insertions(+), 24 deletions(-) commit 9cefa4bae8d20beddf695380af00945790da0206 @@ -3766,7 +4563,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=25119 - dbus/dbus-gobject.c | 17 ++++++++++------- + dbus/dbus-gobject.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit 5e5a1c1930173dac0e331c2cb78a164c3565b0eb @@ -3798,8 +4595,8 @@ Signed-off-by: Colin Walters - dbus/dbus-glib.h | 3 +++ - dbus/dbus-gmain.c | 41 +++++++++++++++++++++++++++++++++++++++++ + dbus/dbus-glib.h | 3 +++ + dbus/dbus-gmain.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) commit 90e2199ac99f5b8ab0cd5f45dcb398ecf9af03d9 @@ -3814,7 +4611,7 @@ of the loop, 'iter' would point to a link which has been freed. - dbus/dbus-gobject.c | 8 +++++++- + dbus/dbus-gobject.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 39e2642e41b2293de7556fa15c57872f78ffcdc8 @@ -3823,7 +4620,7 @@ Only re-set registration list if it's non-empty - dbus/dbus-gobject.c | 4 +++- + dbus/dbus-gobject.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 0263b72669de710e0adda419a520ae9f123a1be9 @@ -3845,10 +4642,10 @@ The primary change is that signals are now emitted once for each registration path of an object, using the correct path. - dbus/dbus-gobject.c | 159 - ++++++++++++++++++++++++++++------------- - test/core/test-dbus-glib.c | 41 +++++++++++ - test/core/test-service-glib.c | 4 ++ + dbus/dbus-gobject.c | 159 + +++++++++++++++++++++++++++++------------- + test/core/test-dbus-glib.c | 41 +++++++++++ + test/core/test-service-glib.c | 4 ++ 3 files changed, 154 insertions(+), 50 deletions(-) commit c993494ad463ffe55b8603e58aa5ecb6dd731144 @@ -3857,7 +4654,7 @@ Release 0.82 - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 65e03ccf0f2417a83fd187035b80d680e376fd32 @@ -3868,7 +4665,7 @@ The combined tools are no longer in $PATH for modern git. - Makefile.am | 8 ++++---- + Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit f5edb761202d3aff8f8bd0bc68dd57d3d32d2bd1 @@ -3882,7 +4679,7 @@ Signed-off-by: Colin Walters - dbus/dbus-gobject.c | 4 ++-- + dbus/dbus-gobject.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2508e687e7d7792a656c7af0aad1be851faa33bb @@ -3893,9 +4690,9 @@ Signed-off-by: Colin Walters - doc/Makefile.am | 6 +- - doc/dbus-binding-tool.1 | 294 - +++++++++++++++++++++++++++++++++++++++++++++++ + doc/Makefile.am | 6 +- + doc/dbus-binding-tool.1 | 294 + ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 299 insertions(+), 1 deletion(-) commit 29513843b22dbd2aba1d3ba2930bb38e2c6631e5 @@ -3916,8 +4713,8 @@ (I am using libltdl-dev 2.2.6a-4 from Debian) - Makefile.am | 1 + - autogen.sh | 1 + + Makefile.am | 1 + + autogen.sh | 1 + 2 files changed, 2 insertions(+) commit d66337bdf9fc8f5372d84b05ae68c818bb9c881b @@ -3928,7 +4725,7 @@ Signed-off-by: Colin Walters - dbus/dbus-glib-tool.h | 2 +- + dbus/dbus-glib-tool.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 67c289a60a4ac2ee9660f38a7168a238c1b3cffb @@ -3937,9 +4734,9 @@ Clean up some compilation warnings - dbus/dbus-gloader-expat.c | 6 +++--- - dbus/dbus-gobject.c | 4 ++-- - test/core/test-dbus-glib.c | 2 +- + dbus/dbus-gloader-expat.c | 6 +++--- + dbus/dbus-gobject.c | 4 ++-- + test/core/test-dbus-glib.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) commit 5eea6af0d24780109dbbc15b8bfa4078df3a80a2 @@ -3951,7 +4748,7 @@ The function was introduced in commit b4911558384de and intended to be public, make it so. - dbus/dbus-glib.h | 2 ++ + dbus/dbus-glib.h | 2 ++ 1 file changed, 2 insertions(+) commit de68d2b2fc3012ae733212a704aa29a748f22f80 @@ -3965,7 +4762,7 @@ Signed-off-by: Colin Walters - dbus/dbus-binding-tool-glib.c | 12 ++++++++---- + dbus/dbus-binding-tool-glib.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit af07e13e6afe09456588ddba4b72cba215bc7c93 @@ -3977,13 +4774,13 @@ The _set*_take_ownership are replaced by _take, and use g_main_loop_run. - dbus/dbus-binding-tool-glib.c | 6 +++--- - dbus/dbus-gvalue-utils.c | 14 +++++++------- - dbus/dbus-gvalue.c | 16 ++++++++-------- - m4/gtk-doc.m4 | 2 +- - test/core/test-dbus-glib.c | 2 +- - test/core/test-thread-client.c | 2 +- - test/core/test-thread-server.c | 2 +- + dbus/dbus-binding-tool-glib.c | 6 +++--- + dbus/dbus-gvalue-utils.c | 14 +++++++------- + dbus/dbus-gvalue.c | 16 ++++++++-------- + m4/gtk-doc.m4 | 2 +- + test/core/test-dbus-glib.c | 2 +- + test/core/test-thread-client.c | 2 +- + test/core/test-thread-server.c | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) commit e2007cfc5822f057b975660bd369fee56a7f2eb6 @@ -3994,9 +4791,9 @@ `git grep 'Temple Place'` now returns nothing. - dbus/dbus-bash-completion-helper.c | 2 +- - dbus/dbus-gtool-test.h | 2 +- - dbus/dbus-gtype-specialized-priv.h | 2 +- + dbus/dbus-bash-completion-helper.c | 2 +- + dbus/dbus-gtool-test.h | 2 +- + dbus/dbus-gtype-specialized-priv.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit cbe5250e553112221e1230301767ad1052790b0a @@ -4017,37 +4814,37 @@ Signed-off-by: Simon McVittie - COPYING | 4 ++-- - dbus/dbus-binding-tool-glib.c | 2 +- - dbus/dbus-binding-tool-glib.h | 2 +- - dbus/dbus-gidl.c | 2 +- - dbus/dbus-gidl.h | 2 +- - dbus/dbus-glib-lowlevel.h | 2 +- - dbus/dbus-glib-tool.c | 2 +- - dbus/dbus-glib-tool.h | 2 +- - dbus/dbus-glib.c | 2 +- - dbus/dbus-glib.h | 2 +- - dbus/dbus-gloader-expat.c | 2 +- - dbus/dbus-gmain.c | 2 +- - dbus/dbus-gobject.c | 2 +- - dbus/dbus-gobject.h | 2 +- - dbus/dbus-gparser.c | 2 +- - dbus/dbus-gparser.h | 2 +- - dbus/dbus-gproxy.c | 2 +- - dbus/dbus-gsignature.c | 2 +- - dbus/dbus-gtest-main.c | 2 +- - dbus/dbus-gtest.c | 2 +- - dbus/dbus-gtest.h | 2 +- - dbus/dbus-gthread.c | 2 +- - dbus/dbus-gtype-specialized.c | 2 +- - dbus/dbus-gtype-specialized.h | 2 +- - dbus/dbus-gutils.c | 2 +- - dbus/dbus-gutils.h | 2 +- - dbus/dbus-gvalue-utils.c | 2 +- - dbus/dbus-gvalue-utils.h | 2 +- - dbus/dbus-gvalue.c | 2 +- - test/core/test-profile.c | 2 +- - test/decode-gcov.c | 2 +- + COPYING | 4 ++-- + dbus/dbus-binding-tool-glib.c | 2 +- + dbus/dbus-binding-tool-glib.h | 2 +- + dbus/dbus-gidl.c | 2 +- + dbus/dbus-gidl.h | 2 +- + dbus/dbus-glib-lowlevel.h | 2 +- + dbus/dbus-glib-tool.c | 2 +- + dbus/dbus-glib-tool.h | 2 +- + dbus/dbus-glib.c | 2 +- + dbus/dbus-glib.h | 2 +- + dbus/dbus-gloader-expat.c | 2 +- + dbus/dbus-gmain.c | 2 +- + dbus/dbus-gobject.c | 2 +- + dbus/dbus-gobject.h | 2 +- + dbus/dbus-gparser.c | 2 +- + dbus/dbus-gparser.h | 2 +- + dbus/dbus-gproxy.c | 2 +- + dbus/dbus-gsignature.c | 2 +- + dbus/dbus-gtest-main.c | 2 +- + dbus/dbus-gtest.c | 2 +- + dbus/dbus-gtest.h | 2 +- + dbus/dbus-gthread.c | 2 +- + dbus/dbus-gtype-specialized.c | 2 +- + dbus/dbus-gtype-specialized.h | 2 +- + dbus/dbus-gutils.c | 2 +- + dbus/dbus-gutils.h | 2 +- + dbus/dbus-gvalue-utils.c | 2 +- + dbus/dbus-gvalue-utils.h | 2 +- + dbus/dbus-gvalue.c | 2 +- + test/core/test-profile.c | 2 +- + test/decode-gcov.c | 2 +- 31 files changed, 32 insertions(+), 32 deletions(-) commit 499beb64a12cead99ccb09d7de01890aaa800ef2 @@ -4064,7 +4861,7 @@ after the call is cancelled. - dbus/dbus-gproxy.c | 3 +-- + dbus/dbus-gproxy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit b615918eef9723c00f03d30903181d9989dfd261 @@ -4092,11 +4889,11 @@ API entry points are themselves used inside the initialization. - dbus/Makefile.am | 1 + - dbus/dbus-gtype-specialized-priv.h | 48 +++++++++++++++++++++++++++ - dbus/dbus-gtype-specialized.c | 64 - ++++++++++++++++++++++++++---------- - dbus/dbus-gvalue-utils.c | 11 ++++--- + dbus/Makefile.am | 1 + + dbus/dbus-gtype-specialized-priv.h | 48 ++++++++++++++++++++++++++++ + dbus/dbus-gtype-specialized.c | 64 + +++++++++++++++++++++++++++----------- + dbus/dbus-gvalue-utils.c | 11 ++++--- 4 files changed, 101 insertions(+), 23 deletions(-) commit cb8a113be8808fe2c88d3e7851e79115235f9e8c @@ -4168,8 +4965,8 @@ This makes it clearer we're not taking ownership of the error, and interoperates more nicely with functions which provide const GError *. - dbus/dbus-glib.h | 2 +- - dbus/dbus-gobject.c | 2 +- + dbus/dbus-glib.h | 2 +- + dbus/dbus-gobject.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit a809ea3016a0eae166df13c757f3e917dea0c0f9 @@ -4182,7 +4979,7 @@ Signed-off-by: Colin Walters - dbus/dbus-binding-tool-glib.c | 1 + + dbus/dbus-binding-tool-glib.c | 1 + 1 file changed, 1 insertion(+) commit b93c2a19f468930c6badf054f79597d99d86e76c @@ -4191,10 +4988,10 @@ fd.o #21219: regression test - test/core/Makefile.am | 22 ++++++++++++++- - test/core/run-test.sh | 1 + - test/core/unregister.c | 71 - ++++++++++++++++++++++++++++++++++++++++++++++++ + test/core/Makefile.am | 22 +++++++++++++++- + test/core/run-test.sh | 1 + + test/core/unregister.c | 71 + ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 1 deletion(-) commit e869fda44331e6f590f974ad779115a22f5af22e @@ -4204,7 +5001,7 @@ dbus-gobject: save the ObjectRegistration on each object, not just the path - dbus/dbus-gobject.c | 20 +++++++++++++------- + dbus/dbus-gobject.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) commit b4911558384de9919a231c29d75d9560f81fad0a @@ -4213,8 +5010,8 @@ fd.o #21219: implement unregistration of objects - dbus/dbus-gobject.c | 25 ++++++++++++++++++++++++- - doc/reference/dbus-glib-sections.txt | 1 + + dbus/dbus-gobject.c | 25 ++++++++++++++++++++++++- + doc/reference/dbus-glib-sections.txt | 1 + 2 files changed, 25 insertions(+), 1 deletion(-) commit e42535c3c0dace3ede96c50f5a9b3cc315c80190 @@ -4226,10 +5023,10 @@ Also assert that dbus_g_connection_lookup_g_object works (my previous attempt to fix #5688 broke this). - test/core/5688.c | 81 - +++++++++++++++++++++++++++++++++++++++++++++++++ - test/core/Makefile.am | 13 +++++++- - test/core/run-test.sh | 1 + + test/core/5688.c | 81 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + test/core/Makefile.am | 13 ++++++++- + test/core/run-test.sh | 1 + 3 files changed, 94 insertions(+), 1 deletion(-) commit 6de1441865da2816c6bcd8cae842be93a8a96304 @@ -4248,8 +5045,8 @@ use the second object path, and leak memory). - dbus/dbus-gobject.c | 111 - ++++++++++++++++++++++++++++++++++++++++----------- + dbus/dbus-gobject.c | 111 + +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 88 insertions(+), 23 deletions(-) commit 725e98ffa810d04baf38e5d5d3f62091334b0888 @@ -4267,12 +5064,12 @@ Signed-off-by: Peter Korsgaard Signed-off-by: Robert Schwebel - configure.ac | 5 +++++ - dbus/examples/Makefile.am | 4 ++-- - dbus/examples/statemachine/Makefile.am | 4 ++-- - test/core/Makefile.am | 6 +++--- - test/interfaces/Makefile.am | 12 ++++++------ - tools/Makefile.am | 2 +- + configure.ac | 5 +++++ + dbus/examples/Makefile.am | 4 ++-- + dbus/examples/statemachine/Makefile.am | 4 ++-- + test/core/Makefile.am | 6 +++--- + test/interfaces/Makefile.am | 12 ++++++------ + tools/Makefile.am | 2 +- 6 files changed, 19 insertions(+), 14 deletions(-) commit a0124a5ecc829b73e2293cd7b23bf0cf0eb0a87c @@ -4287,7 +5084,7 @@ Signed-off-by: Simon McVittie - dbus/dbus-gtype-specialized.c | 21 +++++++++++++++------ + dbus/dbus-gtype-specialized.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) commit f36381131b6f410333a9a823a4fc131ac799394f @@ -4312,7 +5109,7 @@ The fix is to replace c with o in the owner_names hash table. - dbus/dbus-gproxy.c | 13 ++++++++++--- + dbus/dbus-gproxy.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) commit d275c2e646f67a3929d9290c6bdb270d6346b83c @@ -4321,9 +5118,9 @@ Remove all sorts of libdbus cruft from configure.ac - configure.ac | 102 - ------------------------------------------------------ - test/Makefile.am | 1 - + configure.ac | 102 + ------------------------------------------------------- + test/Makefile.am | 1 - 2 files changed, 103 deletions(-) commit 6791d09f72a63dcb72d57a187210bc133f463fcf @@ -4336,7 +5133,7 @@ we no longer use the result of the check - configure.ac | 26 -------------------------- + configure.ac | 26 -------------------------- 1 file changed, 26 deletions(-) commit 6de33eb0a3e53d92e47a717849f144a0a313e923 @@ -4347,8 +5144,8 @@ `git grep DBUS_VA_COPY` confirms that we no longer care - configure.ac | 75 - ---------------------------------------------------------- + configure.ac | 75 + ------------------------------------------------------------ 1 file changed, 75 deletions(-) commit 7bf91463598fc1e6ad44096f33aa4b61bf58443f @@ -4359,7 +5156,7 @@ `git grep ENDIAN` confirms that we no longer need it. - configure.ac | 3 --- + configure.ac | 3 --- 1 file changed, 3 deletions(-) commit dc93d2a6eaf75bd783d16d90f62d8abefd4e26a4 @@ -4370,7 +5167,7 @@ It isn't, and we need libdbus >= 1.1 in any case - configure.ac | 2 -- + configure.ac | 2 -- 1 file changed, 2 deletions(-) commit 094f45d0097679e8d458431231bcb3c999568d60 @@ -4381,8 +5178,8 @@ This is presumably a relic of libdbus. - configure.ac | 105 - ---------------------------------------------------------- + configure.ac | 105 + ----------------------------------------------------------- 1 file changed, 105 deletions(-) commit d30b06afd0a8bb6dddeefd7ac4d978799df03a52 @@ -4394,7 +5191,7 @@ There is no C++ in this package, so why are we checking for a C++ compiler? - configure.ac | 3 --- + configure.ac | 3 --- 1 file changed, 3 deletions(-) commit 98087a3d62523b621a1bd2359661ffe24553c34e @@ -4403,10 +5200,10 @@ Bug #16776: add a regression test - test/core/my-object.c | 11 +++++++++++ - test/core/my-object.h | 1 + - test/core/test-dbus-glib.c | 13 +++++++++++++ - test/core/test-service-glib.xml | 3 +++ + test/core/my-object.c | 11 +++++++++++ + test/core/my-object.h | 1 + + test/core/test-dbus-glib.c | 13 +++++++++++++ + test/core/test-service-glib.xml | 3 +++ 4 files changed, 28 insertions(+) commit 20c474b8b8b356836e50af0e9bf3b32584d83ac4 @@ -4420,8 +5217,8 @@ This is clearly not true, and it would be nice to be able to raise the "well-known" D-Bus errors from library user code. - dbus/dbus-gobject.c | 69 - ++++++++++++++++++++++++++++++++++++++++++++++++--- + dbus/dbus-gobject.c | 69 + ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 3 deletions(-) commit e18f5dd13c562333bc580f3b5bdf3ecd8d7555ce @@ -4431,8 +5228,8 @@ Bug 13908: make dbus_g_type_specialized_init() safe for library users to call - dbus/dbus-gtype-specialized.c | 6 ++++++ - dbus/dbus-gvalue.c | 1 - + dbus/dbus-gtype-specialized.c | 6 ++++++ + dbus/dbus-gvalue.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) commit bc474819fa638a0daf3c89e6d041949b73e9228e @@ -4441,7 +5238,7 @@ Use g_strdup instead of strdup in dbus_g_method_get_sender - dbus/dbus-gobject.c | 6 +----- + dbus/dbus-gobject.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) commit dfef72c61c050e7f57e1d2eb601701e0a27827cc @@ -4454,8 +5251,8 @@ process when a process joins or leaves the bus. - dbus/dbus-gproxy.c | 57 - ++++++++++++++++++++++++++-------------------------- + dbus/dbus-gproxy.c | 57 + +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) commit 42b17678dec6d0100bcbc433441f6a75df747e5c @@ -4467,7 +5264,7 @@ We're unlikely to be strict-aliasing safe anytime soon. This change corresponds with http://bugs.freedesktop.org/show_bug.cgi?id=10599 - configure.ac | 8 ++++++++ + configure.ac | 8 ++++++++ 1 file changed, 8 insertions(+) commit 56b9773dc5dd589638e22f48ec4222ae491c2bc1 @@ -4476,7 +5273,7 @@ Fix format-security warning - dbus/dbus-gobject.c | 2 +- + dbus/dbus-gobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 300b4fd822b8f57802ca35f4c867464b881632e3 @@ -4485,7 +5282,7 @@ Bump configure for unstable cycle - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 49cad2ca523de6a85f12d22ade23046c548ea601 @@ -4494,7 +5291,7 @@ Release 0.80 - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b161082148a51f2a2d8a4ee85f5736791dedc276 @@ -4509,13 +5306,13 @@ function and one for processing recursive nodes. - dbus/dbus-binding-tool-glib.c | 108 - ++++++++++++++++++++++----------------- - m4/gtk-doc.m4 | 2 +- - test/Makefile.am | 5 ++ - test/core/Makefile.am | 6 +-- - test/data/nested-introspect.xml | 10 ++++ - test/test-compile-nested.sh | 5 ++ + dbus/dbus-binding-tool-glib.c | 108 + +++++++++++++++++++++++----------------- + m4/gtk-doc.m4 | 2 +- + test/Makefile.am | 5 ++ + test/core/Makefile.am | 6 +-- + test/data/nested-introspect.xml | 10 ++++ + test/test-compile-nested.sh | 5 ++ 6 files changed, 85 insertions(+), 51 deletions(-) commit 64ec55f59a9ebe699e240c2a3b4d82e85f2db4a0 @@ -4526,7 +5323,7 @@ Signed-off-by: Colin Walters - dbus/Makefile.am | 8 ++++---- + dbus/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 299460549e92665e5ea09d459d3985fc85d8d73c @@ -4537,7 +5334,7 @@ This looks like what bash upstream has standardized on. - dbus/Makefile.am | 4 ++-- + dbus/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 78eb504bd9954918c363f357d0ab71ca85e3fc23 @@ -4551,8 +5348,8 @@ avoid introducing a dependency on an existing session bus. - test/core/Makefile.am | 2 +- - test/core/run-test.sh | 1 + + test/core/Makefile.am | 2 +- + test/core/run-test.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) commit 3d25c1640d59e9770c33fafb1a12766feb6494e8 @@ -4575,8 +5372,8 @@ aside from being inefficient. - dbus/dbus-gobject.c | 67 - ++++++++++++++++++++++++++++++++++++--------------- + dbus/dbus-gobject.c | 67 + +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 20 deletions(-) commit 88684866d06df99f89b30a07e4809369b4cb0453 @@ -4585,10 +5382,10 @@ Add new files missed from last commit - test/core/my-object-subclass.c | 115 - ++++++++++++++++++++++++++++++ - test/core/my-object-subclass.h | 33 +++++++++ - test/core/test-service-glib-subclass.xml | 8 +++ + test/core/my-object-subclass.c | 115 + +++++++++++++++++++++++++++++++ + test/core/my-object-subclass.h | 33 +++++++++ + test/core/test-service-glib-subclass.xml | 8 +++ 3 files changed, 156 insertions(+) commit d55ffa5bbccd027caf7f2e7376b555e397a7ac3c @@ -4601,11 +5398,11 @@ Signed-off-by: Colin Walters - test/core/Makefile.am | 11 ++- - test/core/test-dbus-glib.c | 187 - +++++++++++++++++++++++++++++++++++++++ - test/core/test-service-glib.c | 7 ++ - test/core/test-service-glib.xml | 2 + + test/core/Makefile.am | 11 ++- + test/core/test-dbus-glib.c | 187 + ++++++++++++++++++++++++++++++++++++++++ + test/core/test-service-glib.c | 7 ++ + test/core/test-service-glib.xml | 2 + 4 files changed, 205 insertions(+), 2 deletions(-) commit 94d68f00d9d244de3b1d66d3cf78bb5171552311 @@ -4615,8 +5412,8 @@ Use the provided interface for org.freedesktop.DBus.Properties.GetAll call. - dbus/dbus-gobject.c | 82 - ++++++++++++++++++++++++++++++++++++++++++--------- + dbus/dbus-gobject.c | 82 + ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 14 deletions(-) commit 1b150c32aa574b421161b63bb01eeeb5ad23bf3a @@ -4627,7 +5424,7 @@ Signed-off-by: Colin Walters - dbus/Makefile.am | 2 +- + dbus/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f4a6c4755d7a82bb7ec0a8bf472bfe091c310ef0 @@ -4638,7 +5435,7 @@ Should have been in earlier commit, oops. - NEWS | 18 ++++++++++++++++++ + NEWS | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit 3a713710a34d75d174eb632a6444e87dbf3923f4 @@ -4647,7 +5444,7 @@ Bump configure for unstable cycle - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit beaff4e7c8e6ef601a00c03a4bed533becd273be @@ -4656,7 +5453,7 @@ Release 0.78. - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d77506652b555b147e79889d6163208535e1cd74 @@ -4665,7 +5462,7 @@ Clean bash completion file - dbus/Makefile.am | 1 + + dbus/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit 6ba71576f4417bab46ca666fa44dda52dee95e88 @@ -4679,11 +5476,11 @@ Signed-off-by: Colin Walters - configure.ac | 13 + - dbus/Makefile.am | 17 +- - dbus/dbus-bash-completion-helper.c | 513 - ++++++++++++++++++++++++++++++++++++ - dbus/dbus-bash-completion.sh.in | 21 ++ + configure.ac | 13 + + dbus/Makefile.am | 17 +- + dbus/dbus-bash-completion-helper.c | 513 + +++++++++++++++++++++++++++++++++++++ + dbus/dbus-bash-completion.sh.in | 21 ++ 4 files changed, 563 insertions(+), 1 deletion(-) commit 48738e529dc7a0f27d185f2e79174b0e369fd0af @@ -4696,7 +5493,7 @@ Signed-off-by: Colin Walters - test/core/test-thread-server.c | 2 +- + test/core/test-thread-server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit aebec4bd82c023502600786793ba0ce0c7323fbe @@ -4707,7 +5504,7 @@ Also changed the socket search to be the same way. - configure.ac | 4 ++-- + configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f10ee141185f9501c852acaf557b100abafc60fb @@ -4718,7 +5515,7 @@ Signed-off-by: Colin Walters - dbus/dbus-gobject.c | 2 +- + dbus/dbus-gobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c0bba240c4beb6ecfd71aefa184011e8adc27f5f @@ -4770,10 +5567,10 @@ instead, a false free function is provided to print a critical warning for the developer in the case that memory would be leaked. - dbus/dbus-gvalue-utils.c | 151 - +++++++++++++++++++++++++++++++++++++-- - test/core/test-dbus-glib.c | 37 ++++++---- - test/core/test-service-glib.xml | 4 +- + dbus/dbus-gvalue-utils.c | 151 + ++++++++++++++++++++++++++++++++++++++-- + test/core/test-dbus-glib.c | 37 ++++++---- + test/core/test-service-glib.xml | 4 +- 3 files changed, 168 insertions(+), 24 deletions(-) commit 143b09b42d73451dcc3b835f76f8d43da786342a @@ -4791,12 +5588,12 @@ dictionaries back immediately and compare the results. - dbus/dbus-gvalue-utils.c | 29 ++++++++++++ - test/core/my-object.c | 16 +++++++ - test/core/my-object.h | 4 ++ - test/core/test-dbus-glib.c | 96 - +++++++++++++++++++++++++++++++++++++++ - test/core/test-service-glib.xml | 12 +++++ + dbus/dbus-gvalue-utils.c | 29 +++++++++++++ + test/core/my-object.c | 16 +++++++ + test/core/my-object.h | 4 ++ + test/core/test-dbus-glib.c | 96 + +++++++++++++++++++++++++++++++++++++++++ + test/core/test-service-glib.xml | 12 ++++++ 5 files changed, 157 insertions(+) commit e4c917189dc9478c261c94703b311e1579292f22 @@ -4808,16 +5605,16 @@ Adds DBUS_G_TYPE_SIGNATURE, which is a boxed type just like DBUS_G_TYPE_OBJECT_PATH. - dbus/dbus-binding-tool-glib.c | 4 ++ - dbus/dbus-glib.h | 3 ++ - dbus/dbus-gmain.c | 5 ++- - dbus/dbus-gsignature.c | 2 + - dbus/dbus-gvalue.c | 82 - ++++++++++++++++++++++++++++++++++++++- - test/core/my-object.c | 7 ++++ - test/core/my-object.h | 1 + - test/core/test-dbus-glib.c | 19 +++++++++ - test/core/test-service-glib.xml | 5 +++ + dbus/dbus-binding-tool-glib.c | 4 ++ + dbus/dbus-glib.h | 3 ++ + dbus/dbus-gmain.c | 5 ++- + dbus/dbus-gsignature.c | 2 + + dbus/dbus-gvalue.c | 82 + ++++++++++++++++++++++++++++++++++++++++- + test/core/my-object.c | 7 ++++ + test/core/my-object.h | 1 + + test/core/test-dbus-glib.c | 19 ++++++++++ + test/core/test-service-glib.xml | 5 +++ 9 files changed, 126 insertions(+), 2 deletions(-) commit f89b8de02f21891f430a2e370c391238b575403a @@ -4844,8 +5641,8 @@ it. People can depend on the next version of dbus-glib if they rely on _unref. - configure.ac | 2 +- - dbus/dbus-gvalue-utils.c | 4 ---- + configure.ac | 2 +- + dbus/dbus-gvalue-utils.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) commit 24b94fb83c0d22cf2803af692dd8ccbc485d890c @@ -4857,7 +5654,7 @@ Missing die() function meant this wasn't returning non-zero even when tests were failing. Oops. - test/core/run-test.sh | 6 ++++++ + test/core/run-test.sh | 6 ++++++ 1 file changed, 6 insertions(+) commit 3ca014ea6b55cd843f1c80b04a4e0ec41af6210e @@ -4872,7 +5669,7 @@ Correspondingly we need to cancel any inflight GetNameOwner call when disassociating proxies to avoid leaking. - dbus/dbus-gproxy.c | 11 +++++++++-- + dbus/dbus-gproxy.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit 0a883a523f8d133f71271276b755162c56480021 @@ -4885,7 +5682,7 @@ Signed-off-by: Colin Walters - dbus/dbus-binding-tool-glib.c | 10 ++++++++-- + dbus/dbus-binding-tool-glib.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit 4c7e60e3ff4148a181a496f85b491e8cb39d7e46 @@ -4901,7 +5698,7 @@ GArray type which handles reallocating as size increases appropriately. - dbus/dbus-gvalue.c | 25 +++++++++++-------------- + dbus/dbus-gvalue.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) commit 2514b84b3644223653018cd75d0d6e1459a7ab70 @@ -4921,14 +5718,14 @@ will throw an error. * test/core/Makefile.am: Add test-variant-recursion. - dbus/dbus-gobject.c | 2 + - dbus/dbus-gproxy.c | 2 + - dbus/dbus-gvalue.c | 21 ++++++++- - dbus/dbus-gvalue.h | 1 + - test/core/Makefile.am | 6 ++- - test/core/run-test.sh | 1 + - test/core/test-variant-recursion.c | 89 - ++++++++++++++++++++++++++++++++++++ + dbus/dbus-gobject.c | 2 + + dbus/dbus-gproxy.c | 2 + + dbus/dbus-gvalue.c | 21 ++++++++- + dbus/dbus-gvalue.h | 1 + + test/core/Makefile.am | 6 ++- + test/core/run-test.sh | 1 + + test/core/test-variant-recursion.c | 89 + ++++++++++++++++++++++++++++++++++++++ 7 files changed, 119 insertions(+), 3 deletions(-) commit d1b80d803a0268bd4b3dd5b9a9522230461f2947 @@ -4940,7 +5737,7 @@ * dbus/dbus-gobject.c: We need to uscore property names so that we actually find the right properties. - dbus/dbus-gobject.c | 10 ++++++++-- + dbus/dbus-gobject.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit 8054025ae498cc586676fd0ed6573828dd0de4a0 @@ -4949,7 +5746,7 @@ One final large HACKING update - HACKING | 32 +++++++++++++++++++++++++++++--- + HACKING | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) commit d80bc7686a0e5cc7d45d940e8404ac4c8742b8f5 @@ -4962,7 +5759,9 @@ * doc/reference/dbus-glib.types: New files without which gtk-doc complains. - 0 files changed + doc/reference/dbus-glib-undeclared.txt | 0 + doc/reference/dbus-glib.types | 0 + 2 files changed, 0 insertions(+), 0 deletions(-) commit d91cf40b83f7900899fe89cc83a75c82cd4bf833 Author: Colin Walters @@ -4970,7 +5769,7 @@ Another HACKING tweak - HACKING | 6 ++++-- + HACKING | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit e4b73986d1b2d6f9badda4656e57023b2c921ff7 @@ -4979,8 +5778,8 @@ Bump for development - configure.ac | 2 +- - doc/reference/dbus-glib-undocumented.txt | 20 +++----------------- + configure.ac | 2 +- + doc/reference/dbus-glib-undocumented.txt | 20 +++----------------- 2 files changed, 4 insertions(+), 18 deletions(-) commit 96f144d25c7f3d573684bd50f87d912990f3c589 @@ -4989,7 +5788,7 @@ Release 0.76 - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1517f7f395527519402f8b37988de9d4ea24dbc5 @@ -4998,7 +5797,7 @@ Document release process - HACKING | 23 ++++++++++++++++++++++- + HACKING | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) commit e0dcd92e33e566f9852df94036e74f48af795ea3 @@ -5007,7 +5806,7 @@ Update HACKING - HACKING | 13 ++++++++++--- + HACKING | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) commit 4f776e9db9f299dab96a12a00a6279b6977f6c32 @@ -5016,7 +5815,7 @@ Update gtk-doc - doc/reference/dbus-glib-undocumented.txt | 20 +++++++++++++++++--- + doc/reference/dbus-glib-undocumented.txt | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) commit fa46dc8d35de877b8bdcb53f9508252249138bd6 @@ -5025,7 +5824,7 @@ Update NEWS - NEWS | 25 +++++++++++++++++++++++++ + NEWS | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) commit acd44d2ae3069667dbbb8b9c9c8b9c2afcad96d9 @@ -5041,7 +5840,7 @@ Signed-off-by: Colin Walters - dbus/dbus-binding-tool-glib.c | 3 +-- + dbus/dbus-binding-tool-glib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 1744bf88024756d17f867ab9b86aca25e2b77e64 @@ -5050,7 +5849,7 @@ Remove GConnection tests that assert, since we abort on those - test/core/test-types.c | 26 -------------------------- + test/core/test-types.c | 26 -------------------------- 1 file changed, 26 deletions(-) commit a94e11973467e1b2cc43ba1e77b7413655b1dff7 @@ -5061,9 +5860,9 @@ This as a side effect fixes the test suite on Solaris. - test/core/peer-client.c | 13 ++++++++++++- - test/core/peer-server.c | 26 ++++++++++++++------------ - test/core/run-peer-test.sh | 9 +++------ + test/core/peer-client.c | 13 ++++++++++++- + test/core/peer-server.c | 26 ++++++++++++++------------ + test/core/run-peer-test.sh | 9 +++------ 3 files changed, 29 insertions(+), 19 deletions(-) commit dceee795d0cdc5889701064ac38d3c64451b02ec @@ -5072,7 +5871,7 @@ From OpenSUSE: Add return statement in case assertions not enabled - dbus/dbus-gvalue-utils.c | 1 + + dbus/dbus-gvalue-utils.c | 1 + 1 file changed, 1 insertion(+) commit 681f3ae573b2e00dad5c1193a044a994fc50cf38 @@ -5082,7 +5881,7 @@ Bug 13060: Remove NameOwnerChange matches on unref (Kimmo Hämäläinen) - dbus/dbus-gproxy.c | 14 ++++++++++++++ + dbus/dbus-gproxy.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit eef148bdc0f602b0fba09a851c1ca6b55b8bb71c @@ -5091,7 +5890,7 @@ Bug 15733: Cosmetic fix for removing redundant declarations - dbus/dbus-gtype-specialized.h | 2 -- + dbus/dbus-gtype-specialized.h | 2 -- 1 file changed, 2 deletions(-) commit d043342c41535e610268b9bb2a45143bad0b597d @@ -5100,7 +5899,7 @@ Bug 12505: Avoid receiving duplicate NameOwnerChanged (Dan Williams) - dbus/dbus-gproxy.c | 13 +++++++++++-- + dbus/dbus-gproxy.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit 43db9baa4cd0921d2ee830185ab46b4646b4e73b @@ -5117,9 +5916,9 @@ Also add some tests for error handling. - dbus/dbus-gproxy.c | 25 ++++++++++++++++++++----- - dbus/dbus-gvalue.c | 28 ++++++++++++++++++++++++++++ - test/core/test-dbus-glib.c | 29 +++++++++++++++++++++++++++++ + dbus/dbus-gproxy.c | 25 ++++++++++++++++++++----- + dbus/dbus-gvalue.c | 28 ++++++++++++++++++++++++++++ + test/core/test-dbus-glib.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 5 deletions(-) commit dc3bfd517a3bd0e28f4fc2d030ac38bdc848eb86 @@ -5128,7 +5927,7 @@ Fix some test suite memory leaks - test/core/test-dbus-glib.c | 3 +++ + test/core/test-dbus-glib.c | 3 +++ 1 file changed, 3 insertions(+) commit 167ea555cf3a763d148a69d0af9453b83d70d107 @@ -5140,7 +5939,7 @@ Signed-off-by: Julien Danjou Signed-off-by: Colin Walters - dbus/dbus-glib-tool.c | 4 ++-- + dbus/dbus-glib-tool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c057283a86230904552d5c51623bbce5ab0c9770 @@ -5151,7 +5950,7 @@ We need to return FALSE when handling an error. - dbus/dbus-gparser.c | 11 +++++++---- + dbus/dbus-gparser.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 361dc90eaa269325ddc5dae0003ca11e1d7b811e @@ -5160,7 +5959,7 @@ Bug 9867: Respect ACLOCAL_FLAGS (Kalle Vahlman) - autogen.sh | 1 + + autogen.sh | 1 + 1 file changed, 1 insertion(+) commit a8bf32ab8b0e30e0c74e07c58e9bc79a448683b2 @@ -5171,7 +5970,7 @@ This lets users ref hashes with g_hash_table_ref. - dbus/dbus-gvalue-utils.c | 4 ++++ + dbus/dbus-gvalue-utils.c | 4 ++++ 1 file changed, 4 insertions(+) commit ad35bf13f93d18b0b0e8f930ff79af9dcc1c8508 @@ -5181,7 +5980,7 @@ Bug 12675: Handle disconnected connections in calls (Kimmo Hämäläinen) - dbus/dbus-gproxy.c | 22 +++++++++++++++++++--- + dbus/dbus-gproxy.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) commit f110cd3aa0532ab6cdfb1ee9a19f839700fe32e6 @@ -5190,7 +5989,7 @@ Bug 12857: Balance va_start/va_end in error case (Kimmo Hämäläinen) - dbus/dbus-gparser.c | 6 +++++- + dbus/dbus-gparser.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit d20c90aab3b0eca8715deaa59877f35a7d4e345e @@ -5199,7 +5998,7 @@ Bug 12849: Fix use after free (Kimmo Hämäläinen) - dbus/dbus-gvalue.c | 3 ++- + dbus/dbus-gvalue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit fde77bff42fac9ed95869a69acff4f9daab23e04 @@ -5212,9 +6011,9 @@ Previously we just asserted, not very useful. - dbus/dbus-gobject.c | 6 +++++ - test/core/test-dbus-glib.c | 62 - +++++++++++++++++++++++++++++++++++++++++++- + dbus/dbus-gobject.c | 6 +++++ + test/core/test-dbus-glib.c | 62 + +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-) commit b26f1887f6907d4c9a1dac013649f28950c6b2d3 @@ -5223,7 +6022,7 @@ Support for monitoring conversation during tests - test/core/run-test.sh | 3 +++ + test/core/run-test.sh | 3 +++ 1 file changed, 3 insertions(+) commit b783ce802db01a5370ce70514755e1885f6e6eb1 @@ -5232,7 +6031,7 @@ Also make CRITICAL messages fatal in tests. - test/core/test-dbus-glib.c | 2 +- + test/core/test-dbus-glib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8fe656de630e851bc512bbd7e7a6c18c53aecb61 @@ -5245,11 +6044,11 @@ libdbus we're compiled against. fd.o #15430, Debian #476080. - dbus/dbus-glib.h | 34 ++++++++++++++++- - dbus/dbus-gobject.c | 72 - ++++++++++++++++++++++++++++++++++- - dbus/make-dbus-glib-error-enum.sh | 25 +----------- - dbus/make-dbus-glib-error-switch.sh | 29 +------------- + dbus/dbus-glib.h | 34 +++++++++++++++++- + dbus/dbus-gobject.c | 72 + ++++++++++++++++++++++++++++++++++++- + dbus/make-dbus-glib-error-enum.sh | 25 +------------ + dbus/make-dbus-glib-error-switch.sh | 29 +-------------- 4 files changed, 106 insertions(+), 54 deletions(-) commit 7fccdc8386d97d8c7e963800b1fbedd47f72b66b @@ -5258,7 +6057,7 @@ Add some docs to dbus_set_g_error. - dbus/dbus-gobject.c | 17 ++++++++++++++++- + dbus/dbus-gobject.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) commit 34042c4cf2fcf18e101d07e495f9fa5dda99aa58 @@ -5277,7 +6076,7 @@ ... as requested on the mailing list. - dbus/dbus-gproxy.c | 7 +++++++ + dbus/dbus-gproxy.c | 7 +++++++ 1 file changed, 7 insertions(+) commit bd53ac9f7ef9a6c2c9d1d12af382b1a8a10e9dba @@ -5292,8 +6091,8 @@ Patch credit goes to Colin Walters. - dbus/dbus-glib-tool.c | 2 +- - dbus/dbus-gparser.c | 40 +++++++++++++++++++++++++++++----------- + dbus/dbus-glib-tool.c | 2 +- + dbus/dbus-gparser.c | 40 +++++++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 12 deletions(-) commit cb732d38f78dfb7c1ef73179e798fa4f42fd962e @@ -5304,7 +6103,7 @@ Bumps version to 0.75. Bumps dbus dependany to 1.1. - configure.ac | 4 ++-- + configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 09b0fc5818812d0167243bae9fd52cdaf67f0af0 @@ -5315,8 +6114,8 @@ Because round-trip city is a bad place. - dbus/dbus-gobject.c | 220 - +++++++++++++++++++++++++++++++++++++++++---------- + dbus/dbus-gobject.c | 220 + ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 177 insertions(+), 43 deletions(-) commit bf0c9b3d6adc95863d5b5a4ce6ca994fd7fdc137 @@ -5332,11 +6131,11 @@ Also add some missing _with_timeout functions on DBusGProxy to the gtk docs. - dbus/dbus-glib.h | 3 +++ - dbus/dbus-gproxy.c | 35 - ++++++++++++++++++++++++++++-- - doc/reference/dbus-glib-sections.txt | 3 +++ - doc/reference/dbus-glib-undocumented.txt | 15 +++++++++---- + dbus/dbus-glib.h | 3 +++ + dbus/dbus-gproxy.c | 35 + ++++++++++++++++++++++++++++++-- + doc/reference/dbus-glib-sections.txt | 3 +++ + doc/reference/dbus-glib-undocumented.txt | 15 ++++++++++---- 4 files changed, 50 insertions(+), 6 deletions(-) commit 1fa4129f67208e24f6ae5f9ab38a3ee26c521f87 @@ -5345,7 +6144,7 @@ Bump version to 0.75 - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1124256e1a87291101a6c287c1248c2f7276b993 @@ -5357,7 +6156,7 @@ We were assigning a DBusConnection* to a DBusGConnection*, which is bad. - test/core/test-types.c | 4 ++-- + test/core/test-types.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit eea8f7247e1cbeb8c00fe316a37520b98acd55dc @@ -5368,7 +6167,7 @@ The latter is deprecated, so don't use it. - dbus/dbus-gmain.c | 2 +- + dbus/dbus-gmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2cf62d7ff7d3a7bc450d0b60bb81a8365ffd310b @@ -5381,7 +6180,7 @@ but they are DBusPendingCall (thanks Dafyd Harries). - dbus/dbus-gproxy.c | 11 ++++++----- + dbus/dbus-gproxy.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit 8e024ae2252e6e948c28203f07aa416df3dac0b8 @@ -5390,7 +6189,7 @@ Unref the connection and message on dbus_g_return_error - dbus/dbus-gobject.c | 3 +++ + dbus/dbus-gobject.c | 3 +++ 1 file changed, 3 insertions(+) commit 98423ae4e6b85741ce15f097652620886a49c375 @@ -5405,8 +6204,8 @@ Thanks to Brian Cameron for this patch. - configure.ac | 9 +++++++++ - tools/Makefile.am | 2 +- + configure.ac | 9 +++++++++ + tools/Makefile.am | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) commit 33b7a7f05372baaaf95d0e1c2c3b758321e4b0c5 @@ -5417,7 +6216,7 @@ Add the new tests and *~ to the ignore list. - .gitignore | 5 ++++- + .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 4b2cf9d75f6c315071adc925ec56e3bac3423730 @@ -5428,7 +6227,7 @@ "function" is a bashism, so don't use it. - tools/run-with-tmp-session-bus.sh | 2 +- + tools/run-with-tmp-session-bus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3f6e2c0c76d3643a1823b5ea7c8f5486a6b448de @@ -5441,7 +6240,7 @@ written. (#8607, thanks William Jon McCann). - dbus/dbus-gobject.c | 2 -- + dbus/dbus-gobject.c | 2 -- 1 file changed, 2 deletions(-) commit c08a7f910c4c746ba790375be2d0f0682471cf06 @@ -5454,8 +6253,8 @@ the code to work with them (#11675, thanks Peter O'Gorman). - dbus/dbus-gtype-specialized.c | 4 +++- - dbus/examples/statemachine/statemachine.c | 2 +- + dbus/dbus-gtype-specialized.c | 4 +++- + dbus/examples/statemachine/statemachine.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) commit b2bcb0f3fdf8eaec9257f48dd0a0e2ca03220775 @@ -5468,10 +6267,10 @@ (#11672, thanks Peter O'Gorman). - test/core/run-peer-test.sh | 4 ++-- - test/core/run-test.sh | 18 +++++++++--------- - test/interfaces/run-test.sh | 14 +++++++------- - tools/run-with-tmp-session-bus.sh | 9 +++++---- + test/core/run-peer-test.sh | 4 ++-- + test/core/run-test.sh | 18 +++++++++--------- + test/interfaces/run-test.sh | 14 +++++++------- + tools/run-with-tmp-session-bus.sh | 9 +++++---- 4 files changed, 23 insertions(+), 22 deletions(-) commit 377831cc8496bf2b3f96e96a44ff4dfc1a6c690e @@ -5486,7 +6285,7 @@ because it isn't required (#11674, thanks Peter O'Gorman). - test/interfaces/test-interfaces.c | 4 ++-- + test/interfaces/test-interfaces.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2929a9d676b9961abff6c6acb1b67431f7d62ab1 @@ -5497,7 +6296,7 @@ Update version to 0.74 in configure.ac - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit de33a575aa58867642bcfd8bb8cb2efc631d9f1d @@ -5508,7 +6307,7 @@ Update NEWS from git history. - NEWS | 20 ++++++++++++++------ + NEWS | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) commit a732cbc211b562660c5a17c898ad032fb8c041fd @@ -5519,7 +6318,7 @@ This fixes random failures due to the race. - test/core/run-peer-test.sh | 4 ++-- + test/core/run-peer-test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 4335b1204a483ffa5c5a72d58b585f77827d852d @@ -5528,7 +6327,7 @@ Update NEWS for pending release. - NEWS | 12 ++++++++++++ + NEWS | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 0d77d83b7afd5837d4427b7cdc5940f54625b65c @@ -5537,7 +6336,8 @@ make test/core/run-peer-test.sh executable - 0 files changed + test/core/run-peer-test.sh | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) commit 0ba73bf7cf1a2770b7aac8d57e61e755aca45b4d Author: Ross Burton @@ -5545,7 +6345,7 @@ Add missing include. - test/core/Makefile.am | 1 + + test/core/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit bf647c411b42064fe48877c30803cbe10d751204 @@ -5560,7 +6360,7 @@ type info initialises the types. - test/core/my-object.c | 6 +++--- + test/core/my-object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit a3a6efda1117633cc8a5525811f6a3ba41f2d31b @@ -5569,9 +6369,10 @@ Init threading first to stop a warning from new GLib. - test/core/peer-client.c | 2 +- - test/core/peer-server.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + test/core/peer-client.c | 2 +- + test/core/peer-server.c | 2 +- + test/core/run-peer-test.sh | 0 + 3 files changed, 2 insertions(+), 2 deletions(-) commit 36ed523539074a84cd990a8513b5d02a6223c44c Author: Ross Burton @@ -5579,7 +6380,8 @@ Make test script executable - 0 files changed + test/core/run-peer-test.sh | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) commit 514fd82183c214e3afd4cca630a20ff24b62e482 Author: Ross Burton @@ -5587,7 +6389,7 @@ Remove unused variable. - test/core/run-peer-test.sh | 2 +- + test/core/run-peer-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d428aa4edf426f662e89f2b08a377b0dd481f3ac @@ -5598,7 +6400,7 @@ It isn't used and is legacy from when this was part of dbus itself. - configure.ac | 34 +--------------------------------- + configure.ac | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) commit 1f385f6b10799cdd0bf57d69d5212ac16ac17266 @@ -5611,7 +6413,7 @@ value. Thanks to Peter Kjellerstedt for noticing this. - dbus/dbus-gvalue-utils.c | 2 +- + dbus/dbus-gvalue-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 68f03928aaac849dd12e38c01e448b569f578976 @@ -5620,7 +6422,7 @@ Update GLib requirement (#10889). - INSTALL | 2 +- + INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 58cacc6872e1b8cf365ac056775498b9dede71b4 @@ -5632,11 +6434,11 @@ Documents all the functions in dbus-gtype-specialized.c and adds an overview of the functionality. - dbus/dbus-gtype-specialized.c | 312 - +++++++++++++++++++++++++++--- - dbus/dbus-gtype-specialized.h | 14 +- - doc/reference/dbus-glib-sections.txt | 2 +- - doc/reference/dbus-glib-undocumented.txt | 38 +--- + dbus/dbus-gtype-specialized.c | 312 + ++++++++++++++++++++++++++++--- + dbus/dbus-gtype-specialized.h | 14 +- + doc/reference/dbus-glib-sections.txt | 2 +- + doc/reference/dbus-glib-undocumented.txt | 38 +--- 4 files changed, 304 insertions(+), 62 deletions(-) commit 26d8584c04c05be29ae35acc3a2e8f573cc79206 @@ -5651,15 +6453,15 @@ tools. Also added is a test suite for dbus_connection_get_g_connection. - test/core/Makefile.am | 26 +- - test/core/my-object.c | 737 ++++++++++++++++++++++++++++++++++++ - test/core/my-object.h | 104 ++++++ - test/core/peer-client.c | 127 +++++++ - test/core/peer-server.c | 55 +++ - test/core/run-peer-test.sh | 9 + - test/core/test-service-glib.c | 832 - +---------------------------------------- - test/core/test-types.c | 74 ++++ + test/core/Makefile.am | 26 +- + test/core/my-object.c | 737 +++++++++++++++++++++++++++++++++++++ + test/core/my-object.h | 104 ++++++ + test/core/peer-client.c | 127 +++++++ + test/core/peer-server.c | 55 +++ + test/core/run-peer-test.sh | 9 + + test/core/test-service-glib.c | 832 + +----------------------------------------- + test/core/test-types.c | 74 ++++ 8 files changed, 1129 insertions(+), 835 deletions(-) commit af91f5e0e2b5a20adf124707356b12da0c2f1e00 @@ -5673,7 +6475,7 @@ This patch stops dbus-glib from crashing when you use a peer signal (#10233). - dbus/dbus-gproxy.c | 35 ++++++++++++++++++----------------- + dbus/dbus-gproxy.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) commit 25f056826336d4385b5488706f0f1ecc0843bf2f @@ -5687,9 +6489,9 @@ it back again. - dbus/dbus-glib-lowlevel.h | 1 + - dbus/dbus-glib.c | 24 ++++++++++++++++++++++++ - dbus/dbus-gmain.c | 12 ++++++------ + dbus/dbus-glib-lowlevel.h | 1 + + dbus/dbus-glib.c | 24 ++++++++++++++++++++++++ + dbus/dbus-gmain.c | 12 ++++++------ 3 files changed, 31 insertions(+), 6 deletions(-) commit 0c46ca1a20eb8ba676ea2f1e829d039d5e3c383d @@ -5698,8 +6500,8 @@ Stop compiler warnings (#10374). - dbus/dbus-gthread.c | 1 + - test/interfaces/test-server.c | 2 ++ + dbus/dbus-gthread.c | 1 + + test/interfaces/test-server.c | 2 ++ 2 files changed, 3 insertions(+) commit 72e9f061668a28cbbeae2400290e1993c5d60d3c @@ -5708,7 +6510,7 @@ Fix error handling - dbus/dbus-gproxy.c | 9 ++++----- + dbus/dbus-gproxy.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) commit 9ca04c94ed6ddc2ff7459ce2031740704ec67ff2 @@ -5717,7 +6519,7 @@ Handle dbus errors which are not name has no owner - dbus/dbus-gproxy.c | 3 +++ + dbus/dbus-gproxy.c | 3 +++ 1 file changed, 3 insertions(+) commit 85b269cc7ca221ee4fe0235154e783b3640ee62d @@ -5730,7 +6532,7 @@ test from the original copy in DBus. - configure.ac | 17 +++++++++-------- + configure.ac | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) commit a64b26cdde04e624b2bb42ccadd3fc252bf05667 @@ -5741,7 +6543,7 @@ The error quark was copied from GLib, renaming it to be unique. - dbus/dbus-glib.c | 2 +- + dbus/dbus-glib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5ca3418e8e00f62e3e60578e3951b51cd158f8dc @@ -5753,7 +6555,7 @@ Correct spelling of S.Nallammai, add Ross Burton, who's been missing here for quite some time. - AUTHORS | 3 ++- + AUTHORS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 7fbd3a1c49614e71a9ff2b3d6e43bf380527301b @@ -5765,7 +6567,7 @@ I had failed to update AUTHORS in the last couple of releases, this commit makesit current. - AUTHORS | 6 ++++++ + AUTHORS | 6 ++++++ 1 file changed, 6 insertions(+) commit f78b90659f32474b7ca56925ddebd88af7f06c86 @@ -5776,7 +6578,7 @@ Ignore autoconf errors, autom4te.cache, some new generated files. - .gitignore | 7 ++++++- + .gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 138e4ce76ae53b86488e12c43db511a838be4fc9 @@ -5788,7 +6590,7 @@ As we're going to start behaving like a proper library, update libtool versionsing appropriately for our added api. - configure.ac | 4 ++-- + configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d19c5c0eac749704af70edffaa1fa0ac70eb9373 @@ -5799,7 +6601,7 @@ Releasing today.. - NEWS | 2 +- + NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e368483363fc920cf2978180f3a9fe6687465807 @@ -5810,7 +6612,7 @@ Update NEWS, adding fix for bug #9769. - NEWS | 4 +++- + NEWS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 814b029d9291199bc9fdd2998c429ee15f243a93 @@ -5824,8 +6626,8 @@ Damien Carbery . Fixes bug #9769. - configure.ac | 1 + - dbus-glib-1-uninstalled.pc.in | 12 ++++++++++++ + configure.ac | 1 + + dbus-glib-1-uninstalled.pc.in | 12 ++++++++++++ 2 files changed, 13 insertions(+) commit 6bcb544eb6bc164e367a0e849b6c41274809401e @@ -5836,7 +6638,7 @@ Updates version 0.73 in configure.ac - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dba710006cb0b25454989f41babc53c12d3fc901 @@ -5847,7 +6649,7 @@ Updates NEWS with all the changes for 0.73 - NEWS | 26 ++++++++++++++++++++++++++ + NEWS | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) commit 133bc8003657169f622d4340360a0e5b15a455de @@ -5861,7 +6663,7 @@ Patch due to Luiz Augusto von Dentz Fixes bug #8795. - dbus/dbus-gvalue.c | 20 +++++++++++++------- + dbus/dbus-gvalue.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) commit 5f70d7b59445b634f94469a8c12cf31f8f81fdae @@ -5874,7 +6676,7 @@ NULL, which could happen in some cases. Fixes bug #8318. - dbus/dbus-gobject.c | 2 +- + dbus/dbus-gobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 678f8e5fdaf5c587547a96b173a5532f14337988 @@ -5890,7 +6692,7 @@ Patch by Kimmo Hämäläinen . Fixes bug #8235. - dbus/dbus-gproxy.c | 29 +++++++++++++++++++---------- + dbus/dbus-gproxy.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) commit 1ce4d3e7324d92d797b7e41e869b1d0ff51f129a @@ -5904,7 +6706,7 @@ a typo :) Fixes bug #6358. - dbus/dbus-binding-tool-glib.c | 2 +- + dbus/dbus-binding-tool-glib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6d61bad839512dedb62318fd82e2c0b20906d62f @@ -5919,7 +6721,7 @@ Closes bug #4185 - dbus/dbus-glib-tool.c | 5 +++-- + dbus/dbus-glib-tool.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit cb866d68e733e48bd6a6cea21fa4b5ca648d861e @@ -5931,7 +6733,7 @@ Adds a note that the caller is responsible for freeing the returned value. - dbus/dbus-gobject.c | 5 +++-- + dbus/dbus-gobject.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 22bd9971b4ac95f926b577e416f54ec57bb16d2d @@ -5951,9 +6753,9 @@ Fixes bug #9832. - dbus/dbus-glib.h | 16 +++++++ - dbus/dbus-gproxy.c | 121 - ++++++++++++++++++++++++++++++++++++++++++++++++---- + dbus/dbus-glib.h | 16 +++++++ + dbus/dbus-gproxy.c | 121 + +++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 128 insertions(+), 9 deletions(-) commit b226873fdc2e7b98740afb93a7bae675952a29f0 @@ -5966,7 +6768,7 @@ this changes configure.ac to not check for libxml2, and error out if expat isn't found. - configure.ac | 47 ++++++----------------------------------------- + configure.ac | 47 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 41 deletions(-) commit c51ff16bc93b4741061c362de638ab5e8cace000 @@ -5980,8 +6782,8 @@ can be gained with dbus-daemon --introspect). This allows dbus-glib to be built without a running dbus-daemon, useful for embedded systems. - configure.ac | 15 +++++++++++++++ - tools/Makefile.am | 5 +++++ + configure.ac | 15 +++++++++++++++ + tools/Makefile.am | 5 +++++ 2 files changed, 20 insertions(+) commit c5c0bed2166767162f599958270e92122da3ff2a @@ -5992,7 +6794,7 @@ dbus_g_thread_init is now documented. - doc/reference/dbus-glib-undocumented.txt | 7 +++---- + doc/reference/dbus-glib-undocumented.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit c807d408924e9a9bcc7b2eb67b411c25888090ee @@ -6008,8 +6810,8 @@ Fixes #9259. - dbus/dbus-gthread.c | 143 - +++------------------------------------------------ + dbus/dbus-gthread.c | 143 + +++------------------------------------------------- 1 file changed, 7 insertions(+), 136 deletions(-) commit 9bb928331e2ad602728320598698de90c9a246d6 @@ -6026,7 +6828,7 @@ Fixes #8793. - configure.ac | 9 +++++++-- + configure.ac | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 79d115030d45fefd96d5ffc7853f80fc454c13b1 @@ -6038,7 +6840,7 @@ Adds Cflags: -I${includedir}/dbus-1.0 to dbus-glib-1.pc.in. Fixes #9384. - dbus-glib-1.pc.in | 1 + + dbus-glib-1.pc.in | 1 + 1 file changed, 1 insertion(+) commit 6de547af3bd7d2c8b77464435c45d22bba702cc7 @@ -6047,7 +6849,7 @@ Correct spellings in NEWS - NEWS | 37 +++++++++++++++++++++++-------------- + NEWS | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) commit 83f8ed0935c37b3b5668d1a512370a51f73ccc27 @@ -6056,7 +6858,7 @@ Update NEWS for release. - NEWS | 36 ++++++++++++++++++++++++++++++++++++ + NEWS | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) commit c449668fd2b8b92fde03a83ba76a0eb8bb2a9326 @@ -6066,7 +6868,7 @@ only use -Wfloat-equal if compiler supports it Closes #7658. Thanks to Jens Granseuer for the patch. - configure.ac | 31 +++++++++++++++++++++++++++---- + configure.ac | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) commit 505e48a851e38664c45e482b8f75ebbfd27fe278 @@ -6076,7 +6878,7 @@ return NULL from g_return_val_if_fail in dbus_g_proxy_begin_call Closes #4159. - dbus/dbus-gproxy.c | 4 ++-- + dbus/dbus-gproxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 62acdb49360dfbf994ef38c8e97d9190d30149f3 @@ -6085,7 +6887,7 @@ Add dbus-gidl.h to IGNORE_HFILES for doxygen docs - doc/reference/Makefile.am | 1 + + doc/reference/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit 0d9889a99241aebc863237faf8126663c97ae059 @@ -6094,7 +6896,7 @@ Update tools/Makefile.am for new dbus-binding-tool behaviour - tools/Makefile.am | 2 +- + tools/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0aa2db3f6f18bff7d5c62a00f052ca89e21b269f @@ -6104,7 +6906,7 @@ Remove bashism in make-dbus-glib-error-enum.sh Closes #6700. - dbus/make-dbus-glib-error-enum.sh | 2 +- + dbus/make-dbus-glib-error-enum.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 74bcfcfbc242325ca470d483817ae37fa8d41f25 @@ -6116,7 +6918,7 @@ Fix thanks to mccann@jhu.edu. Closes #8607. - dbus/dbus-gobject.c | 3 +-- + dbus/dbus-gobject.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 3647d0df5780967dd505d3c046ab37ada70529bf @@ -6126,7 +6928,7 @@ Require --prefix in dbus-binding-tool Closes #4185. - dbus/dbus-glib-tool.c | 8 +++++++- + dbus/dbus-glib-tool.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 054c6476495a6f85ae708ed81b9053bf666897b7 @@ -6137,8 +6939,8 @@ Rename useage of index to index_. Thanks stdlib... Closes #8353. - dbus/dbus-gtype-specialized.c | 12 ++++++------ - dbus/dbus-gvalue.c | 14 +++++++------- + dbus/dbus-gtype-specialized.c | 12 ++++++------ + dbus/dbus-gvalue.c | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) commit d3a494dced8e3f2de111f23ae3fbab6e32f4051a @@ -6148,7 +6950,7 @@ Fix small leak when marshal_table is destroyed Closes #6870 with patch from Richard Hult - dbus/dbus-gobject.c | 9 ++++++++- + dbus/dbus-gobject.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 9bfec032a72e7af5945336fecbb9b6e0b6f2de9e @@ -6159,9 +6961,9 @@ same service to be unrefed in a destoyed callback. - dbus/dbus-gproxy.c | 14 ++++++++- - test/core/test-dbus-glib.c | 67 - ++++++++++++++++++++++++++++++++++++++++++-- + dbus/dbus-gproxy.c | 14 +++++++++- + test/core/test-dbus-glib.c | 67 + ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 78 insertions(+), 3 deletions(-) commit 53bf71bd852810a271d13a73ba445622616c711c @@ -6171,7 +6973,7 @@ Bump version to 0.72 and use modern AC_INIT, AM_INIT_AUTOMAKE - configure.ac | 4 ++-- + configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 28a54df202f089a3e00930e36a787c175501be41 @@ -6180,7 +6982,7 @@ Clean generated run-with-tmp-session-bus.conf on make clean - test/core/Makefile.am | 4 +++- + test/core/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit bcf15d72892582c28755563ca63182c198ef8f64 @@ -6189,7 +6991,7 @@ Actually run unit tests and checks when doing make distcheck - Makefile.am | 2 +- + Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7c21166ef7ce9b370448a39c6c6744813933abee @@ -6198,7 +7000,7 @@ Use TEST_CORE_SERVICE_BINARY path for core test service file - test/data/valid-service-files/debug-glib.service.in | 2 +- + test/data/valid-service-files/debug-glib.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d6980d9d59edcf14cc1ab5af3945bd740a3f2495 @@ -6207,7 +7009,7 @@ Use dbus-daemon --introspect to generate DBus service introspect xml - tools/Makefile.am | 2 +- + tools/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 505f5486f055558934718672f1328b52fab6cd6e @@ -6221,17 +7023,17 @@ Sanitise service/object namespace for interfaces tests Remove accidentally added test/interfaces/.Makefile.am.sw - configure.ac | 6 ++- - test/interfaces/Makefile.am | 81 - +++++++++++++++++-------------------- - test/interfaces/run-test.sh | 23 +---------- - test/interfaces/test-client.c | 22 +++++----- - test/interfaces/test-goodbye.xml | 4 +- - test/interfaces/test-hello.xml | 4 +- - test/interfaces/test-interfaces.c | 4 +- - test/interfaces/test-objects.c | 8 ++-- - test/interfaces/test-server.c | 8 ++-- - test/interfaces/test-song.xml | 4 +- + configure.ac | 6 ++- + test/interfaces/Makefile.am | 81 + +++++++++++++++++---------------------- + test/interfaces/run-test.sh | 23 +---------- + test/interfaces/test-client.c | 22 +++++------ + test/interfaces/test-goodbye.xml | 4 +- + test/interfaces/test-hello.xml | 4 +- + test/interfaces/test-interfaces.c | 4 +- + test/interfaces/test-objects.c | 8 ++-- + test/interfaces/test-server.c | 8 ++-- + test/interfaces/test-song.xml | 4 +- 10 files changed, 69 insertions(+), 95 deletions(-) commit 4a479fe9516b141d94e57489f7e624ea6b94cb94 @@ -6245,8 +7047,8 @@ Sanitise service/object namespace for interfaces tests Remove accidentally added test/interfaces/.Makefile.am.swp - test/data/valid-service-files/interfaces-test.service.in | 3 +++ - test/interfaces/.Makefile.am.swp | Bin 12288 -> + .../data/valid-service-files/interfaces-test.service.in | 3 +++ + test/interfaces/.Makefile.am.swp | Bin 12288 -> 0 bytes 2 files changed, 3 insertions(+) @@ -6257,8 +7059,8 @@ Changes for test/interfaces Changed configure.ac and test/Makefile.am - configure.ac | 1 + - test/Makefile.am | 4 ++-- + configure.ac | 1 + + test/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) commit 4f6a75760f55eeb79113d09baa46ecdd09e100e6 @@ -6268,20 +7070,20 @@ Add tests for new interfaces functionaility From bug #5173 - test/interfaces/.Makefile.am.swp | Bin 0 -> 12288 bytes - test/interfaces/.gitignore | 4 ++ - test/interfaces/Makefile.am | 86 +++++++++++++++++++++++++ - test/interfaces/run-test.sh | 38 +++++++++++ - test/interfaces/test-client.c | 85 +++++++++++++++++++++++++ - test/interfaces/test-goodbye.xml | 9 +++ - test/interfaces/test-hello.xml | 10 +++ - test/interfaces/test-interfaces.c | 126 - +++++++++++++++++++++++++++++++++++++ - test/interfaces/test-interfaces.h | 48 ++++++++++++++ - test/interfaces/test-objects.c | 73 +++++++++++++++++++++ - test/interfaces/test-objects.h | 31 +++++++++ - test/interfaces/test-server.c | 56 +++++++++++++++++ - test/interfaces/test-song.xml | 9 +++ + test/interfaces/.Makefile.am.swp | Bin 0 -> 12288 bytes + test/interfaces/.gitignore | 4 ++ + test/interfaces/Makefile.am | 86 ++++++++++++++++++++++++++ + test/interfaces/run-test.sh | 38 ++++++++++++ + test/interfaces/test-client.c | 85 +++++++++++++++++++++++++ + test/interfaces/test-goodbye.xml | 9 +++ + test/interfaces/test-hello.xml | 10 +++ + test/interfaces/test-interfaces.c | 126 + ++++++++++++++++++++++++++++++++++++++ + test/interfaces/test-interfaces.h | 48 +++++++++++++++ + test/interfaces/test-objects.c | 73 ++++++++++++++++++++++ + test/interfaces/test-objects.h | 31 ++++++++++ + test/interfaces/test-server.c | 56 +++++++++++++++++ + test/interfaces/test-song.xml | 9 +++ 13 files changed, 575 insertions(+) commit 4467ffca15e4783b7e90f1349be18fca3807b6cb @@ -6291,7 +7093,7 @@ Bump GLib dependancy to 2.6 Closes #4390. - configure.ac | 4 ++-- + configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6ac144ff50d6c87795b470fb74cc1c0dd3e549a7 @@ -6302,7 +7104,7 @@ glib bindings depend on gobject. Its amazing we've got this far with noone noticiing this bug... - dbus-glib-1.pc.in | 2 +- + dbus-glib-1.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 03e629cabe1100527c467fc5bf2a8aa4f7d3a6f5 @@ -6311,8 +7113,8 @@ Remove accidentally added test/interfaces stuff in the autotools - configure.ac | 1 - - test/Makefile.am | 4 ++-- + configure.ac | 1 - + test/Makefile.am | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) commit 8e2c2ba5f8f0a25708bac86cafa46be02a1bdb78 @@ -6323,17 +7125,17 @@ Puts all exposed servies in the org.freedesktop.DBus.GLib namespace Make tests run again! - test/core/run-test.sh | 6 +- - test/core/test-dbus-glib.c | 142 - ++++++++++---------- - test/core/test-profile.c | 6 +- - test/core/test-service-glib.c | 16 +-- - test/core/test-service-glib.xml | 6 +- - test/core/test-thread-client.c | 4 +- - test/core/test-thread-server.c | 2 +- - .../data/valid-service-files/debug-echo.service.in | 2 +- - .../data/valid-service-files/debug-glib.service.in | 2 +- - test/test-service.c | 28 ++-- + test/core/run-test.sh | 6 +- + test/core/test-dbus-glib.c | 142 + ++++++++++----------- + test/core/test-profile.c | 6 +- + test/core/test-service-glib.c | 16 +-- + test/core/test-service-glib.xml | 6 +- + test/core/test-thread-client.c | 4 +- + test/core/test-thread-server.c | 2 +- + .../data/valid-service-files/debug-echo.service.in | 2 +- + .../data/valid-service-files/debug-glib.service.in | 2 +- + test/test-service.c | 28 ++-- 10 files changed, 107 insertions(+), 107 deletions(-) commit c0bb50ca11675274464d91ed5651676449ce360d @@ -6342,8 +7144,8 @@ Update autofoo for new tests layout - configure.ac | 1 + - test/Makefile.am | 4 ++-- + configure.ac | 1 + + test/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) commit 33412cde926a9fc6ce86618835661bbc48475177 @@ -6353,7 +7155,7 @@ Make autogen a bit more useful for maintainers Adds default configure parameters - the ones you usually want ;) - autogen.sh | 12 ++++++++---- + autogen.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit b47e9bca585b1104f6d7309b02da27b123015611 @@ -6362,8 +7164,8 @@ Update COPYING and HACKING to be correct for dbus-glib - COPYING | 9 ++++----- - HACKING | 11 +++++++++++ + COPYING | 9 ++++----- + HACKING | 11 +++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) commit 50541a23757d59d93918db52c9e9c65596d943c5 @@ -6372,8 +7174,8 @@ Autoconf changes from test/glib -> test/core move - configure.ac | 4 ++-- - test/Makefile.am | 4 ++-- + configure.ac | 4 ++-- + test/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 01024785e818e72c06ba44e8feea926e8aa8f7a8 @@ -6382,8 +7184,8 @@ add an .gitignore - .gitignore | 205 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + .gitignore | 205 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) commit 003840bd5f08802fb2a63b3c49f9d0685f6f292b @@ -6424,10 +7226,10 @@ Rename configure.in to configure.ac for modernity - configure.ac | 902 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - configure.in | 902 - ---------------------------------------------------------- + configure.ac | 902 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.in | 902 + ----------------------------------------------------------- 2 files changed, 902 insertions(+), 902 deletions(-) commit b17fc759d2d5422ce287706d276443fa338cbf5a @@ -6438,7 +7240,7 @@ Applies fix from Daniel d'Andrada Tenório de Carvalho, closing bug #7352. - dbus/dbus-gtype-specialized.c | 3 +-- + dbus/dbus-gtype-specialized.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 4d6aa726814295cfabab95a51d2e320d02b72dde @@ -6448,9 +7250,9 @@ Add m4 directory Add missing changes from last commit. - Makefile.am | 9 +++++---- - autogen.sh | 6 +++++- - configure.in | 1 + + Makefile.am | 9 +++++---- + autogen.sh | 6 +++++- + configure.in | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) commit 1571d556aa5f087e52074e5fd7c5e5c29667c551 @@ -6461,7 +7263,7 @@ Add an m4 directory and add gtk-doc.m4, which is installed in the tree by gtkdocize. - m4/Makefile.am | 1 + + m4/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit fcc2ccdb19bfa25db005494271dbd91a3205c3a6 @@ -6480,7 +7282,7 @@ check works from tarballs - tools/Makefile.am | 2 +- + tools/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 99e10857c50a025fb37613c4dae720b5afc890f5 @@ -6496,8 +7298,8 @@ Fix compilation with -Werror - dbus/dbus-gmain.c | 2 +- - test/glib/test-dbus-glib.c | 9 +-------- + dbus/dbus-gmain.c | 2 +- + test/glib/test-dbus-glib.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) commit 368aaee38049dc599fb8d06d7096bcdbd04befab @@ -6506,8 +7308,8 @@ Make test scripts run during out-of-tree compilation - test/glib/run-test.sh | 4 +++- - tools/run-with-tmp-session-bus.sh | 5 ++++- + test/glib/run-test.sh | 4 +++- + tools/run-with-tmp-session-bus.sh | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) commit b193f2b28472790ff66fc575d55d4e6d5a9d3e78 @@ -6517,11 +7319,11 @@ Fix out-of-tree compilation (cherry picked from 4b85a9e92bcf21356f25c535b3550a330cb018a4 commit) - dbus/Makefile.am | 13 +++++++++++-- - dbus/examples/Makefile.am | 8 +++++++- - dbus/examples/statemachine/Makefile.am | 9 ++++++++- - test/Makefile.am | 7 ++++++- - test/glib/Makefile.am | 8 +++++++- + dbus/Makefile.am | 13 +++++++++++-- + dbus/examples/Makefile.am | 8 +++++++- + dbus/examples/statemachine/Makefile.am | 9 ++++++++- + test/Makefile.am | 7 ++++++- + test/glib/Makefile.am | 8 +++++++- 5 files changed, 39 insertions(+), 6 deletions(-) commit 4b85a9e92bcf21356f25c535b3550a330cb018a4 @@ -6530,11 +7332,11 @@ Fix out-of-tree compilation - dbus/Makefile.am | 13 +++++++++++-- - dbus/examples/Makefile.am | 8 +++++++- - dbus/examples/statemachine/Makefile.am | 9 ++++++++- - test/Makefile.am | 7 ++++++- - test/glib/Makefile.am | 8 +++++++- + dbus/Makefile.am | 13 +++++++++++-- + dbus/examples/Makefile.am | 8 +++++++- + dbus/examples/statemachine/Makefile.am | 9 ++++++++- + test/Makefile.am | 7 ++++++- + test/glib/Makefile.am | 8 +++++++- 5 files changed, 39 insertions(+), 6 deletions(-) commit 46e7e573203e354b676e031067b8607b4f2640df @@ -6551,7 +7353,7 @@ replace doxygen with gtk-doc in INSTALL - INSTALL | 2 +- + INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 27e76bb78db2b467ce93fa0088c6c2407836e4ff @@ -6562,7 +7364,7 @@ A .PHONY rule was added by the gtk-doc patch, this combines it with the existsing .PHONY rule - Makefile.am | 5 ++--- + Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit d49a2a2486cd60e22b360dda8ae5a50d25486667 @@ -6575,8 +7377,8 @@ checks for correct gtkdocize version and pretty prints a bit, a-la gnome-autogen.sh. - autogen.sh | 143 - ++++++++++++++++++++++++++++++++++++++++++------------------ + autogen.sh | 143 + +++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 101 insertions(+), 42 deletions(-) commit 62419419257d6353c5f35001e1f538fca300f3c4 @@ -6585,7 +7387,7 @@ add missing doc/Makefile.am from gtk-doc update. - doc/Makefile.am | 1 + + doc/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit f812d9044aa73b0c86f92dc0dcae03d26e23193a @@ -6594,7 +7396,7 @@ Add missing m4/gtk-doc.m4 from gtk-doc patch. - m4/gtk-doc.m4 | 1 + + m4/gtk-doc.m4 | 1 + 1 file changed, 1 insertion(+) commit 2effafca679d6331201e7637b18888a70b958eb8 @@ -6607,27 +7409,28 @@ Closes #7726. - Makefile.am | 5 +- - autogen.sh | 4 + - configure.in | 8 ++ - dbus/dbus-gidl.c | 2 +- - dbus/dbus-glib-tool.c | 2 +- - dbus/dbus-glib.c | 134 ++++++++++++++------- - dbus/dbus-glib.h | 41 ++++--- - dbus/dbus-gmain.c | 46 ++++--- - dbus/dbus-gobject.c | 140 +++++++++++++--------- - dbus/dbus-gproxy.c | 193 - +++++++++++++++++------------- - dbus/dbus-gtype-specialized.c | 20 +++- - dbus/dbus-gutils.c | 2 +- - dbus/dbus-gvalue.c | 6 +- - doc/reference/Makefile.am | 94 +++++++++++++++ - doc/reference/dbus-binding-tool.xml | 62 ++++++++++ - doc/reference/dbus-glib-docs.sgml | 83 +++++++++++++ - doc/reference/dbus-glib-sections.txt | 166 +++++++++++++++++++++++++ - doc/reference/dbus-glib-undocumented.txt | 78 ++++++++++++ - doc/reference/version.xml.in | 1 + - 19 files changed, 858 insertions(+), 229 deletions(-) + Makefile.am | 5 +- + autogen.sh | 4 + + configure.in | 8 ++ + dbus/dbus-gidl.c | 2 +- + dbus/dbus-glib-tool.c | 2 +- + dbus/dbus-glib.c | 134 ++++++++++++++------- + dbus/dbus-glib.h | 41 ++++--- + dbus/dbus-gmain.c | 46 ++++---- + dbus/dbus-gobject.c | 140 +++++++++++++--------- + dbus/dbus-gproxy.c | 193 + ++++++++++++++++++------------- + dbus/dbus-gtype-specialized.c | 20 +++- + dbus/dbus-gutils.c | 2 +- + dbus/dbus-gvalue.c | 6 +- + doc/reference/Makefile.am | 94 +++++++++++++++ + doc/reference/dbus-binding-tool.xml | 62 ++++++++++ + doc/reference/dbus-glib-docs.sgml | 83 +++++++++++++ + doc/reference/dbus-glib-overrides.txt | 0 + doc/reference/dbus-glib-sections.txt | 166 ++++++++++++++++++++++++++ + doc/reference/dbus-glib-undocumented.txt | 78 +++++++++++++ + doc/reference/version.xml.in | 1 + + 20 files changed, 858 insertions(+), 229 deletions(-) commit 355ef78d98d6fc65715845d56232199162cab12a Author: Steve Frécinaux @@ -6635,8 +7438,8 @@ Interface support for bindings. - dbus/dbus-gobject.c | 286 - +++++++++++++++++++++++++++++---------------------- + dbus/dbus-gobject.c | 286 + +++++++++++++++++++++++++++++----------------------- 1 file changed, 161 insertions(+), 125 deletions(-) commit e6c7815f9457757d7364463759766c85981ce207 @@ -6645,8 +7448,8 @@ * Released 0.71 - NEWS | 7 ++++++- - configure.in | 2 +- + NEWS | 7 ++++++- + configure.in | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) commit 3f720d5a5028d2b4075b474ba17fb9b7508093ac @@ -6655,9 +7458,9 @@ * Various Makefile cleanups - Makefile.am | 26 ++++++++++++++++++++++++-- - dbus/Makefile.am | 8 ++++---- - test/Makefile.am | 2 -- + Makefile.am | 26 ++++++++++++++++++++++++-- + dbus/Makefile.am | 8 ++++---- + test/Makefile.am | 2 -- 3 files changed, 28 insertions(+), 8 deletions(-) commit 05cb3fd6e2c139e61d1461443660badfbdf94a83 @@ -6667,7 +7470,7 @@ * Released 0.70 * Add NEWS to the dist - Makefile.am | 1 + + Makefile.am | 1 + 1 file changed, 1 insertion(+) commit d59c4a541397033b69d575c8cc495d0f3ba13ee3 @@ -6676,7 +7479,7 @@ * Added a NEWS entry for this release - NEWS | 18 ++++++++++++++++++ + NEWS | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit 990802d9f01a7c5aa1ae582aad21963fe20b601e @@ -6685,7 +7488,8 @@ * remove ChangeLog because this will now be generated during dist - 0 files changed + ChangeLog | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) commit 6a68e96e69cb17a981c801d8e7480c5bb4d51a6c Author: John (J5) Palmieri @@ -6693,8 +7497,8 @@ * add the Doxyfile.in file - Doxyfile.in | 180 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + Doxyfile.in | 180 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) commit 89a2a3b5b5795434900f1ca41fc73162b7bb09f2 @@ -6703,8 +7507,8 @@ - distcheck cleanups - dbus/Makefile.am | 2 +- - tools/Makefile.am | 6 ++++++ + dbus/Makefile.am | 2 +- + tools/Makefile.am | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) commit 46ea5dc1aa64ca906d28119e2d9eed3a48e6adfc @@ -6713,7 +7517,7 @@ - Renabled another test - dbus/Makefile.am | 20 ++++++++++---------- + dbus/Makefile.am | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit ae743d6feca5e24541124148a53a475f6f27e2a9 @@ -6732,7 +7536,8 @@ - Adding placeholder HACKING file - 0 files changed + HACKING | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) commit 5f47ecc191cae12930652b708d3c52d293eba4da Author: John (J5) Palmieri @@ -6740,9 +7545,9 @@ - Add back the Doxygen doc generation - Makefile.am | 2 +- - configure.in | 1 + - doc/api/README | 3 +++ + Makefile.am | 2 +- + configure.in | 1 + + doc/api/README | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) commit fdb8aaaab032ab4eb63aa80dbef7de91a3de346a @@ -6779,9 +7584,9 @@ - Fix up docs - INSTALL | 78 - ++------------------------------------------------------------- - README | 71 --------------------------------------------------------- + INSTALL | 78 + ++--------------------------------------------------------------- + README | 71 ----------------------------------------------------------- 2 files changed, 2 insertions(+), 147 deletions(-) commit 6aa2aba0a64ea19e504118dc56a1f9e559568f90 @@ -6790,11 +7595,11 @@ - Really commit the glib to dbus move and build fixes - Makefile.am | 10 +++++----- - configure.in | 18 +++++++++++++----- - dbus/dbus-glib.h | 2 +- - dbus/examples/Makefile.am | 14 +++++++------- - dbus/examples/statemachine/Makefile.am | 10 +++++----- + Makefile.am | 10 +++++----- + configure.in | 18 +++++++++++++----- + dbus/dbus-glib.h | 2 +- + dbus/examples/Makefile.am | 14 +++++++------- + dbus/examples/statemachine/Makefile.am | 10 +++++----- 5 files changed, 31 insertions(+), 23 deletions(-) commit 6a9ac47cc9143ee899455c576f557818dab1f7d2 @@ -6806,6 +7611,7 @@ examples - build now works + NEWS | 0 dbus/.cvsignore | 13 + dbus/Makefile.am | 111 + dbus/dbus-binding-tool-glib.c | 1625 ++++++++++++ @@ -6922,7 +7728,7 @@ glib/examples/statemachine/statemachine.xml | 33 - glib/make-dbus-glib-error-enum.sh | 25 - glib/make-dbus-glib-error-switch.sh | 29 - - 112 files changed, 18315 insertions(+), 18309 deletions(-) + 113 files changed, 18315 insertions(+), 18309 deletions(-) commit 7fa1f1471e5b878253695da46a89a3186fb2a0d1 Author: John (J5) Palmieri @@ -6930,7 +7736,7 @@ - Take out comment in a literal - configure.in | 1 - + configure.in | 1 - 1 file changed, 1 deletion(-) commit 1a7d56d33f83dde917871f8b2d5af19f25786449 @@ -6939,7 +7745,7 @@ - Have autogen.sh point to dbus-glib - autogen.sh | 4 ++-- + autogen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 24ec6aba3281c460f64bbe9d5bb2dd265d453cce @@ -6948,10 +7754,10 @@ - Add files missed in the split - glib/dbus-glib-lowlevel.h | 72 +++++++++++ - glib/dbus-glib.h | 256 - +++++++++++++++++++++++++++++++++++++ - glib/make-dbus-glib-error-enum.sh | 25 ++++ + glib/dbus-glib-lowlevel.h | 72 +++++++++++ + glib/dbus-glib.h | 256 + ++++++++++++++++++++++++++++++++++++++ + glib/make-dbus-glib-error-enum.sh | 25 ++++ 3 files changed, 353 insertions(+) commit b8b86555280694d85d64b68d0f9131868598161a @@ -6960,15 +7766,15 @@ - Add boilerplate build files - AUTHORS | 16 + - COPYING | 551 +++++++++++++++++++++++++++++++++ - INSTALL | 294 ++++++++++++++++++ - Makefile.am | 57 ++++ - README | 101 +++++++ - autogen.sh | 93 ++++++ - configure.in | 870 - +++++++++++++++++++++++++++++++++++++++++++++++++++++ - dbus-glib-1.pc.in | 12 + + AUTHORS | 16 + + COPYING | 551 ++++++++++++++++++++++++++++++++++ + INSTALL | 294 ++++++++++++++++++ + Makefile.am | 57 ++++ + README | 101 +++++++ + autogen.sh | 93 ++++++ + configure.in | 870 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + dbus-glib-1.pc.in | 12 + 8 files changed, 1994 insertions(+) commit 698177269a46c2cb80fbb2c471f5ad6314bd106b @@ -6980,7 +7786,7 @@ * glib/dbus-gobject.c: Free a leaking GArray (surely not!) in dbus_g_method_return. - glib/dbus-gobject.c | 1 + + glib/dbus-gobject.c | 1 + 1 file changed, 1 insertion(+) commit 0b305ffe12e7273640226e323074f2cb7d7387cc @@ -6993,7 +7799,7 @@ Don't leak a GArray when firing signals (thank Rob Taylor for review). - glib/dbus-gproxy.c | 4 +++- + glib/dbus-gproxy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 66e5632e14760bbd396afbc4d474cbbed22f37f7 @@ -7006,7 +7812,7 @@ in every call to dbus_g_type_get_struct. - glib/dbus-gtype-specialized.c | 9 +++++++-- + glib/dbus-gtype-specialized.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 9b151fd7a396463aa3f7c6ac0a14df444c78a6b1 @@ -7031,7 +7837,7 @@ too bad, but others should watch their choice of take vs set_static. - glib/dbus-gvalue-utils.c | 24 ++++++++++++++---------- + glib/dbus-gvalue-utils.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) commit 5559e67b90b3c186bf0002253587013264ce9dc0 @@ -7049,8 +7855,8 @@ thing nobody uses this code yet. - glib/dbus-gvalue-utils.c | 101 - ++++++++++++++++++++++++++++++++++++++++------ + glib/dbus-gvalue-utils.c | 101 + +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 89 insertions(+), 12 deletions(-) commit 7ca236d43bc91778e90ac59500aeb1d68c8acd6f @@ -7071,8 +7877,8 @@ the very least. - glib/dbus-gvalue-utils.c | 91 - ++++++++-------------------------------------- + glib/dbus-gvalue-utils.c | 91 + +++++++++--------------------------------------- 1 file changed, 16 insertions(+), 75 deletions(-) commit 8896d43457634c4c10d9909907d0d9082b520a07 @@ -7095,7 +7901,7 @@ apparently broken code to be sure the tests fail and someone will fix them... - glib/dbus-gvalue-utils.c | 15 +++++++++++++++ + glib/dbus-gvalue-utils.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) commit 4da76dd7d5845f05efd553037750ddeffd7d1962 @@ -7108,7 +7914,7 @@ any order, making it easier for people who inherit from this object. - glib/dbus-gproxy.c | 29 ++++++++++++++++++++++------- + glib/dbus-gproxy.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) commit 08cd19641ff8c6fcb1f8e5821e6c9dc81f11cd6f @@ -7121,8 +7927,8 @@ fix leaking of memory from within pointer arrays and lists. Fixes bug #6300. - glib/dbus-gvalue-utils.c | 62 - +++++++++++++++++++++++++++++++++++++++++----- + glib/dbus-gvalue-utils.c | 62 + +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 6 deletions(-) commit 96fb792c6a5661afeef76ece3cd7defc9ffc8db8 @@ -7134,7 +7940,7 @@ * glib/dbus-gvalue.c: Patch from Jakub Stachowski to fix a leak in generating struct signatures. Fixes bug #6083. - glib/dbus-gvalue.c | 9 ++++++--- + glib/dbus-gvalue.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 636fe6ed1b321cd05b72ca39d414ecd1c2cb4b4f @@ -7146,7 +7952,7 @@ * glib/dbus-glib-tool.c (usage): fix up the usage message, someone should make this thing use the new glib options parser - glib/dbus-glib-tool.c | 2 +- + glib/dbus-glib-tool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 844b4184483ac979eff27319f144e8f330858062 @@ -7177,7 +7983,7 @@ an empty array via the glib bindings. Without all of the above patches, this new test fails. - glib/dbus-gvalue.c | 7 ++++--- + glib/dbus-gvalue.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 7b33862bac766c00c12f5cb400af06200ae004c4 @@ -7198,7 +8004,7 @@ chars so that they're not cast to chars and made negative. Thanks to Jakub Stachowski for reporting this and testing the fix. - glib/dbus-gmain.c | 8 ++++---- + glib/dbus-gmain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 8d98ce884210745d7070e4438167ece2be0e357b @@ -7214,7 +8020,7 @@ * ChangeLog: checkin last entry which doesn't seem to be commited - glib/dbus-gmain.c | 37 +++++++++++++++++++++++++++++++++++++ + glib/dbus-gmain.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) commit 6fd3dffe4561b37bc75c13f6296e91b65224ce4d @@ -7238,15 +8044,15 @@ but it's now possible to store these in arrays, emit them in signals, etc. - glib/dbus-binding-tool-glib.c | 26 ++++ - glib/dbus-gmain.c | 4 +- - glib/dbus-gsignature.c | 25 +++- - glib/dbus-gtype-specialized.c | 296 - ++++++++++++++++++++++++++++++++++++++--- - glib/dbus-gtype-specialized.h | 43 ++++++ - glib/dbus-gvalue-utils.c | 184 +++++++++++++++++++++++++ - glib/dbus-gvalue-utils.h | 2 +- - glib/dbus-gvalue.c | 148 ++++++++++++++++++++- + glib/dbus-binding-tool-glib.c | 26 ++++ + glib/dbus-gmain.c | 4 +- + glib/dbus-gsignature.c | 25 +++- + glib/dbus-gtype-specialized.c | 296 + ++++++++++++++++++++++++++++++++++++++---- + glib/dbus-gtype-specialized.h | 43 ++++++ + glib/dbus-gvalue-utils.c | 184 ++++++++++++++++++++++++++ + glib/dbus-gvalue-utils.h | 2 +- + glib/dbus-gvalue.c | 148 ++++++++++++++++++++- 8 files changed, 695 insertions(+), 33 deletions(-) commit eef27dfbd6dc73baa13c78220f98297881071368 @@ -7260,9 +8066,9 @@ when generating the client-side methods, instead of overloading CSymbol which broke everything horribly. My apologies. - glib/dbus-binding-tool-glib.c | 45 - +++++++++++++++++------------------------ - glib/dbus-binding-tool-glib.h | 1 + + glib/dbus-binding-tool-glib.c | 45 + +++++++++++++++++-------------------------- + glib/dbus-binding-tool-glib.h | 1 + 2 files changed, 19 insertions(+), 27 deletions(-) commit 879e2b697e2a0fd439a38ea4d4422cd8c01fefb5 @@ -7283,10 +8089,10 @@ the above code works, and appears not to leak when called repeatedly. - glib/dbus-gtype-specialized.c | 33 ++++++++++++++++++++++++++- - glib/dbus-gtype-specialized.h | 4 +++- - glib/dbus-gvalue-utils.c | 50 - ++++++++++++++++++++++++++++++++++------- + glib/dbus-gtype-specialized.c | 33 +++++++++++++++++++++++++++- + glib/dbus-gtype-specialized.h | 4 +++- + glib/dbus-gvalue-utils.c | 50 + ++++++++++++++++++++++++++++++++++++------- 3 files changed, 77 insertions(+), 10 deletions(-) commit f467138770f3b5b771e772e7f59780a502540cb6 @@ -7299,7 +8105,7 @@ to free a D-Bus allocated string with dbus_free () instead of g_free (). - glib/dbus-gvalue.c | 2 +- + glib/dbus-gvalue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0c87b127b878d41d8a134fd5dee5d41a2434ef41 @@ -7311,7 +8117,7 @@ * glib/dbus-gproxy.c (dbus_g_proxy_dispose): Protect the dispose method from being called multiple times. - glib/dbus-gproxy.c | 5 +++++ + glib/dbus-gproxy.c | 5 +++++ 1 file changed, 5 insertions(+) commit 5ad59f0f48a27d35d58e86c2cf2aa8c7d025248b @@ -7327,7 +8133,7 @@ (ie size-variable things, such as strings, objects, structs, etc). - glib/dbus-binding-tool-glib.c | 32 ++++++++++++++++++++++++++------ + glib/dbus-binding-tool-glib.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) commit 0dffd5ab28874cc6453e8907f1f4cb95785748cb @@ -7344,8 +8150,8 @@ into a connection property, allowing proper GObject construction. - glib/dbus-gproxy.c | 327 - +++++++++++++++++++++++++++++++--------------------- + glib/dbus-gproxy.c | 327 + ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 196 insertions(+), 131 deletions(-) commit b356f998530ffe9762b4b0f5fd7f236eceb044db @@ -7359,8 +8165,8 @@ symbol name annotations when generating glib client bindings. - glib/dbus-binding-tool-glib.c | 42 - ++++++++++++++++++++++++++++++++++++----- + glib/dbus-binding-tool-glib.c | 42 + +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) commit 8029bd07868baa11810b0b3ee56a8daefc0588da @@ -7376,10 +8182,10 @@ dead code and compiler warnings (patch from Kjartan Maraas ) - glib/dbus-binding-tool-glib.c | 2 -- - glib/dbus-glib-tool.c | 4 ---- - glib/dbus-gparser.c | 11 ++--------- - glib/dbus-gproxy.c | 2 -- + glib/dbus-binding-tool-glib.c | 2 -- + glib/dbus-glib-tool.c | 4 ---- + glib/dbus-gparser.c | 11 ++--------- + glib/dbus-gproxy.c | 2 -- 4 files changed, 2 insertions(+), 17 deletions(-) commit c5753442aaccba39a3e0948aa77e523eb3fe866b @@ -7389,7 +8195,7 @@ * glib/dbus-gmain.c (connection_setup_add_watch): plugged a leak (patch from Carlos Garnacho Parro - glib/dbus-gmain.c | 1 + + glib/dbus-gmain.c | 1 + 1 file changed, 1 insertion(+) commit 5d3c9bd0cd7e98df0be8351e3c210a38a978f52a @@ -7401,9 +8207,9 @@ * glib/dbus-gobject.c: Append a GValue instead of a basic type in method return message for property getters - glib/dbus-gobject.c | 41 +++++++++++++++++++++++++++++++---------- - glib/dbus-gvalue.c | 8 ++++---- - glib/dbus-gvalue.h | 1 + + glib/dbus-gobject.c | 41 +++++++++++++++++++++++++++++++---------- + glib/dbus-gvalue.c | 8 ++++---- + glib/dbus-gvalue.h | 1 + 3 files changed, 36 insertions(+), 14 deletions(-) commit 9f2aae9a744e45c0646b36396e846031ec4ffe7f @@ -7529,11 +8335,11 @@ regression test suite for testing various states of the new queueing system - glib/dbus-gobject.c | 28 - +++++++++++++++++++--- - glib/examples/example-service.c | 2 +- - glib/examples/example-signal-emitter.c | 2 +- - glib/examples/statemachine/statemachine-server.c | 2 +- + glib/dbus-gobject.c | 28 + +++++++++++++++++++++--- + glib/examples/example-service.c | 2 +- + glib/examples/example-signal-emitter.c | 2 +- + glib/examples/statemachine/statemachine-server.c | 2 +- 4 files changed, 28 insertions(+), 6 deletions(-) commit 57b6ef4e8648c0c7f9b059690c4a35e73932669f @@ -7555,7 +8361,7 @@ now can, but this is a workable interim solution which might have other applications. - glib/dbus-gobject.c | 34 ++++++++++++++++++++++++++++++++++ + glib/dbus-gobject.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) commit cf87837198ac181b16965dcc8fb3f65bc2efa8bd @@ -7578,9 +8384,9 @@ rules on the command line. - glib/Makefile.am | 2 +- - glib/examples/Makefile.am | 4 ++-- - glib/examples/statemachine/Makefile.am | 4 ++-- + glib/Makefile.am | 2 +- + glib/examples/Makefile.am | 4 ++-- + glib/examples/statemachine/Makefile.am | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) commit 3a8319b792df4ce260f8cf1e0f95fadd76942d75 @@ -7589,7 +8395,7 @@ Cleanups - glib/dbus-gobject.c | 1 + + glib/dbus-gobject.c | 1 + 1 file changed, 1 insertion(+) commit 29f0ea31b256784b4e75cdedcb822f30fe804dd3 @@ -7598,8 +8404,8 @@ Add const keywords - glib/dbus-gmain.c | 2 +- - glib/dbus-gobject.c | 2 +- + glib/dbus-gmain.c | 2 +- + glib/dbus-gobject.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit f4b2bdf28c5e589d9161e27bf89e636c8226169f @@ -7608,9 +8414,9 @@ Add a NoReply annotation - glib/dbus-binding-tool-glib.c | 53 - ++++++++++++++++++++++++++++------------- - glib/dbus-binding-tool-glib.h | 3 ++- + glib/dbus-binding-tool-glib.c | 53 + ++++++++++++++++++++++++++++++------------- + glib/dbus-binding-tool-glib.h | 3 ++- 2 files changed, 39 insertions(+), 17 deletions(-) commit adc1cd1de84b057cc858b1226522d2fde96871a0 @@ -7642,8 +8448,8 @@ finish. this is called when introspect either succeeds or fails (ProxyObject::_introspect_error_handler): call queued methods - glib/dbus-gvalue-utils.c | 17 +++++++++++++++++ - glib/dbus-gvalue.c | 4 +++- + glib/dbus-gvalue-utils.c | 17 +++++++++++++++++ + glib/dbus-gvalue.c | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) commit 8c16af02c159982b451289945835a86ff56805c2 @@ -7697,7 +8503,7 @@ interlanguage communications. - glib/dbus-gvalue.c | 2 +- + glib/dbus-gvalue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b489f57506320ba3e29088dc612e27112c6a1854 @@ -7708,7 +8514,7 @@ DBusBindingOutputMode enum which was causing a warning. #include so using time_t is explicitly defined - glib/dbus-glib-tool.c | 3 ++- + glib/dbus-glib-tool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit a32ca0058020e7e23d72d9ad69fe881ba8b98e93 @@ -7745,7 +8551,7 @@ * python/__init__.py: Sync version with libdbus to (0,50,0) - glib/Makefile.am | 6 +++--- + glib/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 23fb630c1e907187c8d7aa5539b30a34e7cc9632 @@ -7757,7 +8563,7 @@ * glib/dbus-gproxy.c (dbus_g_proxy_call): Doc update, thanks to Ryan Lortie for the suggestion. - glib/dbus-gproxy.c | 3 ++- + glib/dbus-gproxy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 8e13d06500c5b4df219891fc4b5b8242cb9f5cae @@ -7766,7 +8572,7 @@ Unref message and protect against NULL - glib/dbus-gproxy.c | 5 ++++- + glib/dbus-gproxy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 03dc49be2e41245f107e71194ebef428d4d4ccf7 @@ -7778,7 +8584,7 @@ * glib/dbus-gobject.c (dbus_set_g_error): Don't lose if the DBusError message is NULL. - glib/dbus-gobject.c | 2 +- + glib/dbus-gobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 20ab99c264aa730de304f637a7e4eacec3e1686d @@ -7824,18 +8630,18 @@ * test/glib/test-service-glib.c (my_object_rec_arrays): Delete unused variable. - glib/Makefile.am | 5 +- - glib/dbus-binding-tool-glib.c | 36 ++++--- - glib/dbus-gmain.c | 23 ++-- - glib/dbus-gobject.c | 35 +++--- - glib/dbus-gproxy.c | 13 +-- - glib/dbus-gsignature.c | 189 ++++++++++++++++++++++++++++++++ - glib/dbus-gsignature.h | 19 ++++ - glib/dbus-gvalue-utils.c | 46 ++++---- - glib/dbus-gvalue-utils.h | 28 ++--- - glib/dbus-gvalue.c | 237 - +++++++---------------------------------- - glib/dbus-gvalue.h | 21 ++-- + glib/Makefile.am | 5 +- + glib/dbus-binding-tool-glib.c | 36 ++++--- + glib/dbus-gmain.c | 23 ++-- + glib/dbus-gobject.c | 35 ++++--- + glib/dbus-gproxy.c | 13 +-- + glib/dbus-gsignature.c | 189 +++++++++++++++++++++++++++++++++ + glib/dbus-gsignature.h | 19 ++++ + glib/dbus-gvalue-utils.c | 46 ++++---- + glib/dbus-gvalue-utils.h | 28 ++--- + glib/dbus-gvalue.c | 237 + +++++++----------------------------------- + glib/dbus-gvalue.h | 21 ++-- 11 files changed, 350 insertions(+), 302 deletions(-) commit f19bb3b8b599f006e51a1ff81447ac6470c249fc @@ -7848,8 +8654,8 @@ this should catch any incompatible changes accidentally made. - glib/dbus-gobject.c | 150 - +++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/dbus-gobject.c | 150 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) commit f902eead6b209181f7a26b4cb1a967661ac86117 @@ -7863,7 +8669,7 @@ * glib/dbus-gidl.c (property_info_unref, arg_info_unref): Fix use-after-free. - glib/dbus-gidl.c | 4 ++-- + glib/dbus-gidl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit db1be2d67b4239496940080f44c7e05eed42a610 @@ -7880,9 +8686,9 @@ Don't use C99 style initializers (bug #3933). - glib/dbus-gobject.c | 2 +- - glib/dbus-gvalue-utils.c | 7 +++---- - glib/dbus-gvalue.c | 8 ++++---- + glib/dbus-gobject.c | 2 +- + glib/dbus-gvalue-utils.c | 7 +++---- + glib/dbus-gvalue.c | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) commit 04045b587a62e4b5cafbad0b81e18761c28a41e5 @@ -7893,9 +8699,9 @@ * fix a bunch of Doxygen warnings and mistakes - glib/dbus-glib.c | 4 ++-- - glib/dbus-gobject.c | 2 +- - glib/dbus-gproxy.c | 4 ++-- + glib/dbus-glib.c | 4 ++-- + glib/dbus-gobject.c | 2 +- + glib/dbus-gproxy.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) commit f91e8613d913ee943afa5bbb6cdafb2ce062c6ef @@ -7904,7 +8710,7 @@ Remove matchers when all proxies are removed - glib/dbus-gproxy.c | 6 ++++++ + glib/dbus-gproxy.c | 6 ++++++ 1 file changed, 6 insertions(+) commit 2c755e157a9b41451efd5fd88e74c37501e21127 @@ -7921,7 +8727,7 @@ * test/glib/test-service-glib.c: * test/glib/test-service-glib.xml: Add recursive arrays tests. - glib/dbus-gvalue.c | 5 ----- + glib/dbus-gvalue.c | 5 ----- 1 file changed, 5 deletions(-) commit 6bf40ec5a63f7703070f951130d8e78cb044ec66 @@ -7940,9 +8746,9 @@ * python/Makefile.am: Preprend $(srcdir)/ to source files so the compiler looks in the right places during distcheck - glib/Makefile.am | 2 +- - glib/examples/Makefile.am | 2 ++ - glib/examples/statemachine/Makefile.am | 2 +- + glib/Makefile.am | 2 +- + glib/examples/Makefile.am | 2 ++ + glib/examples/statemachine/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) commit a447f257bd0b557b661be74f2d63ba0d31366a46 @@ -7952,7 +8758,7 @@ * glib/example/Makefile.am: Fix a typo which cause make distcheck to fail - glib/examples/Makefile.am | 2 +- + glib/examples/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ce277d89860aaf05064d11eb24878cbf41326ff2 @@ -7961,7 +8767,7 @@ Don't leak messages when calling methods - glib/dbus-gproxy.c | 1 + + glib/dbus-gproxy.c | 1 + 1 file changed, 1 insertion(+) commit 877add82e329e1de4ab7b4d99084362e250fa34c @@ -7979,9 +8785,9 @@ Add libtool --mode=execute so we use the built library instead of any installed one. - glib/Makefile.am | 2 +- - glib/examples/Makefile.am | 4 ++-- - glib/examples/statemachine/Makefile.am | 4 ++-- + glib/Makefile.am | 2 +- + glib/examples/Makefile.am | 4 ++-- + glib/examples/statemachine/Makefile.am | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) commit 31ca9e74c599c17f802698ad8184f9ae654983c5 @@ -8033,11 +8839,11 @@ * test/glib/test-service-glib.c: * test/glib/test-service-glib.xml: Add structure tests. - glib/dbus-binding-tool-glib.c | 1 + - glib/dbus-gvalue.c | 358 - ++++++++++++++++++--------------------- - glib/examples/example-client.c | 32 +++- - glib/examples/example-service.c | 21 ++- + glib/dbus-binding-tool-glib.c | 1 + + glib/dbus-gvalue.c | 358 + +++++++++++++++++++--------------------- + glib/examples/example-client.c | 32 +++- + glib/examples/example-service.c | 21 ++- 4 files changed, 209 insertions(+), 203 deletions(-) commit 5c39fa43d8eb87284abe7d009349523ad5398db0 @@ -8085,14 +8891,14 @@ * test/glib/test-service-glib.xml: * test/glib/test-dbus-glib.c: Add some tests for return values. - glib/Makefile.am | 19 +- - glib/dbus-binding-tool-glib.c | 324 - ++++++++++++++++++++++----------- - glib/dbus-binding-tool-glib.h | 1 + - glib/dbus-gobject.c | 242 ++++++++++++++++++------ - glib/dbus-gvalue-utils.c | 54 ++++++ - glib/dbus-gvalue-utils.h | 4 + - glib/examples/statemachine/.cvsignore | 1 + + glib/Makefile.am | 19 +- + glib/dbus-binding-tool-glib.c | 324 + +++++++++++++++++++++++----------- + glib/dbus-binding-tool-glib.h | 1 + + glib/dbus-gobject.c | 242 +++++++++++++++++++------ + glib/dbus-gvalue-utils.c | 54 ++++++ + glib/dbus-gvalue-utils.h | 4 + + glib/examples/statemachine/.cvsignore | 1 + 7 files changed, 479 insertions(+), 166 deletions(-) commit 00de44640de45aa6068ca9d1b42deb801b430320 @@ -8116,11 +8922,11 @@ * glib/dbus-binding-tool-glib.c (generate_glue): Barf on const annotation on input args. - glib/dbus-binding-tool-glib.c | 17 +++++++++++-- - glib/dbus-glib-tool.h | 3 ++- - glib/dbus-gobject.c | 54 - ++++++++++++++++++++++++----------------- - glib/dbus-gparser.c | 7 +++--- + glib/dbus-binding-tool-glib.c | 17 ++++++++++++-- + glib/dbus-glib-tool.h | 3 ++- + glib/dbus-gobject.c | 54 + +++++++++++++++++++++++++------------------ + glib/dbus-gparser.c | 7 +++--- 4 files changed, 52 insertions(+), 29 deletions(-) commit 91dc6d18c4ccc69fef3c12e6f628f7458c1d4511 @@ -8158,13 +8964,13 @@ * test/glib/test-service-glib.c: Update to make some methods const. - glib/dbus-binding-tool-glib.c | 6 ++++++ - glib/dbus-binding-tool-glib.h | 1 + - glib/dbus-gidl.c | 30 ++++++++++++++++++++++++++ - glib/dbus-gidl.h | 7 ++++++ - glib/dbus-gobject.c | 48 - +++++++++++++++++++++++++++++++++++------ - glib/dbus-gparser.c | 5 ++++- + glib/dbus-binding-tool-glib.c | 6 ++++++ + glib/dbus-binding-tool-glib.h | 1 + + glib/dbus-gidl.c | 30 +++++++++++++++++++++++++++ + glib/dbus-gidl.h | 7 +++++++ + glib/dbus-gobject.c | 48 + ++++++++++++++++++++++++++++++++++++------- + glib/dbus-gparser.c | 5 ++++- 6 files changed, 89 insertions(+), 8 deletions(-) commit 52438e8f3f67fa96ffd9607bad34968875d90226 @@ -8223,16 +9029,16 @@ * glib/dbus-gtest.h: Prototype it. - glib/dbus-gtest.c | 4 + - glib/dbus-gtest.h | 1 + - glib/dbus-gtype-specialized.c | 13 +- - glib/dbus-gtype-specialized.h | 15 +- - glib/dbus-gvalue-utils.c | 116 ++++++- - glib/dbus-gvalue.c | 402 - +++++++++++----------- - glib/examples/statemachine/statemachine-client.c | 192 +++++++++-- - glib/examples/statemachine/statemachine-server.c | 27 ++ - glib/examples/statemachine/statemachine.c | 44 +-- + glib/dbus-gtest.c | 4 + + glib/dbus-gtest.h | 1 + + glib/dbus-gtype-specialized.c | 13 +- + glib/dbus-gtype-specialized.h | 15 +- + glib/dbus-gvalue-utils.c | 116 ++++++- + glib/dbus-gvalue.c | 402 + ++++++++++++----------- + glib/examples/statemachine/statemachine-client.c | 192 +++++++++-- + glib/examples/statemachine/statemachine-server.c | 27 ++ + glib/examples/statemachine/statemachine.c | 44 +-- 9 files changed, 555 insertions(+), 259 deletions(-) commit 6758d07f4dd3bee533488381c8cf236d9d99a5f0 @@ -8241,7 +9047,7 @@ Make async bindings work again - glib/dbus-binding-tool-glib.c | 31 +++++++++++++------------------ + glib/dbus-binding-tool-glib.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) commit 8068477b92f2ee5ca19623e033e335d4b16d8de5 @@ -8352,30 +9158,30 @@ * configure.in: Add glib/examples/statemachine. - glib/dbus-gobject.c | 6 +- - glib/dbus-gproxy.c | 31 +- - glib/dbus-gtest.c | 7 + - glib/dbus-gtest.h | 1 + - glib/dbus-gtype-specialized.c | 44 +- - glib/dbus-gtype-specialized.h | 32 +- - glib/dbus-gvalue-utils.c | 261 +++++++++- - glib/dbus-gvalue-utils.h | 1 - - glib/dbus-gvalue.c | 388 +++++++++++--- - glib/dbus-gvalue.h | 4 +- - glib/examples/Makefile.am | 2 + - glib/examples/example-service.c | 4 +- - glib/examples/example-signal-emitter.c | 4 +- - glib/examples/statemachine/.cvsignore | 15 + - glib/examples/statemachine/Makefile.am | 35 ++ - glib/examples/statemachine/sm-marshal.list | 1 + - glib/examples/statemachine/statemachine-client.c | 540 - ++++++++++++++++++++ - glib/examples/statemachine/statemachine-server.c | 202 ++++++++ - glib/examples/statemachine/statemachine-server.h | 37 ++ - glib/examples/statemachine/statemachine-server.xml | 14 + - glib/examples/statemachine/statemachine.c | 351 +++++++++++++ - glib/examples/statemachine/statemachine.h | 77 +++ - glib/examples/statemachine/statemachine.xml | 33 ++ + glib/dbus-gobject.c | 6 +- + glib/dbus-gproxy.c | 31 +- + glib/dbus-gtest.c | 7 + + glib/dbus-gtest.h | 1 + + glib/dbus-gtype-specialized.c | 44 +- + glib/dbus-gtype-specialized.h | 32 +- + glib/dbus-gvalue-utils.c | 261 +++++++++- + glib/dbus-gvalue-utils.h | 1 - + glib/dbus-gvalue.c | 388 ++++++++++++--- + glib/dbus-gvalue.h | 4 +- + glib/examples/Makefile.am | 2 + + glib/examples/example-service.c | 4 +- + glib/examples/example-signal-emitter.c | 4 +- + glib/examples/statemachine/.cvsignore | 15 + + glib/examples/statemachine/Makefile.am | 35 ++ + glib/examples/statemachine/sm-marshal.list | 1 + + glib/examples/statemachine/statemachine-client.c | 540 + +++++++++++++++++++++ + glib/examples/statemachine/statemachine-server.c | 202 ++++++++ + glib/examples/statemachine/statemachine-server.h | 37 ++ + glib/examples/statemachine/statemachine-server.xml | 14 + + glib/examples/statemachine/statemachine.c | 351 ++++++++++++++ + glib/examples/statemachine/statemachine.h | 77 +++ + glib/examples/statemachine/statemachine.xml | 33 ++ 23 files changed, 1983 insertions(+), 107 deletions(-) commit 8b39e9d32cb505d4f9550ca24627020e5edd9681 @@ -8490,12 +9296,12 @@ * tools/dbus-print-message.c (print_iter): Add literal argument. (print_message): Allow printing string messages literally. - glib/dbus-binding-tool-glib.c | 2 + - glib/dbus-glib.c | 140 ----------- - glib/dbus-gobject.c | 44 ++-- - glib/dbus-gparser.c | 2 +- - glib/dbus-gproxy.c | 555 - +++++++++++++++++++++++++++-------------- + glib/dbus-binding-tool-glib.c | 2 + + glib/dbus-glib.c | 140 ----------- + glib/dbus-gobject.c | 44 ++-- + glib/dbus-gparser.c | 2 +- + glib/dbus-gproxy.c | 555 + ++++++++++++++++++++++++++++-------------- 5 files changed, 390 insertions(+), 353 deletions(-) commit 462a36e4898da053ba749857511f2d634dbea665 @@ -8509,7 +9315,7 @@ . Also remove useless extra value in favor of prepending to value array directly. - glib/dbus-gproxy.c | 7 +++---- + glib/dbus-gproxy.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit d80b7960d7d189d7c33e6d230fdbbf8b69546f60 @@ -8520,7 +9326,7 @@ * glib/dbus-gmain.c (_dbus_gmain_test): Fix test. - glib/dbus-gmain.c | 4 ++-- + glib/dbus-gmain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c7f14e3c337601053b08dc07a186be81063fc005 @@ -8536,7 +9342,7 @@ G_TYPE_LONG as DBUS_TYPE_INT32, G_TYPE_ULONG as DBUS_TYPE_UINT32, and G_TYPE_FLOAT as DBUS_TYPE_DOUBLE. - glib/dbus-gvalue.c | 33 +++++++++++++++++++++++++++++++-- + glib/dbus-gvalue.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) commit 5c82c5ce0eba4ec3bbb0454f3987f56de968bf95 @@ -8579,12 +9385,12 @@ * glib/dbus-glib.c (dbus_g_error_set): Delete. Update tests. - glib/dbus-glib.c | 45 +----------------- - glib/dbus-gmain.c | 3 +- - glib/dbus-gobject.c | 127 - ++++++++++++++++++++++++++++++++++++++++++++++++++- - glib/dbus-gparser.c | 3 +- - glib/dbus-gproxy.c | 6 +-- + glib/dbus-glib.c | 45 +------------------ + glib/dbus-gmain.c | 3 +- + glib/dbus-gobject.c | 127 + +++++++++++++++++++++++++++++++++++++++++++++++++++- + glib/dbus-gparser.c | 3 +- + glib/dbus-gproxy.c | 6 +-- 5 files changed, 134 insertions(+), 50 deletions(-) commit f879e3e832d76a7b3b02cc7d25a3e5b9ef195f42 @@ -8615,9 +9421,9 @@ * test/glib/test-service-glib.c (my_object_objpath): Adapt tests to new object path marshalling. - glib/dbus-binding-tool-glib.c | 5 +- - glib/dbus-gvalue.c | 164 - ++++++++++++++++------------------------- + glib/dbus-binding-tool-glib.c | 5 +- + glib/dbus-gvalue.c | 164 + +++++++++++++++++------------------------- 2 files changed, 68 insertions(+), 101 deletions(-) commit 1f87d5d3363d1e23208c993eabb3cb1f0341b4d9 @@ -8631,7 +9437,7 @@ * glib/dbus-gobject.c (invoke_object_method): Unset object value in all cases, not only in async case. - glib/dbus-gobject.c | 4 ++-- + glib/dbus-gobject.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 49fce903db4124277de6aba92f7c03f24d84e598 @@ -8699,10 +9505,10 @@ * tools/dbus-send.c (main): Print D-BUS error name in addition to message. - glib/dbus-gobject.c | 14 +- - glib/dbus-gproxy.c | 780 - ++++++++++++++++++++++++++---- - glib/examples/example-signal-recipient.c | 9 +- + glib/dbus-gobject.c | 14 +- + glib/dbus-gproxy.c | 780 + +++++++++++++++++++++++++++---- + glib/examples/example-signal-recipient.c | 9 +- 3 files changed, 689 insertions(+), 114 deletions(-) commit f2f505e8027bd4ef84b051ad9cd84ab86524b530 @@ -8721,7 +9527,7 @@ marshallers operate on. Also add an entry for VOID__BOXED. (dbus_g_object_register_marshaller_array): Convert to fundamental. - glib/dbus-gobject.c | 28 +++++++++++++++++++++------- + glib/dbus-gobject.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) commit f0480850590afa233d7e1ad2b0c8250621c2bb9f @@ -8765,15 +9571,15 @@ sure we only change DBUS_ERROR to DBUS_GERROR, not all ERROR to GERROR. Also add DBUS_GERROR_REMOTE_EXCEPTION. - glib/.cvsignore | 1 + - glib/Makefile.am | 8 +++ - glib/dbus-glib.c | 109 - ++++++++++++++++++++++++++++++----- - glib/dbus-gmain.c | 2 +- - glib/dbus-gobject.c | 15 +++-- - glib/dbus-gparser.c | 2 +- - glib/dbus-gproxy.c | 6 +- - glib/make-dbus-glib-error-switch.sh | 29 ++++++++++ + glib/.cvsignore | 1 + + glib/Makefile.am | 8 +++ + glib/dbus-glib.c | 109 + +++++++++++++++++++++++++++++++----- + glib/dbus-gmain.c | 2 +- + glib/dbus-gobject.c | 15 +++-- + glib/dbus-gparser.c | 2 +- + glib/dbus-gproxy.c | 6 +- + glib/make-dbus-glib-error-switch.sh | 29 ++++++++++ 8 files changed, 150 insertions(+), 22 deletions(-) commit ce03d4c9e9be4724a3255085b5ab5e51d9b9c196 @@ -8786,7 +9592,7 @@ * glib/dbus-gobject.c (dbus_g_method_return): Free out_sig. - glib/dbus-gobject.c | 1 + + glib/dbus-gobject.c | 1 + 1 file changed, 1 insertion(+) commit 6d152f08fa90bdc14d75b9091cccd5422faf3f11 @@ -8810,17 +9616,17 @@ New files; GLib binding examples, ported from python/examples. - glib/Makefile.am | 2 + - glib/examples/.cvsignore | 17 ++++ - glib/examples/Makefile.am | 34 ++++++++ - glib/examples/example-client.c | 107 +++++++++++++++++++++++ - glib/examples/example-service.c | 138 - ++++++++++++++++++++++++++++++ - glib/examples/example-service.xml | 19 ++++ - glib/examples/example-signal-emitter.c | 132 - ++++++++++++++++++++++++++++ - glib/examples/example-signal-emitter.xml | 13 +++ - glib/examples/example-signal-recipient.c | 103 ++++++++++++++++++++++ + glib/Makefile.am | 2 + + glib/examples/.cvsignore | 17 ++++ + glib/examples/Makefile.am | 34 ++++++++ + glib/examples/example-client.c | 107 ++++++++++++++++++++++++ + glib/examples/example-service.c | 138 + +++++++++++++++++++++++++++++++ + glib/examples/example-service.xml | 19 +++++ + glib/examples/example-signal-emitter.c | 132 + +++++++++++++++++++++++++++++ + glib/examples/example-signal-emitter.xml | 13 +++ + glib/examples/example-signal-recipient.c | 103 +++++++++++++++++++++++ 9 files changed, 565 insertions(+) commit ad05d7aa3b298fdc6c214550944e9aa1464a1e43 @@ -8837,8 +9643,8 @@ * doc/dbus-tutorial.xml: * test/glib/test-dbus-glib.c: Update for rename. - glib/dbus-binding-tool-glib.c | 2 +- - glib/dbus-gproxy.c | 18 ++++++++++-------- + glib/dbus-binding-tool-glib.c | 2 +- + glib/dbus-gproxy.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) commit 17ba4df65fdf4a7b65eedd2a4f10e616dd1b186c @@ -8855,7 +9661,7 @@ (dbus_g_method_return_error): Free context, and note we do so. - glib/dbus-gobject.c | 6 +++++- + glib/dbus-gobject.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 01b89e61b5b98ad983babb506c9856aeadef2562 @@ -8873,9 +9679,9 @@ redeclare the prototypes. Other GNOME libraries do this already. - glib/dbus-gobject.c | 2 +- - glib/dbus-gproxy.c | 8 ++++---- - glib/dbus-gvalue.c | 2 +- + glib/dbus-gobject.c | 2 +- + glib/dbus-gproxy.c | 8 ++++---- + glib/dbus-gvalue.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) commit da18702f63a9f33d4f929113b6361062a86443a6 @@ -8944,10 +9750,10 @@ * doc/TODO: Remove two GLib TODO items fixed by this patch. - glib/dbus-binding-tool-glib.c | 88 +++++-- - glib/dbus-gobject.c | 547 - ++++++++++++++++++++++++----------------- - glib/dbus-gproxy.c | 3 + + glib/dbus-binding-tool-glib.c | 88 +++++-- + glib/dbus-gobject.c | 547 + ++++++++++++++++++++++++------------------ + glib/dbus-gproxy.c | 3 + 3 files changed, 394 insertions(+), 244 deletions(-) commit 5c64ac1e7abcb7013c640d8aa6621319341f228d @@ -8961,9 +9767,9 @@ * glib/dbus-gproxy.c: Add Nokia copyright; Patch from Ross Burton, for his GLib bindings work. - glib/dbus-binding-tool-glib.c | 1 + - glib/dbus-gobject.c | 1 + - glib/dbus-gproxy.c | 1 + + glib/dbus-binding-tool-glib.c | 1 + + glib/dbus-gobject.c | 1 + + glib/dbus-gproxy.c | 1 + 3 files changed, 3 insertions(+) commit 87556105e7b984f8e56fc75d5c5ede8a69d63d12 @@ -8977,7 +9783,7 @@ Patch based on a patch from Ryan Gammon. - glib/dbus-gobject.c | 11 ++++++----- + glib/dbus-gobject.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit b274594d1f15e23be62d3ae2693524652ff58752 @@ -8989,7 +9795,7 @@ * glib/dbus-gvalue.c (marshal_basic): Marshal NULL string values as the empty string (#2948). - glib/dbus-gvalue.c | 2 ++ + glib/dbus-gvalue.c | 2 ++ 1 file changed, 2 insertions(+) commit 702f09f4f45225f603a6d17ae77c3360c428855a @@ -9002,10 +9808,10 @@ * glib/dbus-gobject.c: * glib/dbus-gvalue.c: Fix indentation and brace style. - glib/dbus-binding-tool-glib.c | 74 ++++++++-------- - glib/dbus-gobject.c | 190 - +++++++++++++++++++++-------------------- - glib/dbus-gvalue.c | 11 +-- + glib/dbus-binding-tool-glib.c | 74 ++++++++-------- + glib/dbus-gobject.c | 190 + ++++++++++++++++++++++-------------------- + glib/dbus-gvalue.c | 11 +-- 3 files changed, 145 insertions(+), 130 deletions(-) commit ceb44c57e8ebc78ef420597bae484f7713c2e8bf @@ -9025,9 +9831,9 @@ and dbus_g_method_return_error into public API section. - glib/dbus-gobject.c | 119 - ++++++++++++++++++++++++++++++--------------------- - glib/dbus-gproxy.c | 1 + + glib/dbus-gobject.c | 119 + ++++++++++++++++++++++++++++++---------------------- + glib/dbus-gproxy.c | 1 + 2 files changed, 71 insertions(+), 49 deletions(-) commit 72b52186a73aac9f4d0ae1868fe1dedcedf3a6e6 @@ -9039,7 +9845,7 @@ * glib/dbus-gobject.c (_dbus_gobject_lookup_marshaller): Add missing return statements, noticed by Ross Burton. - glib/dbus-gobject.c | 6 ++++++ + glib/dbus-gobject.c | 6 ++++++ 1 file changed, 6 insertions(+) commit 40617899dc08750ab5a8cd0fb176dc2111a95420 @@ -9052,8 +9858,8 @@ demarshalling by sending error message back. * glib/dbus-gvalue.c: Initialize return variables. - glib/dbus-gobject.c | 11 ++++++++--- - glib/dbus-gvalue.c | 8 ++++---- + glib/dbus-gobject.c | 11 ++++++++--- + glib/dbus-gvalue.c | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) commit fc23d39a292cee7d4f9ee9a1df0c0141c69d0942 @@ -9064,7 +9870,7 @@ * glib/Makefile.am: Fix thinko in last patch. - glib/Makefile.am | 2 +- + glib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7c42065c67e99716130a5dec4e493bce3ccc9aaa @@ -9077,7 +9883,7 @@ and dbus-gtype-specialized.h into a _HEADERS variable, install them. - glib/Makefile.am | 8 ++++++-- + glib/Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 8bcbafe775d6bc63290c5c73f138c1511b104c70 @@ -9300,7 +10106,7 @@ alias for ProxyMethod to make it easier for the Twisted networking framework to integrate dbus. - glib/dbus-gmain.c | 8 +------- + glib/dbus-gmain.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) commit 3c7dcbf8f47d3061fccdc315716c90a0b69a470f @@ -9317,9 +10123,9 @@ (dbus_binding_tool_output_glib_server): Pass prefix to glib-genmarshal. - glib/dbus-binding-tool-glib.c | 16 ++++++++++------ - glib/dbus-binding-tool-glib.h | 2 +- - glib/dbus-glib-tool.c | 8 +++++++- + glib/dbus-binding-tool-glib.c | 16 ++++++++++------ + glib/dbus-binding-tool-glib.h | 2 +- + glib/dbus-glib-tool.c | 8 +++++++- 3 files changed, 18 insertions(+), 8 deletions(-) commit 55263b490f4dba73b1590939be2b087856487054 @@ -9333,7 +10139,7 @@ weak reference on object to unregister if object is destroyed. (unregister_gobject): New function. - glib/dbus-gobject.c | 18 ++++++++++++++---- + glib/dbus-gobject.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) commit 260e1fecf1690bb12c5bf7d5ddf793d79a1efed5 @@ -9346,7 +10152,7 @@ (timeout_handler_destroy_source, connection_setup_free): Also unref the source to avoid memory leaks. - glib/dbus-gmain.c | 3 +++ + glib/dbus-gmain.c | 3 +++ 1 file changed, 3 insertions(+) commit 56288b6e3a9e5f8bd8920c5f7dac2a2b64842b15 @@ -9359,7 +10165,7 @@ message at a time to avoid monopolizing the main loop, bug #2953 from Benjamin Otte - glib/dbus-gmain.c | 6 +++--- + glib/dbus-gmain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit ca2ab9616ed7c6e936e495e64303f77956cb6b82 @@ -9379,8 +10185,8 @@ add a new function that can be used in simple applications that don't have a main loop and are willing to block - glib/dbus-binding-tool-glib.c | 3 +++ - glib/dbus-glib-tool.c | 1 + + glib/dbus-binding-tool-glib.c | 3 +++ + glib/dbus-glib-tool.c | 1 + 2 files changed, 4 insertions(+) commit b34961c0e5a75ff9f70e0ba439a96d993456ef92 @@ -9403,7 +10209,7 @@ IO and timeout handlers as the _destroy_source removes them from the list synchronously - glib/dbus-gmain.c | 14 ++++++-------- + glib/dbus-gmain.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) commit 681e7deee9a01c1f315b0066b87204e0da207d99 @@ -9436,8 +10242,8 @@ * tools/.cvsignore, glib/.cvsignore, bus/.cvsignore: Update. - glib/.cvsignore | 1 - - glib/Makefile.am | 8 -------- + glib/.cvsignore | 1 - + glib/Makefile.am | 8 -------- 2 files changed, 9 deletions(-) commit 1cc2659deb9f108f449ad3ca8f18bff743a4cd81 @@ -9476,11 +10282,11 @@ --ignore-unsupported by default until glib bindings support arrays. - glib/Makefile.am | 2 +- - glib/dbus-binding-tool-glib.c | 64 - +++++++++++++++++++++++++++++++++++------ - glib/dbus-binding-tool-glib.h | 2 +- - glib/dbus-glib-tool.c | 6 +++- + glib/Makefile.am | 2 +- + glib/dbus-binding-tool-glib.c | 64 + +++++++++++++++++++++++++++++++++++++------ + glib/dbus-binding-tool-glib.h | 2 +- + glib/dbus-glib-tool.c | 6 +++- 4 files changed, 63 insertions(+), 11 deletions(-) commit c5247484ea45ef9b6b3449a71e3ea80b86de03ad @@ -9508,8 +10314,8 @@ * glib/.cvsignore, bus/.cvsignore, test/glib/.cvsignore: Update. - glib/.cvsignore | 1 + - glib/Makefile.am | 8 ++++++++ + glib/.cvsignore | 1 + + glib/Makefile.am | 8 ++++++++ 2 files changed, 9 insertions(+) commit 10dc75239d071c49622972d061ff7546ed169bc5 @@ -9574,11 +10380,11 @@ * glib/dbus-gvalue.h: Remove dbus_gvalue_binding_type_from_type, add dbus_gvalue_store. - glib/dbus-binding-tool-glib.c | 73 ++++++------ - glib/dbus-gproxy.c | 205 +++++++++++++++++++++++++++++++++ - glib/dbus-gvalue.c | 254 - +++++++++++++++++++++++------------------ - glib/dbus-gvalue.h | 4 +- + glib/dbus-binding-tool-glib.c | 73 ++++++------ + glib/dbus-gproxy.c | 205 ++++++++++++++++++++++++++++++++++ + glib/dbus-gvalue.c | 254 + ++++++++++++++++++++++++------------------ + glib/dbus-gvalue.h | 4 +- 4 files changed, 392 insertions(+), 144 deletions(-) commit 61b05621beeb5a929bf68b95fdb9cb63516c1c7e @@ -9596,7 +10402,7 @@ * glib/Makefile.am: soname bump for libdbus-glib - glib/Makefile.am | 2 +- + glib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit be6ef9488ddc1b9fd3fc303cccf6e6618450be89 @@ -9660,19 +10466,19 @@ * test/glib/test-service-glib.xml: Change types to new introspection format. - glib/dbus-binding-tool-glib.c | 20 ++++++------ - glib/dbus-gidl.c | 18 ++++++----- - glib/dbus-gidl.h | 8 ++--- - glib/dbus-glib-tool.c | 8 ++--- - glib/dbus-gobject.c | 69 - ++++++++------------------------------- - glib/dbus-gparser.c | 72 + glib/dbus-binding-tool-glib.c | 20 ++++++------ + glib/dbus-gidl.c | 18 ++++++----- + glib/dbus-gidl.h | 8 ++--- + glib/dbus-glib-tool.c | 8 ++--- + glib/dbus-gobject.c | 69 +++++++++-------------------------------- - glib/dbus-gutils.c | 42 ------------------------ - glib/dbus-gutils.h | 1 - - glib/dbus-gvalue.c | 71 - ++++++++++++++++++++++++++++++++++++++-- - glib/dbus-gvalue.h | 8 +++-- + glib/dbus-gparser.c | 72 + ++++++++++--------------------------------- + glib/dbus-gutils.c | 42 ------------------------- + glib/dbus-gutils.h | 1 - + glib/dbus-gvalue.c | 71 + ++++++++++++++++++++++++++++++++++++++++-- + glib/dbus-gvalue.h | 8 +++-- 10 files changed, 131 insertions(+), 186 deletions(-) commit 662755210c931da87972398ded13d4651e3d3fec @@ -9683,7 +10489,7 @@ so distcheck doesn't fail - glib/Makefile.am | 1 + + glib/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit 0573676ce932874b07780036eaeaa42a6f3e1628 @@ -9707,9 +10513,9 @@ messages to use lose (since it's shorter), and switch to using g_io_channel_shutdown. - glib/dbus-binding-tool-glib.c | 2 +- - glib/dbus-glib-tool.c | 119 - +++++++++++++++++++++++++++++++---------- + glib/dbus-binding-tool-glib.c | 2 +- + glib/dbus-glib-tool.c | 119 + ++++++++++++++++++++++++++++++++---------- 2 files changed, 91 insertions(+), 30 deletions(-) commit 7ff788981218b324d0eeec16fa4b7bb9ec97d694 @@ -9726,9 +10532,9 @@ * glib/dbus-gparser.c (parse_annotation): error if an annotation is found on an - glib/dbus-glib.c | 8 ++++---- - glib/dbus-gobject.c | 8 +++++++- - glib/dbus-gparser.c | 4 +--- + glib/dbus-glib.c | 8 ++++---- + glib/dbus-gobject.c | 8 +++++++- + glib/dbus-gparser.c | 4 +--- 3 files changed, 12 insertions(+), 8 deletions(-) commit 03186401718758948242881cf429bdbb48eb8474 @@ -9747,9 +10553,9 @@ * glib/dbus-gproxy.c (marshal_dbus_message_to_g_marshaller): Handle rename. - glib/dbus-gobject.c | 4 ++-- - glib/dbus-gobject.h | 2 +- - glib/dbus-gproxy.c | 2 +- + glib/dbus-gobject.c | 4 ++-- + glib/dbus-gobject.h | 2 +- + glib/dbus-gproxy.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit a6e8deb82f6202628fcb3b9b3a616d0a98598474 @@ -9781,8 +10587,8 @@ * doc/dbus-faq.xml, doc/dbus-specification.xml: Update for rename. - glib/dbus-gobject.c | 10 +++++----- - glib/dbus-gproxy.c | 8 ++++---- + glib/dbus-gobject.c | 10 +++++----- + glib/dbus-gproxy.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) commit b085dcd0556e82c8fe347cc4bedd2e5b9b876a95 @@ -9836,13 +10642,13 @@ * test/glib/test-service-glib.xml: Make validate against new DTD. - glib/dbus-binding-tool-glib.c | 10 ++--- - glib/dbus-binding-tool-glib.h | 2 + - glib/dbus-gidl.c | 60 ++++++++++++++-------------- - glib/dbus-gidl.h | 24 +++++------ - glib/dbus-glib-tool.c | 30 +++++++------- - glib/dbus-gparser.c | 88 - ++++++++++++++++++++++++++++++++++++----- + glib/dbus-binding-tool-glib.c | 10 ++--- + glib/dbus-binding-tool-glib.h | 2 + + glib/dbus-gidl.c | 60 ++++++++++++++--------------- + glib/dbus-gidl.h | 24 ++++++------ + glib/dbus-glib-tool.c | 30 +++++++-------- + glib/dbus-gparser.c | 88 + ++++++++++++++++++++++++++++++++++++++----- 6 files changed, 143 insertions(+), 71 deletions(-) commit 87e81b87d7b443142302ecb48e46191a443ae02a @@ -10005,22 +10811,22 @@ using both the dbus_gproxy stuff directly as well as the generated bindings. - glib/Makefile.am | 3 + - glib/dbus-binding-tool-glib.c | 812 - +++++++++++++++++++++++++++++++++++++++++ - glib/dbus-binding-tool-glib.h | 33 ++ - glib/dbus-gidl.c | 73 ++++ - glib/dbus-gidl.h | 14 +- - glib/dbus-glib-tool.c | 120 +++++- - glib/dbus-glib-tool.h | 37 ++ - glib/dbus-gobject.c | 596 +++++++++++++++++++++++++++--- - glib/dbus-gobject.h | 35 ++ - glib/dbus-gparser.c | 8 + - glib/dbus-gproxy.c | 52 +-- - glib/dbus-gutils.c | 28 ++ - glib/dbus-gutils.h | 1 + - glib/dbus-gvalue.c | 171 ++++++++- - glib/dbus-gvalue.h | 28 +- + glib/Makefile.am | 3 + + glib/dbus-binding-tool-glib.c | 812 + ++++++++++++++++++++++++++++++++++++++++++ + glib/dbus-binding-tool-glib.h | 33 ++ + glib/dbus-gidl.c | 73 ++++ + glib/dbus-gidl.h | 14 +- + glib/dbus-glib-tool.c | 120 +++++-- + glib/dbus-glib-tool.h | 37 ++ + glib/dbus-gobject.c | 596 ++++++++++++++++++++++++++++--- + glib/dbus-gobject.h | 35 ++ + glib/dbus-gparser.c | 8 + + glib/dbus-gproxy.c | 52 +-- + glib/dbus-gutils.c | 28 ++ + glib/dbus-gutils.h | 1 + + glib/dbus-gvalue.c | 171 ++++++++- + glib/dbus-gvalue.h | 28 +- 15 files changed, 1889 insertions(+), 122 deletions(-) commit dd22216537d98b06366ade81eb6f63621d4c6379 @@ -10046,7 +10852,7 @@ (_dbus_connection_block_pending_call): replace block_for_reply with this - glib/dbus-gproxy.c | 5 ++++- + glib/dbus-gproxy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 3ce5325735aae6b1d4e6a28b45465a586710d23e @@ -10067,9 +10873,9 @@ * glib/dbus-gidl.c (signal_info_get_n_args): new function (method_info_get_n_args): new function - glib/dbus-gidl.c | 12 ++++++++++++ - glib/dbus-gidl.h | 2 ++ - glib/dbus-gparser.c | 13 ++++++++++++- + glib/dbus-gidl.c | 12 ++++++++++++ + glib/dbus-gidl.h | 2 ++ + glib/dbus-gparser.c | 13 ++++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) commit 89113d257f1f75cea5d0f39bbca4785afc784bf2 @@ -10085,7 +10891,7 @@ (_dbus_connection_send_preallocated_unlocked_no_update): rename to have no_update so we can find this bug quickly in future - glib/dbus-gthread.c | 2 ++ + glib/dbus-gthread.c | 2 ++ 1 file changed, 2 insertions(+) commit 116d931394d42412595e64185cd9cb97444cd653 @@ -10108,8 +10914,8 @@ (DBUS_G_PROXY_DESTROYED): add this macro, and use it in a bunch of g_return_if_fail() checks - glib/dbus-gproxy.c | 59 - ++++++++++++++++++++++++++++++++++++++++------------ + glib/dbus-gproxy.c | 59 + ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 13 deletions(-) commit 1fdc099a4ed729871597c501a9015ec2855bebc2 @@ -10121,8 +10927,8 @@ * glib/dbus-gproxy.c: rewrite how signals work again, this time I think it's sort of right - glib/dbus-gproxy.c | 334 - ++++++++++++++++++++++++++++++---------------------- + glib/dbus-gproxy.c | 334 + +++++++++++++++++++++++++++++++---------------------- 1 file changed, 194 insertions(+), 140 deletions(-) commit 463fb506e9661849d9838aedbdf4b7febe8e132e @@ -10141,12 +10947,12 @@ (dbus_g_proxy_emit_received): marshal the dbus message to GValues, and g_warning if the incoming message has the wrong signature. - glib/Makefile.am | 11 ++ - glib/dbus-gmarshal.c | 89 ++++++++++++ - glib/dbus-gmarshal.h | 21 +++ - glib/dbus-gmarshal.list | 1 + - glib/dbus-gproxy.c | 345 - ++++++++++++++++++++++++++++++++++++----------- + glib/Makefile.am | 11 ++ + glib/dbus-gmarshal.c | 89 +++++++++++++ + glib/dbus-gmarshal.h | 21 +++ + glib/dbus-gmarshal.list | 1 + + glib/dbus-gproxy.c | 345 + +++++++++++++++++++++++++++++++++++++----------- 5 files changed, 390 insertions(+), 77 deletions(-) commit c39a68d373c1f73a3bb7d0f45287cee1cd8eff55 @@ -10168,10 +10974,10 @@ * tools/dbus-tree-view.c (model_new): use proper typing on the model rows - glib/dbus-glib.c | 335 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - glib/dbus-gmain.c | 172 --------------------------- - glib/dbus-gproxy.c | 32 +---- + glib/dbus-glib.c | 335 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/dbus-gmain.c | 172 --------------------------- + glib/dbus-gproxy.c | 32 +---- 3 files changed, 338 insertions(+), 201 deletions(-) commit 967f6acd6c220b0be691edd18d9a636f4d16fbaf @@ -10188,8 +10994,8 @@ * dbus/dbus-connection-internal.h (_DBUS_DEFAULT_TIMEOUT_VALUE): increase default message timeout to 25 seconds - glib/dbus-gmain.c | 93 - +++++++++++++++++++++++++++++++++++++++++++++++++---- + glib/dbus-gmain.c | 93 + ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 86 insertions(+), 7 deletions(-) commit af3c2731c74f014c0713a52d66027a9428c1ddaf @@ -10202,8 +11008,8 @@ custom source, seems to be a lot easier to understand and work better. - glib/dbus-gmain.c | 653 - +++++++++++++++++++++++++---------------------------- + glib/dbus-gmain.c | 653 + ++++++++++++++++++++++++++---------------------------- 1 file changed, 313 insertions(+), 340 deletions(-) commit 32587c38401f16a9477f7ea7868120645d072462 @@ -10221,8 +11027,8 @@ (gsource_server_finalize, gsource_connection_finalize): add finalize handlers that remove all the watches. - glib/dbus-gmain.c | 90 - +++++++++++++++++++++++++++++++++++++++++++---------- + glib/dbus-gmain.c | 90 + +++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 16 deletions(-) commit 4b7acbbfacaa37ce399df1ce616920c09750ae60 @@ -10249,8 +11055,8 @@ * configure.in: add debug-glib.service to the output - glib/dbus-gobject.c | 10 +++++----- - glib/dbus-gparser.c | 2 ++ + glib/dbus-gobject.c | 10 +++++----- + glib/dbus-gparser.c | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) commit 71181795196712bbb64d721464f42432997c7d0c @@ -10304,13 +11110,13 @@ * glib/dbus-gproxy.c (dbus_g_pending_call_ref): add (dbus_g_pending_call_unref): add - glib/dbus-gidl.c | 14 ++++++++++ - glib/dbus-gidl.h | 3 +++ - glib/dbus-gloader-expat.c | 4 +++ - glib/dbus-gobject.c | 16 +++++++----- - glib/dbus-gproxy.c | 62 - ++++++++++++++++++++++++++++++++++++++++----- - glib/dbus-gutils.c | 20 ++++++++++----- + glib/dbus-gidl.c | 14 +++++++++++ + glib/dbus-gidl.h | 3 +++ + glib/dbus-gloader-expat.c | 4 +++ + glib/dbus-gobject.c | 16 ++++++------ + glib/dbus-gproxy.c | 62 + +++++++++++++++++++++++++++++++++++++++++------ + glib/dbus-gutils.c | 20 +++++++++------ 6 files changed, 98 insertions(+), 21 deletions(-) commit 3593b814632b482b541ccf3adb2b31887028b234 @@ -10330,7 +11136,7 @@ * doc/dbus-specification.xml: allow empty interface name when Get/Set a property - glib/dbus-gobject.c | 28 ++++++++++++++++++++++++++-- + glib/dbus-gobject.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) commit 426cf6b944282d16db0d88b230627793df52f1ad @@ -10361,14 +11167,14 @@ (introspect_properties): export properties as rather than as method calls - glib/.cvsignore | 2 +- - glib/Makefile.am | 6 +- - glib/dbus-gidl.c | 100 +++++++++++++++++++++++++- - glib/dbus-gidl.h | 112 ++++++++++++++++------------- - glib/dbus-glib-tool.c | 31 ++++++-- - glib/dbus-gobject.c | 104 ++++++++++++++++++--------- - glib/dbus-gparser.c | 190 - +++++++++++++++++++++++++++++++++++++++++++++---- + glib/.cvsignore | 2 +- + glib/Makefile.am | 6 +- + glib/dbus-gidl.c | 100 +++++++++++++++++++++++++- + glib/dbus-gidl.h | 112 ++++++++++++++++------------- + glib/dbus-glib-tool.c | 31 ++++++-- + glib/dbus-gobject.c | 104 ++++++++++++++++++--------- + glib/dbus-gparser.c | 190 + ++++++++++++++++++++++++++++++++++++++++++++++---- 7 files changed, 434 insertions(+), 111 deletions(-) commit 54c56014a0d2dab88f1fa3bd17a7c1fd2768c4e9 @@ -10386,9 +11192,9 @@ the 16-bit types so people don't have to stuff them in 32-bit or byte arrays. - glib/dbus-gparser.c | 4 ++++ - glib/dbus-gutils.c | 4 ++++ - glib/dbus-gvalue.c | 29 +++++++++++++++++++++++------ + glib/dbus-gparser.c | 4 ++++ + glib/dbus-gutils.c | 4 ++++ + glib/dbus-gvalue.c | 29 +++++++++++++++++++++++------ 3 files changed, 31 insertions(+), 6 deletions(-) commit 459e046b1ca4bdd06d85458fd4f213354833d1ed @@ -10402,7 +11208,7 @@ * dbus/dbus.h: note that libdbus is the low-level API - glib/dbus-gmain.c | 12 +++++++----- + glib/dbus-gmain.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit 8cecb5bad77434129fc751c2ace45c389f46ef0d @@ -10423,8 +11229,8 @@ * bus/config-parser.c (all_are_equiv): fix bug using freed string in error case - glib/dbus-gproxy.c | 171 - +++++++++++++++++++++++++++------------------------- + glib/dbus-gproxy.c | 171 + +++++++++++++++++++++++++++-------------------------- 1 file changed, 88 insertions(+), 83 deletions(-) commit 40c882bcb60faeee24e3e887f3503e9ecb878166 @@ -10439,7 +11245,7 @@ of an 8-bit type. Now dbus_bool_t is the type to use whenever you are marshaling/unmarshaling a boolean. - glib/dbus-gvalue.c | 4 +++- + glib/dbus-gvalue.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit c8c3d8a243f6b284b3aa46352afb9fb913f09f78 @@ -10463,8 +11269,8 @@ (_dbus_type_reader_get_element_type): rename from _dbus_type_reader_get_array_type - glib/dbus-glib.c | 2 +- - glib/dbus-gobject.c | 2 +- + glib/dbus-glib.c | 2 +- + glib/dbus-gobject.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit e116119209a507a5ba305e890f897d31e5b626e1 @@ -10530,11 +11336,11 @@ * dbus/dbus-object-tree.c (_dbus_decompose_path): move this function here from dbus-marshal.c - glib/dbus-gobject.c | 2 +- - glib/dbus-gproxy.c | 7 +- - glib/dbus-gutils.c | 24 ++++--- - glib/dbus-gvalue.c | 186 - ++++++++++++++++++++++++++++++++++++++------------- + glib/dbus-gobject.c | 2 +- + glib/dbus-gproxy.c | 7 +- + glib/dbus-gutils.c | 24 ++++--- + glib/dbus-gvalue.c | 186 + ++++++++++++++++++++++++++++++++++++++-------------- 4 files changed, 156 insertions(+), 63 deletions(-) commit 62f29fd0fea8e1eaa3e61db44ddd1eeba765f153 @@ -10565,7 +11371,7 @@ macro; it showed up in the profile because it's used for loop tests and so forth - glib/dbus-gmain.c | 4 ++-- + glib/dbus-gmain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0ab857b2916731f92be856c6821d5c9950716f89 @@ -10578,7 +11384,7 @@ * glib/dbus-dbus-gmain.c (dbus_g_bus_get): do not mangle NULL pointer (bug #1540, Leonardo Boiko). - glib/dbus-gmain.c | 9 ++++----- + glib/dbus-gmain.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) commit 4b50c510605d5dda629c9d493a61611bb382a55d @@ -10590,23 +11396,23 @@ * COPYING: switch to Academic Free License version 2.1 instead of 2.0, to resolve complaints about patent termination clause. - glib/dbus-gidl.c | 2 +- - glib/dbus-gidl.h | 2 +- - glib/dbus-glib-tool.c | 2 +- - glib/dbus-glib.c | 2 +- - glib/dbus-gloader-expat.c | 2 +- - glib/dbus-gmain.c | 2 +- - glib/dbus-gobject.c | 2 +- - glib/dbus-gparser.c | 2 +- - glib/dbus-gparser.h | 2 +- - glib/dbus-gproxy.c | 4 ++-- - glib/dbus-gtest-main.c | 2 +- - glib/dbus-gtest.c | 2 +- - glib/dbus-gtest.h | 2 +- - glib/dbus-gthread.c | 2 +- - glib/dbus-gtool-test.h | 2 +- - glib/dbus-gutils.c | 2 +- - glib/dbus-gutils.h | 2 +- + glib/dbus-gidl.c | 2 +- + glib/dbus-gidl.h | 2 +- + glib/dbus-glib-tool.c | 2 +- + glib/dbus-glib.c | 2 +- + glib/dbus-gloader-expat.c | 2 +- + glib/dbus-gmain.c | 2 +- + glib/dbus-gobject.c | 2 +- + glib/dbus-gparser.c | 2 +- + glib/dbus-gparser.h | 2 +- + glib/dbus-gproxy.c | 4 ++-- + glib/dbus-gtest-main.c | 2 +- + glib/dbus-gtest.c | 2 +- + glib/dbus-gtest.h | 2 +- + glib/dbus-gthread.c | 2 +- + glib/dbus-gtool-test.h | 2 +- + glib/dbus-gutils.c | 2 +- + glib/dbus-gutils.h | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) commit 301a3547a2efd9784fa3ab253373fa689c9bd1c3 @@ -10635,7 +11441,7 @@ test case for byte-through-vararg bug (#901). patch by Kimmo Hmlinen. - glib/Makefile.am | 2 +- + glib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ef7e145899ce58a5df564127783f014d8bed233f @@ -10670,21 +11476,21 @@ * a bunch of other changes with the same basic "separate glib bindings from dbus.h" theme - glib/Makefile.am | 6 +- - glib/dbus-gidl.c | 2 +- - glib/dbus-glib-tool.c | 2 +- - glib/dbus-glib.c | 67 ++++++++++++++ - glib/dbus-glib.h | 159 -------------------------------- - glib/dbus-gmain.c | 121 ++++++++++++++++++++++-- - glib/dbus-gobject.c | 17 ++-- - glib/dbus-gproxy.c | 237 - +++++++++++++++++++++++++----------------------- - glib/dbus-gtest.c | 4 + - glib/dbus-gtest.h | 9 +- - glib/dbus-gthread.c | 3 +- - glib/dbus-gtool-test.h | 4 +- - glib/dbus-gutils.c | 2 +- - glib/dbus-gutils.h | 15 +++ + glib/Makefile.am | 6 +- + glib/dbus-gidl.c | 2 +- + glib/dbus-glib-tool.c | 2 +- + glib/dbus-glib.c | 67 ++++++++++++++ + glib/dbus-glib.h | 159 --------------------------------- + glib/dbus-gmain.c | 121 +++++++++++++++++++++++-- + glib/dbus-gobject.c | 17 ++-- + glib/dbus-gproxy.c | 237 + +++++++++++++++++++++++++------------------------ + glib/dbus-gtest.c | 4 + + glib/dbus-gtest.h | 9 +- + glib/dbus-gthread.c | 3 +- + glib/dbus-gtool-test.h | 4 +- + glib/dbus-gutils.c | 2 +- + glib/dbus-gutils.h | 15 ++++ 14 files changed, 342 insertions(+), 306 deletions(-) commit 9426e419227a721a8b7b04661ec133cb93c389e5 @@ -10704,7 +11510,7 @@ * glib/dbus-gobject.c, test/test-service.c: update accordingly. - glib/dbus-gobject.c | 16 +++------------- + glib/dbus-gobject.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) commit b2a4e237f907acd5127f85d0e2110b32d8a7ea86 @@ -10724,14 +11530,14 @@ glib/test-thread-server.c, glib/test-profile.c, glib/test-dbus-glib.c: remove these unused files. - glib/dbus-gmain.c | 12 ++- - glib/dbus-gproxy.c | 32 +++++- - glib/test-dbus-glib.c | 50 --------- - glib/test-profile.c | 223 ---------------------------------------- - glib/test-thread-client.c | 95 ----------------- - glib/test-thread-server.c | 248 - --------------------------------------------- - glib/test-thread.h | 1 - + glib/dbus-gmain.c | 12 ++- + glib/dbus-gproxy.c | 32 +++++- + glib/test-dbus-glib.c | 50 ---------- + glib/test-profile.c | 223 ----------------------------------------- + glib/test-thread-client.c | 95 ------------------ + glib/test-thread-server.c | 248 + ---------------------------------------------- + glib/test-thread.h | 1 - 7 files changed, 36 insertions(+), 625 deletions(-) commit 05a2332400f9e23d84e7376b9908f19a59868d5d @@ -10757,15 +11563,15 @@ * glib/dbus-gparser.c (parser_check_doctype): doctype should be "node" (I think...) - glib/Makefile.am | 9 +- - glib/dbus-gidl.c | 25 +++++ - glib/dbus-glib-tool.c | 280 - ++++++++++++++++++++++++++++++++++++++++++++++--- - glib/dbus-glib.h | 5 +- - glib/dbus-gobject.c | 36 +------ - glib/dbus-gparser.c | 4 +- - glib/dbus-gutils.c | 34 ++++++ - glib/dbus-gutils.h | 4 +- + glib/Makefile.am | 9 +- + glib/dbus-gidl.c | 25 +++++ + glib/dbus-glib-tool.c | 280 + +++++++++++++++++++++++++++++++++++++++++++++++--- + glib/dbus-glib.h | 5 +- + glib/dbus-gobject.c | 36 +------ + glib/dbus-gparser.c | 4 +- + glib/dbus-gutils.c | 34 ++++++ + glib/dbus-gutils.h | 4 +- 8 files changed, 338 insertions(+), 59 deletions(-) commit c02ba470d7a212d7c51777c467eae808dd954f2f @@ -10787,7 +11593,7 @@ * dbus/dbus-message.c: add various _dbus_return_val_if_fail for whether error_name passed in is a valid error name. - glib/dbus-gidl.c | 4 ++-- + glib/dbus-gidl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1400b16528f4d0d8f6a60b199e5799eadb0ff0ea @@ -10818,7 +11624,7 @@ (demarshal_and_validate_len/arg): beef up debug. (_dbus_marshal_basic_type, _dbus_marshal_basic_type_array): impl. - glib/dbus-gvalue.c | 4 ++++ + glib/dbus-gvalue.c | 4 ++++ 1 file changed, 4 insertions(+) commit 7866137fa3b028e7a8e22f03998754c0967e1501 @@ -10839,8 +11645,8 @@ use dbus_gproxy_new_for_service_owner so that we can receive the signal. - glib/dbus-gproxy.c | 55 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/dbus-gproxy.c | 55 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) commit e03a715a21237d70233d40a393958ec7d3d4027d @@ -10853,8 +11659,8 @@ (introspect_properties): this. (handle_introspect): implement this. - glib/dbus-gobject.c | 123 - ++++++++++++++++++++++++++++++++++----------------- + glib/dbus-gobject.c | 123 + ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 82 insertions(+), 41 deletions(-) commit e7e5d9377e54b9d26a59402197d26bb575c15976 @@ -10872,11 +11678,11 @@ for signals too, also on both proxy and server side. Re-write for more efficiency / readability. - glib/Makefile.am | 4 +- - glib/dbus-gobject.c | 187 - +++------------------------------------------------ - glib/dbus-gvalue.c | 115 +++++++++++++++++++++++++++++++ - glib/dbus-gvalue.h | 16 +++++ + glib/Makefile.am | 4 +- + glib/dbus-gobject.c | 187 + +++------------------------------------------------- + glib/dbus-gvalue.c | 115 ++++++++++++++++++++++++++++++++ + glib/dbus-gvalue.h | 16 +++++ 4 files changed, 142 insertions(+), 180 deletions(-) commit 82d9c846687c428fde8e517ca38d69642de9a66a @@ -10888,24 +11694,24 @@ * Update AFL version to 2.0 throughout the source files to reflect the update that was done a while ago. - glib/dbus-gidl.c | 2 +- - glib/dbus-gidl.h | 2 +- - glib/dbus-glib-tool.c | 2 +- - glib/dbus-glib.h | 2 +- - glib/dbus-gloader-expat.c | 2 +- - glib/dbus-gmain.c | 2 +- - glib/dbus-gobject.c | 2 +- - glib/dbus-gparser.c | 2 +- - glib/dbus-gparser.h | 2 +- - glib/dbus-gproxy.c | 2 +- - glib/dbus-gtest-main.c | 2 +- - glib/dbus-gtest.c | 2 +- - glib/dbus-gtest.h | 2 +- - glib/dbus-gthread.c | 2 +- - glib/dbus-gtool-test.h | 2 +- - glib/dbus-gutils.c | 2 +- - glib/dbus-gutils.h | 2 +- - glib/test-profile.c | 2 +- + glib/dbus-gidl.c | 2 +- + glib/dbus-gidl.h | 2 +- + glib/dbus-glib-tool.c | 2 +- + glib/dbus-glib.h | 2 +- + glib/dbus-gloader-expat.c | 2 +- + glib/dbus-gmain.c | 2 +- + glib/dbus-gobject.c | 2 +- + glib/dbus-gparser.c | 2 +- + glib/dbus-gparser.h | 2 +- + glib/dbus-gproxy.c | 2 +- + glib/dbus-gtest-main.c | 2 +- + glib/dbus-gtest.c | 2 +- + glib/dbus-gtest.h | 2 +- + glib/dbus-gthread.c | 2 +- + glib/dbus-gtool-test.h | 2 +- + glib/dbus-gutils.c | 2 +- + glib/dbus-gutils.h | 2 +- + glib/test-profile.c | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) commit 64858892747bea931226f39dad9e063475bf3c89 @@ -10918,12 +11724,12 @@ * dbus/*.[ch]: * glib/*.[ch]: Made ref functions return the pointer - glib/dbus-gidl.c | 24 ++++++++++++++++++------ - glib/dbus-gidl.h | 12 ++++++------ - glib/dbus-gmain.c | 4 +++- - glib/dbus-gparser.c | 4 +++- - glib/dbus-gparser.h | 2 +- - glib/dbus-gproxy.c | 6 ++++-- + glib/dbus-gidl.c | 24 ++++++++++++++++++------ + glib/dbus-gidl.h | 12 ++++++------ + glib/dbus-gmain.c | 4 +++- + glib/dbus-gparser.c | 4 +++- + glib/dbus-gparser.h | 2 +- + glib/dbus-gproxy.c | 6 ++++-- 6 files changed, 35 insertions(+), 17 deletions(-) commit f130073ef0a107d0b57695720f5a94d0e17ce38f @@ -10984,8 +11790,8 @@ test those codepaths; register with DBUS_BUS_ACTIVATION rather than DBUS_BUS_SESSION - glib/dbus-gobject.c | 4 ++-- - glib/dbus-gproxy.c | 12 +++++++++++- + glib/dbus-gobject.c | 4 ++-- + glib/dbus-gproxy.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) commit 756f88a96232ae730faca81feeb30fcd07458df9 @@ -11000,7 +11806,7 @@ coverage of the tests (coverage-report.txt): don't move the .da and .bbg files around - glib/dbus-gtest-main.c | 5 +++++ + glib/dbus-gtest-main.c | 5 +++++ 1 file changed, 5 insertions(+) commit aa0c367ff5214ddbb2578e5b290cfae6aa472a0d @@ -11062,7 +11868,7 @@ * bus/system.conf.in: fix to allow replies, I modified .conf instead of .conf.in again. - glib/dbus-gproxy.c | 26 ++++++++++++++++++++------ + glib/dbus-gproxy.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) commit 33689cc9f76ff14f77ba9b9d6e17094991fc2ba1 @@ -11104,8 +11910,8 @@ no-reply-expected flag on all these. Redundant, but may as well be consistent. - glib/dbus-gmain.c | 2 +- - glib/dbus-gproxy.c | 17 ++++++++++++----- + glib/dbus-gmain.c | 2 +- + glib/dbus-gproxy.c | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) commit 6741526f3dedd835d9f0d7ae4beaa097016b0b9e @@ -11122,10 +11928,10 @@ than once on the same args (dbus_bus_get_with_g_main): new function - glib/dbus-glib.h | 14 ++++---- - glib/dbus-gmain.c | 99 - ++++++++++++++++++++++++++++++++++++++++++++-------- - glib/dbus-gproxy.c | 8 ++--- + glib/dbus-glib.h | 14 ++++---- + glib/dbus-gmain.c | 99 + ++++++++++++++++++++++++++++++++++++++++++++++-------- + glib/dbus-gproxy.c | 8 ++--- 3 files changed, 97 insertions(+), 24 deletions(-) commit b05fc993d8d813ca93fa2c49e4c8b7345613c8e0 @@ -11679,8 +12485,8 @@ (add_watch), (remove_watch), (create_source): Refcount fds, fixes some reentrancy issues. - glib/dbus-gmain.c | 116 - +++++++++++++++++++++++++++++++++++------------------ + glib/dbus-gmain.c | 116 + ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 38 deletions(-) commit a3c695d62bcfc46bd12f4165610649a604ed6166 @@ -11708,8 +12514,8 @@ * bus/connection.c: ditto - glib/dbus-gmain.c | 24 ++++++++++-------------- - glib/test-thread-server.c | 5 +++-- + glib/dbus-gmain.c | 24 ++++++++++-------------- + glib/test-thread-server.c | 5 +++-- 2 files changed, 13 insertions(+), 16 deletions(-) commit 1284fea96df990975632f0a5d8d982ec5c974161 @@ -11721,7 +12527,7 @@ * glib/dbus-glib.h: Fix so that dbus-glib.h can be used from C++ (Patch by Miloslav Trmac). - glib/dbus-glib.h | 4 ++++ + glib/dbus-glib.h | 4 ++++ 1 file changed, 4 insertions(+) commit 375ff8ffbed8683c1a46fab9c537ccb9e603e1d7 @@ -11730,7 +12536,7 @@ Add .cvsignore files - glib/.cvsignore | 1 + + glib/.cvsignore | 1 + 1 file changed, 1 insertion(+) commit b4dd1b2cb3e226ece5055bc2f24ef819db7d1b08 @@ -11745,7 +12551,7 @@ * bus/policy.c (bus_policy_merge): function to merge two policies together - glib/test-profile.c | 4 ++-- + glib/test-profile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ae655688473fc5e5d6a279b3e764a713fc73b8ca @@ -11803,7 +12609,7 @@ swap the string data instead of doing any reallocs. (_dbus_string_init_preallocated): new function - glib/test-profile.c | 16 ++++++++++++---- + glib/test-profile.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit b36dd8b35d932d01407b88e948c5196b49e31aa0 @@ -11840,9 +12646,9 @@ thread locks; include config.h at top; fix deadlock in dbus_connection_flush() - glib/Makefile.am | 33 +++++--- - glib/test-profile.c | 215 - +++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/Makefile.am | 33 +++++--- + glib/test-profile.c | 215 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 237 insertions(+), 11 deletions(-) commit 6f4b867ddd6cef070d65149a4d935b4a964987f1 @@ -11858,7 +12664,7 @@ * dbus/dbus-memory.c: fix docs to avoid putting private API in public API docs section - glib/dbus-gmain.c | 8 +++++++- + glib/dbus-gmain.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 7d22e9a86a21e337a31ee42ccdb851ada88c0b40 @@ -11870,7 +12676,7 @@ * glib/dbus-gmain.c (remove_watch): fix for a crash when watches were toggled without add/remove, fix from Anders Gustafsson - glib/dbus-gmain.c | 4 ++++ + glib/dbus-gmain.c | 4 ++++ 1 file changed, 4 insertions(+) commit 36a6a6bc4edb1b3280e405b0addb9113dc09de5c @@ -11894,8 +12700,8 @@ Throughout: use dbus_return_if_fail - glib/test-dbus-glib.c | 3 ++- - glib/test-thread-client.c | 2 +- + glib/test-dbus-glib.c | 3 ++- + glib/test-thread-client.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) commit eb553e370e7651a3104038cbba7ebb7a502118e7 @@ -11918,11 +12724,11 @@ dbus_connection_setup_with_g_main() and dbus_server_setup_with_g_main(). - glib/dbus-glib.h | 6 ++++-- - glib/dbus-gmain.c | 36 +++++++++++++++++++++++------------- - glib/test-dbus-glib.c | 2 +- - glib/test-thread-client.c | 2 +- - glib/test-thread-server.c | 4 ++-- + glib/dbus-glib.h | 6 ++++-- + glib/dbus-gmain.c | 36 +++++++++++++++++++++++------------- + glib/test-dbus-glib.c | 2 +- + glib/test-thread-client.c | 2 +- + glib/test-thread-server.c | 4 ++-- 5 files changed, 31 insertions(+), 19 deletions(-) commit 62cc9827dee1d9fa052a11ce259acc7d1d2dcb9d @@ -11943,7 +12749,7 @@ like DBusTimeout, so we don't need dbus_connection_handle_watch etc. - glib/dbus-gmain.c | 9 ++------- + glib/dbus-gmain.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) commit 723f9251ee8892f05f4c94a9b0cfa864c5e56bae @@ -11970,7 +12776,7 @@ (_dbus_message_test): More tests. - glib/.cvsignore | 2 ++ + glib/.cvsignore | 2 ++ 1 file changed, 2 insertions(+) commit f8c607ec8949388bd09136d0a6635190910a3e9a @@ -12052,8 +12858,8 @@ * test/data/valid-messages/recursive-types.message: Add new test for deeply recursive types. - glib/test-thread-client.c | 9 ++++++--- - glib/test-thread-server.c | 23 +++++++++++------------ + glib/test-thread-client.c | 9 ++++++--- + glib/test-thread-server.c | 23 +++++++++++------------ 2 files changed, 17 insertions(+), 15 deletions(-) commit 4612ff9267417cf8860c233a59fe8ec249ee4a62 @@ -12076,9 +12882,9 @@ * bus/policy.c (bus_policy_test): test code stub - glib/test-dbus-glib.c | 7 ++++--- - glib/test-thread-client.c | 8 +++++--- - glib/test-thread-server.c | 8 +++++--- + glib/test-dbus-glib.c | 7 ++++--- + glib/test-thread-client.c | 8 +++++--- + glib/test-thread-server.c | 8 +++++--- 3 files changed, 14 insertions(+), 9 deletions(-) commit 9eb162678713477754e9d88eb68c156d336c80ab @@ -12110,8 +12916,8 @@ (dbus_connection_dispatch): rename from dbus_connection_dispatch_message - glib/dbus-gmain.c | 64 - ++++++++++++++++++++++++++--------------------------- + glib/dbus-gmain.c | 64 + +++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) commit 457dd574d5eda1286571f7070860c6feb56f184e @@ -12148,7 +12954,7 @@ * glib/dbus-gmain.c: adapt to enable/disable watches and timeouts - glib/dbus-gmain.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- + glib/dbus-gmain.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) commit 0f748f23b6fd40ab314bdc4d18e631cde958c1d2 @@ -12176,7 +12982,7 @@ * bus/dispatch.c (bus_dispatch_test): add some more test code, not quite passing yet - glib/dbus-gmain.c | 2 +- + glib/dbus-gmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a15287bc97819cca7b61cc18d6d69232bb05117d @@ -12211,7 +13017,7 @@ * bus/dispatch.c (bus_dispatch_test): started adding this but didn't finish - glib/dbus-gmain.c | 28 +++++++++++++++++----------- + glib/dbus-gmain.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) commit e0a3fe2914f611ef4d74bbc1ca39794f0f7ae575 @@ -12283,8 +13089,8 @@ DBusResultCode (_dbus_result_from_errno): move to this file - glib/test-dbus-glib.c | 20 ++++++++++++++------ - glib/test-thread-client.c | 9 +++++---- + glib/test-dbus-glib.c | 20 ++++++++++++++------ + glib/test-thread-client.c | 9 +++++---- 2 files changed, 19 insertions(+), 10 deletions(-) commit 284daff1f103a303178243ca3e2dee960651fec0 @@ -12298,7 +13104,7 @@ Make gthreads-2.0 dependency optional. Don't build thread test if its not found. - glib/Makefile.am | 8 +++++++- + glib/Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit b9589e9908d368cb064d1614e5c52239394414f4 @@ -12336,12 +13142,12 @@ * glib/test-thread.h: Initial cut at some thread test code. Not really done yet. - glib/Makefile.am | 16 ++- - glib/dbus-gmain.c | 13 ++- - glib/test-thread-client.c | 89 ++++++++++++++++ - glib/test-thread-server.c | 246 - +++++++++++++++++++++++++++++++++++++++++++++ - glib/test-thread.h | 1 + + glib/Makefile.am | 16 ++- + glib/dbus-gmain.c | 13 ++- + glib/test-thread-client.c | 89 +++++++++++++++++ + glib/test-thread-server.c | 246 + ++++++++++++++++++++++++++++++++++++++++++++++ + glib/test-thread.h | 1 + 5 files changed, 362 insertions(+), 3 deletions(-) commit c79213c6d3b041ce00bb00f24d4824e4a77f63ef @@ -12379,11 +13185,11 @@ * glib/dbus-gmain.c (dbus_connection_setup_with_g_main): rename setup_with_g_main instead of hookup_with_g_main; write docs - glib/dbus-glib.h | 5 +- - glib/dbus-gmain.c | 257 - +++++++++++++++++++++++++++++++++++++++++-------- - glib/dbus-gthread.c | 16 +++ - glib/test-dbus-glib.c | 2 +- + glib/dbus-glib.h | 5 +- + glib/dbus-gmain.c | 257 + ++++++++++++++++++++++++++++++++++++++++++-------- + glib/dbus-gthread.c | 16 ++++ + glib/test-dbus-glib.c | 2 +- 4 files changed, 238 insertions(+), 42 deletions(-) commit ebace7f90ea6b3d85a9140be3671ea527c3a5727 @@ -12412,7 +13218,7 @@ * test/data/auth/fallback.auth-script: Added. Tests that a client can fallback to a secondary auth mechanism if the first fails. - glib/test-dbus-glib.c | 7 +++++++ + glib/test-dbus-glib.c | 7 +++++++ 1 file changed, 7 insertions(+) commit 2655a78cdf1114a686d3c2ee28025db133b287c3 @@ -12431,7 +13237,7 @@ (dbus_connection_hookup_with_g_main): Make sure to remove the GSource when the connection is finalized. - glib/dbus-gmain.c | 15 +++++++++++++++ + glib/dbus-gmain.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) commit 4fbaec0ff143d92f96fb60c585282b5cb03bdc76 @@ -12445,7 +13251,7 @@ (_dbus_connection_new_for_transport): disable SIGPIPE unless we've been asked not to - glib/.cvsignore | 4 ++++ + glib/.cvsignore | 4 ++++ 1 file changed, 4 insertions(+) commit 69a436d7913c1681eea397e768687fab736f9d7c @@ -12519,9 +13325,9 @@ * bus/dispatch.c: Call bus_connection_disconnect when we get a disconnected message. - glib/dbus-gmain.c | 2 +- - glib/dbus-gthread.c | 94 - ++++++++++++++++++++++++++++++++++++++++++++++----- + glib/dbus-gmain.c | 2 +- + glib/dbus-gthread.c | 94 + ++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 86 insertions(+), 10 deletions(-) commit 530cf7689515707b5430b3207da225320cf244c4 @@ -12538,7 +13344,7 @@ * test/bus-test.c: (message_handler): Fix tyop. - glib/test-dbus-glib.c | 3 --- + glib/test-dbus-glib.c | 3 --- 1 file changed, 3 deletions(-) commit 044f4c6ed2170170d833d402079b90277893cd05 @@ -12551,7 +13357,7 @@ (remove_timeout): Implement support for timeouts in dbus-glib. - glib/dbus-gmain.c | 22 ++++++++++++++++++++++ + glib/dbus-gmain.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) commit 12d8e0d2d6aeb5f29ff8b51cdd4aae857d35d13f @@ -12571,7 +13377,7 @@ Add semicolon after dbus_message_iter_get_string_array(). Makes qt code build again - glib/dbus-gmain.c | 5 +---- + glib/dbus-gmain.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit bb581faf87398e807a828f2686474869cd23757d @@ -12583,7 +13389,7 @@ * glib/dbus-gmain.c (dbus_connection_dispatch): Traverse a copy of the file descriptor list, since it can change under us. - glib/dbus-gmain.c | 12 ++++++++---- + glib/dbus-gmain.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 74cef08b5e2f2596cade4fc1027933d763cd13ae @@ -12599,8 +13405,8 @@ GIOChannel so we can catch messages put in the queue while waiting for a reply. - glib/dbus-gmain.c | 193 - +++++++++++++++++++++++++++++++++++------------------ + glib/dbus-gmain.c | 193 + ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 128 insertions(+), 65 deletions(-) commit 6f062c93ca19a73b34688488e76ec055d2bab2a0 @@ -12634,8 +13440,8 @@ * glib/dbus-gmain.c: Update copyright year. - glib/dbus-glib.h | 2 +- - glib/dbus-gmain.c | 2 +- + glib/dbus-glib.h | 2 +- + glib/dbus-gmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit ea868ce1cd9328ffa31cd9419e23498771f8feb2 @@ -12684,10 +13490,10 @@ * test/watch.c: (check_messages): Update for changed APIs - glib/dbus-glib.h | 10 +-- - glib/dbus-gmain.c | 219 - +++++++++++++++++++------------------------------ - glib/test-dbus-glib.c | 48 +++-------- + glib/dbus-glib.h | 10 +-- + glib/dbus-gmain.c | 219 + ++++++++++++++++++++------------------------------ + glib/test-dbus-glib.c | 48 +++-------- 3 files changed, 99 insertions(+), 178 deletions(-) commit f8a3cb6d30e74be85b583ce9ff3482f91cd26b9a @@ -12731,7 +13537,7 @@ * test/watch.c: (check_messages): Make messages sendable and receivable for real. - glib/test-dbus-glib.c | 4 ++-- + glib/test-dbus-glib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 9784f2653287c62f32a637f869ad0029412ebfae @@ -12740,7 +13546,7 @@ Ssh - glib/.cvsignore | 7 +++++++ + glib/.cvsignore | 7 +++++++ 1 file changed, 7 insertions(+) commit c27a1609f595a75be3910c5185f7312cb93575c7 @@ -12788,9 +13594,9 @@ * dbus/dbus-message-handler.h, dbus/dbus-message-handler.c: an object representing a handler for messages. - glib/dbus-glib.h | 6 +++--- - glib/dbus-gmain.c | 2 +- - glib/dbus-gthread.c | 2 +- + glib/dbus-glib.h | 6 +++--- + glib/dbus-gmain.c | 2 +- + glib/dbus-gthread.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) commit 723dc26c4880ae66688ff707588797e7c83b4fe4 @@ -12799,7 +13605,7 @@ Doh - glib/dbus-glib.h | 2 +- + glib/dbus-glib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a2c39755d2c9749d22f547e9b92125509e95aae6 @@ -12812,8 +13618,8 @@ * glib/dbus-gthread.c: (dbus_gthread_init): Don't use the gdbus prefix for public functions. - glib/dbus-glib.h | 4 +--- - glib/dbus-gthread.c | 4 ++-- + glib/dbus-glib.h | 4 +--- + glib/dbus-gthread.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) commit 03900e96a260048f23176319003671c17b6a0013 @@ -12837,12 +13643,12 @@ * glib/test-dbus-glib.c: (message_handler), (main): Add GLib support. - glib/Makefile.am | 26 +++++++ - glib/dbus-glib.h | 40 ++++++++++ - glib/dbus-gmain.c | 194 - +++++++++++++++++++++++++++++++++++++++++++++++++ - glib/dbus-gthread.c | 84 +++++++++++++++++++++ - glib/test-dbus-glib.c | 60 +++++++++++++++ + glib/Makefile.am | 26 +++++++ + glib/dbus-glib.h | 40 +++++++++++ + glib/dbus-gmain.c | 194 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/dbus-gthread.c | 84 ++++++++++++++++++++++ + glib/test-dbus-glib.c | 60 ++++++++++++++++ 5 files changed, 404 insertions(+) commit 7c0c11bfa019cd4be3f7a62fe936aaf2573fa51e @@ -12851,4 +13657,5 @@ Initial commit of module dbus-glib - 0 files changed + ChangeLog | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) diff -Nru dbus-glib-0.100.2/compile dbus-glib-0.102/compile --- dbus-glib-0.100.2/compile 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.102/compile 2014-02-12 13:39:28.000000000 +0000 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru dbus-glib-0.100.2/config.guess dbus-glib-0.102/config.guess --- dbus-glib-0.100.2/config.guess 2012-06-08 16:15:38.000000000 +0000 +++ dbus-glib-0.102/config.guess 2014-02-12 13:39:28.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-06-10' # 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 -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1287,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1361,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < header file. */ #undef HAVE_DLFCN_H @@ -95,29 +80,5 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Full path to test file test/core/test-service-glib in builddir */ -#undef TEST_CORE_SERVICE_BINARY - -/* Full path to test file test/test-exit in builddir */ -#undef TEST_EXIT_BINARY - -/* Full path to test file test/interfaces/test-service in builddir */ -#undef TEST_INTERFACES_SERVICE_BINARY - -/* Full path to test file test/test-segfault in builddir */ -#undef TEST_SEGFAULT_BINARY - -/* Full path to test file test/test-service in builddir */ -#undef TEST_SERVICE_BINARY - -/* Full path to test file test/data/valid-service-files in builddir */ -#undef TEST_SERVICE_DIR - -/* Full path to test file test/test-shell-service in builddir */ -#undef TEST_SHELL_SERVICE_BINARY - -/* Full path to test file test/test-sleep-forever in builddir */ -#undef TEST_SLEEP_FOREVER_BINARY - /* Version number of package */ #undef VERSION diff -Nru dbus-glib-0.100.2/config.sub dbus-glib-0.102/config.sub --- dbus-glib-0.100.2/config.sub 2012-06-08 16:15:38.000000000 +0000 +++ dbus-glib-0.102/config.sub 2014-02-12 13:39:28.000000000 +0000 @@ -1,24 +1,18 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. - -timestamp='2012-04-18' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 -# the Free Software Foundation; either version 2 of the License, or +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-08-10' + +# 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, see . @@ -26,11 +20,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,10 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -273,7 +268,7 @@ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -291,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -370,13 +366,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -389,7 +385,8 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -407,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -788,11 +786,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -828,7 +830,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1019,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,21 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1492,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1543,6 +1546,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1586,6 +1592,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru dbus-glib-0.100.2/configure dbus-glib-0.102/configure --- dbus-glib-0.100.2/configure 2013-02-25 12:20:14.000000000 +0000 +++ dbus-glib-0.102/configure 2014-02-12 13:39:27.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dbus-glib 0.100.2. +# Generated by GNU Autoconf 2.69 for dbus-glib 0.102. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='dbus-glib' PACKAGE_TARNAME='dbus-glib' -PACKAGE_VERSION='0.100.2' -PACKAGE_STRING='dbus-glib 0.100.2' +PACKAGE_VERSION='0.102' +PACKAGE_STRING='dbus-glib 0.102' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=GLib' PACKAGE_URL='' @@ -636,21 +636,6 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -TEST_SOCKET_DIR -ABSOLUTE_TOP_BUILDDIR -TEST_SLEEP_FOREVER_BINARY -TEST_SEGFAULT_BINARY -TEST_EXIT_BINARY -TEST_INTERFACES_SERVICE_BINARY -TEST_CORE_SERVICE_BINARY -TEST_SHELL_SERVICE_BINARY -TEST_SERVICE_BINARY -TEST_SERVICE_DIR -EXPANDED_DATADIR -EXPANDED_LIBDIR -EXPANDED_BINDIR -EXPANDED_SYSCONFDIR -EXPANDED_LOCALSTATEDIR GTK_DOC_USE_REBASE_FALSE GTK_DOC_USE_REBASE_TRUE GTK_DOC_USE_LIBTOOL_FALSE @@ -681,7 +666,6 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG -DBUS_PATH_OR_ABSTRACT OTOOL64 OTOOL LIPO @@ -729,13 +713,13 @@ LT_AGE LT_REVISION LT_CURRENT +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -808,19 +792,18 @@ ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_silent_rules +enable_maintainer_mode enable_dependency_tracking enable_tests enable_ansi -enable_verbose_mode -enable_asserts -enable_checks enable_gcov enable_bash_completion with_test_socket_dir with_introspect_xml with_dbus_binding_tool +enable_asserts +enable_checks enable_shared enable_static with_pic @@ -1393,7 +1376,7 @@ # 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 dbus-glib 0.100.2 to adapt to many kinds of systems. +\`configure' configures dbus-glib 0.102 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1463,7 +1446,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dbus-glib 0.100.2:";; + short | recursive ) echo "Configuration of dbus-glib 0.102:";; esac cat <<\_ACEOF @@ -1471,21 +1454,23 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-tests enable unit test code --enable-ansi enable -ansi -pedantic gcc flags - --enable-verbose-mode support verbose debug mode - --enable-asserts include assertion checks - --enable-checks include sanity checks on public API --enable-gcov compile with coverage profiling instrumentation (gcc only) --enable-bash-completion install bash completion scripts + --enable-asserts include assertion checks + --enable-checks include sanity checks on public API --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1608,7 +1593,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dbus-glib configure 0.100.2 +dbus-glib configure 0.102 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1977,7 +1962,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dbus-glib $as_me 0.100.2, which was +It was created by dbus-glib $as_me 0.102, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2427,7 +2412,7 @@ -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2524,9 +2509,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2537,32 +2519,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# 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 # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2574,6 +2564,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2596,12 +2596,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2613,10 +2613,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2755,12 +2755,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2843,6 +2837,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2865,7 +2898,7 @@ # Define the identity of the package. PACKAGE='dbus-glib' - VERSION='0.100.2' + VERSION='0.102' cat >>confdefs.h <<_ACEOF @@ -2893,12 +2926,22 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2906,6 +2949,48 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + ac_config_headers="$ac_config_headers config.h" @@ -2943,10 +3028,10 @@ enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -3788,6 +3873,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -3807,7 +3951,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3863,8 +4007,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -3899,16 +4043,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3917,8 +4061,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -3926,7 +4070,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4432,27 +4576,6 @@ enable_ansi=no fi -# Check whether --enable-verbose-mode was given. -if test "${enable_verbose_mode+set}" = set; then : - enableval=$enable_verbose_mode; enable_verbose_mode=$enableval -else - enable_verbose_mode=$USE_MAINTAINER_MODE -fi - -# Check whether --enable-asserts was given. -if test "${enable_asserts+set}" = set; then : - enableval=$enable_asserts; enable_asserts=$enableval -else - enable_asserts=$USE_MAINTAINER_MODE -fi - -# Check whether --enable-checks was given. -if test "${enable_checks+set}" = set; then : - enableval=$enable_checks; enable_checks=$enableval -else - enable_checks=yes -fi - # Check whether --enable-gcov was given. if test "${enable_gcov+set}" = set; then : enableval=$enable_gcov; enable_gcov=$enableval @@ -4497,12 +4620,6 @@ fi -if test x$enable_verbose_mode = xyes; then - -$as_echo "#define DBUS_ENABLE_VERBOSE_MODE 1" >>confdefs.h - -fi - # Check whether --with-dbus-binding-tool was given. if test "${with_dbus_binding_tool+set}" = set; then : @@ -4528,23 +4645,27 @@ fi -if test x$enable_verbose_mode = xyes; then - -$as_echo "#define DBUS_ENABLE_VERBOSE_MODE 1" >>confdefs.h - +# Check whether --enable-asserts was given. +if test "${enable_asserts+set}" = set; then : + enableval=$enable_asserts; enable_asserts=$enableval +else + enable_asserts=$USE_MAINTAINER_MODE fi -if test x$enable_asserts = xno; then - -$as_echo "#define DBUS_DISABLE_ASSERT 1" >>confdefs.h +if test x$enable_asserts = xno; then $as_echo "#define G_DISABLE_ASSERT 1" >>confdefs.h fi -if test x$enable_checks = xno; then -$as_echo "#define DBUS_DISABLE_CHECKS 1" >>confdefs.h +# Check whether --enable-checks was given. +if test "${enable_checks+set}" = set; then : + enableval=$enable_checks; enable_checks=$enableval +else + enable_checks=yes +fi +if test x$enable_checks = xno; then $as_echo "#define G_DISABLE_CHECKS 1" >>confdefs.h @@ -6883,7 +7004,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6908,7 +7029,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6927,7 +7051,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -11924,112 +12051,6 @@ fi -#### Abstract sockets - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking abstract socket namespace" >&5 -$as_echo_n "checking abstract socket namespace... " >&6; } -if ${ac_cv_have_abstract_sockets+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#include -#include -#include -#include -#include - -int -main () -{ - - int listen_fd; - struct sockaddr_un addr; - - listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); - - if (listen_fd < 0) - { - fprintf (stderr, "socket() failed: %s\n", strerror (errno)); - exit (1); - } - - memset (&addr, '\0', sizeof (addr)); - addr.sun_family = AF_UNIX; - strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); - addr.sun_path[0] = '\0'; /* this is what makes it abstract */ - - if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) - { - fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", - strerror (errno)); - exit (1); - } - else - exit (0); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_have_abstract_sockets=yes -else - ac_cv_have_abstract_sockets=no - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_abstract_sockets" >&5 -$as_echo "$ac_cv_have_abstract_sockets" >&6; } -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -if test x$enable_abstract_sockets = xyes; then - if test x$ac_cv_have_abstract_sockets = xno; then - as_fn_error $? "Abstract sockets explicitly required, and support not detected." "$LINENO" 5 - fi -fi - -if test x$enable_abstract_sockets = xno; then - ac_cv_have_abstract_sockets=no; -fi - -if test x$ac_cv_have_abstract_sockets = xyes ; then - DBUS_PATH_OR_ABSTRACT=abstract - -$as_echo "#define HAVE_ABSTRACT_SOCKETS 1" >>confdefs.h - -else - DBUS_PATH_OR_ABSTRACT=path -fi - -# this is used in addresses to prefer abstract, e.g. -# unix:path=/foo or unix:abstract=/foo - - #### Sort out XML library # see what we have @@ -12719,31 +12740,11 @@ # Put the nasty error message in config.log where it belongs echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: - -$GTKDOC_DEPS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 + : elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } + : else GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS @@ -12778,6 +12779,10 @@ enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= @@ -12821,147 +12826,6 @@ -#### Have to go $localstatedir->$prefix/var->/usr/local/var -#### someone please fix this a better way... - -#### find the actual value for $prefix that we'll end up with -## (I know this is broken and should be done in the Makefile, but -## that's a major pain and almost nobody actually seems to care) -REAL_PREFIX= -if test "x$prefix" = "xNONE"; then - REAL_PREFIX=$ac_default_prefix -else - REAL_PREFIX=$prefix -fi - -## temporarily change prefix and exec_prefix -old_prefix=$prefix -prefix=$REAL_PREFIX - -if test "x$exec_prefix" = xNONE ; then - REAL_EXEC_PREFIX=$REAL_PREFIX -else - REAL_EXEC_PREFIX=$exec_prefix -fi -old_exec_prefix=$exec_prefix -exec_prefix=$REAL_EXEC_PREFIX - -## eval everything -LOCALSTATEDIR_TMP="$localstatedir" -EXPANDED_LOCALSTATEDIR=`eval echo $LOCALSTATEDIR_TMP` - - -SYSCONFDIR_TMP="$sysconfdir" -EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP` - - -BINDIR_TMP="$bindir" -EXPANDED_BINDIR=`eval echo $BINDIR_TMP` - - -LIBDIR_TMP="$libdir" -EXPANDED_LIBDIR=`eval echo $LIBDIR_TMP` - - -DATADIR_TMP="$datadir" -EXPANDED_DATADIR=`eval echo $DATADIR_TMP` - - -## put prefix and exec_prefix back -prefix=$old_prefix -exec_prefix=$old_exec_prefix - -#### Tell tests where to find certain stuff in builddir -ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd` - - - - -TEST_SERVICE_DIR=${ABSOLUTE_TOP_BUILDDIR}/test/data/valid-service-files - -cat >>confdefs.h <<_ACEOF -#define TEST_SERVICE_DIR "$TEST_SERVICE_DIR" -_ACEOF - - - - -TEST_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-service - -cat >>confdefs.h <<_ACEOF -#define TEST_SERVICE_BINARY "$TEST_SERVICE_BINARY" -_ACEOF - - - - -TEST_SHELL_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-shell-service - -cat >>confdefs.h <<_ACEOF -#define TEST_SHELL_SERVICE_BINARY "$TEST_SHELL_SERVICE_BINARY" -_ACEOF - - - - -TEST_CORE_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/core/test-service-glib - -cat >>confdefs.h <<_ACEOF -#define TEST_CORE_SERVICE_BINARY "$TEST_CORE_SERVICE_BINARY" -_ACEOF - - - - -TEST_INTERFACES_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/interfaces/test-service - -cat >>confdefs.h <<_ACEOF -#define TEST_INTERFACES_SERVICE_BINARY "$TEST_INTERFACES_SERVICE_BINARY" -_ACEOF - - - - -TEST_EXIT_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-exit - -cat >>confdefs.h <<_ACEOF -#define TEST_EXIT_BINARY "$TEST_EXIT_BINARY" -_ACEOF - - - - -TEST_SEGFAULT_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-segfault - -cat >>confdefs.h <<_ACEOF -#define TEST_SEGFAULT_BINARY "$TEST_SEGFAULT_BINARY" -_ACEOF - - - - -TEST_SLEEP_FOREVER_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-sleep-forever - -cat >>confdefs.h <<_ACEOF -#define TEST_SLEEP_FOREVER_BINARY "$TEST_SLEEP_FOREVER_BINARY" -_ACEOF - - - - - -if ! test -z "$with_test_socket_dir" ; then - TEST_SOCKET_DIR="$with_test_socket_dir" -else - TEST_SOCKET_DIR=$DEFAULT_SOCKET_DIR -fi - - -cat >>confdefs.h <<_ACEOF -#define DBUS_TEST_SOCKET_DIR "$TEST_SOCKET_DIR" -_ACEOF - - ac_config_files="$ac_config_files Makefile m4/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml dbus/Makefile dbus/examples/Makefile dbus/examples/statemachine/Makefile test/Makefile test/core/Makefile test/interfaces/Makefile test/data/valid-service-files/debug-glib.service test/data/valid-service-files/debug-echo.service test/data/valid-service-files/interfaces-test.service test/lib/Makefile test/manual/Makefile tools/Makefile dbus-glib-1.pc dbus-glib-1-uninstalled.pc" cat >confcache <<\_ACEOF @@ -13073,6 +12937,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -13522,7 +13394,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dbus-glib $as_me 0.100.2, which was +This file was extended by dbus-glib $as_me 0.102, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13588,7 +13460,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dbus-glib config.status 0.100.2 +dbus-glib config.status 0.102 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -14612,7 +14484,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -14625,7 +14497,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -14659,21 +14531,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -15381,11 +15251,6 @@ prefix: ${prefix} exec_prefix: ${exec_prefix} - libdir: ${EXPANDED_LIBDIR} - bindir: ${EXPANDED_BINDIR} - sysconfdir: ${EXPANDED_SYSCONFDIR} - localstatedir: ${EXPANDED_LOCALSTATEDIR} - datadir: ${EXPANDED_DATADIR} source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} @@ -15396,13 +15261,11 @@ Maintainer mode: ${USE_MAINTAINER_MODE} gcc coverage profiling: ${enable_gcov} Building unit tests: ${enable_tests} - Building verbose mode: ${enable_verbose_mode} Building assertions: ${enable_asserts} Building checks: ${enable_checks} Building Gtk-doc docs: ${enable_gtk_doc} Bash Completion: ${enable_bash_completion} Using XML parser: ${with_xml} - 'make check' socket dir: ${TEST_SOCKET_DIR} " if test x$enable_tests = xyes; then @@ -15414,9 +15277,6 @@ if test x$enable_gcov = xyes; then echo "NOTE: building with coverage profiling is definitely for developers only." fi -if test x$enable_verbose_mode = xyes; then - echo "NOTE: building with verbose mode increases library size, may slightly increase security risk, and decreases performance." -fi if test x$enable_asserts = xyes; then echo "NOTE: building with assertions increases library size and decreases performance." fi diff -Nru dbus-glib-0.100.2/configure.ac dbus-glib-0.102/configure.ac --- dbus-glib-0.100.2/configure.ac 2013-02-25 12:14:27.000000000 +0000 +++ dbus-glib-0.102/configure.ac 2014-02-12 13:31:39.000000000 +0000 @@ -1,14 +1,14 @@ dnl -*- mode: m4 -*- AC_PREREQ(2.52) -AC_INIT([dbus-glib], [0.100.2], +AC_INIT([dbus-glib], [0.102], [https://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=GLib]) AC_CANONICAL_HOST AM_INIT_AUTOMAKE([1.9]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) # Honor aclocal flags ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" @@ -47,9 +47,6 @@ AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[enable unit test code]),enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE) AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],[enable -ansi -pedantic gcc flags]),enable_ansi=$enableval,enable_ansi=no) -AC_ARG_ENABLE(verbose-mode, AS_HELP_STRING([--enable-verbose-mode],[support verbose debug mode]),enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE) -AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE) -AC_ARG_ENABLE(checks, AS_HELP_STRING([--enable-checks],[include sanity checks on public API]),enable_checks=$enableval,enable_checks=yes) AC_ARG_ENABLE(gcov, AS_HELP_STRING([--enable-gcov],[compile with coverage profiling instrumentation (gcc only)]),enable_gcov=$enableval,enable_gcov=no) AC_ARG_ENABLE(bash-completion, AS_HELP_STRING([--enable-bash-completion],[install bash completion scripts]),enable_bash_completion=$enableval,enable_bash_completion=yes) AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check])) @@ -63,10 +60,6 @@ AC_DEFINE(DBUS_BASH_COMPLETION,1,[Enable bash completion]) fi -if test x$enable_verbose_mode = xyes; then - AC_DEFINE(DBUS_ENABLE_VERBOSE_MODE,1,[Support a verbose mode]) -fi - AC_ARG_WITH(dbus-binding-tool, AS_HELP_STRING([--with-dbus-binding-tool=[filename]],[Use external dbus-binding-tool program]), [DBUS_BINDING_TOOL=$withval],[DBUS_BINDING_TOOL=\$\(top_builddir\)/dbus/dbus-binding-tool]) @@ -80,16 +73,18 @@ AC_DEFINE(DBUS_BUILD_TESTS,1,[Build test code]) fi -if test x$enable_verbose_mode = xyes; then - AC_DEFINE(DBUS_ENABLE_VERBOSE_MODE,1,[Support a verbose mode]) -fi +AC_ARG_ENABLE([asserts], + [AS_HELP_STRING([--enable-asserts], [include assertion checks])], + [enable_asserts=$enableval], [enable_asserts=$USE_MAINTAINER_MODE]) if test x$enable_asserts = xno; then - AC_DEFINE(DBUS_DISABLE_ASSERT,1,[Disable assertion checking]) - AC_DEFINE(G_DISABLE_ASSERT,1,[Disable GLib assertion macros]) + AC_DEFINE([G_DISABLE_ASSERT], [1], [Disable GLib assertion macros]) fi + +AC_ARG_ENABLE([checks], + [AS_HELP_STRING([--enable-checks], [include sanity checks on public API])], + [enable_checks=$enableval], [enable_checks=yes]) if test x$enable_checks = xno; then - AC_DEFINE(DBUS_DISABLE_CHECKS,1,[Disable public API sanity checking]) - AC_DEFINE(G_DISABLE_CHECKS,1,[Disable GLib public API sanity checking]) + AC_DEFINE([G_DISABLE_CHECKS], [1], [Disable GLib public API sanity checking]) fi #### gcc warning flags @@ -247,73 +242,6 @@ AC_DEFINE(HAVE_SOCKLEN_T,1,[Have socklen_t type]) fi -#### Abstract sockets - -AC_LANG_PUSH(C) -AC_CACHE_CHECK([abstract socket namespace], - ac_cv_have_abstract_sockets, - [AC_RUN_IFELSE([AC_LANG_PROGRAM( -[[ -#include -#include -#include -#include -#include -#include -#include -]], -[[ - int listen_fd; - struct sockaddr_un addr; - - listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); - - if (listen_fd < 0) - { - fprintf (stderr, "socket() failed: %s\n", strerror (errno)); - exit (1); - } - - memset (&addr, '\0', sizeof (addr)); - addr.sun_family = AF_UNIX; - strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); - addr.sun_path[0] = '\0'; /* this is what makes it abstract */ - - if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) - { - fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", - strerror (errno)); - exit (1); - } - else - exit (0); -]])], - [ac_cv_have_abstract_sockets=yes], - [ac_cv_have_abstract_sockets=no] -)]) -AC_LANG_POP(C) - -if test x$enable_abstract_sockets = xyes; then - if test x$ac_cv_have_abstract_sockets = xno; then - AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) - fi -fi - -if test x$enable_abstract_sockets = xno; then - ac_cv_have_abstract_sockets=no; -fi - -if test x$ac_cv_have_abstract_sockets = xyes ; then - DBUS_PATH_OR_ABSTRACT=abstract - AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace]) -else - DBUS_PATH_OR_ABSTRACT=path -fi - -# this is used in addresses to prefer abstract, e.g. -# unix:path=/foo or unix:abstract=/foo -AC_SUBST(DBUS_PATH_OR_ABSTRACT) - #### Sort out XML library # see what we have @@ -357,84 +285,6 @@ ### gtk-doc Documentation GTK_DOC_CHECK(1.4) -#### Have to go $localstatedir->$prefix/var->/usr/local/var -#### someone please fix this a better way... - -#### find the actual value for $prefix that we'll end up with -## (I know this is broken and should be done in the Makefile, but -## that's a major pain and almost nobody actually seems to care) -REAL_PREFIX= -if test "x$prefix" = "xNONE"; then - REAL_PREFIX=$ac_default_prefix -else - REAL_PREFIX=$prefix -fi - -## temporarily change prefix and exec_prefix -old_prefix=$prefix -prefix=$REAL_PREFIX - -if test "x$exec_prefix" = xNONE ; then - REAL_EXEC_PREFIX=$REAL_PREFIX -else - REAL_EXEC_PREFIX=$exec_prefix -fi -old_exec_prefix=$exec_prefix -exec_prefix=$REAL_EXEC_PREFIX - -## eval everything -LOCALSTATEDIR_TMP="$localstatedir" -EXPANDED_LOCALSTATEDIR=`eval echo $LOCALSTATEDIR_TMP` -AC_SUBST(EXPANDED_LOCALSTATEDIR) - -SYSCONFDIR_TMP="$sysconfdir" -EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP` -AC_SUBST(EXPANDED_SYSCONFDIR) - -BINDIR_TMP="$bindir" -EXPANDED_BINDIR=`eval echo $BINDIR_TMP` -AC_SUBST(EXPANDED_BINDIR) - -LIBDIR_TMP="$libdir" -EXPANDED_LIBDIR=`eval echo $LIBDIR_TMP` -AC_SUBST(EXPANDED_LIBDIR) - -DATADIR_TMP="$datadir" -EXPANDED_DATADIR=`eval echo $DATADIR_TMP` -AC_SUBST(EXPANDED_DATADIR) - -## put prefix and exec_prefix back -prefix=$old_prefix -exec_prefix=$old_exec_prefix - -#### Tell tests where to find certain stuff in builddir -ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd` - -AC_DEFUN([TEST_PATH], [ -TEST_$1=${ABSOLUTE_TOP_BUILDDIR}/test/$2 -AC_DEFINE_UNQUOTED(TEST_$1, "$TEST_$1", - [Full path to test file test/$2 in builddir]) -AC_SUBST(TEST_$1) -]) - -TEST_PATH(SERVICE_DIR, data/valid-service-files) -TEST_PATH(SERVICE_BINARY, test-service) -TEST_PATH(SHELL_SERVICE_BINARY, test-shell-service) -TEST_PATH(CORE_SERVICE_BINARY, core/test-service-glib) -TEST_PATH(INTERFACES_SERVICE_BINARY, interfaces/test-service) -TEST_PATH(EXIT_BINARY, test-exit) -TEST_PATH(SEGFAULT_BINARY, test-segfault) -TEST_PATH(SLEEP_FOREVER_BINARY, test-sleep-forever) -AC_SUBST(ABSOLUTE_TOP_BUILDDIR) - -if ! test -z "$with_test_socket_dir" ; then - TEST_SOCKET_DIR="$with_test_socket_dir" -else - TEST_SOCKET_DIR=$DEFAULT_SOCKET_DIR -fi -AC_SUBST(TEST_SOCKET_DIR) -AC_DEFINE_UNQUOTED(DBUS_TEST_SOCKET_DIR, "$TEST_SOCKET_DIR", [Where to put test sockets]) - AC_OUTPUT([ Makefile m4/Makefile @@ -464,11 +314,6 @@ prefix: ${prefix} exec_prefix: ${exec_prefix} - libdir: ${EXPANDED_LIBDIR} - bindir: ${EXPANDED_BINDIR} - sysconfdir: ${EXPANDED_SYSCONFDIR} - localstatedir: ${EXPANDED_LOCALSTATEDIR} - datadir: ${EXPANDED_DATADIR} source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} @@ -479,13 +324,11 @@ Maintainer mode: ${USE_MAINTAINER_MODE} gcc coverage profiling: ${enable_gcov} Building unit tests: ${enable_tests} - Building verbose mode: ${enable_verbose_mode} Building assertions: ${enable_asserts} Building checks: ${enable_checks} Building Gtk-doc docs: ${enable_gtk_doc} Bash Completion: ${enable_bash_completion} Using XML parser: ${with_xml} - 'make check' socket dir: ${TEST_SOCKET_DIR} " if test x$enable_tests = xyes; then @@ -497,9 +340,6 @@ if test x$enable_gcov = xyes; then echo "NOTE: building with coverage profiling is definitely for developers only." fi -if test x$enable_verbose_mode = xyes; then - echo "NOTE: building with verbose mode increases library size, may slightly increase security risk, and decreases performance." -fi if test x$enable_asserts = xyes; then echo "NOTE: building with assertions increases library size and decreases performance." fi diff -Nru dbus-glib-0.100.2/dbus/dbus-gidl.c dbus-glib-0.102/dbus/dbus-gidl.c --- dbus-glib-0.100.2/dbus/dbus-gidl.c 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/dbus/dbus-gidl.c 2014-01-14 11:24:22.000000000 +0000 @@ -26,6 +26,8 @@ #include "dbus-gidl.h" +#include + struct BaseInfo { unsigned int refcount : 28; @@ -342,6 +344,8 @@ { InterfaceInfo *info; + g_return_val_if_fail (g_dbus_is_interface_name (name), NULL); + info = g_new0 (InterfaceInfo, 1); info->base.refcount = 1; info->base.name = g_strdup (name); @@ -467,6 +471,8 @@ { MethodInfo *info; + g_return_val_if_fail (g_dbus_is_member_name (name), NULL); + info = g_new0 (MethodInfo, 1); info->base.refcount = 1; info->base.name = g_strdup (name); @@ -573,6 +579,8 @@ { SignalInfo *info; + g_return_val_if_fail (g_dbus_is_member_name (name), NULL); + info = g_new0 (SignalInfo, 1); info->base.refcount = 1; info->base.name = g_strdup (name); @@ -637,6 +645,9 @@ { PropertyInfo *info; + g_return_val_if_fail (g_utf8_validate (name, -1, NULL), NULL); + g_return_val_if_fail (g_variant_is_signature (type), NULL); + info = g_new0 (PropertyInfo, 1); info->base.refcount = 1; info->base.name = g_strdup (name); diff -Nru dbus-glib-0.100.2/dbus/dbus-glib.c dbus-glib-0.102/dbus/dbus-glib.c --- dbus-glib-0.100.2/dbus/dbus-glib.c 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/dbus/dbus-glib.c 2014-01-14 11:21:24.000000000 +0000 @@ -367,32 +367,3 @@ { return DBUS_MESSAGE_FROM_G_MESSAGE (gmessage); } - -#ifdef DBUS_BUILD_TESTS - -/* - * Unit test for general glib stuff - * Returns: %TRUE on success. - */ -gboolean -_dbus_glib_test (const char *test_data_dir) -{ - DBusError err; - GError *gerror = NULL; - - dbus_error_init (&err); - dbus_set_error_const (&err, DBUS_ERROR_NO_MEMORY, "Out of memory!"); - - dbus_set_g_error (&gerror, &err); - g_assert (gerror != NULL); - g_assert (gerror->domain == DBUS_GERROR); - g_assert (gerror->code == DBUS_GERROR_NO_MEMORY); - g_assert (!strcmp (gerror->message, "Out of memory!")); - - dbus_error_init (&err); - g_clear_error (&gerror); - - return TRUE; -} - -#endif /* DBUS_BUILD_TESTS */ diff -Nru dbus-glib-0.100.2/dbus/dbus-glib.h dbus-glib-0.102/dbus/dbus-glib.h --- dbus-glib-0.100.2/dbus/dbus-glib.h 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/dbus/dbus-glib.h 2014-01-14 11:21:24.000000000 +0000 @@ -103,6 +103,9 @@ DBusGConnection* dbus_g_connection_open (const gchar *address, GError **error); +DBusGConnection* dbus_g_connection_open_private (const gchar *address, + GMainContext *context, + GError **error); DBusGConnection* dbus_g_bus_get (DBusBusType type, GError **error); DBusGConnection* dbus_g_bus_get_private (DBusBusType type, @@ -326,6 +329,8 @@ void dbus_g_method_return_error (DBusGMethodInvocation *context, const GError *error); +DBusGConnection * dbus_g_method_invocation_get_g_connection (DBusGMethodInvocation *context); + /* Probably possible to replace this with a closure */ typedef struct { GCallback cb; diff -Nru dbus-glib-0.100.2/dbus/dbus-gmain.c dbus-glib-0.102/dbus/dbus-gmain.c --- dbus-glib-0.100.2/dbus/dbus-gmain.c 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/dbus/dbus-gmain.c 2014-01-14 11:21:24.000000000 +0000 @@ -705,6 +705,49 @@ } /** + * dbus_g_connection_open_private: + * @address: address of the connection to open + * @context: the #GMainContext or %NULL for default context + * @error: address where an error can be returned. + * + * Returns a private connection to the given address; this + * connection does not talk to a bus daemon and thus the caller + * must set up any authentication by itself. If the address + * refers to a message bus, the caller must call dbus_bus_register(). + * + * (Internally, calls dbus_connection_open_private() then calls + * dbus_connection_setup_with_g_main() on the result.) + * + * Returns: (transfer full): a #DBusGConnection + */ +DBusGConnection * +dbus_g_connection_open_private (const gchar *address, + GMainContext *context, + GError **error) +{ + DBusConnection *connection; + DBusError derror; + + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + + _dbus_g_value_types_init (); + + dbus_error_init (&derror); + + connection = dbus_connection_open_private (address, &derror); + if (connection == NULL) + { + dbus_set_g_error (error, &derror); + dbus_error_free (&derror); + return NULL; + } + + dbus_connection_setup_with_g_main (connection, context); + + return DBUS_G_CONNECTION_FROM_CONNECTION (connection); +} + +/** * dbus_g_bus_get: * @type: bus type * @error: address where an error can be returned. @@ -786,45 +829,3 @@ return DBUS_G_CONNECTION_FROM_CONNECTION (connection); } - -#ifdef DBUS_BUILD_TESTS - -/* - * Unit test for GLib main loop integration - * Returns: %TRUE on success. - */ -gboolean -_dbus_gmain_test (const char *test_data_dir) -{ - GType type; - GType rectype; - - g_type_init (); - _dbus_g_value_types_init (); - - rectype = dbus_g_type_get_collection ("GArray", G_TYPE_UINT); - g_assert (rectype != G_TYPE_INVALID); - g_assert (!strcmp (g_type_name (rectype), "GArray_guint_")); - - type = _dbus_gtype_from_signature ("au", TRUE); - g_assert (type == rectype); - - rectype = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING); - g_assert (rectype != G_TYPE_INVALID); - g_assert (!strcmp (g_type_name (rectype), "GHashTable_gchararray+gchararray_")); - - type = _dbus_gtype_from_signature ("a{ss}", TRUE); - g_assert (type == rectype); - - type = _dbus_gtype_from_signature ("o", FALSE); - g_assert (type == DBUS_TYPE_G_OBJECT_PATH); - type = _dbus_gtype_from_signature ("o", TRUE); - g_assert (type == DBUS_TYPE_G_OBJECT_PATH); - - type = _dbus_gtype_from_signature ("g", TRUE); - g_assert (type == DBUS_TYPE_G_SIGNATURE); - - return TRUE; -} - -#endif /* DBUS_BUILD_TESTS */ diff -Nru dbus-glib-0.100.2/dbus/dbus-gobject.c dbus-glib-0.102/dbus/dbus-gobject.c --- dbus-glib-0.100.2/dbus/dbus-gobject.c 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/dbus/dbus-gobject.c 2014-01-14 11:21:24.000000000 +0000 @@ -3276,6 +3276,22 @@ g_free (context); } +/** + * dbus_g_method_invocation_get_g_connection: + * @context: the method context + * + * + * + * Returns: (transfer none): the @DBusGConnection from which the method was called. + */ +DBusGConnection * +dbus_g_method_invocation_get_g_connection (DBusGMethodInvocation *context) +{ + g_return_val_if_fail (context != NULL, NULL); + + return context->connection; +} + const char * _dbus_gobject_get_path (GObject *obj) { diff -Nru dbus-glib-0.100.2/dbus/dbus-gparser.c dbus-glib-0.102/dbus/dbus-gparser.c --- dbus-glib-0.100.2/dbus/dbus-gparser.c 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/dbus/dbus-gparser.c 2014-01-14 11:24:22.000000000 +0000 @@ -30,6 +30,8 @@ #include "dbus/dbus-signature.h" #include +#include + #define ELEMENT_IS(name) (strcmp (element_name, (name)) == 0) typedef struct @@ -352,6 +354,14 @@ return FALSE; } + if (!g_dbus_is_interface_name (name)) + { + g_set_error (error, G_MARKUP_ERROR, + G_MARKUP_ERROR_PARSE, + "\"%s\" is not a valid D-Bus interface name", name); + return FALSE; + } + top = parser->node_stack->data; iface = interface_info_new (name); @@ -404,6 +414,14 @@ return FALSE; } + if (!g_dbus_is_member_name (name)) + { + g_set_error (error, G_MARKUP_ERROR, + G_MARKUP_ERROR_PARSE, + "\"%s\" is not a valid D-Bus member name", name); + return FALSE; + } + method = method_info_new (name); interface_info_add_method (parser->interface, method); method_info_unref (method); @@ -454,6 +472,14 @@ return FALSE; } + if (!g_dbus_is_member_name (name)) + { + g_set_error (error, G_MARKUP_ERROR, + G_MARKUP_ERROR_PARSE, + "\"%s\" is not a valid D-Bus member name", name); + return FALSE; + } + signal = signal_info_new (name); interface_info_add_signal (parser->interface, signal); signal_info_unref (signal); @@ -562,7 +588,15 @@ access, element_name); return FALSE; } - + + if (!g_utf8_validate (name, -1, NULL)) + { + g_set_error (error, G_MARKUP_ERROR, + G_MARKUP_ERROR_PARSE, + "\"%s\" is not UTF-8", name); + return FALSE; + } + property = property_info_new (name, type, access_flags); interface_info_add_property (parser->interface, property); property_info_unref (property); diff -Nru dbus-glib-0.100.2/dbus/dbus-gtest.c dbus-glib-0.102/dbus/dbus-gtest.c --- dbus-glib-0.100.2/dbus/dbus-gtest.c 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/dbus/dbus-gtest.c 2014-01-14 11:21:24.000000000 +0000 @@ -59,22 +59,10 @@ g_type_init (); - printf ("%s: running GValue util tests\n", "dbus-glib-test"); - if (!_dbus_gvalue_utils_test (test_data_dir)) - die ("gvalue utils"); - printf ("%s: running GValue tests\n", "dbus-glib-test"); if (!_dbus_gvalue_test (test_data_dir)) die ("gvalue utils"); - printf ("%s: running glib tests\n", "dbus-glib-test"); - if (!_dbus_glib_test (test_data_dir)) - die ("glib"); - - printf ("%s: running mainloop integration tests\n", "dbus-glib-test"); - if (!_dbus_gmain_test (test_data_dir)) - die ("gmain"); - printf ("%s: running GObject tests\n", "dbus-glib-test"); if (!_dbus_gobject_test (test_data_dir)) die ("gobject"); diff -Nru dbus-glib-0.100.2/dbus/dbus-gtest.h dbus-glib-0.102/dbus/dbus-gtest.h --- dbus-glib-0.100.2/dbus/dbus-gtest.h 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/dbus/dbus-gtest.h 2014-01-14 11:21:24.000000000 +0000 @@ -26,12 +26,8 @@ #include -gboolean _dbus_gmain_test (const char *test_data_dir); gboolean _dbus_gobject_test (const char *test_data_dir); -gboolean _dbus_gutils_test (const char *test_data_dir); -gboolean _dbus_glib_test (const char *test_data_dir); gboolean _dbus_gvalue_test (const char *test_data_dir); -gboolean _dbus_gvalue_utils_test (const char *test_data_dir); void dbus_glib_internal_do_not_use_run_tests (const char *test_data_dir); diff -Nru dbus-glib-0.100.2/dbus/dbus-gtype-specialized.c dbus-glib-0.102/dbus/dbus-gtype-specialized.c --- dbus-glib-0.100.2/dbus/dbus-gtype-specialized.c 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/dbus/dbus-gtype-specialized.c 2014-01-14 11:21:24.000000000 +0000 @@ -1694,9 +1694,15 @@ else if (type == G_TYPE_DOUBLE) return g_variant_new_double (g_value_get_double (value)); else if (type == G_TYPE_STRING) - return g_variant_new_string (g_value_get_string (value)); + { + const gchar *str = g_value_get_string (value); + return g_variant_new_string ((str != NULL) ? str : ""); + } else if (type == G_TYPE_STRV) - return g_variant_new_strv (g_value_get_boxed (value), -1); + { + const gchar * const *strv = g_value_get_boxed (value); + return g_variant_new_strv (strv, (strv != NULL) ? -1 : 0); + } else if (type == DBUS_TYPE_G_OBJECT_PATH) return g_variant_new_object_path (g_value_get_boxed (value)); else if (type == DBUS_TYPE_G_SIGNATURE) diff -Nru dbus-glib-0.100.2/dbus/dbus-gvalue.c dbus-glib-0.102/dbus/dbus-gvalue.c --- dbus-glib-0.100.2/dbus/dbus-gvalue.c 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/dbus/dbus-gvalue.c 2014-01-14 11:21:24.000000000 +0000 @@ -2032,6 +2032,10 @@ gboolean _dbus_gvalue_test (const char *test_data_dir) { + GType type; + GType rectype; + + g_type_init (); _dbus_g_value_types_init (); assert_bidirectional_mapping (G_TYPE_STRING, DBUS_TYPE_STRING_AS_STRING); @@ -2047,6 +2051,29 @@ assert_bidirectional_mapping (dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_STRING, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID), DBUS_STRUCT_BEGIN_CHAR_AS_STRING DBUS_TYPE_INT32_AS_STRING DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING DBUS_STRUCT_END_CHAR_AS_STRING ); + + rectype = dbus_g_type_get_collection ("GArray", G_TYPE_UINT); + g_assert (rectype != G_TYPE_INVALID); + g_assert (!strcmp (g_type_name (rectype), "GArray_guint_")); + + type = _dbus_gtype_from_signature ("au", TRUE); + g_assert (type == rectype); + + rectype = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING); + g_assert (rectype != G_TYPE_INVALID); + g_assert (!strcmp (g_type_name (rectype), "GHashTable_gchararray+gchararray_")); + + type = _dbus_gtype_from_signature ("a{ss}", TRUE); + g_assert (type == rectype); + + type = _dbus_gtype_from_signature ("o", FALSE); + g_assert (type == DBUS_TYPE_G_OBJECT_PATH); + type = _dbus_gtype_from_signature ("o", TRUE); + g_assert (type == DBUS_TYPE_G_OBJECT_PATH); + + type = _dbus_gtype_from_signature ("g", TRUE); + g_assert (type == DBUS_TYPE_G_SIGNATURE); + return TRUE; } diff -Nru dbus-glib-0.100.2/dbus/dbus-gvalue-utils.c dbus-glib-0.102/dbus/dbus-gvalue-utils.c --- dbus-glib-0.100.2/dbus/dbus-gvalue-utils.c 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/dbus/dbus-gvalue-utils.c 2014-01-14 11:21:24.000000000 +0000 @@ -1368,398 +1368,3 @@ _dbus_g_type_register_map ("GHashTable", &hashtable_vtable, 0); _dbus_g_type_register_struct ("GValueArray", &valuearray_vtable, 0); } - -#ifdef DBUS_BUILD_TESTS - -typedef struct -{ - gboolean seen_foo; - gboolean seen_baz; -} TestSpecializedHashData; - -static void -test_specialized_hash (const GValue *key, const GValue *val, gpointer user_data) -{ - TestSpecializedHashData *data = user_data; - - g_assert (G_VALUE_HOLDS_STRING (key)); - g_assert (G_VALUE_HOLDS_STRING (val)); - - if (!strcmp (g_value_get_string (key), "foo")) - { - data->seen_foo = TRUE; - g_assert (!strcmp (g_value_get_string (val), "bar")); - } - else if (!strcmp (g_value_get_string (key), "baz")) - { - data->seen_baz = TRUE; - g_assert (!strcmp (g_value_get_string (val), "moo")); - } - else - { - g_assert_not_reached (); - } -} - -static void -test_specialized_hash_2 (const GValue *key, const GValue *val, gpointer user_data) -{ - TestSpecializedHashData *data = user_data; - const GValue *realval; - - g_assert (G_VALUE_HOLDS_STRING (key)); - g_assert (G_VALUE_TYPE (val) == G_TYPE_VALUE); - - realval = g_value_get_boxed (val); - - if (!strcmp (g_value_get_string (key), "foo")) - { - data->seen_foo = TRUE; - g_assert (G_VALUE_HOLDS_UINT (realval)); - g_assert (g_value_get_uint (realval) == 20); - } - else if (!strcmp (g_value_get_string (key), "baz")) - { - data->seen_baz = TRUE; - g_assert (G_VALUE_HOLDS_STRING (realval)); - g_assert (!strcmp ("bar", g_value_get_string (realval))); - } - else - { - g_assert_not_reached (); - } -} - -gboolean -_dbus_gvalue_utils_test (const char *datadir) -{ - GType type; - - dbus_g_type_specialized_init (); - _dbus_g_type_specialized_builtins_init (); - - type = dbus_g_type_get_collection ("GArray", G_TYPE_UINT); - g_assert (dbus_g_type_is_collection (type)); - g_assert (dbus_g_type_get_collection_specialization (type) == G_TYPE_UINT); - { - GArray *instance; - - instance = dbus_g_type_specialized_construct (type); - - g_assert (instance->len == 0); - - g_array_free (instance, TRUE); - } - - type = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING); - g_assert (dbus_g_type_is_map (type)); - g_assert (dbus_g_type_get_map_key_specialization (type) == G_TYPE_STRING); - g_assert (dbus_g_type_get_map_value_specialization (type) == G_TYPE_STRING); - { - GHashTable *instance; - GValue val = { 0, }; - TestSpecializedHashData hashdata; - - instance = dbus_g_type_specialized_construct (type); - - g_assert (g_hash_table_size (instance) == 0); - g_hash_table_insert (instance, g_strdup ("foo"), g_strdup ("bar")); - g_hash_table_insert (instance, g_strdup ("baz"), g_strdup ("moo")); - g_assert (g_hash_table_size (instance) == 2); - - g_value_init (&val, type); - g_value_take_boxed (&val, instance); - hashdata.seen_foo = FALSE; - hashdata.seen_baz = FALSE; - dbus_g_type_map_value_iterate (&val, - test_specialized_hash, - &hashdata); - - g_assert (hashdata.seen_foo); - g_assert (hashdata.seen_baz); - - g_value_unset (&val); - } - - type = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE); - g_assert (dbus_g_type_is_map (type)); - g_assert (dbus_g_type_get_map_key_specialization (type) == G_TYPE_STRING); - g_assert (dbus_g_type_get_map_value_specialization (type) == G_TYPE_VALUE); - { - GHashTable *instance; - GValue val = { 0, }; - TestSpecializedHashData hashdata; - DBusGTypeSpecializedAppendContext ctx; - GValue *eltval; - - instance = dbus_g_type_specialized_construct (type); - g_value_init (&val, type); - g_value_take_boxed (&val, instance); - - dbus_g_type_specialized_init_append (&val, &ctx); - - { - GValue keyval = { 0, }; - GValue valval = { 0, }; - g_value_init (&keyval, G_TYPE_STRING); - g_value_set_string (&keyval, "foo"); - - g_value_init (&valval, G_TYPE_VALUE); - eltval = g_new0 (GValue, 1); - g_value_init (eltval, G_TYPE_UINT); - g_value_set_uint (eltval, 20); - g_value_take_boxed (&valval, eltval); - dbus_g_type_specialized_map_append (&ctx, &keyval, &valval); - } - - { - GValue keyval = { 0, }; - GValue valval = { 0, }; - g_value_init (&keyval, G_TYPE_STRING); - g_value_set_string (&keyval, "baz"); - g_value_init (&valval, G_TYPE_VALUE); - eltval = g_new0 (GValue, 1); - g_value_init (eltval, G_TYPE_STRING); - g_value_set_string (eltval, "bar"); - g_value_take_boxed (&valval, eltval); - dbus_g_type_specialized_map_append (&ctx, &keyval, &valval); - } - - hashdata.seen_foo = FALSE; - hashdata.seen_baz = FALSE; - dbus_g_type_map_value_iterate (&val, - test_specialized_hash_2, - &hashdata); - - g_assert (hashdata.seen_foo); - g_assert (hashdata.seen_baz); - - g_value_unset (&val); - } - - type = dbus_g_type_get_collection ("GSList", G_TYPE_OBJECT); - g_assert (dbus_g_type_is_collection (type)); - g_assert (dbus_g_type_get_collection_specialization (type) == G_TYPE_OBJECT); - { - GSList *instance, *tmp, *copy; - GValue val = {0, }; - GValue copyval = {0, }; - DBusGTypeSpecializedAppendContext ctx; - GObject *objects[3]; - int i; - - instance = dbus_g_type_specialized_construct (type); - g_assert (instance == NULL); - - g_value_init (&val, type); - g_value_take_boxed (&val, instance); - - dbus_g_type_specialized_init_append (&val, &ctx); - - for (i = 0; i < 3; i++) - { - GValue eltval = { 0, }; - GObject *obj = g_object_new (G_TYPE_OBJECT, NULL); - - g_assert (obj != NULL); - objects[i] = obj; - g_object_add_weak_pointer (obj, (gpointer) (objects + i)); - - g_value_init (&eltval, G_TYPE_OBJECT); - g_value_take_object (&eltval, obj); - dbus_g_type_specialized_collection_append (&ctx, &eltval); - } - - dbus_g_type_specialized_collection_end_append (&ctx); - - instance = g_value_get_boxed (&val); - g_assert (g_slist_length (instance) == 3); - - for (tmp = instance; tmp; tmp = tmp->next) - { - GObject *obj = tmp->data; - g_assert (G_IS_OBJECT (obj)); - g_assert (obj->ref_count == 1); - } - - g_value_init (©val, type); - g_value_copy (&val, ©val); - - copy = g_value_get_boxed (©val); - g_assert (g_slist_length (copy) == 3); - - for (tmp = copy; tmp; tmp = tmp->next) - { - GObject *obj = tmp->data; - g_assert (G_IS_OBJECT (obj)); - g_assert (obj->ref_count == 2); - } - - g_value_unset (©val); - - for (i = 0; i < 3; i++) - { - g_assert (objects[i] != NULL); - } - - for (tmp = instance; tmp; tmp = tmp->next) - { - GObject *obj = tmp->data; - g_assert (G_IS_OBJECT (obj)); - g_assert (obj->ref_count == 1); - } - - g_value_unset (&val); - - for (i = 0; i < 3; i++) - { - g_assert (objects[i] == NULL); - } - } - - type = dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRING); - g_assert (dbus_g_type_is_collection (type)); - g_assert (dbus_g_type_get_collection_specialization (type) == G_TYPE_STRING); - { - GPtrArray *instance; - DBusGTypeSpecializedAppendContext ctx; - GValue val = {0, }; - GValue eltval = {0, }; - - instance = dbus_g_type_specialized_construct (type); - - g_assert (instance->len == 0); - - g_value_init (&val, type); - g_value_take_boxed (&val, instance); - - dbus_g_type_specialized_init_append (&val, &ctx); - - g_value_init (&eltval, G_TYPE_STRING); - g_value_set_static_string (&eltval, "foo"); - dbus_g_type_specialized_collection_append (&ctx, &eltval); - - g_value_reset (&eltval); - g_value_set_static_string (&eltval, "bar"); - dbus_g_type_specialized_collection_append (&ctx, &eltval); - - g_value_reset (&eltval); - g_value_set_static_string (&eltval, "baz"); - dbus_g_type_specialized_collection_append (&ctx, &eltval); - - dbus_g_type_specialized_collection_end_append (&ctx); - - g_assert (instance->len == 3); - - g_assert (!strcmp ("foo", g_ptr_array_index (instance, 0))); - g_assert (!strcmp ("bar", g_ptr_array_index (instance, 1))); - g_assert (!strcmp ("baz", g_ptr_array_index (instance, 2))); - - g_value_unset (&val); - } - - type = dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); - g_assert (dbus_g_type_is_struct (type)); - g_assert (dbus_g_type_get_struct_size (type) == 3); - g_assert (dbus_g_type_get_struct_member_type (type, 0) == G_TYPE_STRING); - g_assert (dbus_g_type_get_struct_member_type (type, 1) == G_TYPE_UINT); - g_assert (dbus_g_type_get_struct_member_type (type, 2) == DBUS_TYPE_G_OBJECT_PATH); - { - GValueArray *instance; - GValue val = {0, }; - GValue memval = {0, }; - - instance = dbus_g_type_specialized_construct (type); - - g_assert (instance->n_values == 3); - - g_value_init (&val, type); - g_value_take_boxed (&val, instance); - - g_value_init (&memval, G_TYPE_STRING); - g_value_set_static_string (&memval, "foo"); - dbus_g_type_struct_set_member (&val, 0, &memval); - g_value_unset (&memval); - - g_value_init (&memval, G_TYPE_UINT); - g_value_set_uint (&memval, 42); - dbus_g_type_struct_set_member (&val, 1, &memval); - g_value_unset (&memval); - - g_value_init (&memval, DBUS_TYPE_G_OBJECT_PATH); - g_value_set_static_boxed (&memval, "/bar/moo/foo/baz"); - dbus_g_type_struct_set_member (&val, 2, &memval); - g_value_unset (&memval); - - g_assert (instance->n_values == 3); - - g_value_init (&memval, G_TYPE_STRING); - dbus_g_type_struct_get_member (&val, 0, &memval); - g_assert (0 == strcmp (g_value_get_string (&memval), "foo")); - g_value_unset (&memval); - - g_value_init (&memval, G_TYPE_UINT); - dbus_g_type_struct_get_member (&val, 1, &memval); - g_assert (g_value_get_uint (&memval) == 42); - g_value_unset (&memval); - - g_value_init (&memval, DBUS_TYPE_G_OBJECT_PATH); - dbus_g_type_struct_get_member (&val, 2, &memval); - g_assert (0 == strcmp ((gchar*) g_value_get_boxed (&memval), - "/bar/moo/foo/baz")); - g_value_unset (&memval); - - g_value_unset (&val); - } - - type = dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); - g_assert (dbus_g_type_is_struct (type)); - g_assert (dbus_g_type_get_struct_size (type) == 3); - g_assert (dbus_g_type_get_struct_member_type (type, 0) == G_TYPE_STRING); - g_assert (dbus_g_type_get_struct_member_type (type, 1) == G_TYPE_UINT); - g_assert (dbus_g_type_get_struct_member_type (type, 2) == DBUS_TYPE_G_OBJECT_PATH); - { - GValueArray *instance; - GValue val = {0, }; - - instance = dbus_g_type_specialized_construct (type); - - g_assert (instance->n_values == 3); - - g_value_init (&val, type); - g_value_take_boxed (&val, instance); - - dbus_g_type_struct_set (&val, - 0,"foo", - 1, 42, - 2, "/bar/moo/foo/baz", - G_MAXUINT); - - g_assert (instance->n_values == 3); - - { - gchar *string; - guint intval; - gchar *path; - - dbus_g_type_struct_get (&val, - 0, &string, - 1, &intval, - 2, &path, - G_MAXUINT); - - g_assert (0 == strcmp (string, "foo")); - g_assert (intval == 42); - g_assert (0 == strcmp (path, "/bar/moo/foo/baz")); - } - - g_value_unset (&val); - } - - - return TRUE; -} - - - -#endif /* DBUS_BUILD_TESTS */ diff -Nru dbus-glib-0.100.2/dbus/examples/Makefile.in dbus-glib-0.102/dbus/examples/Makefile.in --- dbus-glib-0.100.2/dbus/examples/Makefile.in 2013-02-25 12:20:15.000000000 +0000 +++ dbus-glib-0.102/dbus/examples/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,7 +82,8 @@ example-signal-recipient$(EXEEXT) \ example-signal-emitter$(EXEEXT) subdir = dbus/examples -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -77,6 +105,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am_example_service_OBJECTS = example-service.$(OBJEXT) example_service_OBJECTS = $(am_example_service_OBJECTS) example_service_LDADD = $(LDADD) @@ -94,6 +123,18 @@ example_signal_recipient_LDADD = $(LDADD) example_signal_recipient_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(top_builddir)/dbus/libdbus-glib-1.la +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -106,33 +147,30 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(example_client_SOURCES) $(example_service_SOURCES) \ $(example_signal_emitter_SOURCES) \ $(example_signal_recipient_SOURCES) DIST_SOURCES = $(example_client_SOURCES) $(example_service_SOURCES) \ $(example_signal_emitter_SOURCES) \ $(example_signal_recipient_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -140,9 +178,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -172,7 +230,6 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -196,7 +253,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -207,11 +263,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -263,15 +314,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -389,15 +431,19 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + example-client$(EXEEXT): $(example_client_OBJECTS) $(example_client_DEPENDENCIES) $(EXTRA_example_client_DEPENDENCIES) @rm -f example-client$(EXEEXT) $(AM_V_CCLD)$(LINK) $(example_client_OBJECTS) $(example_client_LDADD) $(LIBS) + example-service$(EXEEXT): $(example_service_OBJECTS) $(example_service_DEPENDENCIES) $(EXTRA_example_service_DEPENDENCIES) @rm -f example-service$(EXEEXT) $(AM_V_CCLD)$(LINK) $(example_service_OBJECTS) $(example_service_LDADD) $(LIBS) + example-signal-emitter$(EXEEXT): $(example_signal_emitter_OBJECTS) $(example_signal_emitter_DEPENDENCIES) $(EXTRA_example_signal_emitter_DEPENDENCIES) @rm -f example-signal-emitter$(EXEEXT) $(AM_V_CCLD)$(LINK) $(example_signal_emitter_OBJECTS) $(example_signal_emitter_LDADD) $(LIBS) + example-signal-recipient$(EXEEXT): $(example_signal_recipient_OBJECTS) $(example_signal_recipient_DEPENDENCIES) $(EXTRA_example_signal_recipient_DEPENDENCIES) @rm -f example-signal-recipient$(EXEEXT) $(AM_V_CCLD)$(LINK) $(example_signal_recipient_OBJECTS) $(example_signal_recipient_LDADD) $(LIBS) @@ -418,14 +464,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -441,22 +487,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -471,57 +520,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -537,12 +541,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -554,15 +553,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -571,6 +566,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -740,13 +750,12 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - ctags-recursive install install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-noinstPROGRAMS ctags ctags-recursive distclean \ +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -756,8 +765,8 @@ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am example-service-glue.h: example-service.xml diff -Nru dbus-glib-0.100.2/dbus/examples/statemachine/Makefile.in dbus-glib-0.102/dbus/examples/statemachine/Makefile.in --- dbus-glib-0.100.2/dbus/examples/statemachine/Makefile.in 2013-02-25 12:20:15.000000000 +0000 +++ dbus-glib-0.102/dbus/examples/statemachine/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,7 +80,8 @@ host_triplet = @host@ noinst_PROGRAMS = statemachine-server$(EXEEXT) subdir = dbus/examples/statemachine -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -76,6 +104,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -88,20 +129,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(statemachine_server_SOURCES) DIST_SOURCES = $(statemachine_server_SOURCES) am__can_run_installinfo = \ @@ -109,10 +146,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -136,7 +189,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -147,11 +199,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -203,15 +250,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -333,6 +371,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + statemachine-server$(EXEEXT): $(statemachine_server_OBJECTS) $(statemachine_server_DEPENDENCIES) $(EXTRA_statemachine_server_DEPENDENCIES) @rm -f statemachine-server$(EXEEXT) $(AM_V_CCLD)$(LINK) $(statemachine_server_OBJECTS) $(statemachine_server_LDADD) $(LIBS) @@ -352,14 +391,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -374,26 +413,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -405,15 +433,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -422,6 +446,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -567,18 +606,19 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am statemachine-server-glue.h: statemachine-server.xml diff -Nru dbus-glib-0.100.2/dbus/Makefile.am dbus-glib-0.102/dbus/Makefile.am --- dbus-glib-0.100.2/dbus/Makefile.am 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/dbus/Makefile.am 2014-01-14 11:21:47.000000000 +0000 @@ -63,7 +63,12 @@ dbus-gparser.c \ dbus-gparser.h -libdbus_gtool_la_LIBADD = $(DBUS_LIBS) -lexpat +libdbus_gtool_la_LIBADD = \ + -lexpat \ + $(DBUS_LIBS) \ + $(DBUS_GLIB_LIBS) \ + libdbus-glib-1.la \ + $(NULL) bin_PROGRAMS=dbus-binding-tool diff -Nru dbus-glib-0.100.2/dbus/Makefile.in dbus-glib-0.102/dbus/Makefile.in --- dbus-glib-0.100.2/dbus/Makefile.in 2013-02-25 12:20:14.000000000 +0000 +++ dbus-glib-0.102/dbus/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,23 +18,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -59,8 +86,9 @@ @DBUS_BUILD_TESTS_TRUE@noinst_PROGRAMS = $(am__EXEEXT_1) @DBUS_BUILD_TESTS_TRUE@TESTS = dbus-glib-test$(EXEEXT) subdir = dbus -DIST_COMMON = $(libdbus_glib_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(libdbus_glib_HEADERS) \ + $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -116,11 +144,13 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libdbus_glib_1_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libdbus_glib_1_la_LDFLAGS) $(LDFLAGS) \ -o $@ -libdbus_gtool_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libdbus_gtool_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) libdbus-glib-1.la am_libdbus_gtool_la_OBJECTS = $(am__objects_1) dbus-gidl.lo \ dbus-gloader-expat.lo dbus-gparser.lo libdbus_gtool_la_OBJECTS = $(am_libdbus_gtool_la_OBJECTS) @@ -146,6 +176,18 @@ @DBUS_BUILD_TESTS_TRUE@dbus_glib_test_DEPENDENCIES = \ @DBUS_BUILD_TESTS_TRUE@ $(builddir)/libdbus-glib-1.la SCRIPTS = $(completion_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -158,20 +200,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libdbus_glib_1_la_SOURCES) $(libdbus_gtool_la_SOURCES) \ $(dbus_bash_completion_helper_SOURCES) \ $(dbus_binding_tool_SOURCES) $(dbus_glib_test_SOURCES) @@ -180,13 +218,14 @@ $(dbus_bash_completion_helper_SOURCES) \ $(dbus_binding_tool_SOURCES) \ $(am__dbus_glib_test_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -195,13 +234,207 @@ HEADERS = $(libdbus_glib_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -229,7 +462,6 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -253,7 +485,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -264,11 +495,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -320,15 +546,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -440,7 +657,13 @@ dbus-gparser.c \ dbus-gparser.h -libdbus_gtool_la_LIBADD = $(DBUS_LIBS) -lexpat +libdbus_gtool_la_LIBADD = \ + -lexpat \ + $(DBUS_LIBS) \ + $(DBUS_GLIB_LIBS) \ + libdbus-glib-1.la \ + $(NULL) + dbus_binding_tool_SOURCES = \ dbus-binding-tool-glib.h \ dbus-binding-tool-glib.c \ @@ -463,7 +686,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -494,6 +717,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -520,23 +744,29 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libdbus-glib-1.la: $(libdbus_glib_1_la_OBJECTS) $(libdbus_glib_1_la_DEPENDENCIES) $(EXTRA_libdbus_glib_1_la_DEPENDENCIES) $(AM_V_CCLD)$(libdbus_glib_1_la_LINK) -rpath $(libdir) $(libdbus_glib_1_la_OBJECTS) $(libdbus_glib_1_la_LIBADD) $(LIBS) + libdbus-gtool.la: $(libdbus_gtool_la_OBJECTS) $(libdbus_gtool_la_DEPENDENCIES) $(EXTRA_libdbus_gtool_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libdbus_gtool_la_OBJECTS) $(libdbus_gtool_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@ -548,10 +778,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -572,7 +804,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -594,10 +827,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -618,7 +853,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -640,12 +876,15 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + dbus-bash-completion-helper$(EXEEXT): $(dbus_bash_completion_helper_OBJECTS) $(dbus_bash_completion_helper_DEPENDENCIES) $(EXTRA_dbus_bash_completion_helper_DEPENDENCIES) @rm -f dbus-bash-completion-helper$(EXEEXT) $(AM_V_CCLD)$(LINK) $(dbus_bash_completion_helper_OBJECTS) $(dbus_bash_completion_helper_LDADD) $(LIBS) + dbus-binding-tool$(EXEEXT): $(dbus_binding_tool_OBJECTS) $(dbus_binding_tool_DEPENDENCIES) $(EXTRA_dbus_binding_tool_DEPENDENCIES) @rm -f dbus-binding-tool$(EXEEXT) $(AM_V_CCLD)$(LINK) $(dbus_binding_tool_OBJECTS) $(dbus_binding_tool_LDADD) $(LIBS) + dbus-glib-test$(EXEEXT): $(dbus_glib_test_OBJECTS) $(dbus_glib_test_DEPENDENCIES) $(EXTRA_dbus_glib_test_DEPENDENCIES) @rm -f dbus-glib-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(dbus_glib_test_OBJECTS) $(dbus_glib_test_LDADD) $(LIBS) @@ -717,14 +956,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -761,22 +1000,25 @@ dir='$(DESTDIR)$(libdbus_glibdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -791,57 +1033,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -857,12 +1054,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -874,15 +1066,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -891,102 +1079,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +dbus-glib-test.log: dbus-glib-test$(EXEEXT) + @p='dbus-glib-test$(EXEEXT)'; \ + b='dbus-glib-test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -1074,6 +1347,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1160,27 +1436,25 @@ uninstall-libLTLIBRARIES uninstall-libdbus_glibHEADERS \ uninstall-libexecPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean clean-binPROGRAMS \ - clean-generic clean-libLTLIBRARIES clean-libexecPROGRAMS \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-completionSCRIPTS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES \ - install-libdbus_glibHEADERS install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-binPROGRAMS clean-generic \ + clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \ + clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-completionSCRIPTS install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-libdbus_glibHEADERS \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + recheck tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-completionSCRIPTS \ uninstall-libLTLIBRARIES uninstall-libdbus_glibHEADERS \ uninstall-libexecPROGRAMS diff -Nru dbus-glib-0.100.2/debian/changelog dbus-glib-0.102/debian/changelog --- dbus-glib-0.100.2/debian/changelog 2013-02-25 12:59:22.000000000 +0000 +++ dbus-glib-0.102/debian/changelog 2014-02-12 15:22:16.000000000 +0000 @@ -1,3 +1,18 @@ +dbus-glib (0.102-1) unstable; urgency=low + + * New upstream release + - update symbols file for new ABI + * Update dbus-daemon introspection data from dbus/1.8.0-1 + * Bump debhelper compat level to 9 + - use compilation options from dpkg-buildflags + - have compressed, multi-arch-safe debug symbols + - make the -dbg package Multi-Arch: same + * Redo debian/copyright to be machine-readable, and actually mention + the copyright holders + * Standards-Version: 3.9.5, no further changes required + + -- Simon McVittie Wed, 12 Feb 2014 15:21:55 +0000 + dbus-glib (0.100.2-1) unstable; urgency=low * New upstream release diff -Nru dbus-glib-0.100.2/debian/compat dbus-glib-0.102/debian/compat --- dbus-glib-0.100.2/debian/compat 2013-02-25 12:59:22.000000000 +0000 +++ dbus-glib-0.102/debian/compat 2014-02-12 15:22:16.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru dbus-glib-0.100.2/debian/control dbus-glib-0.102/debian/control --- dbus-glib-0.100.2/debian/control 2013-02-25 12:59:22.000000000 +0000 +++ dbus-glib-0.102/debian/control 2014-02-12 15:22:16.000000000 +0000 @@ -6,14 +6,14 @@ Sebastian Dröge , Simon McVittie , Michael Biebl -Build-Depends: debhelper (>= 8.1.3), +Build-Depends: debhelper (>= 9), dh-autoreconf, dpkg-dev (>= 1.16.1), libglib2.0-dev (>= 2.26), libdbus-1-dev (>= 1.1), libexpat-dev, gtk-doc-tools (>= 1.4) -Standards-Version: 3.9.2 +Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/pkg-utopia/dbus-glib.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-utopia/dbus-glib.git Homepage: http://www.freedesktop.org/wiki/Software/DBusBindings @@ -76,6 +76,7 @@ Section: debug Priority: extra Architecture: any +Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libdbus-glib-1-2 (= ${binary:Version}), ${misc:Depends} diff -Nru dbus-glib-0.100.2/debian/copyright dbus-glib-0.102/debian/copyright --- dbus-glib-0.100.2/debian/copyright 2013-02-25 12:59:22.000000000 +0000 +++ dbus-glib-0.102/debian/copyright 2014-02-12 15:22:16.000000000 +0000 @@ -1,214 +1,248 @@ -This package was debianized by Colin Walters on -Thu, 6 Mar 2003 18:01:37 -0500 - -It was downloaded from http://www.freedesktop.org/software/dbus - -This package is dual-licensed under the Academic Free License version 2.1, -and the GPL version 2. For a description of the GPL, see -/usr/share/common-licenses/GPL-2 on your Debian system. - -Portions of the package are only licensed under the GPL (notably -tools/dbus-cleanup-sockets.c and test/decode-gcov.c ). - -The Academic Free License follows: - -The Academic Free License -v. 2.1 - -This Academic Free License (the "License") applies to any original -work of authorship (the "Original Work") whose owner (the "Licensor") -has placed the following notice immediately following the copyright -notice for the Original Work: - -Licensed under the Academic Free License version 2.1 - -1) Grant of Copyright License. Licensor hereby grants You a -world-wide, royalty-free, non-exclusive, perpetual, sublicenseable -license to do the following: - -a) to reproduce the Original Work in copies; - -b) to prepare derivative works ("Derivative Works") based upon the Original Work; - -c) to distribute copies of the Original Work and Derivative Works to the public; - -d) to perform the Original Work publicly; and - -e) to display the Original Work publicly. - -2) Grant of Patent License. Licensor hereby grants You a world-wide, -royalty-free, non-exclusive, perpetual, sublicenseable license, under -patent claims owned or controlled by the Licensor that are embodied in -the Original Work as furnished by the Licensor, to make, use, sell and -offer for sale the Original Work and Derivative Works. - -3) Grant of Source Code License. The term "Source Code" means the -preferred form of the Original Work for making modifications to it and -all available documentation describing how to modify the Original -Work. Licensor hereby agrees to provide a machine-readable copy of the -Source Code of the Original Work along with each copy of the Original -Work that Licensor distributes. Licensor reserves the right to satisfy -this obligation by placing a machine-readable copy of the Source Code -in an information repository reasonably calculated to permit -inexpensive and convenient access by You for as long as Licensor -continues to distribute the Original Work, and by publishing the -address of that information repository in a notice immediately -following the copyright notice that applies to the Original Work. - -4) Exclusions From License Grant. Neither the names of Licensor, nor -the names of any contributors to the Original Work, nor any of their -trademarks or service marks, may be used to endorse or promote -products derived from this Original Work without express prior written -permission of the Licensor. Nothing in this License shall be deemed to -grant any rights to trademarks, copyrights, patents, trade secrets or -any other intellectual property of Licensor except as expressly stated -herein. No patent license is granted to make, use, sell or offer to -sell embodiments of any patent claims other than the licensed claims -defined in Section 2. No right is granted to the trademarks of -Licensor even if such marks are included in the Original Work. Nothing -in this License shall be interpreted to prohibit Licensor from -licensing under different terms from this License any Original Work -that Licensor otherwise would have a right to license. - -5) This section intentionally omitted. - -6) Attribution Rights. You must retain, in the Source Code of any -Derivative Works that You create, all copyright, patent or trademark -notices from the Source Code of the Original Work, as well as any -notices of licensing and any descriptive text identified therein as an -"Attribution Notice." You must cause the Source Code for any -Derivative Works that You create to carry a prominent Attribution -Notice reasonably calculated to inform recipients that You have -modified the Original Work. - -7) Warranty of Provenance and Disclaimer of Warranty. Licensor -warrants that the copyright in and to the Original Work and the patent -rights granted herein by Licensor are owned by the Licensor or are -sublicensed to You under the terms of this License with the permission -of the contributor(s) of those copyrights and patent rights. Except as -expressly stated in the immediately proceeding sentence, the Original -Work is provided under this License on an "AS IS" BASIS and WITHOUT -WARRANTY, either express or implied, including, without limitation, -the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL -WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential -part of this License. No license to Original Work is granted hereunder -except under this disclaimer. - -8) Limitation of Liability. Under no circumstances and under no legal -theory, whether in tort (including negligence), contract, or -otherwise, shall the Licensor be liable to any person for any direct, -indirect, special, incidental, or consequential damages of any -character arising as a result of this License or the use of the -Original Work including, without limitation, damages for loss of -goodwill, work stoppage, computer failure or malfunction, or any and -all other commercial damages or losses. This limitation of liability -shall not apply to liability for death or personal injury resulting -from Licensor's negligence to the extent applicable law prohibits such -limitation. Some jurisdictions do not allow the exclusion or -limitation of incidental or consequential damages, so this exclusion -and limitation may not apply to You. - -9) Acceptance and Termination. If You distribute copies of the -Original Work or a Derivative Work, You must make a reasonable effort -under the circumstances to obtain the express assent of recipients to -the terms of this License. Nothing else but this License (or another -written agreement between Licensor and You) grants You permission to -create Derivative Works based upon the Original Work or to exercise -any of the rights granted in Section 1 herein, and any attempt to do -so except under the terms of this License (or another written -agreement between Licensor and You) is expressly prohibited by -U.S. copyright law, the equivalent laws of other countries, and by -international treaty. Therefore, by exercising any of the rights -granted to You in Section 1 herein, You indicate Your acceptance of -this License and all of its terms and conditions. - -10) Termination for Patent Action. This License shall terminate -automatically and You may no longer exercise any of the rights granted -to You by this License as of the date You commence an action, -including a cross-claim or counterclaim, against Licensor or any -licensee alleging that the Original Work infringes a patent. This -termination provision shall not apply for an action alleging patent -infringement by combinations of the Original Work with other software -or hardware. - -11) Jurisdiction, Venue and Governing Law. Any action or suit relating -to this License may be brought only in the courts of a jurisdiction -wherein the Licensor resides or in which Licensor conducts its primary -business, and under the laws of that jurisdiction excluding its -conflict-of-law provisions. The application of the United Nations -Convention on Contracts for the International Sale of Goods is -expressly excluded. Any use of the Original Work outside the scope of -this License or after its termination shall be subject to the -requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101 -et seq., the equivalent laws of other countries, and international -treaty. This section shall survive the termination of this License. - -12) Attorneys Fees. In any action to enforce the terms of this License -or seeking damages relating thereto, the prevailing party shall be -entitled to recover its costs and expenses, including, without -limitation, reasonable attorneys' fees and costs incurred in -connection with such action, including any appeal of such action. This -section shall survive the termination of this License. - -13) Miscellaneous. This License represents the complete agreement -concerning the subject matter hereof. If any provision of this License -is held to be unenforceable, such provision shall be reformed only to -the extent necessary to make it enforceable. - -14) Definition of "You" in This License. "You" throughout this -License, whether in upper or lower case, means an individual or a -legal entity exercising rights under, and complying with all of the -terms of, this License. For legal entities, "You" includes any entity -that controls, is controlled by, or is under common control with -you. For purposes of this definition, "control" means (i) the power, -direct or indirect, to cause the direction or management of such -entity, whether by contract or otherwise, or (ii) ownership of fifty -percent (50%) or more of the outstanding shares, or (iii) beneficial -ownership of such entity. - -15) Right to Use. You may use the Original Work in all ways not -otherwise restricted or conditioned by this License or by law, and -Licensor promises not to interfere with or be responsible for such -uses by You. - -This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights -reserved. Permission is hereby granted to copy and distribute this -license without modification. This license may not be modified without -the express written permission of its copyright owner. - - --- -END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential -differences between the Academic Free License (AFL) version 1.0 and other -open source licenses: - -The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache -licenses in many respects but it is intended to solve a few problems with -those licenses. - -* The AFL is written so as to make it clear what software is being -licensed (by the inclusion of a statement following the copyright notice -in the software). This way, the license functions better than a template -license. The BSD, MIT and UoI/NCSA licenses apply to unidentified software. - -* The AFL contains a complete copyright grant to the software. The BSD -and Apache licenses are vague and incomplete in that respect. - -* The AFL contains a complete patent grant to the software. The BSD, MIT, -UoI/NCSA and Apache licenses rely on an implied patent license and contain -no explicit patent grant. - -* The AFL makes it clear that no trademark rights are granted to the -licensor's trademarks. The Apache license contains such a provision, but the -BSD, MIT and UoI/NCSA licenses do not. - -* The AFL includes the warranty by the licensor that it either owns the -copyright or that it is distributing the software under a license. None of -the other licenses contain that warranty. All other warranties are disclaimed, -as is the case for the other licenses. - -* The AFL is itself copyrighted (with the right granted to copy and distribute -without modification). This ensures that the owner of the copyright to the -license will control changes. The Apache license contains a copyright notice, -but the BSD, MIT and UoI/NCSA licenses do not. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: dbus-glib +Source: http://dbus.freedesktop.org/releases/dbus-glib/ +Comment: + The effective license of the majority of the package, including the + shared library, is "GPL-2+ or AFL-2.1". Certain utilities are + "GPL-2+" only. + +Files: * +Copyright: + © 2002-2010 Red Hat, Inc + © 2002-2003 CodeFactory AB + © 2004 Ximian, Inc + © 2005-2011 Nokia Corporation + © 2006 Steve Frécinaux + © 2007 Codethink Ltd + © 2009-2014 Collabora Ltd + © 2013 Intel Corporation +License: GPL-2+ or AFL-2.1 + +Files: dbus/dbus-bash-completion-helper.c +Copyright: + © 2008 David Zeuthen +License: GPL-2+ + +Files: + test/core/peer-on-bus.c + test/core/private.c + test/core/registrations.c +Copyright: + © 2009 Collabora Ltd + © 2009-2011 Nokia Corporation +License: GPL-2+ or AFL-2.1 or Expat + +Files: + test/core/proxy-noc.c + test/core/proxy-peer.c +Copyright: + © 2011 Nokia Corporation + © 2013 Collabora Ltd +License: Expat + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +Comment: + On Debian systems, see /usr/share/common-licenses/GPL-2 for the full + text of the GPL version 2. + +License: Expat + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +License: AFL-2.1 + The Academic Free License + v. 2.1 + . + This Academic Free License (the "License") applies to any original + work of authorship (the "Original Work") whose owner (the "Licensor") + has placed the following notice immediately following the copyright + notice for the Original Work: + . + Licensed under the Academic Free License version 2.1 + . + 1) Grant of Copyright License. Licensor hereby grants You a + world-wide, royalty-free, non-exclusive, perpetual, sublicenseable + license to do the following: + . + a) to reproduce the Original Work in copies; + . + b) to prepare derivative works ("Derivative Works") based upon the + Original Work; + . + c) to distribute copies of the Original Work and Derivative Works to + the public; + . + d) to perform the Original Work publicly; and + . + e) to display the Original Work publicly. + . + 2) Grant of Patent License. Licensor hereby grants You a world-wide, + royalty-free, non-exclusive, perpetual, sublicenseable license, under + patent claims owned or controlled by the Licensor that are embodied in + the Original Work as furnished by the Licensor, to make, use, sell and + offer for sale the Original Work and Derivative Works. + . + 3) Grant of Source Code License. The term "Source Code" means the + preferred form of the Original Work for making modifications to it and + all available documentation describing how to modify the Original + Work. Licensor hereby agrees to provide a machine-readable copy of the + Source Code of the Original Work along with each copy of the Original + Work that Licensor distributes. Licensor reserves the right to satisfy + this obligation by placing a machine-readable copy of the Source Code + in an information repository reasonably calculated to permit + inexpensive and convenient access by You for as long as Licensor + continues to distribute the Original Work, and by publishing the + address of that information repository in a notice immediately + following the copyright notice that applies to the Original Work. + . + 4) Exclusions From License Grant. Neither the names of Licensor, nor + the names of any contributors to the Original Work, nor any of their + trademarks or service marks, may be used to endorse or promote + products derived from this Original Work without express prior written + permission of the Licensor. Nothing in this License shall be deemed to + grant any rights to trademarks, copyrights, patents, trade secrets or + any other intellectual property of Licensor except as expressly stated + herein. No patent license is granted to make, use, sell or offer to + sell embodiments of any patent claims other than the licensed claims + defined in Section 2. No right is granted to the trademarks of + Licensor even if such marks are included in the Original Work. Nothing + in this License shall be interpreted to prohibit Licensor from + licensing under different terms from this License any Original Work + that Licensor otherwise would have a right to license. + . + 5) This section intentionally omitted. + . + 6) Attribution Rights. You must retain, in the Source Code of any + Derivative Works that You create, all copyright, patent or trademark + notices from the Source Code of the Original Work, as well as any + notices of licensing and any descriptive text identified therein as an + "Attribution Notice." You must cause the Source Code for any + Derivative Works that You create to carry a prominent Attribution + Notice reasonably calculated to inform recipients that You have + modified the Original Work. + . + 7) Warranty of Provenance and Disclaimer of Warranty. Licensor + warrants that the copyright in and to the Original Work and the patent + rights granted herein by Licensor are owned by the Licensor or are + sublicensed to You under the terms of this License with the permission + of the contributor(s) of those copyrights and patent rights. Except as + expressly stated in the immediately proceeding sentence, the Original + Work is provided under this License on an "AS IS" BASIS and WITHOUT + WARRANTY, either express or implied, including, without limitation, + the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL + WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential + part of this License. No license to Original Work is granted hereunder + except under this disclaimer. + . + 8) Limitation of Liability. Under no circumstances and under no legal + theory, whether in tort (including negligence), contract, or + otherwise, shall the Licensor be liable to any person for any direct, + indirect, special, incidental, or consequential damages of any + character arising as a result of this License or the use of the + Original Work including, without limitation, damages for loss of + goodwill, work stoppage, computer failure or malfunction, or any and + all other commercial damages or losses. This limitation of liability + shall not apply to liability for death or personal injury resulting + from Licensor's negligence to the extent applicable law prohibits such + limitation. Some jurisdictions do not allow the exclusion or + limitation of incidental or consequential damages, so this exclusion + and limitation may not apply to You. + . + 9) Acceptance and Termination. If You distribute copies of the + Original Work or a Derivative Work, You must make a reasonable effort + under the circumstances to obtain the express assent of recipients to + the terms of this License. Nothing else but this License (or another + written agreement between Licensor and You) grants You permission to + create Derivative Works based upon the Original Work or to exercise + any of the rights granted in Section 1 herein, and any attempt to do + so except under the terms of this License (or another written + agreement between Licensor and You) is expressly prohibited by + U.S. copyright law, the equivalent laws of other countries, and by + international treaty. Therefore, by exercising any of the rights + granted to You in Section 1 herein, You indicate Your acceptance of + this License and all of its terms and conditions. + . + 10) Termination for Patent Action. This License shall terminate + automatically and You may no longer exercise any of the rights granted + to You by this License as of the date You commence an action, + including a cross-claim or counterclaim, against Licensor or any + licensee alleging that the Original Work infringes a patent. This + termination provision shall not apply for an action alleging patent + infringement by combinations of the Original Work with other software + or hardware. + . + 11) Jurisdiction, Venue and Governing Law. Any action or suit relating + to this License may be brought only in the courts of a jurisdiction + wherein the Licensor resides or in which Licensor conducts its primary + business, and under the laws of that jurisdiction excluding its + conflict-of-law provisions. The application of the United Nations + Convention on Contracts for the International Sale of Goods is + expressly excluded. Any use of the Original Work outside the scope of + this License or after its termination shall be subject to the + requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101 + et seq., the equivalent laws of other countries, and international + treaty. This section shall survive the termination of this License. + . + 12) Attorneys Fees. In any action to enforce the terms of this License + or seeking damages relating thereto, the prevailing party shall be + entitled to recover its costs and expenses, including, without + limitation, reasonable attorneys' fees and costs incurred in + connection with such action, including any appeal of such action. This + section shall survive the termination of this License. + . + 13) Miscellaneous. This License represents the complete agreement + concerning the subject matter hereof. If any provision of this License + is held to be unenforceable, such provision shall be reformed only to + the extent necessary to make it enforceable. + . + 14) Definition of "You" in This License. "You" throughout this + License, whether in upper or lower case, means an individual or a + legal entity exercising rights under, and complying with all of the + terms of, this License. For legal entities, "You" includes any entity + that controls, is controlled by, or is under common control with + you. For purposes of this definition, "control" means (i) the power, + direct or indirect, to cause the direction or management of such + entity, whether by contract or otherwise, or (ii) ownership of fifty + percent (50%) or more of the outstanding shares, or (iii) beneficial + ownership of such entity. + . + 15) Right to Use. You may use the Original Work in all ways not + otherwise restricted or conditioned by this License or by law, and + Licensor promises not to interfere with or be responsible for such + uses by You. + . + This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights + reserved. Permission is hereby granted to copy and distribute this + license without modification. This license may not be modified without + the express written permission of its copyright owner. diff -Nru dbus-glib-0.100.2/debian/dbus-bus-introspect.xml dbus-glib-0.102/debian/dbus-bus-introspect.xml --- dbus-glib-0.100.2/debian/dbus-bus-introspect.xml 2013-02-25 12:59:22.000000000 +0000 +++ dbus-glib-0.102/debian/dbus-bus-introspect.xml 2014-02-12 15:22:16.000000000 +0000 @@ -67,6 +67,10 @@ + + + + diff -Nru dbus-glib-0.100.2/debian/libdbus-glib-1-2.symbols dbus-glib-0.102/debian/libdbus-glib-1-2.symbols --- dbus-glib-0.100.2/debian/libdbus-glib-1-2.symbols 2013-02-25 12:59:22.000000000 +0000 +++ dbus-glib-0.102/debian/libdbus-glib-1-2.symbols 2014-02-12 15:22:16.000000000 +0000 @@ -9,6 +9,7 @@ dbus_g_connection_get_g_type@Base 0.78 dbus_g_connection_lookup_g_object@Base 0.78 dbus_g_connection_open@Base 0.78 + dbus_g_connection_open_private@Base 0.102 dbus_g_connection_ref@Base 0.78 dbus_g_connection_register_g_object@Base 0.78 dbus_g_connection_unref@Base 0.78 @@ -23,6 +24,7 @@ dbus_g_message_unref@Base 0.78 dbus_g_method_get_reply@Base 0.78 dbus_g_method_get_sender@Base 0.78 + dbus_g_method_invocation_get_g_connection@Base 0.102 dbus_g_method_return@Base 0.78 dbus_g_method_return_error@Base 0.78 dbus_g_method_send_reply@Base 0.78 diff -Nru dbus-glib-0.100.2/debian/rules dbus-glib-0.102/debian/rules --- dbus-glib-0.100.2/debian/rules 2013-02-25 12:59:22.000000000 +0000 +++ dbus-glib-0.102/debian/rules 2014-02-12 15:22:16.000000000 +0000 @@ -13,7 +13,7 @@ dh_auto_configure -- \ --enable-gtk-doc \ --with-introspect-xml=$(CURDIR)/debian/dbus-bus-introspect.xml \ - --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) + $(NULL) override_dh_install: rm -f debian/tmp/usr/lib/*/*.la diff -Nru dbus-glib-0.100.2/depcomp dbus-glib-0.102/depcomp --- dbus-glib-0.100.2/depcomp 2012-07-10 21:28:47.000000000 +0000 +++ dbus-glib-0.102/depcomp 2014-02-12 13:39:29.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -57,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -75,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -86,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -134,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -143,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -157,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -174,15 +232,15 @@ ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -200,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -209,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -217,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -247,9 +299,8 @@ # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -262,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -273,65 +322,113 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -342,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -355,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -366,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -446,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -473,6 +552,7 @@ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -524,13 +604,14 @@ # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -583,10 +664,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -622,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -657,15 +740,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff -Nru dbus-glib-0.100.2/doc/Makefile.in dbus-glib-0.102/doc/Makefile.in --- dbus-glib-0.100.2/doc/Makefile.in 2013-02-25 12:20:15.000000000 +0000 +++ dbus-glib-0.102/doc/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -63,21 +90,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -116,9 +150,29 @@ MANS = $(man_MANS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -148,7 +202,6 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -172,7 +225,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -183,11 +235,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -239,15 +286,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -388,22 +426,25 @@ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -418,57 +459,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -484,12 +480,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -501,15 +492,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -518,24 +505,26 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -696,23 +685,21 @@ uninstall-man: uninstall-man1 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man1 install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-man \ - uninstall-man1 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-man uninstall-man1 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru dbus-glib-0.100.2/doc/reference/html/ch01.html dbus-glib-0.102/doc/reference/html/ch01.html --- dbus-glib-0.100.2/doc/reference/html/ch01.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/ch01.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,12 +3,12 @@ Introduction - + - + @@ -20,8 +20,8 @@ Next
-

-Introduction

+

+Introduction

D-Bus is a message bus system, a simple way for applications to talk to one another.

D-Bus supplies both a system daemon (for events such as "new @@ -55,6 +55,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/ch02.html dbus-glib-0.102/doc/reference/html/ch02.html --- dbus-glib-0.100.2/doc/reference/html/ch02.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/ch02.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,12 +3,12 @@ API Reference - + - + @@ -20,15 +20,15 @@ Next
-

-API Reference

-
+

+API Reference

+
API for using D-BUS with GLib
DBusGConnection — DBus Connection
-DBus GObject related functions — Exporting a GObject remotely +DBus GObject related functionsExporting a GObject remotely
DBusGMessage — DBus Message @@ -63,6 +63,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/ch03.html dbus-glib-0.102/doc/reference/html/ch03.html --- dbus-glib-0.100.2/doc/reference/html/ch03.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/ch03.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,12 +3,12 @@ Tools Reference - + - + @@ -20,14 +20,14 @@ Next
-

-Tools Reference

-
+

+Tools Reference

+
dbus-binding-tool — C language GLib bindings generation utility
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/dbus-binding-tool.html dbus-glib-0.102/doc/reference/html/dbus-binding-tool.html --- dbus-glib-0.100.2/doc/reference/html/dbus-binding-tool.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/dbus-binding-tool.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,11 +3,11 @@ dbus-binding-tool - + - + @@ -32,18 +32,21 @@

[options...] [files...]

-

Description

+

Description

dbus-binding-tool bla bla bla

-

Invocation

+

Invocation

dbus-binding-tool bla bla bla

-

Options

-
+

Options

+
+++ @@ -68,13 +71,13 @@
-

See also

+

See also

glib-genmarshal(1)

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGConnection.html dbus-glib-0.102/doc/reference/html/dbus-glib-DBusGConnection.html --- dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGConnection.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/dbus-glib-DBusGConnection.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,12 +3,12 @@ DBusGConnection - + - + @@ -92,8 +92,11 @@

Expands to a function call returning the boxed GType of a DBusGConnection.

-

--modepretty|glib-server|glib-client
+
+++ @@ -113,8 +116,11 @@ (Internally, calls dbus_bus_get() then calls dbus_connection_setup_with_g_main() on the result.)

-

Returns :

 the GLib type
+
+++ @@ -146,8 +152,11 @@ dbus_connection_setup_with_g_main() on the result; see the documentation of the former function for more information on private connections.

-

type :

+
+++ @@ -191,8 +200,11 @@ (Internally, calls dbus_connection_open() then calls dbus_connection_setup_with_g_main() on the result.)

-

type :

+
+++ @@ -216,8 +228,11 @@

Increment refcount on a DBusGConnection

-

address :

+
+++ @@ -237,8 +252,11 @@

Decrement refcount on a DBusGConnection

-

connection :

+
+++ @@ -252,8 +270,11 @@

Blocks until outgoing calls and signal emissions have been sent.

-

connection :

 the connection to unref
+
+++ @@ -268,8 +289,11 @@ Get the DBusConnection corresponding to this DBusGConnection. The return value does not have its refcount incremented.

-

connection :

 the DBusGConnection to flush
+
+++ @@ -304,8 +328,11 @@ Note: If an object is registered multiple times, the first registration takes priority for cases such as turning an object into an object path.

-

gconnection :

+
+++ @@ -333,8 +360,11 @@ connection. Properties, methods, and signals of the object can no longer be accessed remotely.

-

connection :

+
+++ @@ -355,8 +385,11 @@

FIXME

-

connection :

+
+++ @@ -383,6 +416,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGError.html dbus-glib-0.102/doc/reference/html/dbus-glib-DBusGError.html --- dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGError.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/dbus-glib-DBusGError.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,12 +3,12 @@ DBusGError - + - + @@ -105,6 +105,179 @@ can be found by looking at the comments for the corresponding constants in dbus-protocol.h.

+

connection :
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

DBUS_GERROR_FAILED

 +

DBUS_GERROR_NO_MEMORY

 +

DBUS_GERROR_SERVICE_UNKNOWN

 +

DBUS_GERROR_NAME_HAS_NO_OWNER

 +

DBUS_GERROR_NO_REPLY

 +

DBUS_GERROR_IO_ERROR

 +

DBUS_GERROR_BAD_ADDRESS

 +

DBUS_GERROR_NOT_SUPPORTED

 +

DBUS_GERROR_LIMITS_EXCEEDED

 +

DBUS_GERROR_ACCESS_DENIED

 +

DBUS_GERROR_AUTH_FAILED

 +

DBUS_GERROR_NO_SERVER

 +

DBUS_GERROR_TIMEOUT

 +

DBUS_GERROR_NO_NETWORK

 +

DBUS_GERROR_ADDRESS_IN_USE

 +

DBUS_GERROR_DISCONNECTED

 +

DBUS_GERROR_INVALID_ARGS

 +

DBUS_GERROR_FILE_NOT_FOUND

 +

DBUS_GERROR_FILE_EXISTS

 +

DBUS_GERROR_UNKNOWN_METHOD

 +

DBUS_GERROR_TIMED_OUT

 +

DBUS_GERROR_MATCH_RULE_NOT_FOUND

 +

DBUS_GERROR_MATCH_RULE_INVALID

 +

DBUS_GERROR_SPAWN_EXEC_FAILED

 +

DBUS_GERROR_SPAWN_FORK_FAILED

 +

DBUS_GERROR_SPAWN_CHILD_EXITED

 +

DBUS_GERROR_SPAWN_CHILD_SIGNALED

 +

DBUS_GERROR_SPAWN_FAILED

 +

DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN

 +

DBUS_GERROR_INVALID_SIGNATURE

 +

DBUS_GERROR_INVALID_FILE_CONTENT

 +

DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN

 +

DBUS_GERROR_REMOTE_EXCEPTION

 +
@@ -118,10 +291,13 @@ dbus_g_proxy_end_call(). It will silently return FALSE for errors which are not remote D-BUS exceptions (i.e. with a domain other than DBUS_GERROR or a code other than -DBUS_GERROR_REMOTE_EXCEPTION). +DBUS_GERROR_REMOTE_EXCEPTION).

-
+
+++ @@ -147,10 +323,13 @@ This function may only be invoked on a GError returned from an invocation of a remote method, e.g. via dbus_g_proxy_end_call(). Moreover, you must ensure that the error's domain is DBUS_GERROR, -and the code is DBUS_GERROR_REMOTE_EXCEPTION. +and the code is DBUS_GERROR_REMOTE_EXCEPTION.

-

error :

+
+++ @@ -197,8 +376,11 @@ instead, then the D-Bus error string would be com.example.MyObject.NotHappy.)

-

error :

+
+++ @@ -234,6 +416,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBus-GLib-low-level.html dbus-glib-0.102/doc/reference/html/dbus-glib-DBus-GLib-low-level.html --- dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBus-GLib-low-level.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/dbus-glib-DBus-GLib-low-level.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,12 +3,12 @@ DBus GLib low level - + - + @@ -102,8 +102,11 @@

-

domain :
+
+++ @@ -134,8 +137,11 @@ context B replaces context A as the context monitoring the connection.

-

gerror :

+
+++ @@ -158,8 +164,11 @@ registered with the GLib main loop. The return value does not have its refcount incremented.

-

connection :

+
+++ @@ -189,8 +198,11 @@ context B replaces context A as the context monitoring the connection.

-

connection :

+
+++ @@ -213,8 +225,11 @@ DBusConnection pointer from libdbus. Not to be confused with DBUS_TYPE_G_CONNECTION, which you should usually use instead.

-

server :

+
+++ @@ -231,8 +246,11 @@ DBusMessage pointer from libdbus. Not to be confused with DBUS_TYPE_G_MESSAGE, which you should usually use instead.

-

Returns :

 the GLib type
+
+++ @@ -243,6 +261,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGMessage.html dbus-glib-0.102/doc/reference/html/dbus-glib-DBusGMessage.html --- dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGMessage.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/dbus-glib-DBusGMessage.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,12 +3,12 @@ DBusGMessage - + - + @@ -75,8 +75,11 @@

Expands to a function call returning the boxed GType of a DBusGConnection.

-

Returns :

 the GLib type
+
+++ @@ -90,8 +93,11 @@

Increment refcount on a DBusGMessage

-

Returns :

 the GLib type
+
+++ @@ -111,8 +117,11 @@

Decrement refcount on a DBusGMessage

-

message :

+
+++ @@ -127,8 +136,11 @@ Get the DBusMessage corresponding to this DBusGMessage. The return value does not have its refcount incremented.

-

message :

 the message to unref
+
+++ @@ -150,6 +162,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGMethod.html dbus-glib-0.102/doc/reference/html/dbus-glib-DBusGMethod.html --- dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGMethod.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/dbus-glib-DBusGMethod.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,12 +3,12 @@ DBusGMethod - + - + @@ -77,8 +77,11 @@ stores a mapping from introspection data to a function pointer for a C method to be invoked.

-

gmessage :
+
+++ @@ -89,7 +92,7 @@ - + @@ -114,8 +117,11 @@ to a service which invoked the method at a later time).

-

GCallback function;

Marshaller to invoke method

int data_offset;

int data_offset;

 Offset into the introspection data
+
+++ @@ -138,8 +144,11 @@ Used as a sidedoor when you can't generate dbus values of the correct type due to glib binding limitations

-

context :

+
+++ @@ -164,8 +173,11 @@ Used as a sidedoor when you can't generate dbus values of the correct type due to glib binding limitations

-

context :

+
+++ @@ -187,8 +199,11 @@ Send a return message for a given method invocation, with arguments. This function also frees the sending context.

-

context :

+
+++ @@ -212,8 +227,11 @@ Send a error message for a given method invocation. This function also frees the sending context.

-

context :

+
+++ @@ -234,6 +252,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBus-GObject-related-functions.html dbus-glib-0.102/doc/reference/html/dbus-glib-DBus-GObject-related-functions.html --- dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBus-GObject-related-functions.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/dbus-glib-DBus-GObject-related-functions.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,12 +3,12 @@ DBus GObject related functions - + - + @@ -88,11 +88,14 @@ Introspection data for a GObject, normally autogenerated by a tool such as dbus-binding-tool.

-

context :
+
+++ - + @@ -101,7 +104,7 @@ - + @@ -136,8 +139,11 @@ object registered with dbus_g_connection_register_g_object() can have their methods invoked remotely.

-

int format_version;

int format_version;

 Allows us to change the rest of this struct by adding DBusGObjectInfo2, DBusGObjectInfo3, etc.
Array of method pointers

int n_method_infos;

int n_method_infos;

 Length of the infos array
+
+++ @@ -179,8 +185,11 @@ "a-bork" and "b-bork" and D-Bus requests for "Bork" on either D-Bus interface will not conflict.

-

object_type :

+
+++ @@ -222,8 +231,11 @@

This function will not be needed once GLib includes libffi.

-

iface_type :

+
+++ @@ -253,8 +265,11 @@ Register a GClosureMarshal to be used for signal invocations. see_alsodbus_g_object_register_marshaller()

-

marshaller :
+
+++ @@ -303,6 +318,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGProxy.html dbus-glib-0.102/doc/reference/html/dbus-glib-DBusGProxy.html --- dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGProxy.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/dbus-glib-DBusGProxy.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,12 +3,12 @@ DBusGProxy - + - + @@ -92,7 +92,7 @@ ...); gbooleandbus_g_proxy_call_with_timeout (DBusGProxy *proxy, const char *method, - int timeout, + int timeout, GError **error, GType first_arg_type, ...); @@ -113,7 +113,7 @@ DBusGProxyCallNotify notify, gpointer user_data, GDestroyNotify destroy, - int timeout, + int timeout, GType first_arg_type, ...); gbooleandbus_g_proxy_end_call (DBusGProxy *proxy, @@ -124,7 +124,7 @@ voiddbus_g_proxy_cancel_call (DBusGProxy *proxy, DBusGProxyCall *call); voiddbus_g_proxy_set_default_timeout (DBusGProxy *proxy, - int timeout); + int timeout);
@@ -164,8 +164,11 @@ Use dbus_g_proxy_end_call() to see whether call_id succeeded or failed, and get the arguments returned (if any) on success.

-

marshaller :
+
+++ @@ -211,8 +214,11 @@ disappears. If a well-known name changes owner, the proxy will still be alive.

-

proxy :

+
+++ @@ -262,8 +268,11 @@ dbus_g_proxy_new_for_name_owner() will bind to the unique name of that owner rather than the generic name.

-

connection :

+
+++ @@ -302,8 +311,11 @@ Creates a proxy using an existing proxy as a template, substituting the specified interface and path. Either or both may be NULL.

-

connection :

+
+++ @@ -337,8 +349,11 @@ we're doing a simple 1-to-1 communication between two applications.

-

proxy :

+
+++ @@ -371,8 +386,11 @@ It is an error to call this method on a proxy that has emitted the "destroy" signal.

-

connection :

+
+++ @@ -396,8 +414,11 @@ It is an error to call this method on a proxy that has emitted the "destroy" signal.

-

proxy :

+
+++ @@ -426,8 +447,11 @@ It is an error to call this method on a proxy that has emitted the "destroy" signal.

-

proxy :

+
+++ @@ -451,8 +475,11 @@ It is an error to call this method on a proxy that has emitted the "destroy" signal.

-

proxy :

+
+++ @@ -485,8 +512,11 @@ It is also an error to call this method on a proxy that has emitted the "destroy" signal.

-

proxy :

+
+++ @@ -525,8 +555,11 @@ It is an error to call this method on a proxy that has emitted the "destroy" signal.

-

proxy :

+
+++ @@ -566,8 +599,11 @@ It is an error to call this method on a proxy that has emitted the "destroy" signal.

-

proxy :

+
+++ @@ -615,8 +651,11 @@ It is an error to call this method on a proxy that has emitted the "destroy" signal.

-

proxy :

+
+++ @@ -654,8 +693,11 @@ It is an error to call this method on a proxy that has emitted the "destroy" signal.

-

proxy :

+
+++ @@ -692,7 +734,7 @@

dbus_g_proxy_call_with_timeout ()

gboolean            dbus_g_proxy_call_with_timeout      (DBusGProxy *proxy,
                                                          const char *method,
-                                                         int timeout,
+                                                         int timeout,
                                                          GError **error,
                                                          GType first_arg_type,
                                                          ...);
@@ -708,8 +750,11 @@ It is an error to call this method on a proxy that has emitted the "destroy" signal.

-

proxy :
+
+++ @@ -763,8 +808,11 @@ TODO: this particular function shouldn't die on out of memory, since you should be able to do a call with large arguments.

-

proxy :

+
+++ @@ -814,8 +862,11 @@ TODO this particular function shouldn't die on out of memory, since you should be able to do a call with large arguments.

-

proxy :

+
+++ @@ -864,7 +915,7 @@ DBusGProxyCallNotify notify, gpointer user_data, GDestroyNotify destroy, - int timeout, + int timeout, GType first_arg_type, ...);

@@ -884,8 +935,11 @@ TODO this particular function shouldn't die on out of memory, since you should be able to do a call with large arguments.

-

proxy :
+
+++ @@ -953,8 +1007,11 @@ method are stored in the provided varargs list. The list should be terminated with G_TYPE_INVALID.

-

proxy :

+
+++ @@ -1003,8 +1060,11 @@ It is an error to call this method on a proxy that has emitted the "destroy" signal.

-

proxy :

+
+++ @@ -1022,7 +1082,7 @@

dbus_g_proxy_set_default_timeout ()

void                dbus_g_proxy_set_default_timeout    (DBusGProxy *proxy,
-                                                         int timeout);
+ int timeout);

Sets the default timeout to use for a proxy. This timeout will be used in calls where the timeout is not specified, or is specified to be -1. @@ -1041,8 +1101,11 @@ It is an error to call this method on a proxy that has emitted the "destroy" signal.

-

proxy :

+
+++ @@ -1064,6 +1127,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/dbus-glib.devhelp2 dbus-glib-0.102/doc/reference/html/dbus-glib.devhelp2 --- dbus-glib-0.100.2/doc/reference/html/dbus-glib.devhelp2 2013-02-25 12:24:40.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/dbus-glib.devhelp2 2014-02-12 13:41:13.000000000 +0000 @@ -148,6 +148,39 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru dbus-glib-0.100.2/doc/reference/html/dbus-glib-Specializable-GType-System.html dbus-glib-0.102/doc/reference/html/dbus-glib-Specializable-GType-System.html --- dbus-glib-0.100.2/doc/reference/html/dbus-glib-Specializable-GType-System.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/dbus-glib-Specializable-GType-System.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,12 +3,12 @@ Specializable GType System - + - + @@ -239,8 +239,11 @@ A library-user-supplied function, called for each element in the collection when dbus_g_type_collection_value_iterate() is called.

-

proxy :
+
+++ @@ -265,8 +268,11 @@ A library-user-supplied function, called for each key/value pair in the collection when dbus_g_type_map_value_iterate() is called.

-

value :

+
+++ @@ -297,8 +303,11 @@

A context for appending. There are more fields, which are private.

-

key_val :

+
+++ @@ -318,8 +327,11 @@

-

GValue *val;

+
+++ @@ -343,8 +355,11 @@ can use information from type (for instance to free the contents of a container before freeing the actual container).

-

type :

+
+++ @@ -368,8 +383,11 @@ can use information from type (for instance to copy each element of a collection).

-

type :

+
+++ @@ -408,8 +426,11 @@ There are additional members, which are reserved for future expansion and must be NULL.

-

type :

+
+++ @@ -445,8 +466,11 @@ Implements dbus_g_type_collection_get_fixed() for a GValue with type type, containing instance.

-

DBusGTypeSpecializedConstructor constructor;

+
+++ @@ -487,8 +511,11 @@ Implements dbus_g_type_collection_value_iterate() for a GValue with type type, containing instance.

-

type :

+
+++ @@ -523,8 +550,11 @@

This function should use the val and specialization_type members of ctx.

-

type :

+
+++ @@ -549,8 +579,11 @@

This function should use the val and specialization_type members of ctx.

-

ctx :

+
+++

ctx :

 an appending context returned by dbus_g_type_specialized_init_append() @@ -574,8 +607,11 @@ on user-defined types. At least iterator and append_func must be implemented.

-
+
+++ @@ -618,8 +654,11 @@ Implements dbus_g_type_map_value_iterate() for a GValue with type type, containing instance.

-

DBusGTypeSpecializedVtable base_vtable;

+
+++ @@ -656,8 +695,11 @@ This function should use the val and specialization_type members of ctx, and replace any existing value with key equal to key.

-

type :

+
+++ @@ -688,8 +730,11 @@ A table of methods used to implement specialized collection behaviour on user-defined types. Both methods must be implemented.

-

ctx :

+
+++ @@ -720,8 +765,11 @@ Implements dbus_g_type_struct_get_member() for a GValue with type type, containing instance.

-

DBusGTypeSpecializedVtable base_vtable;

+
+++ @@ -762,8 +810,11 @@ Implements dbus_g_type_struct_set_member() for a GValue with type type, containing instance.

-

type :

+
+++ @@ -805,8 +856,11 @@ A table of methods used to implement specialized collection behaviour on user-defined types. Both methods must be implemented.

-

type :

+
+++ @@ -832,8 +886,11 @@ Gets a GType for a particular collection instance, creating the type if not already created.

-

DBusGTypeSpecializedVtable base_vtable;

+
+++ @@ -861,8 +918,11 @@ Gets a GType for a particular map instance, creating the type if not already created.

-

container :

+
+++ @@ -895,8 +955,11 @@ Gets a GType for a particular struct instance, creating the type if not already created.

-

container :

+
+++ @@ -927,8 +990,11 @@ Varags methsod to get a GType for a particular struct instance, creating the type if not already created.

-

container :

+
+++ @@ -957,8 +1023,11 @@

Tests if a given GType is a collection.

-

container :

+
+++ @@ -979,8 +1048,11 @@ Tests if a given GType is a map, i.e. it was created with dbus_g_type_get_map().

-

gtype :

+
+++ @@ -1001,8 +1073,11 @@ Tests if a given GType is a struct, i.e. it was created with dbus_g_type_get_struct()

-

gtype :
+
+++ @@ -1024,8 +1099,11 @@ Return the type of each element in collections of type gtype. It is an error to call this function on a non-collection type.

-

gtype :

+
+++ @@ -1048,8 +1126,11 @@ Return the type of the keys in maps of type gtype. It is an error to call this function on a non-map type.

-

gtype :

+
+++ @@ -1072,8 +1153,11 @@ Return the type of the values in maps of type gtype. It is an error to call this function on a non-map type.

-

gtype :

+
+++ @@ -1095,8 +1179,11 @@ Get the type of a member of a specialized struct. It is an error to call this function on a non-struct type.

-

gtype :

+
+++ @@ -1124,8 +1211,11 @@ Get the number of members in a specialized struct. It is an error to call this function on a non-struct type.

-

gtype :

+
+++ @@ -1149,8 +1239,11 @@ dbus_g_type_get_collection("GArray", G_TYPE_INT), then this will return a GArray with element_size of sizeof(int)

-

gtype :

+
+++ @@ -1174,8 +1267,11 @@ Create a new context for adding elements to a collection or key/value pairs to a map. You generally don't need or want to use this..

-

gtype :

+
+++ @@ -1197,8 +1293,11 @@

Appends a given element to the end of a collection.

-

value :

+
+++ @@ -1220,8 +1319,11 @@

Finish appending elements to a given collection

-

ctx :

+
+++

ctx :

 a context created by dbus_g_type_specialized_init_append() @@ -1238,8 +1340,11 @@

Inserts the given key/value pair into the map instance.

-
+
+++ @@ -1283,8 +1388,11 @@ Specialized GArrays are the only types provided by dbus-glib that can be used with this function; user-defined types might also work.

-

ctx :

+
+++ @@ -1323,8 +1431,11 @@ user_data parameter. The collection may not be modified while iterating over it.

-

value :

+
+++ @@ -1354,8 +1465,11 @@ user_data parameter. The map may not be modified while iterating over it.

-

value :

+
+++ @@ -1384,8 +1498,11 @@ was the correct type for that member, e.g. as returned by dbus_g_type_get_struct_member_type

-

value :
+
+++ @@ -1417,8 +1534,11 @@ Sets a given member of a struct to a new value. The type of src must match the existing type of member member of the struct.

-

value :

+
+++ @@ -1450,8 +1570,11 @@ Collects the selected values of this struct into the return locations provided.

-

value :

+
+++ @@ -1485,8 +1608,11 @@

Sets the selected members of the struct in value.

-

value :

+
+++ @@ -1532,8 +1658,11 @@

Defines a new collection container.

-

value :

+
+++ @@ -1559,8 +1688,11 @@

Defines a new map container.

-

name :

+
+++ @@ -1585,8 +1717,11 @@

Peek the vtable for a given map specialization

-

name :

+
+++ @@ -1607,8 +1742,11 @@

Peek the vtable for a given collection specialization

-

map_type :

+
+++ @@ -1629,8 +1767,11 @@

Peek the vtable for a given struct specialization

-

collection_type :

+
+++ @@ -1652,8 +1793,11 @@

Defines a new struct container.

-

struct_type :

+
+++ @@ -1684,8 +1828,11 @@ dbus_g_type_get_struct(). Providing any other type is a programming error (including as a child type).

-

name :

+
+++ @@ -1712,8 +1859,11 @@ It is an error if variant contains any GVariant extensions not supported by dbus-glib, including handles (file descriptor passing) and 'maybe' types.

-

value :

+
+++ @@ -1846,8 +1996,11 @@ but have a distinct boxed type to allow them to be distinguished when stored in a GValue.

-

variant :

+
+++

Returns :

 a type derived from G_TYPE_BOXED @@ -1882,8 +2035,11 @@ but have a distinct boxed type to allow them to be distinguished when stored in a GValue.

-
+
+++

Returns :

 a type derived from G_TYPE_BOXED @@ -1895,6 +2051,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/index.html dbus-glib-0.102/doc/reference/html/index.html --- dbus-glib-0.100.2/doc/reference/html/index.html 2013-02-25 12:24:41.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/index.html 2014-02-12 13:41:13.000000000 +0000 @@ -3,10 +3,10 @@ D-Bus GLib bindings - Reference Manual - + - + @@ -14,12 +14,12 @@
-

for version 0.100.2 +

for version 0.102

-
+
Introduction
API Reference
@@ -28,7 +28,7 @@ DBusGConnection — DBus Connection
-DBus GObject related functions — Exporting a GObject remotely +DBus GObject related functionsExporting a GObject remotely
DBusGMessage — DBus Message @@ -57,6 +57,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff -Nru dbus-glib-0.100.2/doc/reference/html/index.sgml dbus-glib-0.102/doc/reference/html/index.sgml --- dbus-glib-0.100.2/doc/reference/html/index.sgml 2013-02-25 12:24:40.000000000 +0000 +++ dbus-glib-0.102/doc/reference/html/index.sgml 2014-02-12 13:41:13.000000000 +0000 @@ -60,6 +60,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru dbus-glib-0.100.2/doc/reference/Makefile.in dbus-glib-0.102/doc/reference/Makefile.in --- dbus-glib-0.100.2/doc/reference/Makefile.in 2013-02-25 12:21:06.000000000 +0000 +++ dbus-glib-0.102/doc/reference/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,8 +83,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make +DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(srcdir)/version.xml.in subdir = doc/reference ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ @@ -70,12 +97,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -83,8 +116,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -108,7 +141,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -119,11 +151,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -175,15 +202,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -385,6 +403,42 @@ @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; + # Files not to distribute # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt @@ -438,11 +492,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -583,18 +637,18 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local @ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -604,35 +658,28 @@ $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp - -#### scan #### + $(AM_V_at)touch setup-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -647,22 +694,19 @@ test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -670,28 +714,20 @@ $(srcdir)/tmpl/*.sgml: @true -#### xml #### - sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -712,16 +748,12 @@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -738,7 +770,7 @@ done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -754,7 +786,7 @@ rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -790,7 +822,7 @@ # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff -Nru dbus-glib-0.100.2/doc/reference/tmpl/dbus-gconnection.sgml dbus-glib-0.102/doc/reference/tmpl/dbus-gconnection.sgml --- dbus-glib-0.100.2/doc/reference/tmpl/dbus-gconnection.sgml 2013-02-25 12:24:40.000000000 +0000 +++ dbus-glib-0.102/doc/reference/tmpl/dbus-gconnection.sgml 2014-02-12 13:41:13.000000000 +0000 @@ -9,13 +9,11 @@ - - diff -Nru dbus-glib-0.100.2/doc/reference/tmpl/dbus-gerror.sgml dbus-glib-0.102/doc/reference/tmpl/dbus-gerror.sgml --- dbus-glib-0.100.2/doc/reference/tmpl/dbus-gerror.sgml 2013-02-25 12:24:40.000000000 +0000 +++ dbus-glib-0.102/doc/reference/tmpl/dbus-gerror.sgml 2014-02-12 13:41:13.000000000 +0000 @@ -9,13 +9,11 @@ - - diff -Nru dbus-glib-0.100.2/doc/reference/tmpl/dbus-glib-lowlevel.sgml dbus-glib-0.102/doc/reference/tmpl/dbus-glib-lowlevel.sgml --- dbus-glib-0.100.2/doc/reference/tmpl/dbus-glib-lowlevel.sgml 2013-02-25 12:24:40.000000000 +0000 +++ dbus-glib-0.102/doc/reference/tmpl/dbus-glib-lowlevel.sgml 2014-02-12 13:41:13.000000000 +0000 @@ -9,13 +9,11 @@ - - diff -Nru dbus-glib-0.100.2/doc/reference/tmpl/dbus-gmessage.sgml dbus-glib-0.102/doc/reference/tmpl/dbus-gmessage.sgml --- dbus-glib-0.100.2/doc/reference/tmpl/dbus-gmessage.sgml 2013-02-25 12:24:40.000000000 +0000 +++ dbus-glib-0.102/doc/reference/tmpl/dbus-gmessage.sgml 2014-02-12 13:41:13.000000000 +0000 @@ -9,13 +9,11 @@ - - diff -Nru dbus-glib-0.100.2/doc/reference/tmpl/dbus-gmethod.sgml dbus-glib-0.102/doc/reference/tmpl/dbus-gmethod.sgml --- dbus-glib-0.100.2/doc/reference/tmpl/dbus-gmethod.sgml 2013-02-25 12:24:40.000000000 +0000 +++ dbus-glib-0.102/doc/reference/tmpl/dbus-gmethod.sgml 2014-02-12 13:41:13.000000000 +0000 @@ -9,13 +9,11 @@ - - diff -Nru dbus-glib-0.100.2/doc/reference/tmpl/dbus-gobject.sgml dbus-glib-0.102/doc/reference/tmpl/dbus-gobject.sgml --- dbus-glib-0.100.2/doc/reference/tmpl/dbus-gobject.sgml 2013-02-25 12:24:40.000000000 +0000 +++ dbus-glib-0.102/doc/reference/tmpl/dbus-gobject.sgml 2014-02-12 13:41:13.000000000 +0000 @@ -9,13 +9,11 @@ - - diff -Nru dbus-glib-0.100.2/doc/reference/tmpl/dbus-gproxy.sgml dbus-glib-0.102/doc/reference/tmpl/dbus-gproxy.sgml --- dbus-glib-0.100.2/doc/reference/tmpl/dbus-gproxy.sgml 2013-02-25 12:24:40.000000000 +0000 +++ dbus-glib-0.102/doc/reference/tmpl/dbus-gproxy.sgml 2014-02-12 13:41:13.000000000 +0000 @@ -9,13 +9,11 @@ - - diff -Nru dbus-glib-0.100.2/doc/reference/tmpl/dbus-gtype-specialized.sgml dbus-glib-0.102/doc/reference/tmpl/dbus-gtype-specialized.sgml --- dbus-glib-0.100.2/doc/reference/tmpl/dbus-gtype-specialized.sgml 2013-02-25 12:24:40.000000000 +0000 +++ dbus-glib-0.102/doc/reference/tmpl/dbus-gtype-specialized.sgml 2014-02-12 13:41:13.000000000 +0000 @@ -9,13 +9,11 @@ - - diff -Nru dbus-glib-0.100.2/doc/reference/version.xml dbus-glib-0.102/doc/reference/version.xml --- dbus-glib-0.100.2/doc/reference/version.xml 2013-02-25 12:21:09.000000000 +0000 +++ dbus-glib-0.102/doc/reference/version.xml 2014-02-12 13:39:35.000000000 +0000 @@ -1 +1 @@ -0.100.2 +0.102 diff -Nru dbus-glib-0.100.2/gtk-doc.make dbus-glib-0.102/gtk-doc.make --- dbus-glib-0.100.2/gtk-doc.make 2012-03-19 06:21:57.000000000 +0000 +++ dbus-glib-0.102/gtk-doc.make 2013-08-29 13:53:13.000000000 +0000 @@ -74,33 +74,42 @@ #### setup #### +GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; + setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp + $(AM_V_at)touch setup-build.stamp #### scan #### +GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; + +GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -115,22 +124,25 @@ test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true #### templates #### +GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files"; + tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -140,26 +152,34 @@ #### xml #### +GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0=@echo " DOC Building XML"; + sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true #### html #### +GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; + +GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -180,16 +200,18 @@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp #### pdf #### +GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; + pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -206,7 +228,7 @@ done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -222,7 +244,7 @@ rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -259,7 +281,7 @@ # Require gtk-doc when making dist # if ENABLE_GTK_DOC -dist-check-gtkdoc: +dist-check-gtkdoc: docs else dist-check-gtkdoc: @echo "*** gtk-doc must be installed and enabled in order to make dist" diff -Nru dbus-glib-0.100.2/HACKING dbus-glib-0.102/HACKING --- dbus-glib-0.100.2/HACKING 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/HACKING 2014-01-14 11:21:24.000000000 +0000 @@ -10,13 +10,13 @@ history of your changes. When you consider changes ready for merging to mainline, use -"git-format-patch" or otherwise generate diffs. Post those diffs +"git-format-patch" or otherwise generate unified diffs. Post those diffs to a new bug at http://bugs.freedesktop.org, project DBus, component GLib. For nontrivial changes *please* try to extend the test suite to cover it. The -test infrastructure is in test/core/, and currently there are a lot of tests -in the single file test/core/test-dbus-glib.c. Extending this file is -suggested (in the future we would like to break this file up). +test infrastructure is in test/core/. If possible, use a GTester-style test +like registrations.c; or if necessary, add things to the giant catch-all +test, test-dbus-glib.c. Run "make check" to run the test suite. @@ -54,6 +54,7 @@ * make distcheck * edit configure.ac, change version to even (e.g. 0.75 -> 0.76) * also in configure.ac, update LT_CURRENT, LT_REVISION and LT_AGE +* edit NEWS, summarize notable changes since the last release * ./autogen.sh * make * make distcheck @@ -64,6 +65,8 @@ * edit configure.ac, change version to odd (e.g. 0.76 -> 0.77) * git commit -m "Bump version for development" * Update the wiki: http://www.freedesktop.org/wiki/Software/DBusBindings -* Announce the release on the mailing list, summarizing notable changes. +* Announce the release on the mailing list, quoting the notable changes + from NEWS. -NEWS is unmaintained. +NEWS is now maintained again (Simon finds it easier this way, and he +does most of the releases). diff -Nru dbus-glib-0.100.2/install-sh dbus-glib-0.102/install-sh --- dbus-glib-0.100.2/install-sh 2012-07-10 21:28:47.000000000 +0000 +++ dbus-glib-0.102/install-sh 2014-02-12 13:39:28.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ 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-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff -Nru dbus-glib-0.100.2/ltmain.sh dbus-glib-0.102/ltmain.sh --- dbus-glib-0.100.2/ltmain.sh 2012-11-24 00:13:31.000000000 +0000 +++ dbus-glib-0.102/ltmain.sh 2014-02-10 12:45:56.000000000 +0000 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.2" +VERSION="2.4.2 Debian-2.4.2-1.7" TIMESTAMP="" package_revision=1.3337 diff -Nru dbus-glib-0.100.2/m4/gtk-doc.m4 dbus-glib-0.102/m4/gtk-doc.m4 --- dbus-glib-0.100.2/m4/gtk-doc.m4 2012-03-19 06:21:57.000000000 +0000 +++ dbus-glib-0.102/m4/gtk-doc.m4 2013-08-29 13:53:13.000000000 +0000 @@ -37,7 +37,7 @@ dnl don't check for glib if we build glib if test "x$PACKAGE_NAME" != "xglib"; then dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) fi fi @@ -58,6 +58,10 @@ enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) diff -Nru dbus-glib-0.100.2/m4/libtool.m4 dbus-glib-0.102/m4/libtool.m4 --- dbus-glib-0.100.2/m4/libtool.m4 2012-11-24 00:13:31.000000000 +0000 +++ dbus-glib-0.102/m4/libtool.m4 2014-02-10 12:45:56.000000000 +0000 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1333,7 +1333,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1355,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -Nru dbus-glib-0.100.2/m4/Makefile.in dbus-glib-0.102/m4/Makefile.in --- dbus-glib-0.100.2/m4/Makefile.in 2013-02-25 12:21:06.000000000 +0000 +++ dbus-glib-0.102/m4/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -63,12 +90,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -76,8 +109,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -101,7 +134,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -112,11 +144,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -168,15 +195,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -270,11 +288,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -410,15 +428,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru dbus-glib-0.100.2/Makefile.am dbus-glib-0.102/Makefile.am --- dbus-glib-0.100.2/Makefile.am 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/Makefile.am 2014-01-14 11:21:24.000000000 +0000 @@ -47,7 +47,10 @@ gpg --verify @PACKAGE@-@VERSION@.tar.gz.asc rsync -vzP @PACKAGE@-@VERSION@.tar.gz dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc - rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX $(srcdir)/docs/reference/html/ \ + rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX doc/reference/html/ \ dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/@PACKAGE@/ +check-valgrind: all + $(MAKE) -C test check-valgrind + include tools/lcov.am diff -Nru dbus-glib-0.100.2/Makefile.in dbus-glib-0.102/Makefile.in --- dbus-glib-0.100.2/Makefile.in 2013-02-25 12:21:06.000000000 +0000 +++ dbus-glib-0.102/Makefile.in 2014-02-12 13:39:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,23 +38,51 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -74,16 +101,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/dbus-glib-1-uninstalled.pc.in \ - $(srcdir)/dbus-glib-1.pc.in $(srcdir)/tools/lcov.am \ - $(top_srcdir)/configure \ - $(top_srcdir)/test/data/valid-service-files/debug-echo.service.in \ +DIST_COMMON = $(srcdir)/tools/lcov.am INSTALL NEWS README AUTHORS \ + ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in \ $(top_srcdir)/test/data/valid-service-files/debug-glib.service.in \ + $(top_srcdir)/test/data/valid-service-files/debug-echo.service.in \ $(top_srcdir)/test/data/valid-service-files/interfaces-test.service.in \ - AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \ - depcomp install-sh ltmain.sh missing + $(srcdir)/dbus-glib-1.pc.in \ + $(srcdir)/dbus-glib-1-uninstalled.pc.in COPYING compile \ + config.guess config.sub install-sh missing ltmain.sh subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ @@ -101,21 +128,28 @@ test/data/valid-service-files/interfaces-test.service \ dbus-glib-1.pc dbus-glib-1-uninstalled.pc CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -152,11 +186,33 @@ DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -166,6 +222,7 @@ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -193,11 +250,11 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -221,7 +278,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -232,11 +288,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -288,15 +339,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -406,8 +448,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -461,22 +503,25 @@ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -491,57 +536,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -557,12 +557,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -574,15 +569,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -591,9 +582,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -661,40 +674,42 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' 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 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -705,8 +720,6 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -718,18 +731,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -752,7 +766,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -892,25 +906,24 @@ uninstall-am: uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-pkgconfigDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-pkgconfigDATA ChangeLog: @@ -937,9 +950,12 @@ gpg --verify @PACKAGE@-@VERSION@.tar.gz.asc rsync -vzP @PACKAGE@-@VERSION@.tar.gz dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc - rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX $(srcdir)/docs/reference/html/ \ + rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX doc/reference/html/ \ dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/@PACKAGE@/ +check-valgrind: all + $(MAKE) -C test check-valgrind + lcov-reset: lcov --directory @top_srcdir@ --zerocounters diff -Nru dbus-glib-0.100.2/missing dbus-glib-0.102/missing --- dbus-glib-0.100.2/missing 2012-07-10 21:28:47.000000000 +0000 +++ dbus-glib-0.102/missing 2014-02-12 13:39:28.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru dbus-glib-0.100.2/NEWS dbus-glib-0.102/NEWS --- dbus-glib-0.100.2/NEWS 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/NEWS 2014-02-12 13:37:49.000000000 +0000 @@ -1,9 +1,384 @@ -== IMPORTANT NOTE: This file isn't maintained anymore == +dbus-glib is deprecated, please use GDBus in new GLib-based projects. -Release summaries are done on the mailing list and linked -through the wiki. +dbus-glib 0.102 (2014-02-12) +============================ -== END IMPORTANT NOTE == +The “I've come to the conclusion that Debian should choose Russ Allbery +to be its new init system” release. [1] + +Enhancements: + +• Add dbus_g_method_invocation_get_connection (fd.o #55729, Dan Williams) + +• Add dbus_g_connection_open_private (fd.o #55730, Dan Williams) + +• Better regression tests (fd.o #23633, fd.o #40711, fd.o #41129, fd.o #51511, + fd.o #68603; Simon McVittie, Dan Williams) + +• Get rid of more dead code (fd.o #40711, Simon McVittie) + +• dbus-binding-tool: check validity of names (fd.o #7909, Simon McVittie) + +Fixes: + +• dbus_g_value_build_g_variant: treat GValues containing (G_TYPE_STRING, NULL) + or (G_TYPE_STRV, NULL) as empty string or empty array instead of asserting + (fd.o #71811, Xavier Claessens) + +• Upload documentation correctly (Simon McVittie) + +• Fix under-linking (fd.o #68601, Simon McVittie) + +[1] credit: https://twitter.com/keybuk/status/433058371290157056 + +dbus-glib 0.100.2 (2013-02-25) +============================== + +The "I would prefer lengthier studies, and fewer explosions" release. + +This release is a respin of the 0.100.1 tarball to drop some old, +broken versions of generated documentation files (fd.o #55830). There +are no source changes. + +dbus-glib 0.100.1 (2013-02-15) +============================== + +Security: + +• Sebastian Krahmer discovered and published an authentication bypass + vulnerability in pam_fprintd, caused by a bug in dbus-glib. It is + possible that other users of dbus-glib can be exploited in the same + way. CVE-2013-0292 has been allocated for this vulnerability. + + This vulnerability is fixed in dbus-glib version 0.100.1 by git commit + 166978a. All users of dbus-glib should upgrade. + + (fd.o #60916; Colin Walters, Simon McVittie) + +dbus-glib 0.100 (2012-06-25) +============================ + +The "Flabbergasted Jerome" release. + +Enhancements: + +• Support building on Android with androgenizer + (fd.o #42532, Derek Foreman) + +• Respect NOCONFIGURE=1 in autogen.sh (Colin Walters) + +Fixes: + +• Fix several GVariant reference leaks in dbus_g_value_parse_variant + (fd.o #41125, Simon McVittie) + +• Don't crash if an error code is out of range for its domain or + has a negative code (fd.o #40151; David Woodhouse, Simon McVittie) + +• Fix compilation with -Werror=format-security (Matthias Klose) + +• Don't crash if dbus_g_proxy_new_for_peer() is used to talk to + the dbus-daemon (fd.o #41126, Simon McVittie) + +dbus-glib 0.98 (2011-09-30) +=========================== + +The "undocumented feature" release. + +• Fix the documentation, a lot. We have nearly 100% coverage now. + (fd.o #37793, smcv) + +• In specialized collection iterators, check that the type is correct; + g_critical and return harmlessly, rather than crashing, if not (smcv) + +• If library users register specialized GTypes, warn if their vtables have + missing callbacks which would cause accessors to crash (smcv) + +• Fix production of documentation out-of-tree with newer gtk-doc (smcv) + +• Simplify invoke_object_method() and OOM handling in dbus-gobject + (fd.o #35767, smcv) + +dbus-glib 0.96 (2011-09-21) +=========================== + +The "terminating at New Cross Gate" release. + +• Fix a regression in marshalling GObject instances as object paths, + which broke NetworkManager (fd.o #37852, Debian #628890; Simon McVittie) + +• Fix crashes when sending a message when disconnected from D-Bus but still + working through our backlog of incoming messages, similar to fd.o #12675 + (fd.o #38406, Simon McVittie) + +• Cope more gracefully, with a critical warning instead of a memory leak, + if programmer error causes G_VALUE_COLLECT to fail + (fd.o #38406, NB#86280, NB#180486; Kimmo Hämäläinen, Christian Dywan, + Simon McVittie) + +• Avoid an assertion failure when unregistering a proxy if GetNameOwner failed + (fd.o #38408, NB#116862; Janne Karhunen, Simon McVittie) + +• Don't report various programmer errors as "out of memory"; raise suitable + critical warnings instead, and don't leak memory (fd.o #35767, fd.o #35766; + Simon McVittie) + +• If a remote process sends a wrong method call on the Properties interface, + send back an error reply, instead of warning on stderr and not replying + (fd.o #35766, Simon McVittie) + +• Show a warning if dbus_g_method_return fails to marshal something + (fd.o #29884, NB#180486; Christian Dywan, Simon McVittie) + +• Remove remnants of i18n (fd.o #36428, Simon McVittie) + +• Remove dead code (NB#180486; Christian Dywan) + +dbus-glib 0.94 (2011-06-01) +=========================== + +The "Norwegian Blue" release. + +Dependencies: + +* dbus 1.2.16 is required (dbus 1.4 is recommended) + +* GIO 2.26 (packaged with GLib) is required + +Fixes: + +* fd.o #10890: remove Doxygen support, to clarify that gtk-doc + is the way to get dbus-glib documentation (Simon McVittie) + +* fd.o #22667: improve documentation (Will Thompson) + +* fd.o #22854: update libtool versioning (Simon McVittie) + +* fd.o #23616: document which DBusGProxy methods stop working on ::destroy, + and improve precondition checks (Simon McVittie) + +* fd.o #26952: add infrastructure to upload tarballs and documentation + (Simon McVittie) + +* fd.o #27193, Gentoo #254192: don't use ${SHELL} to run shell scripts + (Simon McVittie) + +* fd.o #27598: allow signals and properties to be annotated + (Christian Dywan, Simon McVittie) + +* fd.o #29884: improve error handling in various places + (Christian Dywan) + +* fd.o #30171: check validity of more arguments, don't report + "out of memory" or "should not have been reached" if an invalid string or + boolean is given, and abandon broken containers more gracefully + (Simon McVittie) + +* fd.o #30274: allow underscores in error names (Christian Dywan) + +* fd.o #32087: if an object is on more than one connection, emit signals + on all of them; if it's unregistered, only unregister it from the + requested connection (Simon McVittie) + +* fd.o #32351: fix memory leaks in dbus-binding-tool (Christian Dywan) + +* fd.o #33145, fd.o #37789: improve error output if dependencies are too old + (Simon McVittie) + +* fd.o #33646: don't duplicate match rules (Alban Crequy) + +* fd.o #34282: fix linking order for modern ld (Robert Ancell) + +* fd.o #35115: fix ability to switch a DBusConnection from one GMainContext + to another (Mike Gorse) + +* fd.o #35952: forbid a ReturnVal annotation after the first OUT , + which had never worked correctly anyway (Simon McVittie) + +* fd.o #36216: remove false claim that we use Introspect() at runtime, + and document more error cases (Simon McVittie) + +* fd.o #36428: remove unused support for translated messages + (Simon McVittie) + +* fd.o #36793: don't corrupt internal data if a GObject is registered + twice on the same (connection, path) tuple, and fix out-of-bounds reading + (Simon McVittie) + +* fd.o #36811: fix multiple signal emissions if an object is removed from + all of its locations then re-exported, and a memory leak if an exported + object is disposed (Simon McVittie) + +* fd.o #37060: rebuild everything if gcov is enabled/disabled, or if gcc + is upgraded while gcov is enabled (Simon McVittie) + +* fd.o #37062: fail to build if our assumptions about int sizes are not + met, and remove useless variables detected by gcc 4.6 (Simon McVittie) + +* fd.o #37790: remove empty "tests" which don't test anything + (Simon McVittie) + +* fd.o #37795: log the error message if object registration fails + (Dan Williams) + +* fd.o #37812: delete temporary file if dbus-binding-tool fails + (Simon McVittie) + +dbus-glib 0.92 (2010-11-10) +=========================== + +Fixes: + +* check for GLib 2.26 correctly + +dbus-glib 0.90 (2010-11-07) +=========================== + +Dependencies: + +* GLib 2.26 is required + +Enhancements: + +* Add DBusGObjectPath, DBusGSignature typedefs +* Give specialized GArrays iteration/appending support +* Test dbus_g_value_build_g_variant for various fixed arrays +* Remove gcov decoder, which hasn't worked since dbus-glib left libdbus +* replace remnants of gcov support with lcov.am from telepathy-glib +* fd.o #30428: add dbus_g_value_parse_g_variant +* dbus_g_type_specialized_map_append: document that the value contents are + stolen + +Fixes: + +* Remove unused method attribute variables in introspect_interfaces +* Dereference main loop once variant recursion test is done +* Plug leak of expected_str in threaded server test +* Free path string after emission in in statemachine server example +* Always free method_c_name in dbus binding tool +* Free looked up function name in dbus binding tool +* Fix switching a connection's GMainContext +* dbus_g_value_build_g_variant: cope with empty arrays, maps +* Build test/ before its subdirs + +dbus-glib 0.88 (2010-08-12) +=========================== + +First note, and most importantly, this fixes a security issue: +https://bugzilla.redhat.com/show_bug.cgi?id=585394 +Note that affected system services will need to be rebuilt (but not +necessarily patched). + +Dependencies: + +* GLib 2.24 is required + +Security: + +* CVE-2010-1172: Respect property access flags for writing, allow disabling + for reads + +Enhancements: + +* Allow duplicate object path registrations for different connections +* fd.o #28715: Add dbus_g_value_build_g_variant() +* Support DBUS_TYPE_G_SIGNATURE +* fd.o #27958: dbus_g_error_domain_register: rewrite the documentation + +Other fixes: + +* Refer to dbus_g_connection_flush rather than the plain dbus call +* core: don't pass malformed error interface to dbus (rh#581794) +* Fix lookup of regular properties when shadow properties are used +* Don't use the identifier "interface" in public headers +* Use AC_CANONICAL_HOST, not _TARGET +* Use EXEEXT so that we satisfy dependencies when cross-compiling +* Fix linking of tests on Windows +* Put the G_OS_WIN32 check where it can be defined. +* add mising DBUS_TYPE_G_* to the doc +* Bug 14579: remove pending call from hash table before cancelling it +* Add various tests etc. to .gitignore + +dbus-glib 0.86 (2010-03-24) +=========================== + +Enhancements: + +* [configure.ac] Use AM_SILENT_RULES if available +* core: allow duplicate property names on GInterfaces +* core: performance optimization for object info lookup +* turn the gtk-doc documentation into buildable shape + +Fixes: + +* Fix hyphenated error codes +* [dbus-gobject.c] Trivial compiler warning fixes +* Free errors returned by method implementations + +dbus-glib 0.84 (2010-01-27) +=========================== + +Enhancements: + +* Import dbus-bus-introspect.xml upstream +* Bug 19623 - Add dbus_g_bus_get_private +* Support duplicate object registrations +* fd.o #20936: Update FSF address + +Fixes: + +* dbus-gvalue: set an error when demarshal_basic doesn't recognize type +* Fix bad NAME in dbus-binding-tool man page +* fd.o #25119: Don't leak DBusGMethodInvocation for no-reply calls + +dbus-glib 0.82 (2009-07-16) +=========================== + +Enhancements: + +* Bug 20343 - Add a man page for dbus-binding-tool +* Bug 14183 - Listen to NameOwnerChanged using arg0 matching +* Bug 19927 - Use const for GError * param we're not modifying +* Clean up some compilation warnings +* Bug 21362 - Remove use of deprecated symbols +* Bug 13908: make dbus_g_type_specialized_init() safe for library users to call +* add --with-dbus-binding-tool option to use an external dbus-binding-tool +* Bug 16776: teach dbus_g_method_return_error about DBUS_GERROR +* Remove all sorts of libdbus cruft from configure.ac +* dbus_g_type_specialized_init: make some effort at being thread-safe +* fd.o #21219: implement unregistration of objects +* fd.o #13908: silently initialize specialized types whenever required + +Fixes: + +* Bug 18294 - Be defensive about a possibly NULL property string +* Bug 21753 - Correctly initialize GValues in dbus-binding-tool + generated code +* Use -fno-strict-aliasing by default +* Add missing prototype for dbus_g_connection_unregister_g_object +* Fix format-security warning +* Bug 22244 - Only include , not individual headers +* build: fix undefined macro: AM_PROG_LIBTOOL with recent libtool +* fd.o#20884: dbus_g_proxy_manager_replace_name_owner: don't leave + freed memory in the hash table if the name was the owner's first +* fd.o #5688: don't assert when exported object is destroyed + after D-Bus connection closes +* Use g_strdup instead of strdup in dbus_g_method_get_sender +* Bug 20879 - Use --skip-source argument for glib-genmarshal + +dbus-glib 0.80 (2009-02-02) +=========================== + +Fixes: + +* Bug 19441: Don't send replies for messages explicitly not requesting one +* Bug 19065 - handle nested nodes in dbus-binding-tool +* Bug 19325 - parallel build fix +* Bug 19259: Always use /etc/bash_completion.d +* Bug 19647: Move test-types inside run-test to avoid dep on + existing session bus +* Fix linking order so -Wl,--as-needed works +* Use the provided interface for org.freedesktop.DBus.Properties.GetAll call. D-Bus GLib Bindings 0.78 (04 Dec 2008) diff -Nru dbus-glib-0.100.2/README dbus-glib-0.102/README --- dbus-glib-0.100.2/README 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/README 2014-01-14 11:21:24.000000000 +0000 @@ -1,29 +1,6 @@ -D-BUS is a simple IPC library based on messages. +dbus-glib is a deprecated D-Bus binding for GLib. -See http://www.freedesktop.org/software/dbus/ for lots of documentation, -mailing lists, etc. - -Note -=== - -A core concept of the D-BUS implementation is that "libdbus" is -intended to be a low-level API, similar to Xlib. Most programmers are -intended to use the bindings to GLib, Qt, Python, Mono, Java, or -whatever. These bindings have varying levels of completeness. - -Configuration flags -=== - -These are the dbus-specific configuration flags that can be given to -the ./configure program. - - --enable-tests enable unit test code - --enable-ansi enable -ansi -pedantic gcc flags - --enable-verbose-mode support verbose debug mode - --enable-asserts include assertion checks - --enable-checks include sanity checks on public API - --enable-xml-docs build XML documentation (requires xmlto) - --enable-gcov compile with coverage profiling instrumentation (gcc only) - --with-xml=libxml/expat XML library to use - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-tags[=TAGS] include additional configurations [automatic] +dbus-glib receives minimal maintenance and security fixes for the benefit +of projects like Telepathy and NetworkManager that still rely on it, but +should not be used in new projects (and existing projects should try +to move away from it, too). Please use GDBus, part of GLib since 2.26. diff -Nru dbus-glib-0.100.2/test/core/30574.c dbus-glib-0.102/test/core/30574.c --- dbus-glib-0.100.2/test/core/30574.c 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/test/core/30574.c 2014-01-14 11:21:24.000000000 +0000 @@ -5,6 +5,7 @@ #include #include #include +#include "test/lib/util.h" DBusConnection *bus; GMainContext *main_context; @@ -44,6 +45,7 @@ g_main_loop_run (closure.loop); g_main_loop_unref (closure.loop); + dbus_pending_call_unref (pending); return closure.reply; } @@ -56,7 +58,7 @@ main_context = g_main_context_new (); dbus_error_init (&error); - bus = dbus_bus_get (DBUS_BUS_SESSION, &error); + bus = dbus_bus_get_private (DBUS_BUS_SESSION, &error); if (!bus) { fprintf(stderr, "Couldn't connect to bus: %s\n", error.name); @@ -93,6 +95,15 @@ fprintf(stderr, "Sorry; can't communicate: %s\n", error.message); exit(1); } + dbus_message_unref (reply); + dbus_message_unref (message); + + test_run_until_disconnected (dbus_connection_get_g_connection (bus), + NULL); + dbus_connection_unref (bus); + + dbus_shutdown (); + g_main_context_unref (main_context); return 0; } diff -Nru dbus-glib-0.100.2/test/core/error-mapping.c dbus-glib-0.102/test/core/error-mapping.c --- dbus-glib-0.100.2/test/core/error-mapping.c 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/test/core/error-mapping.c 2014-01-14 11:21:24.000000000 +0000 @@ -115,6 +115,13 @@ f->error_name = g_strdup (dbus_g_error_get_name (error)); else f->error_name = NULL; + + /* On error, this callback is expected to free it, which is pretty + * astonishing, but is how it's always been. In principle, the generated + * code ought to document this, or something. + * https://bugs.freedesktop.org/show_bug.cgi?id=29195 + */ + g_error_free (error); } static void diff -Nru dbus-glib-0.100.2/test/core/Makefile.am dbus-glib-0.102/test/core/Makefile.am --- dbus-glib-0.100.2/test/core/Makefile.am 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/test/core/Makefile.am 2014-01-14 11:21:24.000000000 +0000 @@ -24,12 +24,28 @@ ## so if adding tests not to be run in make check, don't add them to ## TESTS if DBUS_BUILD_TESTS -TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR) +TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ TESTS=run-test.sh run-peer-test.sh else TESTS= endif +VALGRIND_ENV = G_DEBUG=gc-friendly G_SLICE=always-malloc +VALGRIND = valgrind +VALGRIND_ARGS = \ + --gen-suppressions=all \ + --leak-check=full \ + --leak-resolution=high \ + --num-callers=20 \ + --suppressions=$(abs_top_srcdir)/tools/dbus-glib.supp \ + --suppressions=$(abs_top_srcdir)/tools/dbus-glib-tests.supp \ + --verbose \ + $(NULL) + +check-valgrind: all + $(MAKE) check-TESTS \ + DEBUG="env $(VALGRIND_ENV) $(VALGRIND) $(VALGRIND_ARGS)" + EXTRA_DIST=run-test.sh run-peer-test.sh test-service-glib.xml my-object-marshal.list test-service-glib-subclass.xml if DBUS_BUILD_TESTS @@ -57,15 +73,28 @@ peer-client \ test-types \ test-30574 \ + test-private \ test-peer-on-bus \ + test-proxy-noc \ test-proxy-peer \ test-registrations \ test-variant-recursion \ - test-gvariant + test-gvariant \ + test-shared-bus \ + $(NULL) test_30574_SOURCES = \ 30574.c +test_private_SOURCES = \ + my-object.c \ + my-object.h \ + my-object-marshal.c \ + private.c + +test_proxy_noc_SOURCES = \ + proxy-noc.c + test_proxy_peer_SOURCES = \ my-object-marshal.c \ my-object.c \ @@ -145,6 +174,8 @@ test_peer_on_bus_SOURCES = peer-on-bus.c +test_shared_bus_SOURCES = shared-bus.c + CLEANFILES = \ $(BUILT_SOURCES) \ run-with-tmp-session-bus.conf diff -Nru dbus-glib-0.100.2/test/core/Makefile.in dbus-glib-0.102/test/core/Makefile.in --- dbus-glib-0.100.2/test/core/Makefile.in 2013-02-25 12:21:06.000000000 +0000 +++ dbus-glib-0.102/test/core/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -59,13 +86,17 @@ @DBUS_BUILD_TESTS_TRUE@ $(am__EXEEXT_1) peer-server$(EXEEXT) \ @DBUS_BUILD_TESTS_TRUE@ peer-client$(EXEEXT) \ @DBUS_BUILD_TESTS_TRUE@ test-types$(EXEEXT) test-30574$(EXEEXT) \ +@DBUS_BUILD_TESTS_TRUE@ test-private$(EXEEXT) \ @DBUS_BUILD_TESTS_TRUE@ test-peer-on-bus$(EXEEXT) \ +@DBUS_BUILD_TESTS_TRUE@ test-proxy-noc$(EXEEXT) \ @DBUS_BUILD_TESTS_TRUE@ test-proxy-peer$(EXEEXT) \ @DBUS_BUILD_TESTS_TRUE@ test-registrations$(EXEEXT) \ @DBUS_BUILD_TESTS_TRUE@ test-variant-recursion$(EXEEXT) \ -@DBUS_BUILD_TESTS_TRUE@ test-gvariant$(EXEEXT) +@DBUS_BUILD_TESTS_TRUE@ test-gvariant$(EXEEXT) \ +@DBUS_BUILD_TESTS_TRUE@ test-shared-bus$(EXEEXT) subdir = test/core -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -92,6 +123,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am__peer_server_SOURCES_DIST = my-object.c my-object.h \ my-object-subclass.c my-object-subclass.h my-object-marshal.c \ peer-server.c @@ -155,6 +187,17 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(top_builddir)/dbus/libdbus-glib-1.la \ $(top_builddir)/test/lib/libtest.la +am__test_private_SOURCES_DIST = my-object.c my-object.h \ + my-object-marshal.c private.c +@DBUS_BUILD_TESTS_TRUE@am_test_private_OBJECTS = my-object.$(OBJEXT) \ +@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.$(OBJEXT) \ +@DBUS_BUILD_TESTS_TRUE@ private.$(OBJEXT) +test_private_OBJECTS = $(am_test_private_OBJECTS) +test_private_LDADD = $(LDADD) +test_private_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/dbus/libdbus-glib-1.la \ + $(top_builddir)/test/lib/libtest.la am__test_profile_SOURCES_DIST = test-profile.c @HAVE_GLIB_THREADS_TRUE@am_test_profile_OBJECTS = \ @HAVE_GLIB_THREADS_TRUE@ test-profile.$(OBJEXT) @@ -164,6 +207,15 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(top_builddir)/dbus/libdbus-glib-1.la \ $(top_builddir)/test/lib/libtest.la +am__test_proxy_noc_SOURCES_DIST = proxy-noc.c +@DBUS_BUILD_TESTS_TRUE@am_test_proxy_noc_OBJECTS = \ +@DBUS_BUILD_TESTS_TRUE@ proxy-noc.$(OBJEXT) +test_proxy_noc_OBJECTS = $(am_test_proxy_noc_OBJECTS) +test_proxy_noc_LDADD = $(LDADD) +test_proxy_noc_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/dbus/libdbus-glib-1.la \ + $(top_builddir)/test/lib/libtest.la am__test_proxy_peer_SOURCES_DIST = my-object-marshal.c my-object.c \ my-object.h proxy-peer.c @DBUS_BUILD_TESTS_TRUE@am_test_proxy_peer_OBJECTS = \ @@ -204,6 +256,15 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(top_builddir)/dbus/libdbus-glib-1.la \ $(top_builddir)/test/lib/libtest.la +am__test_shared_bus_SOURCES_DIST = shared-bus.c +@DBUS_BUILD_TESTS_TRUE@am_test_shared_bus_OBJECTS = \ +@DBUS_BUILD_TESTS_TRUE@ shared-bus.$(OBJEXT) +test_shared_bus_OBJECTS = $(am_test_shared_bus_OBJECTS) +test_shared_bus_LDADD = $(LDADD) +test_shared_bus_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/dbus/libdbus-glib-1.la \ + $(top_builddir)/test/lib/libtest.la am__test_thread_client_SOURCES_DIST = test-thread-client.c \ test-thread.h @DBUS_BUILD_TESTS_TRUE@@HAVE_GLIB_THREADS_TRUE@am_test_thread_client_OBJECTS = test-thread-client.$(OBJEXT) @@ -235,6 +296,18 @@ test_variant_recursion_OBJECTS = $(am_test_variant_recursion_OBJECTS) @DBUS_BUILD_TESTS_TRUE@test_variant_recursion_DEPENDENCIES = \ @DBUS_BUILD_TESTS_TRUE@ $(am__DEPENDENCIES_3) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -247,38 +320,38 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(peer_client_SOURCES) $(peer_server_SOURCES) \ $(test_30574_SOURCES) $(test_dbus_glib_SOURCES) \ $(test_error_mapping_SOURCES) $(test_gvariant_SOURCES) \ - $(test_peer_on_bus_SOURCES) $(test_profile_SOURCES) \ + $(test_peer_on_bus_SOURCES) $(test_private_SOURCES) \ + $(test_profile_SOURCES) $(test_proxy_noc_SOURCES) \ $(test_proxy_peer_SOURCES) $(test_registrations_SOURCES) \ - $(test_service_glib_SOURCES) $(test_thread_client_SOURCES) \ - $(test_thread_server_SOURCES) $(test_types_SOURCES) \ - $(test_variant_recursion_SOURCES) + $(test_service_glib_SOURCES) $(test_shared_bus_SOURCES) \ + $(test_thread_client_SOURCES) $(test_thread_server_SOURCES) \ + $(test_types_SOURCES) $(test_variant_recursion_SOURCES) DIST_SOURCES = $(am__peer_client_SOURCES_DIST) \ $(am__peer_server_SOURCES_DIST) $(am__test_30574_SOURCES_DIST) \ $(am__test_dbus_glib_SOURCES_DIST) \ $(am__test_error_mapping_SOURCES_DIST) \ $(am__test_gvariant_SOURCES_DIST) \ $(am__test_peer_on_bus_SOURCES_DIST) \ + $(am__test_private_SOURCES_DIST) \ $(am__test_profile_SOURCES_DIST) \ + $(am__test_proxy_noc_SOURCES_DIST) \ $(am__test_proxy_peer_SOURCES_DIST) \ $(am__test_registrations_SOURCES_DIST) \ $(am__test_service_glib_SOURCES_DIST) \ + $(am__test_shared_bus_SOURCES_DIST) \ $(am__test_thread_client_SOURCES_DIST) \ $(am__test_thread_server_SOURCES_DIST) \ $(am__test_types_SOURCES_DIST) \ @@ -288,12 +361,230 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -317,7 +608,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -328,11 +618,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -384,15 +669,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -468,7 +744,19 @@ $(DBUS_GLIB_TOOL_LIBS) \ $(top_builddir)/dbus/libdbus-gtool.la -@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR) +@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TOP_BUILDDIR=@abs_top_builddir@ +VALGRIND_ENV = G_DEBUG=gc-friendly G_SLICE=always-malloc +VALGRIND = valgrind +VALGRIND_ARGS = \ + --gen-suppressions=all \ + --leak-check=full \ + --leak-resolution=high \ + --num-callers=20 \ + --suppressions=$(abs_top_srcdir)/tools/dbus-glib.supp \ + --suppressions=$(abs_top_srcdir)/tools/dbus-glib-tests.supp \ + --verbose \ + $(NULL) + EXTRA_DIST = run-test.sh run-peer-test.sh test-service-glib.xml my-object-marshal.list test-service-glib-subclass.xml @DBUS_BUILD_TESTS_TRUE@@HAVE_GLIB_THREADS_TRUE@THREAD_APPS = test-thread-server test-thread-client test-profile @DBUS_BUILD_TESTS_TRUE@@HAVE_GLIB_THREADS_TRUE@test_thread_server_SOURCES = \ @@ -482,6 +770,15 @@ @DBUS_BUILD_TESTS_TRUE@test_30574_SOURCES = \ @DBUS_BUILD_TESTS_TRUE@ 30574.c +@DBUS_BUILD_TESTS_TRUE@test_private_SOURCES = \ +@DBUS_BUILD_TESTS_TRUE@ my-object.c \ +@DBUS_BUILD_TESTS_TRUE@ my-object.h \ +@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.c \ +@DBUS_BUILD_TESTS_TRUE@ private.c + +@DBUS_BUILD_TESTS_TRUE@test_proxy_noc_SOURCES = \ +@DBUS_BUILD_TESTS_TRUE@ proxy-noc.c + @DBUS_BUILD_TESTS_TRUE@test_proxy_peer_SOURCES = \ @DBUS_BUILD_TESTS_TRUE@ my-object-marshal.c \ @DBUS_BUILD_TESTS_TRUE@ my-object.c \ @@ -538,6 +835,7 @@ @DBUS_BUILD_TESTS_TRUE@ test-gvariant.c @DBUS_BUILD_TESTS_TRUE@test_peer_on_bus_SOURCES = peer-on-bus.c +@DBUS_BUILD_TESTS_TRUE@test_shared_bus_SOURCES = shared-bus.c @DBUS_BUILD_TESTS_TRUE@CLEANFILES = \ @DBUS_BUILD_TESTS_TRUE@ $(BUILT_SOURCES) \ @DBUS_BUILD_TESTS_TRUE@ run-with-tmp-session-bus.conf @@ -549,7 +847,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -589,48 +887,75 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + peer-client$(EXEEXT): $(peer_client_OBJECTS) $(peer_client_DEPENDENCIES) $(EXTRA_peer_client_DEPENDENCIES) @rm -f peer-client$(EXEEXT) $(AM_V_CCLD)$(LINK) $(peer_client_OBJECTS) $(peer_client_LDADD) $(LIBS) + peer-server$(EXEEXT): $(peer_server_OBJECTS) $(peer_server_DEPENDENCIES) $(EXTRA_peer_server_DEPENDENCIES) @rm -f peer-server$(EXEEXT) $(AM_V_CCLD)$(LINK) $(peer_server_OBJECTS) $(peer_server_LDADD) $(LIBS) + test-30574$(EXEEXT): $(test_30574_OBJECTS) $(test_30574_DEPENDENCIES) $(EXTRA_test_30574_DEPENDENCIES) @rm -f test-30574$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_30574_OBJECTS) $(test_30574_LDADD) $(LIBS) + test-dbus-glib$(EXEEXT): $(test_dbus_glib_OBJECTS) $(test_dbus_glib_DEPENDENCIES) $(EXTRA_test_dbus_glib_DEPENDENCIES) @rm -f test-dbus-glib$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_dbus_glib_OBJECTS) $(test_dbus_glib_LDADD) $(LIBS) + test-error-mapping$(EXEEXT): $(test_error_mapping_OBJECTS) $(test_error_mapping_DEPENDENCIES) $(EXTRA_test_error_mapping_DEPENDENCIES) @rm -f test-error-mapping$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_error_mapping_OBJECTS) $(test_error_mapping_LDADD) $(LIBS) + test-gvariant$(EXEEXT): $(test_gvariant_OBJECTS) $(test_gvariant_DEPENDENCIES) $(EXTRA_test_gvariant_DEPENDENCIES) @rm -f test-gvariant$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_gvariant_OBJECTS) $(test_gvariant_LDADD) $(LIBS) + test-peer-on-bus$(EXEEXT): $(test_peer_on_bus_OBJECTS) $(test_peer_on_bus_DEPENDENCIES) $(EXTRA_test_peer_on_bus_DEPENDENCIES) @rm -f test-peer-on-bus$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_peer_on_bus_OBJECTS) $(test_peer_on_bus_LDADD) $(LIBS) + +test-private$(EXEEXT): $(test_private_OBJECTS) $(test_private_DEPENDENCIES) $(EXTRA_test_private_DEPENDENCIES) + @rm -f test-private$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_private_OBJECTS) $(test_private_LDADD) $(LIBS) + test-profile$(EXEEXT): $(test_profile_OBJECTS) $(test_profile_DEPENDENCIES) $(EXTRA_test_profile_DEPENDENCIES) @rm -f test-profile$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_profile_OBJECTS) $(test_profile_LDADD) $(LIBS) + +test-proxy-noc$(EXEEXT): $(test_proxy_noc_OBJECTS) $(test_proxy_noc_DEPENDENCIES) $(EXTRA_test_proxy_noc_DEPENDENCIES) + @rm -f test-proxy-noc$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_proxy_noc_OBJECTS) $(test_proxy_noc_LDADD) $(LIBS) + test-proxy-peer$(EXEEXT): $(test_proxy_peer_OBJECTS) $(test_proxy_peer_DEPENDENCIES) $(EXTRA_test_proxy_peer_DEPENDENCIES) @rm -f test-proxy-peer$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_proxy_peer_OBJECTS) $(test_proxy_peer_LDADD) $(LIBS) + test-registrations$(EXEEXT): $(test_registrations_OBJECTS) $(test_registrations_DEPENDENCIES) $(EXTRA_test_registrations_DEPENDENCIES) @rm -f test-registrations$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_registrations_OBJECTS) $(test_registrations_LDADD) $(LIBS) + test-service-glib$(EXEEXT): $(test_service_glib_OBJECTS) $(test_service_glib_DEPENDENCIES) $(EXTRA_test_service_glib_DEPENDENCIES) @rm -f test-service-glib$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_service_glib_OBJECTS) $(test_service_glib_LDADD) $(LIBS) + +test-shared-bus$(EXEEXT): $(test_shared_bus_OBJECTS) $(test_shared_bus_DEPENDENCIES) $(EXTRA_test_shared_bus_DEPENDENCIES) + @rm -f test-shared-bus$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_shared_bus_OBJECTS) $(test_shared_bus_LDADD) $(LIBS) + test-thread-client$(EXEEXT): $(test_thread_client_OBJECTS) $(test_thread_client_DEPENDENCIES) $(EXTRA_test_thread_client_DEPENDENCIES) @rm -f test-thread-client$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_thread_client_OBJECTS) $(test_thread_client_LDADD) $(LIBS) + test-thread-server$(EXEEXT): $(test_thread_server_OBJECTS) $(test_thread_server_DEPENDENCIES) $(EXTRA_test_thread_server_DEPENDENCIES) @rm -f test-thread-server$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_thread_server_OBJECTS) $(test_thread_server_LDADD) $(LIBS) + test-types$(EXEEXT): $(test_types_OBJECTS) $(test_types_DEPENDENCIES) $(EXTRA_test_types_DEPENDENCIES) @rm -f test-types$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_types_OBJECTS) $(test_types_LDADD) $(LIBS) + test-variant-recursion$(EXEEXT): $(test_variant_recursion_OBJECTS) $(test_variant_recursion_DEPENDENCIES) $(EXTRA_test_variant_recursion_DEPENDENCIES) @rm -f test-variant-recursion$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_variant_recursion_OBJECTS) $(test_variant_recursion_LDADD) $(LIBS) @@ -649,8 +974,11 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peer-client.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peer-on-bus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peer-server.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/private.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy-noc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy-peer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/registrations.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shared-bus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dbus-glib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gvariant.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-profile.Po@am__quote@ @@ -665,14 +993,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -687,26 +1015,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -718,15 +1035,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -735,102 +1048,194 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +run-test.sh.log: run-test.sh + @p='run-test.sh'; \ + b='run-test.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +run-peer-test.sh.log: run-peer-test.sh + @p='run-peer-test.sh'; \ + b='run-peer-test.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -889,6 +1294,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -974,9 +1382,9 @@ .MAKE: all check check-am install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -986,8 +1394,12 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am + +check-valgrind: all + $(MAKE) check-TESTS \ + DEBUG="env $(VALGRIND_ENV) $(VALGRIND) $(VALGRIND_ARGS)" @DBUS_BUILD_TESTS_TRUE@test-service-glib-glue.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) @DBUS_BUILD_TESTS_TRUE@ $(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml diff -Nru dbus-glib-0.100.2/test/core/my-object.c dbus-glib-0.102/test/core/my-object.c --- dbus-glib-0.100.2/test/core/my-object.c 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/test/core/my-object.c 2014-01-14 11:21:24.000000000 +0000 @@ -859,10 +859,12 @@ g_idle_add ((GSourceFunc) do_async_error, data); } -void -my_object_unsafe_disable_legacy_property_access (MyObject *obj) +gboolean +my_object_unsafe_disable_legacy_property_access (MyObject *obj, + GError **error) { dbus_glib_global_set_disable_legacy_property_access (); + return TRUE; } extern GMainLoop *loop; diff -Nru dbus-glib-0.100.2/test/core/my-object.h dbus-glib-0.102/test/core/my-object.h --- dbus-glib-0.100.2/test/core/my-object.h 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/test/core/my-object.h 2014-01-14 11:21:24.000000000 +0000 @@ -116,7 +116,8 @@ void my_object_async_throw_error (MyObject *obj, DBusGMethodInvocation *context); -void my_object_unsafe_disable_legacy_property_access (MyObject *obj); +gboolean my_object_unsafe_disable_legacy_property_access (MyObject *obj, + GError **error); void my_object_emit_objectified (MyObject *obj, GObject *other); diff -Nru dbus-glib-0.100.2/test/core/private.c dbus-glib-0.102/test/core/private.c --- dbus-glib-0.100.2/test/core/private.c 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.102/test/core/private.c 2014-01-14 11:21:24.000000000 +0000 @@ -0,0 +1,268 @@ +/* Feature test for freedesktop.org #23633 - non-default main context + * + * Copyright © 2009 Collabora Ltd. + * Copyright © 2009-2011 Nokia Corporation + * + * In preparation for dbus-glib relicensing (if it ever happens), this file is + * licensed under (at your option) either the AFL v2.1, the GPL v2 or later, + * or an MIT/X11-style license: + * + * Licensed under the Academic Free License version 2.1 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include + +#include "my-object.h" + +/* MyObject needs this, but it doesn't do anything useful... */ +GMainLoop *loop = NULL; + +typedef struct { + GMainContext *context; + DBusGConnection *bus; + GObject *object; + DBusGProxy *proxy; + DBusGProxyCall *call; + + gsize in_flight; +} Fixture; + +static void +call_cb (DBusGProxy *proxy, + DBusGProxyCall *call, + gpointer user_data) +{ + Fixture *f = user_data; + + g_assert (proxy == f->proxy); + g_assert (call == f->call); + + f->in_flight--; +} + +static void +frobnicate_cb (DBusGProxy *proxy, + int arg, + gpointer user_data) +{ + Fixture *f = user_data; + + g_assert (proxy == f->proxy); + + f->in_flight--; + + g_assert_cmpint (arg, ==, 42); +} + +static void +setup (Fixture *f, + gconstpointer path_to_use) +{ + f->context = g_main_context_new (); + + f->in_flight = 0; + + f->bus = dbus_g_bus_get_private (DBUS_BUS_SESSION, f->context, NULL); + g_assert (f->bus != NULL); + + f->object = g_object_new (MY_TYPE_OBJECT, NULL); + g_assert (MY_IS_OBJECT (f->object)); + dbus_g_connection_register_g_object (f->bus, "/object", + (GObject *) f->object); + + f->proxy = dbus_g_proxy_new_for_name (f->bus, + dbus_bus_get_unique_name (dbus_g_connection_get_connection (f->bus)), + "/object", "org.freedesktop.DBus.GLib.Tests.MyObject"); + + dbus_g_proxy_add_signal (f->proxy, "Frobnicate", G_TYPE_INT, G_TYPE_INVALID); + dbus_g_proxy_connect_signal (f->proxy, "Frobnicate", + G_CALLBACK (frobnicate_cb), f, NULL); +} + +static void +teardown (Fixture *f, + gconstpointer test_data G_GNUC_UNUSED) +{ + if (f->proxy != NULL) + { + dbus_g_proxy_disconnect_signal (f->proxy, "Frobnicate", + G_CALLBACK (frobnicate_cb), f); + + g_object_unref (f->proxy); + } + + if (f->object != NULL) + { + dbus_g_connection_unregister_g_object (f->bus, f->object); + g_object_unref (f->object); + } + + if (f->bus != NULL) + { + dbus_connection_close (dbus_g_connection_get_connection (f->bus)); + dbus_g_connection_unref (f->bus); + } + + if (f->context != NULL) + g_main_context_unref (f->context); +} + +static void +test_call (Fixture *f, + gconstpointer test_data G_GNUC_UNUSED) +{ + guint i, iterations; + double t; + + if (g_test_perf ()) + iterations = 100000; + else + iterations = 1000; + + g_test_timer_start (); + + for (i = 0; i < iterations; i++) + { + GError *error = NULL; + guint result; + gboolean ok; + + f->in_flight++; + f->call = dbus_g_proxy_begin_call (f->proxy, "Increment", + call_cb, f, NULL, + G_TYPE_UINT, 666, + G_TYPE_INVALID); + + while (f->in_flight) + g_main_context_iteration (f->context, TRUE); + + ok = dbus_g_proxy_end_call (f->proxy, f->call, &error, + G_TYPE_UINT, &result, + G_TYPE_INVALID); + + g_assert_no_error (error); + g_assert (ok); + g_assert_cmpuint (result, ==, 667); + } + + t = g_test_timer_elapsed (); + + g_test_maximized_result (t / iterations, + "%f seconds / %u iterations = %f s**-1", t, iterations, t / iterations); +} + +static void +test_emit (Fixture *f, + gconstpointer test_data G_GNUC_UNUSED) +{ + guint i, iterations; + double t; + + if (g_test_perf ()) + iterations = 100000; + else + iterations = 1000; + + g_test_timer_start (); + + for (i = 0; i < iterations; i++) + { + f->in_flight++; + + my_object_emit_frobnicate (MY_OBJECT (f->object), NULL); + + while (f->in_flight) + g_main_context_iteration (f->context, TRUE); + } + + t = g_test_timer_elapsed (); + + g_test_maximized_result (t / iterations, + "%f seconds / %u iterations = %f s**-1", t, iterations, t / iterations); +} + +static void +test_timeout (Fixture *f, + gconstpointer test_data G_GNUC_UNUSED) +{ + guint i; + + for (i = 0; i < 100; i++) + { + GError *error = NULL; + guint result; + gboolean ok; + + f->in_flight++; + /* AsyncIncrement doesn't return until the default main context + * runs, and we're not letting it run, so this will time out after 1 + * millisecond */ + f->call = dbus_g_proxy_begin_call_with_timeout (f->proxy, + "AsyncIncrement", + call_cb, f, NULL, 1, + G_TYPE_UINT, 666, + G_TYPE_INVALID); + + while (f->in_flight) + g_main_context_iteration (f->context, TRUE); + + ok = dbus_g_proxy_end_call (f->proxy, f->call, &error, + G_TYPE_UINT, &result, + G_TYPE_INVALID); + + g_assert_error (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY); + g_assert (!ok); + g_clear_error (&error); + } + + /* drain the queue of idles with replies (which will be ignored) + * just so we don't leak them */ + while (g_main_context_pending (NULL)) + g_main_context_iteration (NULL, FALSE); + + while (g_main_context_pending (f->context)) + g_main_context_iteration (f->context, FALSE); +} + +int +main (int argc, + char **argv) +{ + g_type_init (); + dbus_g_type_specialized_init (); + + g_test_init (&argc, &argv, NULL); + + g_test_add ("/private/call", Fixture, NULL, setup, test_call, teardown); + g_test_add ("/private/emit", Fixture, NULL, setup, test_emit, teardown); + g_test_add ("/private/timeout", Fixture, NULL, setup, test_timeout, + teardown); + + return g_test_run (); +} diff -Nru dbus-glib-0.100.2/test/core/proxy-noc.c dbus-glib-0.102/test/core/proxy-noc.c --- dbus-glib-0.100.2/test/core/proxy-noc.c 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.102/test/core/proxy-noc.c 2014-01-14 11:21:24.000000000 +0000 @@ -0,0 +1,264 @@ +/* Regression tests for DBusGProxy's NameOwnerChanged handling. + * + * Author: Simon McVittie + * Copyright © 2011 Nokia Corporation + * Copyright © 2013 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/* To compile outside dbus-glib: + cc -otest-proxy-noc \ + `pkg-config --cflags --libs gobject-2.0 dbus-glib-1 dbus-1` \ + proxy-noc.c + */ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include +#include + +#define WELL_KNOWN_NAME "com.example.AuthService" +#define PATH "/" +#define IFACE WELL_KNOWN_NAME +#define AUTH_RESULT "AuthenticationResult" + +typedef struct { + GError *error; + DBusError dbus_error; + + DBusConnection *service_conn; + DBusGConnection *service_gconn; + DBusConnection *attacker_conn; + DBusGConnection *attacker_gconn; + DBusConnection *client_conn; + DBusGConnection *client_gconn; + DBusGProxy *proxy; + + GPtrArray *auth_results; +} Fixture; + +static void oom (void) G_GNUC_NORETURN; + +static void +oom (void) +{ + g_error ("out of memory"); +} + +static void +assert_no_error (const DBusError *e) +{ + if (G_UNLIKELY (dbus_error_is_set (e))) + g_error ("expected success but got error: %s: %s", e->name, e->message); +} + +static void +auth_result_cb (DBusGProxy *proxy, + const gchar *res, + gpointer user_data) +{ + Fixture *f = user_data; + + g_assert (proxy == f->proxy); + g_ptr_array_add (f->auth_results, g_strdup (res)); +} + +static void +setup (Fixture *f, + gconstpointer addr) +{ + int ret; + + dbus_error_init (&f->dbus_error); + + /* A trusted service on the bus. (For this to be a vulnerability, it + * would have to be the system bus.) */ + f->service_gconn = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, + &f->error); + g_assert_no_error (f->error); + g_assert (f->service_gconn != NULL); + f->service_conn = dbus_g_connection_get_connection (f->service_gconn); + + /* An attacker that intends to pretend to be that service. */ + f->attacker_gconn = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, + &f->error); + g_assert_no_error (f->error); + g_assert (f->attacker_gconn != NULL); + f->attacker_conn = dbus_g_connection_get_connection (f->attacker_gconn); + + /* The service owns a well-known name. */ + ret = dbus_bus_request_name (f->service_conn, WELL_KNOWN_NAME, + DBUS_NAME_FLAG_DO_NOT_QUEUE, &f->dbus_error); + assert_no_error (&f->dbus_error); + g_assert_cmpint (ret, ==, DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER); + + /* The victim of the attack. */ + f->client_gconn = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, &f->error); + g_assert_no_error (f->error); + g_assert (f->client_gconn != NULL); + f->client_conn = dbus_g_connection_get_connection (f->client_gconn); + + f->proxy = dbus_g_proxy_new_for_name (f->client_gconn, WELL_KNOWN_NAME, + PATH, IFACE); + g_assert (DBUS_IS_G_PROXY (f->proxy)); + + /* The proxy is listening for the signal. */ + f->auth_results = g_ptr_array_new_with_free_func (g_free); + dbus_g_proxy_add_signal (f->proxy, AUTH_RESULT, + G_TYPE_STRING, + G_TYPE_INVALID); + dbus_g_proxy_connect_signal (f->proxy, AUTH_RESULT, + G_CALLBACK (auth_result_cb), f, NULL); +} + +static void +test_spoof (Fixture *f, + gconstpointer addr) +{ + DBusMessage *message; + const char *well_known_name = WELL_KNOWN_NAME; + const char *service_name = dbus_bus_get_unique_name (f->service_conn); + const char *client_name = dbus_bus_get_unique_name (f->client_conn); + const char *attacker_name = dbus_bus_get_unique_name (f->attacker_conn); + const char *auth_result; + + auth_result = "on yr bus spoofing yr authentication"; + + /* The attacker tries to pretend to be the service by spoofing + * NameOwnerChanged(name=WELL_KNOWN_NAME, old=service, new=attacker). */ + message = dbus_message_new_signal (DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, + "NameOwnerChanged"); + + if (message == NULL || + /* Bypass match rules by sending it unicast */ + !dbus_message_set_destination (message, client_name) || + !dbus_message_append_args (message, + DBUS_TYPE_STRING, &well_known_name, + DBUS_TYPE_STRING, &service_name, + DBUS_TYPE_STRING, &attacker_name, + DBUS_TYPE_INVALID) || + !dbus_connection_send (f->attacker_conn, message, NULL)) + { + oom (); + } + + dbus_message_unref (message); + + /* The attacker sends a message purporting to be from the service. */ + message = dbus_message_new_signal (PATH, IFACE, AUTH_RESULT); + + if (message == NULL || + /* Again, bypass match rules by sending it unicast */ + !dbus_message_set_destination (message, client_name) || + !dbus_message_append_args (message, + DBUS_TYPE_STRING, &auth_result, + DBUS_TYPE_INVALID) || + !dbus_connection_send (f->attacker_conn, message, NULL)) + { + oom (); + } + + dbus_message_unref (message); + + /* The service sends a message - too slow! The attacker won the race. */ + auth_result = "access denied"; + message = dbus_message_new_signal (PATH, IFACE, AUTH_RESULT); + + if (message == NULL || + !dbus_message_append_args (message, + DBUS_TYPE_STRING, &auth_result, + DBUS_TYPE_INVALID) || + !dbus_connection_send (f->service_conn, message, NULL)) + { + oom (); + } + + dbus_message_unref (message); + + /* Client waits for the first response */ + while (f->auth_results->len < 1) + g_main_context_iteration (NULL, TRUE); + + /* The spoofed result was ignored, the real result was used. */ + g_assert_cmpstr (g_ptr_array_index (f->auth_results, 0), ==, + "access denied"); +} + +static void +teardown (Fixture *f, + gconstpointer addr G_GNUC_UNUSED) +{ + f->client_gconn = NULL; + f->service_gconn = NULL; + f->attacker_gconn = NULL; + + g_ptr_array_unref (f->auth_results); + + if (f->proxy != NULL) + { + dbus_g_proxy_disconnect_signal (f->proxy, AUTH_RESULT, + G_CALLBACK (auth_result_cb), f); + g_object_unref (f->proxy); + f->proxy = NULL; + } + + if (f->client_conn != NULL) + { + dbus_connection_close (f->client_conn); + dbus_connection_unref (f->client_conn); + f->client_conn = NULL; + } + + if (f->service_conn != NULL) + { + dbus_connection_close (f->service_conn); + dbus_connection_unref (f->service_conn); + f->service_conn = NULL; + } + + if (f->attacker_conn != NULL) + { + dbus_connection_close (f->attacker_conn); + dbus_connection_unref (f->attacker_conn); + f->attacker_conn = NULL; + } +} + +int +main (int argc, + char **argv) +{ + g_test_init (&argc, &argv, NULL); + g_type_init (); + dbus_g_type_specialized_init (); + + g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id="); + + g_test_add ("/proxy/spoof", Fixture, "unix:tmpdir=/tmp", setup, + test_spoof, teardown); + + return g_test_run (); +} diff -Nru dbus-glib-0.100.2/test/core/registrations.c dbus-glib-0.102/test/core/registrations.c --- dbus-glib-0.100.2/test/core/registrations.c 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/test/core/registrations.c 2014-01-14 11:21:24.000000000 +0000 @@ -42,6 +42,8 @@ #include "my-object.h" +#include "test/lib/util.h" + GMainLoop *loop = NULL; typedef struct { @@ -89,13 +91,13 @@ * in test_lookup() */ if (f->bus != NULL) { - dbus_connection_close (dbus_g_connection_get_connection (f->bus)); + test_run_until_disconnected (f->bus, NULL); dbus_g_connection_unref (f->bus); } if (f->bus2 != NULL) { - dbus_connection_close (dbus_g_connection_get_connection (f->bus2)); + test_run_until_disconnected (f->bus2, NULL); dbus_g_connection_unref (f->bus2); } @@ -107,6 +109,8 @@ /* This is safe to call on an initialized-but-unset DBusError, a bit like * g_clear_error */ dbus_error_free (&f->dbus_error); + + dbus_shutdown (); } static void @@ -286,7 +290,6 @@ test_clean_slate (Fixture *f, gconstpointer test_data G_GNUC_UNUSED) { - DBusError e; dbus_bool_t mem; dbus_bus_add_match (dbus_g_connection_get_connection (f->bus), @@ -415,8 +418,6 @@ int main (int argc, char **argv) { - loop = g_main_loop_new (NULL, FALSE); - g_type_init (); g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL); dbus_g_type_specialized_init (); diff -Nru dbus-glib-0.100.2/test/core/run-test.sh dbus-glib-0.102/test/core/run-test.sh --- dbus-glib-0.100.2/test/core/run-test.sh 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/test/core/run-test.sh 2014-01-14 11:21:24.000000000 +0000 @@ -43,12 +43,14 @@ if test x$DBUS_TEST_MONITOR != x; then dbus-monitor --session & fi + ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-shared-bus || die "test-shared-bus failed" ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-types || die "test-types failed" ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-registrations || die "test-registrations failed" ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-dbus-glib || die "test-dbus-glib failed" ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-variant-recursion || die "test-variant-recursion failed" ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-gvariant || die "test-gvariant failed" ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-30574 || die "test-30574 failed" + ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-private || die "test-private failed" ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-error-mapping || die "test-error-mapping failed" ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-peer-on-bus || die "test-peer-on-bus failed" fi diff -Nru dbus-glib-0.100.2/test/core/shared-bus.c dbus-glib-0.102/test/core/shared-bus.c --- dbus-glib-0.100.2/test/core/shared-bus.c 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.102/test/core/shared-bus.c 2014-01-14 11:21:24.000000000 +0000 @@ -0,0 +1,135 @@ +/* Regression test for the shared bus instance. + * This test is expected to "leak" the shared connection. + * + * Copyright © 2006-2010 Red Hat, Inc. + * Copyright © 2006-2008 Collabora Ltd. + * Copyright © 2011 Nokia Corporation + * + * Licensed under the Academic Free License version 2.1 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include + +#include + +#include +#include + +GMainLoop *loop = NULL; + +typedef struct { + DBusGConnection *bus; + DBusGConnection *priv; + GError *error; +} Fixture; + +static void +destroy_cb (DBusGProxy *proxy G_GNUC_UNUSED, + gpointer user_data) +{ + gboolean *disconnected = user_data; + + *disconnected = TRUE; +} + +static void +disconnect (DBusGConnection **bus) +{ + DBusGProxy *proxy; + gboolean disconnected = FALSE; + + g_printerr ("Disconnecting... "); + + dbus_connection_set_exit_on_disconnect (dbus_g_connection_get_connection (*bus), + FALSE); + proxy = dbus_g_proxy_new_for_peer (*bus, "/", + "org.freedesktop.DBus.Peer"); + g_signal_connect (G_OBJECT (proxy), "destroy", G_CALLBACK (destroy_cb), + &disconnected); + + dbus_connection_close (dbus_g_connection_get_connection (*bus)); + + while (!disconnected) + { + g_printerr ("."); + g_main_context_iteration (NULL, TRUE); + } + + g_signal_handlers_disconnect_by_func (proxy, destroy_cb, &disconnected); + g_object_unref (proxy); + dbus_g_connection_unref (*bus); + *bus = NULL; + + g_printerr (" disconnected\n"); +} + +static void +setup (Fixture *f, + gconstpointer test_data G_GNUC_UNUSED) +{ +} + +static void +teardown (Fixture *f, + gconstpointer test_data G_GNUC_UNUSED) +{ + if (f->bus != NULL) + dbus_g_connection_unref (f->bus); + + if (f->priv != NULL) + disconnect (&f->priv); + + g_clear_error (&f->error); + dbus_shutdown (); +} + +static void +test_shared_bus (Fixture *f, + gconstpointer test_data G_GNUC_UNUSED) +{ + f->bus = dbus_g_bus_get (DBUS_BUS_SESSION, &f->error); + g_assert_no_error (f->error); + g_assert (f->bus != NULL); + dbus_connection_set_exit_on_disconnect (dbus_g_connection_get_connection (f->bus), + FALSE); + + g_assert (f->bus == dbus_g_bus_get (DBUS_BUS_SESSION, NULL)); + g_assert (f->bus == dbus_g_bus_get (DBUS_BUS_SESSION, NULL)); + g_assert (f->bus == dbus_g_bus_get (DBUS_BUS_SESSION, NULL)); + + f->priv = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, &f->error); + g_assert_no_error (f->error); + g_assert (f->priv != NULL); + g_assert (f->priv != f->bus); + dbus_connection_set_exit_on_disconnect (dbus_g_connection_get_connection (f->priv), + FALSE); +} + +int +main (int argc, char **argv) +{ + g_type_init (); + g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL); + g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id="); + g_test_init (&argc, &argv, NULL); + + g_test_add ("/shared-bus", Fixture, NULL, setup, test_shared_bus, + teardown); + + return g_test_run (); +} diff -Nru dbus-glib-0.100.2/test/core/test-dbus-glib.c dbus-glib-0.102/test/core/test-dbus-glib.c --- dbus-glib-0.100.2/test/core/test-dbus-glib.c 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/test/core/test-dbus-glib.c 2014-01-14 11:21:24.000000000 +0000 @@ -37,6 +37,7 @@ #include #include #include "my-object.h" +#include "test/lib/util.h" GMainLoop *loop = NULL; @@ -91,8 +92,11 @@ test_terminate_proxy1_destroyed_cb (DBusGProxy *proxy, gpointer user_data) { proxy_destroyed = TRUE; + if (proxy_destroy_and_nameowner && !proxy_destroy_and_nameowner_complete && await_terminating_service == NULL) { + g_object_unref(test_terminate_proxy1); + test_terminate_proxy1 = NULL; g_object_unref(test_terminate_proxy2); test_terminate_proxy2 = NULL; g_source_remove (exit_timeout); @@ -544,16 +548,11 @@ loop = g_main_loop_new (NULL, FALSE); error = NULL; - connection = dbus_g_bus_get (DBUS_BUS_SESSION, - &error); + connection = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, &error); + if (connection == NULL) lose_gerror ("Failed to open connection to bus", error); - /* should always get the same one */ - g_assert (connection == dbus_g_bus_get (DBUS_BUS_SESSION, NULL)); - g_assert (connection == dbus_g_bus_get (DBUS_BUS_SESSION, NULL)); - g_assert (connection == dbus_g_bus_get (DBUS_BUS_SESSION, NULL)); - /* Create a proxy object for the "bus driver" */ driver = dbus_g_proxy_new_for_name (connection, @@ -1031,6 +1030,8 @@ lose_gerror ("Failed to complete (wrapped) zero-length recursive1 call", error); if (arraylen != 0) lose ("(wrapped) zero-length recursive1 call returned invalid length %u", arraylen); + + g_array_unref (array); } { @@ -1057,6 +1058,8 @@ lose_gerror ("Failed to complete (wrapped) recursive1 call", error); if (arraylen != 5) lose ("(wrapped) recursive1 call returned invalid length %u", arraylen); + + g_array_unref (array); } { @@ -1291,6 +1294,7 @@ lose_gerror ("Failed to complete RecArrays call", error); g_free (g_ptr_array_index (in_array, 0)); g_free (g_ptr_array_index (in_array, 1)); + g_ptr_array_free (in_array, TRUE); g_assert (out_array); g_assert (out_array->len == 2); @@ -1392,6 +1396,8 @@ lose_gerror ("Failed to complete (wrapped) GetValue call", error); if (val != 3) lose ("(wrapped) GetValue returned invalid value %d", val); + + g_object_unref (ret_proxy); } run_mainloop (); @@ -1775,7 +1781,8 @@ lose ("Didn't get proxy_destroyed"); g_print ("Proxy destroyed successfully\n"); - /* Don't need to unref, proxy was destroyed */ + /* "destroy" does not mean last-unref! */ + g_object_unref (proxy); run_mainloop (); @@ -2026,7 +2033,8 @@ if (!(found_introspectable && found_myobject && found_properties)) lose ("Missing interface"); - g_free (node); + + node_info_unref (node); } g_free (v_STRING_2); @@ -2367,11 +2375,20 @@ lose_gerror ("Failed to complete (wrapped) DoNothing call", error); g_object_unref (G_OBJECT (proxy)); + + test_run_until_disconnected (privconn, NULL); + dbus_g_connection_unref (privconn); } g_object_unref (G_OBJECT (driver)); + test_run_until_disconnected (connection, NULL); + dbus_g_connection_unref (connection); + g_print ("Successfully completed %s\n", argv[0]); + dbus_shutdown (); + g_main_loop_unref (loop); + return 0; } diff -Nru dbus-glib-0.100.2/test/core/test-profile.c dbus-glib-0.102/test/core/test-profile.c --- dbus-glib-0.100.2/test/core/test-profile.c 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/test/core/test-profile.c 2014-01-14 11:21:24.000000000 +0000 @@ -206,6 +206,8 @@ exit (1); } + dbus_connection_set_exit_on_disconnect (connection, FALSE); + context = g_main_context_new (); cd.iterations = 1; @@ -289,8 +291,7 @@ DBusError error; dbus_error_init (&error); - server = dbus_server_listen ("unix:tmpdir="DBUS_TEST_SOCKET_DIR, - &error); + server = dbus_server_listen ("unix:tmpdir=/tmp", &error); if (server == NULL) { g_printerr ("Could not start server: %s\n", @@ -377,6 +378,8 @@ exit (1); } + dbus_connection_set_exit_on_disconnect (connection, FALSE); + if (!dbus_bus_register (connection, &error)) { g_printerr ("could not register with bus: %s\n", error.message); @@ -532,6 +535,8 @@ connection = dbus_g_connection_get_connection (gconnection); + dbus_connection_set_exit_on_disconnect (connection, FALSE); + dbus_bus_request_name (connection, ECHO_SERVICE, 0, NULL); /* ignore errors because we suck */ @@ -837,14 +842,6 @@ _DBUS_ZERO (addr); addr.sun_family = AF_UNIX; -#ifdef HAVE_ABSTRACT_SOCKETS - /* remember that abstract names aren't nul-terminated so we rely - * on sun_path being filled in with zeroes above. - */ - addr.sun_path[0] = '\0'; /* this is what says "use abstract" */ - strncpy (&addr.sun_path[1], path, _DBUS_MAX_SUN_PATH_LENGTH - 2); - /* _dbus_verbose_bytes (addr.sun_path, sizeof (addr.sun_path)); */ -#else /* HAVE_ABSTRACT_SOCKETS */ { struct stat sb; @@ -854,7 +851,6 @@ } strncpy (addr.sun_path, path, _DBUS_MAX_SUN_PATH_LENGTH - 1); -#endif /* ! HAVE_ABSTRACT_SOCKETS */ if (bind (server->listen_fd, (struct sockaddr*) &addr, sizeof (addr)) < 0) { @@ -964,17 +960,8 @@ _DBUS_ZERO (addr); addr.sun_family = AF_UNIX; -#ifdef HAVE_ABSTRACT_SOCKETS - /* remember that abstract names aren't nul-terminated so we rely - * on sun_path being filled in with zeroes above. - */ - addr.sun_path[0] = '\0'; /* this is what says "use abstract" */ - strncpy (&addr.sun_path[1], plain_sockets_address, _DBUS_MAX_SUN_PATH_LENGTH - 2); - /* _dbus_verbose_bytes (addr.sun_path, sizeof (addr.sun_path)); */ -#else /* HAVE_ABSTRACT_SOCKETS */ strncpy (addr.sun_path, plain_sockets_address, _DBUS_MAX_SUN_PATH_LENGTH - 1); -#endif /* ! HAVE_ABSTRACT_SOCKETS */ - + if (connect (fd, (struct sockaddr*) &addr, sizeof (addr)) < 0) { g_printerr ("Failed to connect to socket %s: %s", @@ -1103,18 +1090,18 @@ int main (int argc, char *argv[]) { +#if (!GLIB_CHECK_VERSION (2, 35, 1)) + g_type_init (); +#endif + #ifndef TEST_PROFILE_DISABLED g_thread_init (NULL); dbus_g_thread_init (); -#ifndef DBUS_DISABLE_ASSERT +#ifndef G_DISABLE_ASSERT g_printerr ("You should probably --disable-asserts before you profile as they have noticeable overhead\n"); #endif - -#if DBUS_ENABLE_VERBOSE_MODE - g_printerr ("You should probably --disable-verbose-mode before you profile as verbose has noticeable overhead\n"); -#endif - + payload = g_malloc (PAYLOAD_SIZE); /* The actual size of the DBusMessage on the wire, as of Nov 23 2004, diff -Nru dbus-glib-0.100.2/test/core/test-types.c dbus-glib-0.102/test/core/test-types.c --- dbus-glib-0.100.2/test/core/test-types.c 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/test/core/test-types.c 2014-01-14 11:21:24.000000000 +0000 @@ -32,7 +32,7 @@ dbus_error_init (&derror); /* Check DBusGConnection -> DBusConnection -> DBusGConnection */ - gconn = dbus_g_bus_get (DBUS_BUS_SESSION, &gerror); + gconn = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, &gerror); if (!gconn) lose ("Cannot get connection: %s", gerror->message); @@ -43,8 +43,10 @@ gconn2 = dbus_connection_get_g_connection (conn); if (gconn != gconn2) lose ("Retrieved DBusGConection != original DBusGConnection"); - + + dbus_connection_close (conn); dbus_g_connection_unref (gconn); - + dbus_shutdown (); + return 0; } diff -Nru dbus-glib-0.100.2/test/core/test-variant-recursion.c dbus-glib-0.102/test/core/test-variant-recursion.c --- dbus-glib-0.100.2/test/core/test-variant-recursion.c 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/test/core/test-variant-recursion.c 2014-01-14 11:21:24.000000000 +0000 @@ -1,41 +1,52 @@ #include /* -*- mode: C; c-file-style: "gnu" -*- */ -#include #include #include #include + #include #include +#include +#include + +#include "test/lib/util.h" static gboolean make_recursive_stringify_call (int recursion_depth, DBusGProxy *proxy, GError **error) { - char *out_str; - + gchar *out_str; + gboolean ret; int i; - GValue *vals = g_new0 (GValue, recursion_depth+1); + GValue *val = g_new0 (GValue, 1); - for (i = recursion_depth-1; i >= 0; i--) - { - GValue *curval = &(vals[i]); - g_value_init (curval, G_TYPE_VALUE); - } - for (i = 0; i < recursion_depth; i++) + g_value_init (val, G_TYPE_STRING); + g_value_set_string (val, "end of the line"); + + for (i = 0; i < recursion_depth; i++) { - GValue *curval = &(vals[i]); - GValue *nextval = &(vals[i+1]); - g_value_take_boxed (curval, nextval); + GValue *tmp = g_new0 (GValue, 1); + + g_value_init (tmp, G_TYPE_VALUE); + g_value_take_boxed (tmp, val); + val = tmp; } - g_value_init (&(vals[recursion_depth]), G_TYPE_STRING); - g_value_set_string (&(vals[recursion_depth]), "end of the line"); - return dbus_g_proxy_call (proxy, "Stringify", error, - G_TYPE_VALUE, &(vals[0]), - G_TYPE_INVALID, - G_TYPE_STRING, &out_str, - G_TYPE_INVALID); + + ret = dbus_g_proxy_call (proxy, "Stringify", error, + G_TYPE_VALUE, val, + G_TYPE_INVALID, + G_TYPE_STRING, &out_str, + G_TYPE_INVALID); + + g_boxed_free (G_TYPE_VALUE, val); + + /* the out parameter is meaningless if it failed */ + if (ret) + g_free (out_str); + + return ret; } int @@ -52,7 +63,7 @@ loop = g_main_loop_new (NULL, FALSE); - connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + connection = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, &error); if (connection == NULL) g_error ("Failed to open connection to bus: %s", error->message); @@ -87,7 +98,11 @@ g_object_unref (G_OBJECT (proxy)); + test_run_until_disconnected (connection, NULL); + dbus_g_connection_unref (connection); + g_main_loop_unref (loop); + dbus_shutdown (); return 0; } diff -Nru dbus-glib-0.100.2/test/data/valid-service-files/debug-echo.service.in dbus-glib-0.102/test/data/valid-service-files/debug-echo.service.in --- dbus-glib-0.100.2/test/data/valid-service-files/debug-echo.service.in 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/test/data/valid-service-files/debug-echo.service.in 2014-01-14 11:21:24.000000000 +0000 @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.DBus.GLib.TestEchoService -Exec=@TEST_SERVICE_BINARY@ +Exec=@abs_top_builddir@/test/test-service@EXEEXT@ diff -Nru dbus-glib-0.100.2/test/data/valid-service-files/debug-glib.service.in dbus-glib-0.102/test/data/valid-service-files/debug-glib.service.in --- dbus-glib-0.100.2/test/data/valid-service-files/debug-glib.service.in 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/test/data/valid-service-files/debug-glib.service.in 2014-01-14 11:21:24.000000000 +0000 @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.DBus.GLib.TestService -Exec=@TEST_CORE_SERVICE_BINARY@ +Exec=@abs_top_builddir@/test/core/test-service-glib@EXEEXT@ diff -Nru dbus-glib-0.100.2/test/data/valid-service-files/interfaces-test.service.in dbus-glib-0.102/test/data/valid-service-files/interfaces-test.service.in --- dbus-glib-0.100.2/test/data/valid-service-files/interfaces-test.service.in 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/test/data/valid-service-files/interfaces-test.service.in 2014-01-14 11:21:24.000000000 +0000 @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.DBus.GLib.Test.Interfaces -Exec=@TEST_INTERFACES_SERVICE_BINARY@ +Exec=@abs_top_builddir@/test/interfaces/test-service@EXEEXT@ diff -Nru dbus-glib-0.100.2/test/errors.c dbus-glib-0.102/test/errors.c --- dbus-glib-0.100.2/test/errors.c 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.102/test/errors.c 2014-01-14 11:21:24.000000000 +0000 @@ -0,0 +1,78 @@ +/* Regression test for dbus-glib GError mapping + * + * Copyright © 2004 Red Hat, Inc. + * Copyright © 2011 Nokia Corporation + * + * Licensed under the Academic Free License version 2.1 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include + +#include + +#include + +#include +#include + +typedef struct { + int dummy; +} Fixture; + +static void +setup (Fixture *f G_GNUC_UNUSED, + gconstpointer context G_GNUC_UNUSED) +{ +} + +static void +test_errors (Fixture *f G_GNUC_UNUSED, + gconstpointer context G_GNUC_UNUSED) +{ + DBusError err; + GError *gerror = NULL; + + dbus_error_init (&err); + dbus_set_error_const (&err, DBUS_ERROR_NO_MEMORY, "Out of memory!"); + + dbus_set_g_error (&gerror, &err); + g_assert (gerror != NULL); + g_assert_error (gerror, DBUS_GERROR, DBUS_GERROR_NO_MEMORY); + g_assert_cmpstr (gerror->message, ==, "Out of memory!"); + + dbus_error_init (&err); + g_clear_error (&gerror); +} + +static void +teardown (Fixture *f G_GNUC_UNUSED, + gconstpointer addr G_GNUC_UNUSED) +{ +} + +int +main (int argc, + char **argv) +{ + g_test_init (&argc, &argv, NULL); + g_type_init (); + + g_test_add ("/errors", Fixture, NULL, setup, test_errors, teardown); + + return g_test_run (); +} diff -Nru dbus-glib-0.100.2/test/interfaces/Makefile.am dbus-glib-0.102/test/interfaces/Makefile.am --- dbus-glib-0.100.2/test/interfaces/Makefile.am 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/test/interfaces/Makefile.am 2014-01-14 11:21:24.000000000 +0000 @@ -17,7 +17,7 @@ ## TESTS if DBUS_BUILD_TESTS TESTS_ENVIRONMENT = \ - DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR) \ + DBUS_TOP_BUILDDIR=@abs_top_builddir@ \ DBUS_BINDING_TOOL=$(DBUS_BINDING_TOOL) \ $(NULL) TESTS=run-test.sh @@ -25,6 +25,22 @@ TESTS= endif +VALGRIND_ENV = G_DEBUG=gc-friendly G_SLICE=always-malloc +VALGRIND = valgrind +VALGRIND_ARGS = \ + --gen-suppressions=all \ + --leak-check=full \ + --leak-resolution=high \ + --num-callers=20 \ + --suppressions=$(abs_top_srcdir)/tools/dbus-glib.supp \ + --suppressions=$(abs_top_srcdir)/tools/dbus-glib-tests.supp \ + --verbose \ + $(NULL) + +check-valgrind: all + $(MAKE) check-TESTS \ + DEBUG="env $(VALGRIND_ENV) $(VALGRIND) $(VALGRIND_ARGS)" + EXTRA_DIST = \ invalid-annotated-node.xml \ invalid-nested-annotation.xml \ diff -Nru dbus-glib-0.100.2/test/interfaces/Makefile.in dbus-glib-0.102/test/interfaces/Makefile.in --- dbus-glib-0.100.2/test/interfaces/Makefile.in 2013-02-25 12:21:06.000000000 +0000 +++ dbus-glib-0.102/test/interfaces/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,7 +82,8 @@ @DBUS_BUILD_TESTS_TRUE@noinst_PROGRAMS = test-service$(EXEEXT) \ @DBUS_BUILD_TESTS_TRUE@ test-client$(EXEEXT) subdir = test/interfaces -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -80,6 +108,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am__test_service_SOURCES_DIST = test-interfaces.c test-interfaces.h \ test-dup-prop.c test-dup-prop.h test-objects.c test-objects.h \ test-server.c @@ -94,6 +123,18 @@ $(top_builddir)/dbus/libdbus-glib-1.la \ $(top_builddir)/dbus/libdbus-gtool.la \ $(top_builddir)/test/lib/libtest.la +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -106,20 +147,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(test_client_SOURCES) $(test_service_SOURCES) DIST_SOURCES = $(am__test_client_SOURCES_DIST) \ $(am__test_service_SOURCES_DIST) @@ -128,12 +165,230 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -157,7 +412,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -168,11 +422,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -224,15 +473,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -301,10 +541,22 @@ $(NULL) @DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \ -@DBUS_BUILD_TESTS_TRUE@ DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR) \ +@DBUS_BUILD_TESTS_TRUE@ DBUS_TOP_BUILDDIR=@abs_top_builddir@ \ @DBUS_BUILD_TESTS_TRUE@ DBUS_BINDING_TOOL=$(DBUS_BINDING_TOOL) \ @DBUS_BUILD_TESTS_TRUE@ $(NULL) +VALGRIND_ENV = G_DEBUG=gc-friendly G_SLICE=always-malloc +VALGRIND = valgrind +VALGRIND_ARGS = \ + --gen-suppressions=all \ + --leak-check=full \ + --leak-resolution=high \ + --num-callers=20 \ + --suppressions=$(abs_top_srcdir)/tools/dbus-glib.supp \ + --suppressions=$(abs_top_srcdir)/tools/dbus-glib-tests.supp \ + --verbose \ + $(NULL) + EXTRA_DIST = \ invalid-annotated-node.xml \ invalid-nested-annotation.xml \ @@ -354,7 +606,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -394,9 +646,11 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test-client$(EXEEXT): $(test_client_OBJECTS) $(test_client_DEPENDENCIES) $(EXTRA_test_client_DEPENDENCIES) @rm -f test-client$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_client_OBJECTS) $(test_client_LDADD) $(LIBS) + test-service$(EXEEXT): $(test_service_OBJECTS) $(test_service_DEPENDENCIES) $(EXTRA_test_service_DEPENDENCIES) @rm -f test-service$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_service_OBJECTS) $(test_service_LDADD) $(LIBS) @@ -418,14 +672,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -440,26 +694,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -471,15 +714,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -488,102 +727,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +run-test.sh.log: run-test.sh + @p='run-test.sh'; \ + b='run-test.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -642,6 +966,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -727,9 +1054,9 @@ .MAKE: all check check-am install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -739,8 +1066,12 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am + +check-valgrind: all + $(MAKE) check-TESTS \ + DEBUG="env $(VALGRIND_ENV) $(VALGRIND) $(VALGRIND_ARGS)" @DBUS_BUILD_TESTS_TRUE@test-song-glue.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) @DBUS_BUILD_TESTS_TRUE@ $(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml diff -Nru dbus-glib-0.100.2/test/interfaces/run-test.sh dbus-glib-0.102/test/interfaces/run-test.sh --- dbus-glib-0.100.2/test/interfaces/run-test.sh 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/test/interfaces/run-test.sh 2014-01-14 11:21:24.000000000 +0000 @@ -16,6 +16,8 @@ exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE fi +set -e + for x in annotated-node nested-annotation; do if ! test -f $srcdir/invalid-$x.xml; then echo "invalid-$x.xml missing">&2 @@ -34,4 +36,4 @@ done echo "running test-client" -${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/interfaces/test-client || die "test-client failed" +${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/interfaces/test-client diff -Nru dbus-glib-0.100.2/test/interfaces/test-client.c dbus-glib-0.102/test/interfaces/test-client.c --- dbus-glib-0.100.2/test/interfaces/test-client.c 2013-02-15 21:33:00.000000000 +0000 +++ dbus-glib-0.102/test/interfaces/test-client.c 2014-01-14 11:21:24.000000000 +0000 @@ -2,6 +2,10 @@ #include #include + +#include +#include + #include "dbus/dbus-gparser.h" #include "test-song-bindings.h" #include "test-hello-bindings.h" @@ -9,6 +13,8 @@ #include "test-dup-prop-a-bindings.h" #include "test-dup-prop-b-bindings.h" +#include "test/lib/util.h" + #define TEST_NAMESPACE "org.freedesktop.DBus.GLib.Test.Interfaces" #define TEST_OBJECT_PATH "/org/freedesktop/DBus/GLib/Test/Interfaces" #define TEST_DP_OBJECT_PATH "/org/freedesktop/DBus/GLib/Test/DupPropInterfaces" @@ -96,7 +102,7 @@ g_type_init (); - connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + connection = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, &error); if (connection == NULL) { g_error ("Failed to make connection to session bus: %s", error->message); @@ -104,6 +110,9 @@ exit(1); } + dbus_connection_set_exit_on_disconnect (dbus_g_connection_get_connection (connection), + FALSE); + proxy = dbus_g_proxy_new_for_name (connection, TEST_NAMESPACE, TEST_OBJECT_PATH, "org.freedesktop.DBus.GLib.Test.Interfaces.Song"); success = org_freedesktop_DBus_GLib_Test_Interfaces_Song_get_title (proxy, &str, &error); @@ -256,7 +265,9 @@ } } } + g_free (str); + node_info_unref (node); if (!found_iface_a_prop || !found_iface_b_prop) { @@ -266,6 +277,12 @@ } } + g_object_unref (dp_proxy); + + test_run_until_disconnected (connection, NULL); + dbus_g_connection_unref (connection); + + dbus_shutdown (); exit(0); } diff -Nru dbus-glib-0.100.2/test/lib/Makefile.in dbus-glib-0.102/test/lib/Makefile.in --- dbus-glib-0.100.2/test/lib/Makefile.in 2013-02-25 12:21:06.000000000 +0000 +++ dbus-glib-0.102/test/lib/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = test/lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -73,6 +101,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -85,20 +126,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libtest_la_SOURCES) DIST_SOURCES = $(libtest_la_SOURCES) am__can_run_installinfo = \ @@ -106,10 +143,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -133,7 +186,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -144,11 +196,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -200,15 +247,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -318,12 +356,15 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libtest.la: $(libtest_la_OBJECTS) $(libtest_la_DEPENDENCIES) $(EXTRA_libtest_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libtest_la_OBJECTS) $(libtest_la_LIBADD) $(LIBS) @@ -340,14 +381,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -362,26 +403,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -393,15 +423,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -410,6 +436,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -551,18 +592,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru dbus-glib-0.100.2/test/Makefile.am dbus-glib-0.102/test/Makefile.am --- dbus-glib-0.100.2/test/Makefile.am 2013-02-25 12:13:20.000000000 +0000 +++ dbus-glib-0.102/test/Makefile.am 2014-01-14 11:21:24.000000000 +0000 @@ -5,15 +5,30 @@ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_builddir)/dbus \ - $(DBUS_CFLAGS) + $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(NULL) + +LDADD = \ + $(top_builddir)/dbus/libdbus-glib-1.la \ + $(DBUS_GLIB_LIBS) \ + $(DBUS_LIBS) \ + $(NULL) if DBUS_BUILD_TESTS -TEST_BINARIES=test-service -else -TEST_BINARIES= +test_programs = \ + test-errors \ + test-specialized-types \ + $(NULL) + +# not actually tests, but used by tests +test_related_programs = \ + test-service \ + $(NULL) endif -noinst_PROGRAMS= $(TEST_BINARIES) +test_errors_SOURCES = errors.c +test_specialized_types_SOURCES = specialized-types.c test_service_SOURCES= \ test-service.c @@ -23,4 +38,21 @@ EXTRA_DIST = data/nested-introspect.xml test-compile-nested.sh TESTS_ENVIRONMENT=top_builddir=$(top_builddir) srcdir=$(srcdir) -TESTS = test-compile-nested.sh + +test_scripts = \ + test-compile-nested.sh \ + $(NULL) + +TESTS = \ + $(test_programs) \ + $(test_scripts) \ + $(NULL) + +noinst_PROGRAMS = \ + $(test_programs) \ + $(test_related_programs) \ + $(NULL) + +check-valgrind: all + $(MAKE) -C core check-valgrind + $(MAKE) -C interfaces check-valgrind diff -Nru dbus-glib-0.100.2/test/Makefile.in dbus-glib-0.102/test/Makefile.in --- dbus-glib-0.100.2/test/Makefile.in 2013-02-25 12:21:06.000000000 +0000 +++ dbus-glib-0.102/test/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +78,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = $(am__EXEEXT_1) +TESTS = $(am__EXEEXT_1) $(am__EXEEXT_3) +noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) subdir = test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -65,15 +94,41 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@DBUS_BUILD_TESTS_TRUE@am__EXEEXT_1 = test-service$(EXEEXT) +@DBUS_BUILD_TESTS_TRUE@am__EXEEXT_1 = test-errors$(EXEEXT) \ +@DBUS_BUILD_TESTS_TRUE@ test-specialized-types$(EXEEXT) +@DBUS_BUILD_TESTS_TRUE@am__EXEEXT_2 = test-service$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) -am_test_service_OBJECTS = test-service.$(OBJEXT) -test_service_OBJECTS = $(am_test_service_OBJECTS) +am_test_errors_OBJECTS = errors.$(OBJEXT) +test_errors_OBJECTS = $(am_test_errors_OBJECTS) +test_errors_LDADD = $(LDADD) am__DEPENDENCIES_1 = -test_service_DEPENDENCIES = $(am__DEPENDENCIES_1) +test_errors_DEPENDENCIES = $(top_builddir)/dbus/libdbus-glib-1.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +am_test_service_OBJECTS = test-service.$(OBJEXT) +test_service_OBJECTS = $(am_test_service_OBJECTS) +test_service_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_test_specialized_types_OBJECTS = specialized-types.$(OBJEXT) +test_specialized_types_OBJECTS = $(am_test_specialized_types_OBJECTS) +test_specialized_types_LDADD = $(LDADD) +test_specialized_types_DEPENDENCIES = \ + $(top_builddir)/dbus/libdbus-glib-1.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -86,29 +141,28 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(test_service_SOURCES) -DIST_SOURCES = $(test_service_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(test_errors_SOURCES) $(test_service_SOURCES) \ + $(test_specialized_types_SOURCES) +DIST_SOURCES = $(test_errors_SOURCES) $(test_service_SOURCES) \ + $(test_specialized_types_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -116,13 +170,235 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +am__EXEEXT_3 = test-compile-nested.sh +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -149,7 +425,6 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -173,7 +448,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -184,11 +458,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -240,15 +509,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -308,21 +568,43 @@ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_builddir)/dbus \ - $(DBUS_CFLAGS) + $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(NULL) + +LDADD = \ + $(top_builddir)/dbus/libdbus-glib-1.la \ + $(DBUS_GLIB_LIBS) \ + $(DBUS_LIBS) \ + $(NULL) + +@DBUS_BUILD_TESTS_TRUE@test_programs = \ +@DBUS_BUILD_TESTS_TRUE@ test-errors \ +@DBUS_BUILD_TESTS_TRUE@ test-specialized-types \ +@DBUS_BUILD_TESTS_TRUE@ $(NULL) + + +# not actually tests, but used by tests +@DBUS_BUILD_TESTS_TRUE@test_related_programs = \ +@DBUS_BUILD_TESTS_TRUE@ test-service \ +@DBUS_BUILD_TESTS_TRUE@ $(NULL) -@DBUS_BUILD_TESTS_FALSE@TEST_BINARIES = -@DBUS_BUILD_TESTS_TRUE@TEST_BINARIES = test-service +test_errors_SOURCES = errors.c +test_specialized_types_SOURCES = specialized-types.c test_service_SOURCES = \ test-service.c test_service_LDADD = $(DBUS_LIBS) EXTRA_DIST = data/nested-introspect.xml test-compile-nested.sh TESTS_ENVIRONMENT = top_builddir=$(top_builddir) srcdir=$(srcdir) -TESTS = test-compile-nested.sh +test_scripts = \ + test-compile-nested.sh \ + $(NULL) + all: all-recursive .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -362,16 +644,27 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + +test-errors$(EXEEXT): $(test_errors_OBJECTS) $(test_errors_DEPENDENCIES) $(EXTRA_test_errors_DEPENDENCIES) + @rm -f test-errors$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_errors_OBJECTS) $(test_errors_LDADD) $(LIBS) + test-service$(EXEEXT): $(test_service_OBJECTS) $(test_service_DEPENDENCIES) $(EXTRA_test_service_DEPENDENCIES) @rm -f test-service$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_service_OBJECTS) $(test_service_LDADD) $(LIBS) +test-specialized-types$(EXEEXT): $(test_specialized_types_OBJECTS) $(test_specialized_types_DEPENDENCIES) $(EXTRA_test_specialized_types_DEPENDENCIES) + @rm -f test-specialized-types$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_specialized_types_OBJECTS) $(test_specialized_types_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errors.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/specialized-types.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-service.Po@am__quote@ .c.o: @@ -379,14 +672,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -402,22 +695,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -432,57 +728,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -498,12 +749,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -515,15 +761,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -532,102 +774,201 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +test-errors.log: test-errors$(EXEEXT) + @p='test-errors$(EXEEXT)'; \ + b='test-errors'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-specialized-types.log: test-specialized-types$(EXEEXT) + @p='test-specialized-types$(EXEEXT)'; \ + b='test-specialized-types'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-compile-nested.sh.log: test-compile-nested.sh + @p='test-compile-nested.sh'; \ + b='test-compile-nested.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -710,6 +1051,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -791,24 +1135,27 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) check-am install-am install-strip +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-generic clean-libtool \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am + + +check-valgrind: all + $(MAKE) -C core check-valgrind + $(MAKE) -C interfaces check-valgrind # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru dbus-glib-0.100.2/test/manual/Makefile.in dbus-glib-0.102/test/manual/Makefile.in --- dbus-glib-0.100.2/test/manual/Makefile.in 2013-02-25 12:21:06.000000000 +0000 +++ dbus-glib-0.102/test/manual/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,7 +84,8 @@ @DBUS_BUILD_TESTS_TRUE@ $(NULL) subdir = test/manual -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -82,6 +110,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -94,20 +135,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(test_invalid_usage_SOURCES) DIST_SOURCES = $(test_invalid_usage_SOURCES) am__can_run_installinfo = \ @@ -115,10 +152,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -142,7 +195,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -153,11 +205,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -209,15 +256,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -339,6 +377,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test-invalid-usage$(EXEEXT): $(test_invalid_usage_OBJECTS) $(test_invalid_usage_DEPENDENCIES) $(EXTRA_test_invalid_usage_DEPENDENCIES) @rm -f test-invalid-usage$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_invalid_usage_OBJECTS) $(test_invalid_usage_LDADD) $(LIBS) @@ -358,14 +397,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -408,26 +447,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -439,15 +467,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -456,6 +480,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -597,18 +636,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru dbus-glib-0.100.2/test/specialized-types.c dbus-glib-0.102/test/specialized-types.c --- dbus-glib-0.100.2/test/specialized-types.c 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.102/test/specialized-types.c 2014-01-14 11:21:24.000000000 +0000 @@ -0,0 +1,489 @@ +/* Regression test for dbus-glib specialized types + * + * Copyright © 2005 Red Hat, Inc. + * Copyright © 2011 Nokia Corporation + * + * Licensed under the Academic Free License version 2.1 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include + +#include + +#include + +#include +#include + +typedef struct { + int dummy; +} Fixture; + +static void +setup (Fixture *f G_GNUC_UNUSED, + gconstpointer context G_GNUC_UNUSED) +{ + dbus_g_type_specialized_init (); +} + +static void +test_au (Fixture *f G_GNUC_UNUSED, + gconstpointer context G_GNUC_UNUSED) +{ + GType type; + GArray *instance; + + type = dbus_g_type_get_collection ("GArray", G_TYPE_UINT); + g_assert (dbus_g_type_is_collection (type)); + g_assert (dbus_g_type_get_collection_specialization (type) == G_TYPE_UINT); + + instance = dbus_g_type_specialized_construct (type); + g_assert (instance->len == 0); + g_array_free (instance, TRUE); +} + +typedef struct +{ + gboolean seen_foo; + gboolean seen_baz; +} TestSpecializedHashData; + +static void +test_specialized_hash (const GValue *key, const GValue *val, gpointer user_data) +{ + TestSpecializedHashData *data = user_data; + + g_assert (G_VALUE_HOLDS_STRING (key)); + g_assert (G_VALUE_HOLDS_STRING (val)); + + if (!strcmp (g_value_get_string (key), "foo")) + { + data->seen_foo = TRUE; + g_assert (!strcmp (g_value_get_string (val), "bar")); + } + else if (!strcmp (g_value_get_string (key), "baz")) + { + data->seen_baz = TRUE; + g_assert (!strcmp (g_value_get_string (val), "moo")); + } + else + { + g_assert_not_reached (); + } +} + +static void +test_specialized_hash_2 (const GValue *key, const GValue *val, gpointer user_data) +{ + TestSpecializedHashData *data = user_data; + const GValue *realval; + + g_assert (G_VALUE_HOLDS_STRING (key)); + g_assert (G_VALUE_TYPE (val) == G_TYPE_VALUE); + + realval = g_value_get_boxed (val); + + if (!strcmp (g_value_get_string (key), "foo")) + { + data->seen_foo = TRUE; + g_assert (G_VALUE_HOLDS_UINT (realval)); + g_assert (g_value_get_uint (realval) == 20); + } + else if (!strcmp (g_value_get_string (key), "baz")) + { + data->seen_baz = TRUE; + g_assert (G_VALUE_HOLDS_STRING (realval)); + g_assert (!strcmp ("bar", g_value_get_string (realval))); + } + else + { + g_assert_not_reached (); + } +} + +static void +test_map_ss (Fixture *f G_GNUC_UNUSED, + gconstpointer context G_GNUC_UNUSED) +{ + GType type; + GHashTable *instance; + GValue val = { 0, }; + TestSpecializedHashData hashdata; + + type = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING); + g_assert (dbus_g_type_is_map (type)); + g_assert (dbus_g_type_get_map_key_specialization (type) == G_TYPE_STRING); + g_assert (dbus_g_type_get_map_value_specialization (type) == G_TYPE_STRING); + + instance = dbus_g_type_specialized_construct (type); + + g_assert (g_hash_table_size (instance) == 0); + g_hash_table_insert (instance, g_strdup ("foo"), g_strdup ("bar")); + g_hash_table_insert (instance, g_strdup ("baz"), g_strdup ("moo")); + g_assert (g_hash_table_size (instance) == 2); + + g_value_init (&val, type); + g_value_take_boxed (&val, instance); + hashdata.seen_foo = FALSE; + hashdata.seen_baz = FALSE; + dbus_g_type_map_value_iterate (&val, + test_specialized_hash, + &hashdata); + + g_assert (hashdata.seen_foo); + g_assert (hashdata.seen_baz); + + g_value_unset (&val); +} + +static void +test_map_sv (Fixture *f G_GNUC_UNUSED, + gconstpointer context G_GNUC_UNUSED) +{ + GType type; + + type = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE); + g_assert (dbus_g_type_is_map (type)); + g_assert (dbus_g_type_get_map_key_specialization (type) == G_TYPE_STRING); + g_assert (dbus_g_type_get_map_value_specialization (type) == G_TYPE_VALUE); + { + GHashTable *instance; + GValue val = { 0, }; + TestSpecializedHashData hashdata; + DBusGTypeSpecializedAppendContext ctx; + GValue *eltval; + + instance = dbus_g_type_specialized_construct (type); + g_value_init (&val, type); + g_value_take_boxed (&val, instance); + + dbus_g_type_specialized_init_append (&val, &ctx); + + { + GValue keyval = { 0, }; + GValue valval = { 0, }; + g_value_init (&keyval, G_TYPE_STRING); + g_value_set_string (&keyval, "foo"); + + g_value_init (&valval, G_TYPE_VALUE); + eltval = g_new0 (GValue, 1); + g_value_init (eltval, G_TYPE_UINT); + g_value_set_uint (eltval, 20); + g_value_take_boxed (&valval, eltval); + dbus_g_type_specialized_map_append (&ctx, &keyval, &valval); + } + + { + GValue keyval = { 0, }; + GValue valval = { 0, }; + g_value_init (&keyval, G_TYPE_STRING); + g_value_set_string (&keyval, "baz"); + g_value_init (&valval, G_TYPE_VALUE); + eltval = g_new0 (GValue, 1); + g_value_init (eltval, G_TYPE_STRING); + g_value_set_string (eltval, "bar"); + g_value_take_boxed (&valval, eltval); + dbus_g_type_specialized_map_append (&ctx, &keyval, &valval); + } + + hashdata.seen_foo = FALSE; + hashdata.seen_baz = FALSE; + dbus_g_type_map_value_iterate (&val, + test_specialized_hash_2, + &hashdata); + + g_assert (hashdata.seen_foo); + g_assert (hashdata.seen_baz); + + g_value_unset (&val); + } +} + +static void +test_ao_slist (Fixture *f G_GNUC_UNUSED, + gconstpointer context G_GNUC_UNUSED) +{ + GType type; + + type = dbus_g_type_get_collection ("GSList", G_TYPE_OBJECT); + g_assert (dbus_g_type_is_collection (type)); + g_assert (dbus_g_type_get_collection_specialization (type) == G_TYPE_OBJECT); + { + GSList *instance, *tmp, *copy; + GValue val = {0, }; + GValue copyval = {0, }; + DBusGTypeSpecializedAppendContext ctx; + GObject *objects[3]; + int i; + + instance = dbus_g_type_specialized_construct (type); + g_assert (instance == NULL); + + g_value_init (&val, type); + g_value_take_boxed (&val, instance); + + dbus_g_type_specialized_init_append (&val, &ctx); + + for (i = 0; i < 3; i++) + { + GValue eltval = { 0, }; + GObject *obj = g_object_new (G_TYPE_OBJECT, NULL); + + g_assert (obj != NULL); + objects[i] = obj; + g_object_add_weak_pointer (obj, (gpointer) (objects + i)); + + g_value_init (&eltval, G_TYPE_OBJECT); + g_value_take_object (&eltval, obj); + dbus_g_type_specialized_collection_append (&ctx, &eltval); + } + + dbus_g_type_specialized_collection_end_append (&ctx); + + instance = g_value_get_boxed (&val); + g_assert (g_slist_length (instance) == 3); + + for (tmp = instance; tmp; tmp = tmp->next) + { + GObject *obj = tmp->data; + g_assert (G_IS_OBJECT (obj)); + g_assert (obj->ref_count == 1); + } + + g_value_init (©val, type); + g_value_copy (&val, ©val); + + copy = g_value_get_boxed (©val); + g_assert (g_slist_length (copy) == 3); + + for (tmp = copy; tmp; tmp = tmp->next) + { + GObject *obj = tmp->data; + g_assert (G_IS_OBJECT (obj)); + g_assert (obj->ref_count == 2); + } + + g_value_unset (©val); + + for (i = 0; i < 3; i++) + { + g_assert (objects[i] != NULL); + } + + for (tmp = instance; tmp; tmp = tmp->next) + { + GObject *obj = tmp->data; + g_assert (G_IS_OBJECT (obj)); + g_assert (obj->ref_count == 1); + } + + g_value_unset (&val); + + for (i = 0; i < 3; i++) + { + g_assert (objects[i] == NULL); + } + } +} + +static void +test_as_ptrarray (Fixture *f G_GNUC_UNUSED, + gconstpointer context G_GNUC_UNUSED) +{ + GType type; + + type = dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRING); + g_assert (dbus_g_type_is_collection (type)); + g_assert (dbus_g_type_get_collection_specialization (type) == G_TYPE_STRING); + { + GPtrArray *instance; + DBusGTypeSpecializedAppendContext ctx; + GValue val = {0, }; + GValue eltval = {0, }; + + instance = dbus_g_type_specialized_construct (type); + + g_assert (instance->len == 0); + + g_value_init (&val, type); + g_value_take_boxed (&val, instance); + + dbus_g_type_specialized_init_append (&val, &ctx); + + g_value_init (&eltval, G_TYPE_STRING); + g_value_set_static_string (&eltval, "foo"); + dbus_g_type_specialized_collection_append (&ctx, &eltval); + + g_value_reset (&eltval); + g_value_set_static_string (&eltval, "bar"); + dbus_g_type_specialized_collection_append (&ctx, &eltval); + + g_value_reset (&eltval); + g_value_set_static_string (&eltval, "baz"); + dbus_g_type_specialized_collection_append (&ctx, &eltval); + + dbus_g_type_specialized_collection_end_append (&ctx); + + g_assert (instance->len == 3); + + g_assert (!strcmp ("foo", g_ptr_array_index (instance, 0))); + g_assert (!strcmp ("bar", g_ptr_array_index (instance, 1))); + g_assert (!strcmp ("baz", g_ptr_array_index (instance, 2))); + + g_value_unset (&val); + } +} + +static void +test_suo (Fixture *f G_GNUC_UNUSED, + gconstpointer context G_GNUC_UNUSED) +{ + GType type; + + type = dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); + g_assert (dbus_g_type_is_struct (type)); + g_assert (dbus_g_type_get_struct_size (type) == 3); + g_assert (dbus_g_type_get_struct_member_type (type, 0) == G_TYPE_STRING); + g_assert (dbus_g_type_get_struct_member_type (type, 1) == G_TYPE_UINT); + g_assert (dbus_g_type_get_struct_member_type (type, 2) == DBUS_TYPE_G_OBJECT_PATH); + { + GValueArray *instance; + GValue val = {0, }; + GValue memval = {0, }; + + instance = dbus_g_type_specialized_construct (type); + + g_assert (instance->n_values == 3); + + g_value_init (&val, type); + g_value_take_boxed (&val, instance); + + g_value_init (&memval, G_TYPE_STRING); + g_value_set_static_string (&memval, "foo"); + dbus_g_type_struct_set_member (&val, 0, &memval); + g_value_unset (&memval); + + g_value_init (&memval, G_TYPE_UINT); + g_value_set_uint (&memval, 42); + dbus_g_type_struct_set_member (&val, 1, &memval); + g_value_unset (&memval); + + g_value_init (&memval, DBUS_TYPE_G_OBJECT_PATH); + g_value_set_static_boxed (&memval, "/bar/moo/foo/baz"); + dbus_g_type_struct_set_member (&val, 2, &memval); + g_value_unset (&memval); + + g_assert (instance->n_values == 3); + + g_value_init (&memval, G_TYPE_STRING); + dbus_g_type_struct_get_member (&val, 0, &memval); + g_assert (0 == strcmp (g_value_get_string (&memval), "foo")); + g_value_unset (&memval); + + g_value_init (&memval, G_TYPE_UINT); + dbus_g_type_struct_get_member (&val, 1, &memval); + g_assert (g_value_get_uint (&memval) == 42); + g_value_unset (&memval); + + g_value_init (&memval, DBUS_TYPE_G_OBJECT_PATH); + dbus_g_type_struct_get_member (&val, 2, &memval); + g_assert (0 == strcmp ((gchar*) g_value_get_boxed (&memval), + "/bar/moo/foo/baz")); + g_value_unset (&memval); + + g_value_unset (&val); + } + + type = dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); + g_assert (dbus_g_type_is_struct (type)); + g_assert (dbus_g_type_get_struct_size (type) == 3); + g_assert (dbus_g_type_get_struct_member_type (type, 0) == G_TYPE_STRING); + g_assert (dbus_g_type_get_struct_member_type (type, 1) == G_TYPE_UINT); + g_assert (dbus_g_type_get_struct_member_type (type, 2) == DBUS_TYPE_G_OBJECT_PATH); + { + GValueArray *instance; + GValue val = {0, }; + + instance = dbus_g_type_specialized_construct (type); + + g_assert (instance->n_values == 3); + + g_value_init (&val, type); + g_value_take_boxed (&val, instance); + + dbus_g_type_struct_set (&val, + 0,"foo", + 1, 42, + 2, "/bar/moo/foo/baz", + G_MAXUINT); + + g_assert (instance->n_values == 3); + + { + gchar *string; + guint intval; + gchar *path; + + dbus_g_type_struct_get (&val, + 0, &string, + 1, &intval, + 2, &path, + G_MAXUINT); + + g_assert (0 == strcmp (string, "foo")); + g_assert (intval == 42); + g_assert (0 == strcmp (path, "/bar/moo/foo/baz")); + } + + g_value_unset (&val); + } +} + +static void +teardown (Fixture *f G_GNUC_UNUSED, + gconstpointer context G_GNUC_UNUSED) +{ +} + +int +main (int argc, + char **argv) +{ + g_test_init (&argc, &argv, NULL); + g_type_init (); + + g_test_add ("/specialized-types/au/GArray", Fixture, NULL, + setup, test_au, teardown); + + g_test_add ("/specialized-types/a{ss}/GHashTable", Fixture, NULL, + setup, test_map_ss, teardown); + + g_test_add ("/specialized-types/a{sv}/GHashTable", Fixture, NULL, + setup, test_map_sv, teardown); + + g_test_add ("/specialized-types/ao/GSList", Fixture, NULL, + setup, test_ao_slist, teardown); + + g_test_add ("/specialized-types/as/GPtrArray", Fixture, NULL, + setup, test_as_ptrarray, teardown); + + g_test_add ("/specialized-types/suo/GValueArray", Fixture, NULL, + setup, test_suo, teardown); + + return g_test_run (); +} diff -Nru dbus-glib-0.100.2/test-driver dbus-glib-0.102/test-driver --- dbus-glib-0.100.2/test-driver 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.102/test-driver 2014-02-12 13:39:29.000000000 +0000 @@ -0,0 +1,139 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru dbus-glib-0.100.2/tools/Makefile.in dbus-glib-0.102/tools/Makefile.in --- dbus-glib-0.100.2/tools/Makefile.in 2013-02-25 12:21:06.000000000 +0000 +++ dbus-glib-0.102/tools/Makefile.in 2014-02-12 13:39:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -64,12 +91,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -106,10 +139,26 @@ } am__installdirs = "$(DESTDIR)$(libdbus_glibdir)" HEADERS = $(nodist_libdbus_glib_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -133,7 +182,6 @@ DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@ DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@ DBUS_LIBS = @DBUS_LIBS@ -DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -144,11 +192,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXPANDED_BINDIR = @EXPANDED_BINDIR@ -EXPANDED_DATADIR = @EXPANDED_DATADIR@ -EXPANDED_LIBDIR = @EXPANDED_LIBDIR@ -EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ -EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ FGREP = @FGREP@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GREP = @GREP@ @@ -200,15 +243,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@ -TEST_EXIT_BINARY = @TEST_EXIT_BINARY@ -TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@ -TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@ -TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@ -TEST_SERVICE_DIR = @TEST_SERVICE_DIR@ -TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@ -TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@ -TEST_SOCKET_DIR = @TEST_SOCKET_DIR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -333,26 +367,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libdbus_glibdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -364,15 +387,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -381,6 +400,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -524,19 +558,19 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-nodist_libdbus_glibHEADERS \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am \ - uninstall-nodist_libdbus_glibHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ + install-nodist_libdbus_glibHEADERS install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-nodist_libdbus_glibHEADERS dbus-glib-bindings.h: $(top_srcdir)/dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)