diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/aclocal.m4 gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/aclocal.m4 --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/aclocal.m4 2016-04-26 08:48:20.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/aclocal.m4 2016-06-16 13:32:06.000000000 -0400 @@ -20,129 +20,438 @@ 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'.])]) -# Configure paths for GLIB -# Owen Taylor 1997-2001 - -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -dnl gthread, or gio is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - pkg_config_args=glib-2.0 - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. - PKG_PROG_PKG_CONFIG([0.16]) +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. - no_glib="" +AC_PREREQ([2.50]) - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +]) - min_glib_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29.1) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.1]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - if test x"$no_glib" = x ; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])dnl PKG_PROG_PKG_CONFIG - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) -int -main () -{ - unsigned int major, minor, micro; +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])dnl _PKG_CONFIG - fclose (fopen ("conf.glibtest", "w")); +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])dnl _PKG_SHORT_ERRORS_SUPPORTED - if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[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. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR + +# Configure paths for GLIB +# Owen Taylor 1997-2001 + +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +dnl gthread, or gio is specified in MODULES, pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GLIB_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], + , enable_glibtest=yes) + + pkg_config_args=glib-2.0 + for module in . $4 + do + case "$module" in + gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; + gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; + esac + done + + PKG_PROG_PKG_CONFIG([0.16]) + + no_glib="" + + if test "x$PKG_CONFIG" = x ; then + no_glib=yes + PKG_CONFIG=no + fi + + min_glib_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi + + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + unsigned int major, minor, micro; + + fclose (fopen ("conf.glibtest", "w")); + + if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); printf("*** library (version %d.%d.%d)\n", glib_major_version, glib_minor_version, glib_micro_version); @@ -663,582 +972,280 @@ _ACEOF if AC_RUN_LOG([$1 conftest.foo]); then m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) - - -# gnome-compiler-flags.m4 -# -# serial 2 -# - -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings and substitute the result into -dnl WARN_CFLAGS -dnl For now, only works on GCC -dnl Pass the default value of the --enable-compile-warnings configure option as -dnl the first argument to the macro, defaulting to 'yes'. -dnl Additional warning/error flags can be passed as an optional second argument. -dnl -dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - AC_ARG_ENABLE(compile-warnings, - AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) - - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - - warning_flags= - realsave_CFLAGS="$CFLAGS" - - dnl These are warning flags that aren't marked as fatal. Can be - dnl overridden on a per-project basis with -Wno-foo. - base_warn_flags=" \ - -Wall \ - -Wstrict-prototypes \ - -Wnested-externs \ - " - - dnl These compiler flags typically indicate very broken or suspicious - dnl code. Some of them such as implicit-function-declaration are - dnl just not default because gcc compiles a lot of legacy code. - dnl We choose to make this set into explicit errors. - base_error_flags=" \ - -Werror=missing-prototypes \ - -Werror=implicit-function-declaration \ - -Werror=pointer-arith \ - -Werror=init-self \ - -Werror=format-security \ - -Werror=format=2 \ - -Werror=missing-include-dirs \ - " - - dnl Additional warning or error flags provided by the module author to - dnl allow stricter standards to be imposed on a per-module basis. - dnl The author can pass -W or -Werror flags here as they see fit. - additional_flags="m4_default([$2],[])" - - case "$enable_compile_warnings" in - no) - warning_flags="-w" - ;; - minimum) - warning_flags="-Wall" - ;; - yes|maximum|error) - warning_flags="$base_warn_flags $base_error_flags $additional_flags" - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - - dnl Check whether GCC supports the warning options - for option in $warning_flags; do - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$save_CFLAGS" - AC_MSG_RESULT([$has_option]) - if test $has_option = yes; then - tested_warning_flags="$tested_warning_flags $option" - fi - unset has_option - unset save_CFLAGS - done - unset option - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($tested_warning_flags) - - AC_ARG_ENABLE(iso-c, - AS_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - - WARN_CFLAGS="$tested_warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -]) - -dnl For C++, do basically the same thing. - -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) - - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - AS_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac - - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) - - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -]) - -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl - -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi - - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas - -mostlyclean-am: clean-gsettings-schemas - -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) - -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ - -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas - -.SECONDARY: $(gsettings_SCHEMAS) - -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi - -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) - -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) - -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, -dnl Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# gnome-compiler-flags.m4 +# +# serial 4 +# + +dnl GNOME_COMPILE_WARNINGS +dnl Turn on many useful compiler warnings and substitute the result into +dnl WARN_CFLAGS +dnl For now, only works on GCC +dnl Pass the default value of the --enable-compile-warnings configure option as +dnl the first argument to the macro, defaulting to 'yes'. +dnl Additional warning/error flags can be passed as an optional second argument. dnl -dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package is covered by the GNU General Public License. -dnl They are *not* in the public domain. +dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) +AU_DEFUN([GNOME_COMPILE_WARNINGS],[ + dnl ****************************** + dnl More compiler warnings + dnl ****************************** -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. + AC_ARG_ENABLE(compile-warnings, + AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], + [Turn on compiler warnings]),, + [enable_compile_warnings="m4_default([$1],[yes])"]) -AC_PREREQ([2.50]) + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) + warning_flags= + realsave_CFLAGS="$CFLAGS" -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl -dnl Copyright © 2004 Scott James Remnant . -dnl Copyright © 2012-2015 Dan Nicholson -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -dnl 02111-1307, USA. -dnl -dnl As a special exception to the GNU General Public License, if you -dnl distribute this file as part of a program that contains a -dnl configuration script generated by Autoconf, you may include it under -dnl the same distribution terms that you use for the rest of that -dnl program. + dnl These are warning flags that aren't marked as fatal. Can be + dnl overridden on a per-project basis with -Wno-foo. + base_warn_flags=" \ + -Wall \ + -Wstrict-prototypes \ + -Wnested-externs \ + " -dnl PKG_PREREQ(MIN-VERSION) -dnl ----------------------- -dnl Since: 0.29 -dnl -dnl Verify that the version of the pkg-config macros are at least -dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's -dnl installed version of pkg-config, this checks the developer's version -dnl of pkg.m4 when generating configure. -dnl -dnl To ensure that this macro is defined, also add: -dnl m4_ifndef([PKG_PREREQ], -dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) -dnl -dnl See the "Since" comment for each macro you use to see what version -dnl of the macros you require. -m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) -m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, - [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) -])dnl PKG_PREREQ + dnl These compiler flags typically indicate very broken or suspicious + dnl code. Some of them such as implicit-function-declaration are + dnl just not default because gcc compiles a lot of legacy code. + dnl We choose to make this set into explicit errors. + base_error_flags=" \ + -Werror=missing-prototypes \ + -Werror=implicit-function-declaration \ + -Werror=pointer-arith \ + -Werror=init-self \ + -Werror=format-security \ + -Werror=format=2 \ + -Werror=missing-include-dirs \ + -Werror=return-type \ + " -dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) -dnl ---------------------------------- -dnl Since: 0.16 -dnl -dnl Search for the pkg-config tool and set the PKG_CONFIG variable to -dnl first found in the path. Checks that the version of pkg-config found -dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is -dnl used since that's the first version where most current features of -dnl pkg-config existed. -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + dnl Additional warning or error flags provided by the module author to + dnl allow stricter standards to be imposed on a per-module basis. + dnl The author can pass -W or -Werror flags here as they see fit. + additional_flags="m4_default([$2],[])" -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])dnl PKG_PROG_PKG_CONFIG + case "$enable_compile_warnings" in + no) + warning_flags="-w" + ;; + minimum) + warning_flags="-Wall" + ;; + yes|maximum|error) + warning_flags="$base_warn_flags $base_error_flags $additional_flags" + ;; + *) + AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) + ;; + esac -dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------------------------------- -dnl Since: 0.18 -dnl -dnl Check to see whether a particular set of modules exists. Similar to -dnl PKG_CHECK_MODULES(), but does not set variables or print errors. -dnl -dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place -dnl it's called might be skipped (such as if it is within an "if", you -dnl have to call PKG_CHECK_EXISTS manually -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi -dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -dnl --------------------------------------------- -dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting -dnl pkg_failed based on the result. -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])dnl _PKG_CONFIG + dnl Check whether GCC supports the warning options + for option in $warning_flags; do + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + CFLAGS="$save_CFLAGS" + AC_MSG_RESULT([$has_option]) + if test $has_option = yes; then + tested_warning_flags="$tested_warning_flags $option" + fi + unset has_option + unset save_CFLAGS + done + unset option + CFLAGS="$realsave_CFLAGS" + AC_MSG_CHECKING(what warning flags to pass to the C compiler) + AC_MSG_RESULT($tested_warning_flags) -dnl _PKG_SHORT_ERRORS_SUPPORTED -dnl --------------------------- -dnl Internal check to see if pkg-config supports short errors. -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])dnl _PKG_SHORT_ERRORS_SUPPORTED + AC_ARG_ENABLE(iso-c, + AS_HELP_STRING([--enable-iso-c], + [Try to warn if code is not ISO C ]),, + [enable_iso_c=no]) + + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + case " $CFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCFLAGS) + WARN_CFLAGS="$tested_warning_flags $complCFLAGS" + AC_SUBST(WARN_CFLAGS) +], +[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and +eliminate use of --enable-iso-c. +See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) -dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl -------------------------------------------------------------- -dnl Since: 0.4.0 -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES might not happen, you should be sure to include an -dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +dnl For C++, do basically the same thing. -pkg_failed=no -AC_MSG_CHECKING([for $1]) +AU_DEFUN([GNOME_CXX_WARNINGS],[ + AC_ARG_ENABLE(cxx-warnings, + AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] + [Turn on compiler warnings.]),, + [enable_cxx_warnings="m4_default([$1],[minimum])"]) -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) + warnCXXFLAGS= + if test "x$GXX" != xyes; then + enable_cxx_warnings=no + fi + if test "x$enable_cxx_warnings" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) warnCXXFLAGS="-Wall -Wno-unused" ;; + esac -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_cxx_warnings" = "xyes"; then + warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" + fi + fi + fi + AC_MSG_RESULT($warnCXXFLAGS) -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + AC_ARG_ENABLE(iso-cxx, + AS_HELP_STRING([--enable-iso-cxx], + [Try to warn if code is not ISO C++ ]),, + [enable_iso_cxx=no]) - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: + AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) + complCXXFLAGS= + if test "x$enable_iso_cxx" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; + esac -$$1_PKG_ERRORS + case " $CXXFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCXXFLAGS) -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" + AC_SUBST(WARN_CXXFLAGS) +], +[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and +eliminate use of --enable-iso-cxx. +See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[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. +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl -_PKG_TEXT +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])dnl PKG_CHECK_MODULES + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas +mostlyclean-am: clean-gsettings-schemas -dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl --------------------------------------------------------------------- -dnl Since: 0.29 -dnl -dnl Checks for existence of MODULES and gathers its build flags with -dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags -dnl and VARIABLE-PREFIX_LIBS from --libs. -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to -dnl include an explicit call to PKG_PROG_PKG_CONFIG in your -dnl configure.ac. -AC_DEFUN([PKG_CHECK_MODULES_STATIC], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -_save_PKG_CONFIG=$PKG_CONFIG -PKG_CONFIG="$PKG_CONFIG --static" -PKG_CHECK_MODULES($@) -PKG_CONFIG=$_save_PKG_CONFIG[]dnl -])dnl PKG_CHECK_MODULES_STATIC +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ -dnl PKG_INSTALLDIR([DIRECTORY]) -dnl ------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable pkgconfigdir as the location where a module -dnl should install pkg-config .pc files. By default the directory is -dnl $libdir/pkgconfig, but the default can be changed by passing -dnl DIRECTORY. The user can override through the --with-pkgconfigdir -dnl parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_INSTALLDIR +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas +.SECONDARY: $(gsettings_SCHEMAS) -dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) -dnl -------------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable noarch_pkgconfigdir as the location where a -dnl module should install arch-independent pkg-config .pc files. By -dnl default the directory is $datadir/pkgconfig, but the default can be -dnl changed by passing DIRECTORY. The user can override through the -dnl --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_NOARCH_INSTALLDIR +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) -dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------- -dnl Since: 0.28 -dnl -dnl Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])dnl PKG_CHECK_VAR +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) # Copyright (C) 2002-2014 Free Software Foundation, Inc. # diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/configure gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/configure --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/configure 2016-04-26 08:48:21.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/configure 2016-06-16 13:32:07.000000000 -0400 @@ -16883,6 +16883,7 @@ -Werror=format-security \ -Werror=format=2 \ -Werror=missing-include-dirs \ + -Werror=return-type \ " additional_flags=" diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/debian/changelog gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/debian/changelog --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/debian/changelog 2016-04-26 09:36:09.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/debian/changelog 2016-06-16 14:07:54.000000000 -0400 @@ -1,3 +1,19 @@ +gnome-software (3.20.1+git20160616.1.a708c4e-ubuntu-xenial-0ubuntu1) xenial; urgency=medium + + * New upstream snapshot from the wip/ubuntu-xenial branch at + git://git.gnome.org/gnome-software. + - Fix launching various KDE4 applications (LP: #1575529) + - Guard against review server errors (LP: #1590508) + - Fix a couple of CSS errors (LP: #1590508) + - Fix conversion from star ratings (1-5) to G-S rating (0-100) (LP: #1581938) + - Fix wilson score calulation (LP: #1581938) + - Make the app folder dialog work again (LP: #1590115) + - Remove broken symlink of xdg-app-reviews plugin (LP: #1573052) + - Disable redundant notification (LP: #1592382) + - Disable app folders feature when run outside GNOME (LP: #1590152) + + -- William Hua Thu, 16 Jun 2016 13:40:00 -0400 + gnome-software (3.20.1+git20160426.1.a976144-ubuntu-xenial-0ubuntu1) xenial; urgency=medium * New upstream snapshot from the wip/ubuntu-xenial branch at diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gnome-software-local-file.desktop.in gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gnome-software-local-file.desktop.in --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gnome-software-local-file.desktop.in 2016-04-26 06:11:37.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gnome-software-local-file.desktop.in 2016-06-15 11:25:21.000000000 -0400 @@ -8,4 +8,4 @@ Icon=system-software-install StartupNotify=true NoDisplay=true -MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-deb;application/x-app-package;application/vnd.ms-cab-compressed;application/vnd.xdgapp;x-scheme-handler/apt; +MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-deb;application/x-app-package;application/vnd.ms-cab-compressed;application/vnd.xdgapp;x-scheme-handler/apt;application/vnd.snap; diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-app-folder-dialog.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-app-folder-dialog.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-app-folder-dialog.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-app-folder-dialog.c 2016-06-15 11:25:21.000000000 -0400 @@ -60,12 +60,6 @@ } static void -cancel_cb (GsAppFolderDialog *dialog) -{ - gtk_window_close (GTK_WINDOW (dialog)); -} - -static void apply_changes (GsAppFolderDialog *dialog) { const gchar *folder; @@ -88,10 +82,23 @@ } static void -done_cb (GsAppFolderDialog *dialog) -{ - apply_changes (dialog); - gtk_window_close (GTK_WINDOW (dialog)); +response_cb (GtkDialog *dialog, + GtkResponseType response_type, + gpointer user_data) +{ + switch (response_type) { + case GTK_RESPONSE_APPLY: + apply_changes (GS_APP_FOLDER_DIALOG (dialog)); + gtk_window_close (GTK_WINDOW (dialog)); + break; + case GTK_RESPONSE_CANCEL: + gtk_window_close (GTK_WINDOW (dialog)); + break; + case GTK_RESPONSE_DELETE_EVENT: + break; + default: + g_assert_not_reached (); + } } static GtkWidget *create_row (GsAppFolderDialog *dialog, const gchar *folder); @@ -129,10 +136,9 @@ dialog->folders = gs_folders_get (); gtk_widget_init_template (GTK_WIDGET (dialog)); - g_signal_connect_swapped (dialog->cancel_button, "clicked", - G_CALLBACK (cancel_cb), dialog); - g_signal_connect_swapped (dialog->done_button, "clicked", - G_CALLBACK (done_cb), dialog); + g_signal_connect (dialog, "response", + G_CALLBACK (response_cb), + NULL); dialog->rows = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); gtk_list_box_set_header_func (GTK_LIST_BOX (dialog->app_folder_list), diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-app.h gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-app.h --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-app.h 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-app.h 2016-06-15 11:25:21.000000000 -0400 @@ -78,6 +78,11 @@ #define AS_APP_QUIRK_NOT_REVIEWABLE (1 << 5) #endif +#if !AS_CHECK_VERSION(0,5,15) +#define AS_APP_QUIRK_HAS_SHORTCUT (1 << 6) +#define AS_APP_QUIRK_NOT_LAUNCHABLE (1 << 7) +#endif + GQuark gs_app_error_quark (void); GsApp *gs_app_new (const gchar *id); diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-application.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-application.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-application.c 2016-04-26 06:11:37.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-application.c 2016-06-15 11:25:21.000000000 -0400 @@ -332,6 +332,8 @@ g_signal_connect (dialog, "destroy", G_CALLBACK (first_run_dialog_destroyed_cb), app); gs_shell_modal_dialog_present (app->shell, GTK_DIALOG (dialog)); g_settings_set_boolean (app->settings, "first-run", FALSE); + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); } else if (needs_refresh ()) gdk_threads_add_idle (ask_refresh, app); } @@ -460,6 +462,10 @@ "software on your system.")); gs_shell_modal_dialog_present (app->shell, GTK_DIALOG (dialog)); + + /* just destroy */ + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); } static void @@ -723,7 +729,7 @@ desktop_id = g_variant_get_string (parameter, NULL); display = gdk_display_get_default (); - appinfo = G_APP_INFO (g_desktop_app_info_new (desktop_id)); + appinfo = G_APP_INFO (gs_utils_get_desktop_app_info (desktop_id)); if (appinfo == NULL) { g_warning ("no such desktop file: %s", desktop_id); return; diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-dbus-helper.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-dbus-helper.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-dbus-helper.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-dbus-helper.c 2016-06-15 10:23:42.000000000 -0400 @@ -298,7 +298,7 @@ g_autoptr(GNotification) n = NULL; if (desktop_id != NULL) { - app_info = g_desktop_app_info_new (desktop_id); + app_info = gs_utils_get_desktop_app_info (desktop_id); if (app_info != NULL) app_name = g_app_info_get_name (G_APP_INFO (app_info)); } diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-page.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-page.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-page.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-page.c 2016-06-15 11:25:21.000000000 -0400 @@ -188,6 +188,9 @@ { GsPagePrivate *priv = gs_page_get_instance_private (helper->page); + /* unmap the dialog */ + gtk_widget_destroy (GTK_WIDGET (dialog)); + /* not agreed */ if (response != GTK_RESPONSE_OK) { gs_page_helper_free (helper); @@ -266,6 +269,9 @@ { GsPagePrivate *priv = gs_page_get_instance_private (helper->page); + /* unmap the dialog */ + gtk_widget_destroy (GTK_WIDGET (dialog)); + /* not agreed */ if (response != GTK_RESPONSE_OK) { gs_page_helper_free (helper); diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-plugin.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-plugin.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-plugin.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-plugin.c 2016-06-15 11:25:21.000000000 -0400 @@ -44,6 +44,7 @@ #include "gs-plugin.h" #include "gs-os-release.h" +#include "gs-utils.h" /** * gs_plugin_status_to_string: @@ -362,7 +363,7 @@ desktop_id); return FALSE; } - appinfo = G_APP_INFO (g_desktop_app_info_new (desktop_id)); + appinfo = G_APP_INFO (gs_utils_get_desktop_app_info (desktop_id)); if (appinfo == NULL) { g_set_error (error, GS_PLUGIN_ERROR, diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-shell.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-shell.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-shell.c 2016-04-26 06:11:37.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-shell.c 2016-06-15 11:25:21.000000000 -0400 @@ -89,17 +89,12 @@ static guint signals [SIGNAL_LAST] = { 0 }; -/** - * gs_shell_modal_dialog_present: - **/ static void -gs_shell_modal_dialog_response_cb (GtkDialog *dialog, - gint response_id, - GsShell *shell) +modal_dialog_unmapped_cb (GtkWidget *dialog, + GsShell *shell) { GsShellPrivate *priv = gs_shell_get_instance_private (shell); - g_debug ("handling modal dialog response %i for %p", - response_id, dialog); + g_debug ("modal dialog %p unmapped", dialog); g_ptr_array_remove (priv->modal_dialogs, dialog); } @@ -125,10 +120,10 @@ /* add to stack, transfer ownership to here */ g_ptr_array_add (priv->modal_dialogs, dialog); + g_signal_connect (GTK_WIDGET (dialog), "unmap", + G_CALLBACK (modal_dialog_unmapped_cb), shell); /* present the new one */ - g_signal_connect (dialog, "response", - G_CALLBACK (gs_shell_modal_dialog_response_cb), shell); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_window_present (GTK_WINDOW (dialog)); } @@ -872,6 +867,10 @@ dialog = gs_sources_dialog_new (priv->main_window, priv->plugin_loader); gs_shell_modal_dialog_present (shell, GTK_DIALOG (dialog)); + + /* just destroy */ + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); } void diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-shell-details.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-shell-details.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-shell-details.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-shell-details.c 2016-06-15 11:25:21.000000000 -0400 @@ -259,9 +259,7 @@ case AS_APP_STATE_INSTALLED: case AS_APP_STATE_UPDATABLE: case AS_APP_STATE_UPDATABLE_LIVE: - if ((gs_app_get_kind (self->app) == AS_APP_KIND_DESKTOP || - gs_app_get_kind (self->app) == AS_APP_KIND_WEB_APP) && - g_strcmp0 (gs_app_get_management_plugin (self->app), "snappy") != 0) { + if (!gs_app_has_quirk (self->app, AS_APP_QUIRK_NOT_LAUNCHABLE)) { gtk_widget_set_visible (self->button_details_launch, TRUE); } else { gtk_widget_set_visible (self->button_details_launch, FALSE); @@ -1176,6 +1174,9 @@ gint response, GsShellDetails *self) { + /* unmap the dialog */ + gtk_widget_destroy (GTK_WIDGET (dialog)); + /* switch away from the details view that failed to load */ gs_shell_set_mode (self->shell, GS_SHELL_MODE_OVERVIEW); } @@ -1450,6 +1451,9 @@ g_autoptr(GsReview) review = NULL; GsReviewDialog *rdialog = GS_REVIEW_DIALOG (dialog); + /* unmap the dialog */ + gtk_widget_destroy (GTK_WIDGET (dialog)); + /* not agreed */ if (response != GTK_RESPONSE_OK) return; diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-shell-installed.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-shell-installed.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-shell-installed.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-shell-installed.c 2016-06-15 11:25:21.000000000 -0400 @@ -275,7 +275,7 @@ widget = GTK_WIDGET (gtk_builder_get_object (self->builder, "buttonbox_main")); gtk_widget_show (widget); - gtk_widget_show (self->button_select); + gtk_widget_set_visible (self->button_select, gs_utils_is_current_desktop ("GNOME")); if (scroll_up) { GtkAdjustment *adj; @@ -612,6 +612,8 @@ dialog = gs_app_folder_dialog_new (GTK_WINDOW (toplevel), apps); g_signal_connect_swapped (dialog, "delete-event", G_CALLBACK (folder_dialog_done), self); + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); gs_shell_modal_dialog_present (self->shell, GTK_DIALOG (dialog)); } diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-shell-updates.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-shell-updates.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-shell-updates.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-shell-updates.c 2016-06-15 11:25:21.000000000 -0400 @@ -636,6 +636,10 @@ dialog = gs_update_dialog_new (self->plugin_loader); gs_update_dialog_show_update_details (GS_UPDATE_DIALOG (dialog), app); gs_shell_modal_dialog_present (self->shell, GTK_DIALOG (dialog)); + + /* just destroy */ + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); } /** @@ -762,6 +766,9 @@ GtkResponseType response_type, GsShellUpdates *self) { + /* unmap the dialog */ + gtk_widget_destroy (GTK_WIDGET (dialog)); + switch (response_type) { case GTK_RESPONSE_REJECT: /* open the control center */ diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-update-monitor.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-update-monitor.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-update-monitor.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-update-monitor.c 2016-06-15 11:25:21.000000000 -0400 @@ -95,17 +95,6 @@ g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates"); } g_application_send_notification (monitor->application, "updates-available", n); - } else { - title = _("Software Updates Available"); - body = _("Important OS and application updates are ready to be installed"); - n = g_notification_new (title); - g_notification_set_body (n, body); - if (!gs_utils_is_current_desktop ("Unity")) { - g_notification_add_button (n, _("Not Now"), "app.nop"); - g_notification_add_button_with_target (n, _("View"), "app.set-mode", "s", "updates"); - g_notification_set_default_action_and_target (n, "app.set-mode", "s", "updates"); - } - g_application_send_notification (monitor->application, "updates-available", n); } } diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-utils.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-utils.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-utils.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-utils.c 2016-06-15 11:25:21.000000000 -0400 @@ -532,4 +532,28 @@ return g_strv_contains ((const gchar * const *) names, name); } +/** + * gs_utils_get_desktop_app_info: + */ +GDesktopAppInfo * +gs_utils_get_desktop_app_info (const gchar *id) +{ + GDesktopAppInfo *app_info; + + /* try to get the standard app-id */ + app_info = g_desktop_app_info_new (id); + + /* KDE is a special project because it believes /usr/share/applications + * isn't KDE enough. For this reason we support falling back to the + * "kde4-" prefixed ID to avoid educating various self-righteous + * upstreams about the correct ID to use in the AppData file. */ + if (app_info == NULL) { + g_autofree gchar *kde_id = NULL; + kde_id = g_strdup_printf ("%s-%s", "kde4", id); + app_info = g_desktop_app_info_new (kde_id); + } + + return app_info; +} + /* vim: set noexpandtab: */ diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-utils.h gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-utils.h --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gs-utils.h 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gs-utils.h 2016-06-15 11:25:21.000000000 -0400 @@ -22,6 +22,7 @@ #ifndef __GS_UTILS_H #define __GS_UTILS_H +#include #include #include "gs-app.h" @@ -67,6 +68,8 @@ gboolean gs_utils_is_current_desktop (const gchar *name); +GDesktopAppInfo *gs_utils_get_desktop_app_info (const gchar *id); + G_END_DECLS #endif /* __GS_UTILS_H */ diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gtk-style.css gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gtk-style.css --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gtk-style.css 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gtk-style.css 2016-06-15 11:25:21.000000000 -0400 @@ -269,9 +269,9 @@ } .update-failed-details { - font: Monospace; + font-family: Monospace; font-size: 90%; - padding: 16px + padding: 16px; } .upgrade-banner { diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gtk-style-hc.css gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gtk-style-hc.css --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/gtk-style-hc.css 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/gtk-style-hc.css 2016-06-15 11:25:21.000000000 -0400 @@ -225,7 +225,7 @@ } .update-failed-details { - font: Monospace; + font-family: Monospace; font-size: 90%; - padding: 16px + padding: 16px; } diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/gs-appstream.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/gs-appstream.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/gs-appstream.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/gs-appstream.c 2016-06-15 11:25:21.000000000 -0400 @@ -396,6 +396,25 @@ } } + /* types we can never launch */ + switch (gs_app_get_kind (app)) { + case AS_APP_KIND_ADDON: + case AS_APP_KIND_CODEC: + case AS_APP_KIND_FIRMWARE: + case AS_APP_KIND_FONT: + case AS_APP_KIND_GENERIC: + case AS_APP_KIND_INPUT_METHOD: + case AS_APP_KIND_LOCALIZATION: + case AS_APP_KIND_OS_UPDATE: + case AS_APP_KIND_OS_UPGRADE: + case AS_APP_KIND_RUNTIME: + case AS_APP_KIND_SOURCE: + gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE); + break; + default: + break; + } + /* set management plugin automatically */ gs_refine_item_management_plugin (app, item); diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/gs-plugin-fwupd.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/gs-plugin-fwupd.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/gs-plugin-fwupd.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/gs-plugin-fwupd.c 2016-06-15 11:25:21.000000000 -0400 @@ -207,6 +207,8 @@ { g_debug ("key %s", key); + gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE); + if (g_strcmp0 (key, "AppstreamId") == 0) { gs_app_set_id (app, g_variant_get_string (val, NULL)); return; diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/gs-plugin-snappy.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/gs-plugin-snappy.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/gs-plugin-snappy.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/gs-plugin-snappy.c 2016-06-16 13:31:25.000000000 -0400 @@ -233,6 +233,7 @@ gs_app_set_origin (app, _("Ubuntu Snappy Store")); gs_app_set_kind (app, AS_APP_KIND_DESKTOP); gs_app_add_quirk (app, AS_APP_QUIRK_NOT_REVIEWABLE); + gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE); refine_app (plugin, app, package); gs_plugin_add_app (list, app); } diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/gs-plugin-ubuntu-reviews.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/gs-plugin-ubuntu-reviews.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/gs-plugin-ubuntu-reviews.c 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/gs-plugin-ubuntu-reviews.c 2016-06-15 11:25:21.000000000 -0400 @@ -251,11 +251,10 @@ // Use a Wilson score which is a method of ensuring small numbers of ratings don't give high scores // https://en.wikipedia.org/wiki/Binomial_proportion_confidence_interval - return ((wilson_score (one_star_count, n_ratings, 0.1) * 20) + - (wilson_score (two_star_count, n_ratings, 0.1) * 40) + - (wilson_score (three_star_count, n_ratings, 0.1) * 60) + - (wilson_score (four_star_count, n_ratings, 0.1) * 80) + - (wilson_score (five_star_count, n_ratings, 0.1) * 100)); + return (((wilson_score (one_star_count, n_ratings, 0.1) * -2) + + (wilson_score (two_star_count, n_ratings, 0.1) * -1) + + (wilson_score (four_star_count, n_ratings, 0.1) * 1) + + (wilson_score (five_star_count, n_ratings, 0.1) * 2)) + 3) * 20 - 10; } static gboolean @@ -635,7 +634,7 @@ gs_review_set_version (review, json_object_get_string_member (object, "version")); star_rating = json_object_get_int_member (object, "rating"); if (star_rating > 0) - gs_review_set_rating (review, star_rating * 20); + gs_review_set_rating (review, star_rating * 20 - 10); gs_review_set_date (review, parse_date_time (json_object_get_string_member (object, "date_created"))); id_string = g_strdup_printf ("%" G_GINT64_FORMAT, json_object_get_int_member (object, "id")); gs_review_add_metadata (review, "ubuntu-id", id_string); @@ -1127,7 +1126,7 @@ if (entry->rating < 80) break; - app = gs_app_new (entry->package_name); + app = gs_app_new (NULL); gs_app_add_source (app, entry->package_name); gs_plugin_add_app (list, app); } diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/gs-ubuntuone-dialog.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/gs-ubuntuone-dialog.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/gs-ubuntuone-dialog.c 2016-04-26 08:32:52.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/gs-ubuntuone-dialog.c 2016-06-15 10:23:42.000000000 -0400 @@ -130,7 +130,9 @@ NULL); body = g_bytes_unref_to_data (bytes, &length); - response = json_gvariant_deserialize_data (body, length, NULL, NULL); + + if (body) + response = json_gvariant_deserialize_data (body, length, NULL, NULL); if (response) g_variant_ref_sink (response); @@ -228,65 +230,71 @@ reenable_widgets (self); - switch (status) { - case SOUP_STATUS_OK: - case SOUP_STATUS_CREATED: - g_clear_pointer (&self->token_secret, g_free); - g_clear_pointer (&self->token_key, g_free); - g_clear_pointer (&self->consumer_secret, g_free); - g_clear_pointer (&self->consumer_key, g_free); - - g_variant_lookup (response, "consumer_key", "s", &self->consumer_key); - g_variant_lookup (response, "consumer_secret", "s", &self->consumer_secret); - g_variant_lookup (response, "token_key", "s", &self->token_key); - g_variant_lookup (response, "token_secret", "s", &self->token_secret); + if (response) { + switch (status) { + case SOUP_STATUS_OK: + case SOUP_STATUS_CREATED: + g_clear_pointer (&self->token_secret, g_free); + g_clear_pointer (&self->token_key, g_free); + g_clear_pointer (&self->consumer_secret, g_free); + g_clear_pointer (&self->consumer_key, g_free); + + g_variant_lookup (response, "consumer_key", "s", &self->consumer_key); + g_variant_lookup (response, "consumer_secret", "s", &self->consumer_secret); + g_variant_lookup (response, "token_key", "s", &self->token_key); + g_variant_lookup (response, "token_secret", "s", &self->token_secret); - gtk_stack_set_visible_child_name (GTK_STACK (self->page_stack), "page-2"); - update_widgets (self); - break; + gtk_stack_set_visible_child_name (GTK_STACK (self->page_stack), "page-2"); + update_widgets (self); + break; + + default: + g_variant_lookup (response, "code", "&s", &code); - default: - g_variant_lookup (response, "code", "&s", &code); + if (!code) + code = ""; - if (!code) - code = ""; + if (g_str_equal (code, "TWOFACTOR_REQUIRED")) { + gtk_stack_set_visible_child_name (GTK_STACK (self->page_stack), "page-1"); + gtk_widget_grab_focus (self->passcode_entry); + update_widgets (self); + break; + } - if (g_str_equal (code, "TWOFACTOR_REQUIRED")) { - gtk_stack_set_visible_child_name (GTK_STACK (self->page_stack), "page-1"); - gtk_widget_grab_focus (self->passcode_entry); update_widgets (self); - break; - } - update_widgets (self); + if (g_str_equal (code, "INVALID_CREDENTIALS")) { + show_status (self, _("Incorrect email or password"), TRUE); + gtk_widget_grab_focus (self->password_entry); + } else if (g_str_equal (code, "ACCOUNT_SUSPENDED")) { + show_status (self, _("Account suspended"), TRUE); + gtk_widget_grab_focus (self->email_entry); + } else if (g_str_equal (code, "ACCOUNT_DEACTIVATED")) { + show_status (self, _("Account deactivated"), TRUE); + gtk_widget_grab_focus (self->email_entry); + } else if (g_str_equal (code, "EMAIL_INVALIDATED")) { + show_status (self, _("Email invalidated"), TRUE); + gtk_widget_grab_focus (self->email_entry); + } else if (g_str_equal (code, "TWOFACTOR_FAILURE")) { + show_status (self, _("Two-factor authentication failed"), TRUE); + gtk_widget_grab_focus (self->passcode_entry); + } else if (g_str_equal (code, "PASSWORD_POLICY_ERROR")) { + show_status (self, _("Password reset required"), TRUE); + gtk_widget_grab_focus (self->reset_radio); + } else if (g_str_equal (code, "TOO_MANY_REQUESTS")) { + show_status (self, _("Too many requests"), TRUE); + gtk_widget_grab_focus (self->password_entry); + } else { + show_status (self, _("An error occurred"), TRUE); + gtk_widget_grab_focus (self->password_entry); + } - if (g_str_equal (code, "INVALID_CREDENTIALS")) { - show_status (self, _("Incorrect email or password"), TRUE); - gtk_widget_grab_focus (self->password_entry); - } else if (g_str_equal (code, "ACCOUNT_SUSPENDED")) { - show_status (self, _("Account suspended"), TRUE); - gtk_widget_grab_focus (self->email_entry); - } else if (g_str_equal (code, "ACCOUNT_DEACTIVATED")) { - show_status (self, _("Account deactivated"), TRUE); - gtk_widget_grab_focus (self->email_entry); - } else if (g_str_equal (code, "EMAIL_INVALIDATED")) { - show_status (self, _("Email invalidated"), TRUE); - gtk_widget_grab_focus (self->email_entry); - } else if (g_str_equal (code, "TWOFACTOR_FAILURE")) { - show_status (self, _("Two-factor authentication failed"), TRUE); - gtk_widget_grab_focus (self->passcode_entry); - } else if (g_str_equal (code, "PASSWORD_POLICY_ERROR")) { - show_status (self, _("Password reset required"), TRUE); - gtk_widget_grab_focus (self->reset_radio); - } else if (g_str_equal (code, "TOO_MANY_REQUESTS")) { - show_status (self, _("Too many requests"), TRUE); - gtk_widget_grab_focus (self->password_entry); - } else { - show_status (self, _("An error occurred"), TRUE); - gtk_widget_grab_focus (self->password_entry); + break; } - - break; + } else { + update_widgets (self); + show_status (self, _("An error occurred"), TRUE); + gtk_widget_grab_focus (self->password_entry); } } diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/Makefile.am gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/Makefile.am --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/Makefile.am 2016-04-26 05:38:56.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/Makefile.am 2016-06-15 11:25:21.000000000 -0400 @@ -76,9 +76,11 @@ plugin_LTLIBRARIES += libgs_plugin_limba.la endif +if HAVE_XDG_APP if HAVE_ODRS plugin_LTLIBRARIES += libgs_plugin_xdg_app_reviews.la endif +endif libgs_plugin_dummy_la_SOURCES = gs-plugin-dummy.c libgs_plugin_dummy_la_LIBADD = $(GS_PLUGIN_LIBS) @@ -141,11 +143,13 @@ libgs_plugin_xdg_app_la_LDFLAGS = -module -avoid-version libgs_plugin_xdg_app_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS) +if HAVE_ODRS libgs_plugin_xdg_app_reviews_la_SOURCES = gs-plugin-xdg-app-reviews.c libgs_plugin_xdg_app_reviews_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS) libgs_plugin_xdg_app_reviews_la_LDFLAGS = -module -avoid-version libgs_plugin_xdg_app_reviews_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS) endif +endif if HAVE_APT ubuntu-unity-launcher-proxy.c ubuntu-unity-launcher-proxy.h: com.canonical.Unity.Launcher.xml Makefile diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/Makefile.in gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/Makefile.in --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/Makefile.in 2016-04-26 08:48:24.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/Makefile.in 2016-06-16 13:32:09.000000000 -0400 @@ -104,7 +104,7 @@ @HAVE_FIRMWARE_TRUE@am__append_3 = libgs_plugin_fwupd.la @HAVE_XDG_APP_TRUE@am__append_4 = libgs_plugin_xdg_app.la @HAVE_LIMBA_TRUE@am__append_5 = libgs_plugin_limba.la -@HAVE_ODRS_TRUE@am__append_6 = libgs_plugin_xdg_app_reviews.la +@HAVE_ODRS_TRUE@@HAVE_XDG_APP_TRUE@am__append_6 = libgs_plugin_xdg_app_reviews.la check_PROGRAMS = gs-self-test$(EXEEXT) TESTS = gs-self-test$(EXEEXT) subdir = src/plugins @@ -441,19 +441,19 @@ $(libgs_plugin_xdg_app_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_XDG_APP_TRUE@am_libgs_plugin_xdg_app_la_rpath = -rpath \ @HAVE_XDG_APP_TRUE@ $(plugindir) -@HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_reviews_la_DEPENDENCIES = \ -@HAVE_XDG_APP_TRUE@ $(am__DEPENDENCIES_1) +@HAVE_ODRS_TRUE@@HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_reviews_la_DEPENDENCIES = \ +@HAVE_ODRS_TRUE@@HAVE_XDG_APP_TRUE@ $(am__DEPENDENCIES_1) am__libgs_plugin_xdg_app_reviews_la_SOURCES_DIST = \ gs-plugin-xdg-app-reviews.c -@HAVE_XDG_APP_TRUE@am_libgs_plugin_xdg_app_reviews_la_OBJECTS = libgs_plugin_xdg_app_reviews_la-gs-plugin-xdg-app-reviews.lo +@HAVE_ODRS_TRUE@@HAVE_XDG_APP_TRUE@am_libgs_plugin_xdg_app_reviews_la_OBJECTS = libgs_plugin_xdg_app_reviews_la-gs-plugin-xdg-app-reviews.lo libgs_plugin_xdg_app_reviews_la_OBJECTS = \ $(am_libgs_plugin_xdg_app_reviews_la_OBJECTS) libgs_plugin_xdg_app_reviews_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libgs_plugin_xdg_app_reviews_la_CFLAGS) $(CFLAGS) \ $(libgs_plugin_xdg_app_reviews_la_LDFLAGS) $(LDFLAGS) -o $@ -@HAVE_ODRS_TRUE@am_libgs_plugin_xdg_app_reviews_la_rpath = -rpath \ -@HAVE_ODRS_TRUE@ $(plugindir) +@HAVE_ODRS_TRUE@@HAVE_XDG_APP_TRUE@am_libgs_plugin_xdg_app_reviews_la_rpath = \ +@HAVE_ODRS_TRUE@@HAVE_XDG_APP_TRUE@ -rpath $(plugindir) am_gs_self_test_OBJECTS = gs_self_test-gs-moduleset.$(OBJEXT) \ gs_self_test-gs-self-test.$(OBJEXT) gs_self_test_OBJECTS = $(am_gs_self_test_OBJECTS) @@ -908,10 +908,10 @@ @HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_la_LIBADD = $(GS_PLUGIN_LIBS) $(XDG_APP_LIBS) @HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_la_LDFLAGS = -module -avoid-version @HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS) -@HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_reviews_la_SOURCES = gs-plugin-xdg-app-reviews.c -@HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_reviews_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS) -@HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_reviews_la_LDFLAGS = -module -avoid-version -@HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_reviews_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS) +@HAVE_ODRS_TRUE@@HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_reviews_la_SOURCES = gs-plugin-xdg-app-reviews.c +@HAVE_ODRS_TRUE@@HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_reviews_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS) +@HAVE_ODRS_TRUE@@HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_reviews_la_LDFLAGS = -module -avoid-version +@HAVE_ODRS_TRUE@@HAVE_XDG_APP_TRUE@libgs_plugin_xdg_app_reviews_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS) @HAVE_APT_TRUE@CLEANFILES = ubuntu-unity-launcher-proxy.h ubuntu-unity-launcher-proxy.c @HAVE_APT_TRUE@libgs_plugin_apt_la_SOURCES = \ @HAVE_APT_TRUE@ ubuntu-unity-launcher-proxy.c \ diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/ubuntu-unity-launcher-proxy.c gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/ubuntu-unity-launcher-proxy.c --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/ubuntu-unity-launcher-proxy.c 2016-04-26 08:48:40.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/ubuntu-unity-launcher-proxy.c 2016-06-16 13:32:32.000000000 -0400 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.48.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.1. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/ubuntu-unity-launcher-proxy.h gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/ubuntu-unity-launcher-proxy.h --- gnome-software-3.20.1+git20160426.1.a976144-ubuntu-xenial/src/plugins/ubuntu-unity-launcher-proxy.h 2016-04-26 08:48:40.000000000 -0400 +++ gnome-software-3.20.1+git20160616.1.a708c4e-ubuntu-xenial/src/plugins/ubuntu-unity-launcher-proxy.h 2016-06-16 13:32:32.000000000 -0400 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.48.0. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.1. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */