Hello community, here is the log from the commit of package gnome-software for openSUSE:Factory checked in at 2014-11-18 22:46:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-software (Old) and /work/SRC/openSUSE:Factory/.gnome-software.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-software" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-software/gnome-software.changes 2014-11-15 12:16:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-software.new/gnome-software.changes 2014-11-18 22:48:32.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Nov 13 09:32:21 UTC 2014 - [email protected] + +- Update to version 3.14.2: + + New Features: + - Add the origin as a keyword if it's not the majority source. + - Support the LOCAL AppStream icon type. + + Bugfix: + - Do not fail to get popular apps if the AppStream data is + invalid. + - Do not show a random white line above the star rating widget. + - Do not show empty app boxes if no popular results are + available. + - Do not try to download local web-app icons. + - Fix screenshot loading with --details. + - Use blue stars for the user-ratings rather than yellow/gold. + +------------------------------------------------------------------- Old: ---- gnome-software-3.14.1.tar.xz New: ---- gnome-software-3.14.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-software.spec ++++++ --- /var/tmp/diff_new_pack.VABakO/_old 2014-11-18 22:48:33.000000000 +0100 +++ /var/tmp/diff_new_pack.VABakO/_new 2014-11-18 22:48:33.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnome-software -Version: 3.14.1 +Version: 3.14.2 Release: 0 %define gs_plugin_api 7 Summary: GNOME Software Store ++++++ gnome-software-3.14.1.tar.xz -> gnome-software-3.14.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/NEWS new/gnome-software-3.14.2/NEWS --- old/gnome-software-3.14.1/NEWS 2014-10-13 16:35:14.000000000 +0200 +++ new/gnome-software-3.14.2/NEWS 2014-11-10 17:05:01.000000000 +0100 @@ -1,3 +1,19 @@ +Version 3.14.2 +~~~~~~~~~~~~~~ +Released: 2014-11-10 + +* New Features: + - Add the origin as a keyword if it's not the majority source (Richard Hughes) + - Support the LOCAL AppStream icon type (Richard Hughes) + +* Bugfix: + - Do not fail to get popular apps if the AppStream data is invalid (Richard Hughes) + - Do not show a random white line above the star rating widget (Richard Hughes) + - Do not show empty app boxes if no popular results are available (Richard Hughes) + - Do not try to download local web-app icons (Richard Hughes) + - Fix screenshot loading with --details (Kalev Lember) + - Use blue stars for the user-ratings rather than yellow/gold (Richard Hughes) + Version 3.14.1 ~~~~~~~~~~~~~~ Released: 2014-10-13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/aclocal.m4 new/gnome-software-3.14.2/aclocal.m4 --- old/gnome-software-3.14.1/aclocal.m4 2014-10-01 22:21:17.000000000 +0200 +++ new/gnome-software-3.14.2/aclocal.m4 2014-11-10 16:45:06.000000000 +0100 @@ -20,254 +20,6 @@ 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'.])]) -# 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 -dnl This file can 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 package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper <[email protected]>, 1995-2000. -dnl Bruno Haible <[email protected]>, 2000-2003. - -AC_PREREQ([2.50]) - -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]) -]) - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant <[email protected]>. -# -# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# 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. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -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$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 -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# 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]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -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 -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -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 -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# 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 <http://pkg-config.freedesktop.org/>.])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES - - -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# 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 - - -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --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 - - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# 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 -])# PKG_CHECK_VAR - # Configure paths for GLIB # Owen Taylor 1997-2001 @@ -1178,6 +930,254 @@ ] ) +# 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 +dnl This file can 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 package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <[email protected]>, 1995-2000. +dnl Bruno Haible <[email protected]>, 2000-2003. + +AC_PREREQ([2.50]) + +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]) +]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant <[email protected]>. +# +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# 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. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +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$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 +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# 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]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +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 +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +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 +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# 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 <http://pkg-config.freedesktop.org/>.])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# 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 + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --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 + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# 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 +])# PKG_CHECK_VAR + # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/config.h new/gnome-software-3.14.2/config.h --- old/gnome-software-3.14.1/config.h 2014-09-29 21:10:03.000000000 +0200 +++ new/gnome-software-3.14.2/config.h 2014-10-21 11:48:10.000000000 +0200 @@ -69,7 +69,7 @@ #define PACKAGE_NAME "gnome-software" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "gnome-software 3.14.1" +#define PACKAGE_STRING "gnome-software 3.14.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gnome-software" @@ -78,10 +78,10 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "3.14.1" +#define PACKAGE_VERSION "3.14.2" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "3.14.1" +#define VERSION "3.14.2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/configure new/gnome-software-3.14.2/configure --- old/gnome-software-3.14.1/configure 2014-10-01 22:21:19.000000000 +0200 +++ new/gnome-software-3.14.2/configure 2014-11-10 16:45:11.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-software 3.14.1. +# Generated by GNU Autoconf 2.69 for gnome-software 3.14.2. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-software>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gnome-software' PACKAGE_TARNAME='gnome-software' -PACKAGE_VERSION='3.14.1' -PACKAGE_STRING='gnome-software 3.14.1' +PACKAGE_VERSION='3.14.2' +PACKAGE_STRING='gnome-software 3.14.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-software' PACKAGE_URL='' @@ -1425,7 +1425,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 gnome-software 3.14.1 to adapt to many kinds of systems. +\`configure' configures gnome-software 3.14.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1495,7 +1495,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-software 3.14.1:";; + short | recursive ) echo "Configuration of gnome-software 3.14.2:";; esac cat <<\_ACEOF @@ -1643,7 +1643,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-software configure 3.14.1 +gnome-software configure 3.14.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2012,7 +2012,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-software $as_me 3.14.1, which was +It was created by gnome-software $as_me 3.14.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2876,7 +2876,7 @@ # Define the identity of the package. PACKAGE='gnome-software' - VERSION='3.14.1' + VERSION='3.14.2' cat >>confdefs.h <<_ACEOF @@ -15116,7 +15116,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-software $as_me 3.14.1, which was +This file was extended by gnome-software $as_me 3.14.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15182,7 +15182,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-software config.status 3.14.1 +gnome-software config.status 3.14.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/configure.ac new/gnome-software-3.14.2/configure.ac --- old/gnome-software-3.14.1/configure.ac 2014-10-01 22:21:14.000000000 +0200 +++ new/gnome-software-3.14.2/configure.ac 2014-11-10 16:44:31.000000000 +0100 @@ -1,7 +1,7 @@ # Copyright (C) 2010-2012 Richard Hughes <[email protected]> AC_PREREQ(2.63) -AC_INIT([gnome-software],[3.14.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-software]) +AC_INIT([gnome-software],[3.14.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-software]) AC_CONFIG_SRCDIR(src) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar serial-tests]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/src/gs-application.c new/gnome-software-3.14.2/src/gs-application.c --- old/gnome-software-3.14.1/src/gs-application.c 2014-10-07 09:53:23.000000000 +0200 +++ new/gnome-software-3.14.2/src/gs-application.c 2014-11-10 16:44:38.000000000 +0100 @@ -115,7 +115,6 @@ gboolean available, GsApplication *app) { - g_debug ("*** Network status change: %s", available ? "online" : "offline"); gs_plugin_loader_set_network_status (app->plugin_loader, available); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/src/gs-plugin-loader.c new/gnome-software-3.14.2/src/gs-plugin-loader.c --- old/gnome-software-3.14.1/src/gs-plugin-loader.c 2014-10-07 09:53:23.000000000 +0200 +++ new/gnome-software-3.14.2/src/gs-plugin-loader.c 2014-11-10 16:44:38.000000000 +0100 @@ -3006,6 +3006,8 @@ if (plugin_loader->priv->online == online) return; + g_debug ("*** Network status change: %s", online ? "online" : "offline"); + plugin_loader->priv->online = online; if (!online) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/src/gs-resources.c new/gnome-software-3.14.2/src/gs-resources.c --- old/gnome-software-3.14.1/src/gs-resources.c 2014-10-07 10:09:14.000000000 +0200 +++ new/gnome-software-3.14.2/src/gs-resources.c 2014-11-10 16:48:17.000000000 +0100 @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[141829]; const double alignment; void * const ptr;} gs_resource_data = { { +static const SECTION union { const guint8 data[141885]; const double alignment; void * const ptr;} gs_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x4c, 0x03, 0x00, 0x00, @@ -52,67 +52,67 @@ 0x41, 0xdc, 0x00, 0x00, 0xa5, 0x10, 0x55, 0xae, 0x10, 0x00, 0x00, 0x00, 0x41, 0xdc, 0x00, 0x00, 0x0d, 0x00, 0x76, 0x00, 0x50, 0xdc, 0x00, 0x00, - 0xa5, 0xea, 0x00, 0x00, 0x93, 0xf4, 0xc0, 0x92, - 0x00, 0x00, 0x00, 0x00, 0xa5, 0xea, 0x00, 0x00, - 0x08, 0x00, 0x76, 0x00, 0xb0, 0xea, 0x00, 0x00, - 0xfd, 0xec, 0x00, 0x00, 0x88, 0x6d, 0x94, 0x04, - 0x10, 0x00, 0x00, 0x00, 0xfd, 0xec, 0x00, 0x00, - 0x13, 0x00, 0x76, 0x00, 0x10, 0xed, 0x00, 0x00, - 0xc3, 0x6a, 0x01, 0x00, 0x28, 0xc1, 0x6c, 0x77, - 0x10, 0x00, 0x00, 0x00, 0xc3, 0x6a, 0x01, 0x00, - 0x11, 0x00, 0x76, 0x00, 0xd8, 0x6a, 0x01, 0x00, - 0x76, 0x78, 0x01, 0x00, 0x72, 0x56, 0x90, 0x94, - 0x10, 0x00, 0x00, 0x00, 0x76, 0x78, 0x01, 0x00, - 0x0b, 0x00, 0x76, 0x00, 0x88, 0x78, 0x01, 0x00, - 0x63, 0x87, 0x01, 0x00, 0x80, 0x54, 0xc3, 0x1f, - 0x10, 0x00, 0x00, 0x00, 0x63, 0x87, 0x01, 0x00, - 0x14, 0x00, 0x76, 0x00, 0x78, 0x87, 0x01, 0x00, - 0xe8, 0x90, 0x01, 0x00, 0x04, 0xd4, 0xaa, 0x73, - 0x10, 0x00, 0x00, 0x00, 0xe8, 0x90, 0x01, 0x00, - 0x13, 0x00, 0x76, 0x00, 0x00, 0x91, 0x01, 0x00, - 0x3b, 0x98, 0x01, 0x00, 0xb8, 0xb3, 0x0b, 0x25, - 0x10, 0x00, 0x00, 0x00, 0x3b, 0x98, 0x01, 0x00, - 0x12, 0x00, 0x76, 0x00, 0x50, 0x98, 0x01, 0x00, - 0xbf, 0xa2, 0x01, 0x00, 0x4a, 0x73, 0x75, 0xe5, - 0x15, 0x00, 0x00, 0x00, 0xbf, 0xa2, 0x01, 0x00, - 0x09, 0x00, 0x4c, 0x00, 0xc8, 0xa2, 0x01, 0x00, - 0x28, 0xa3, 0x01, 0x00, 0x4b, 0x50, 0x90, 0x0b, - 0x1a, 0x00, 0x00, 0x00, 0x28, 0xa3, 0x01, 0x00, - 0x04, 0x00, 0x4c, 0x00, 0x2c, 0xa3, 0x01, 0x00, - 0x30, 0xa3, 0x01, 0x00, 0xf6, 0x40, 0x9c, 0x48, - 0x10, 0x00, 0x00, 0x00, 0x30, 0xa3, 0x01, 0x00, - 0x13, 0x00, 0x76, 0x00, 0x48, 0xa3, 0x01, 0x00, - 0x8f, 0xab, 0x01, 0x00, 0x54, 0xcd, 0x62, 0x45, - 0x10, 0x00, 0x00, 0x00, 0x8f, 0xab, 0x01, 0x00, - 0x0f, 0x00, 0x76, 0x00, 0xa0, 0xab, 0x01, 0x00, - 0x19, 0xb8, 0x01, 0x00, 0x02, 0x36, 0x11, 0x53, - 0x10, 0x00, 0x00, 0x00, 0x19, 0xb8, 0x01, 0x00, - 0x15, 0x00, 0x76, 0x00, 0x30, 0xb8, 0x01, 0x00, - 0x82, 0xc4, 0x01, 0x00, 0xb0, 0xb7, 0x24, 0x30, - 0x11, 0x00, 0x00, 0x00, 0x82, 0xc4, 0x01, 0x00, - 0x06, 0x00, 0x4c, 0x00, 0x88, 0xc4, 0x01, 0x00, - 0x8c, 0xc4, 0x01, 0x00, 0x1d, 0x6f, 0xbf, 0x50, - 0x10, 0x00, 0x00, 0x00, 0x8c, 0xc4, 0x01, 0x00, - 0x10, 0x00, 0x76, 0x00, 0xa0, 0xc4, 0x01, 0x00, - 0x11, 0xc9, 0x01, 0x00, 0xa3, 0xa7, 0x27, 0x29, - 0x10, 0x00, 0x00, 0x00, 0x11, 0xc9, 0x01, 0x00, - 0x0d, 0x00, 0x76, 0x00, 0x20, 0xc9, 0x01, 0x00, - 0x3b, 0xdb, 0x01, 0x00, 0xfd, 0x9c, 0x35, 0xc7, - 0x10, 0x00, 0x00, 0x00, 0x3b, 0xdb, 0x01, 0x00, - 0x0f, 0x00, 0x76, 0x00, 0x50, 0xdb, 0x01, 0x00, - 0x3b, 0xe4, 0x01, 0x00, 0x44, 0xc7, 0x68, 0xfb, - 0x10, 0x00, 0x00, 0x00, 0x3b, 0xe4, 0x01, 0x00, - 0x11, 0x00, 0x76, 0x00, 0x50, 0xe4, 0x01, 0x00, - 0xd4, 0x14, 0x02, 0x00, 0xd4, 0xb5, 0x02, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xd4, 0x14, 0x02, 0x00, - 0x01, 0x00, 0x4c, 0x00, 0xd8, 0x14, 0x02, 0x00, - 0xdc, 0x14, 0x02, 0x00, 0x2c, 0x27, 0x30, 0xfc, - 0x10, 0x00, 0x00, 0x00, 0xdc, 0x14, 0x02, 0x00, - 0x14, 0x00, 0x76, 0x00, 0xf0, 0x14, 0x02, 0x00, - 0x34, 0x1c, 0x02, 0x00, 0xa4, 0x68, 0x60, 0x4f, - 0x10, 0x00, 0x00, 0x00, 0x34, 0x1c, 0x02, 0x00, - 0x16, 0x00, 0x76, 0x00, 0x50, 0x1c, 0x02, 0x00, - 0x05, 0x2a, 0x02, 0x00, 0x67, 0x74, 0x6b, 0x2f, + 0xe0, 0xea, 0x00, 0x00, 0x93, 0xf4, 0xc0, 0x92, + 0x00, 0x00, 0x00, 0x00, 0xe0, 0xea, 0x00, 0x00, + 0x08, 0x00, 0x76, 0x00, 0xe8, 0xea, 0x00, 0x00, + 0x35, 0xed, 0x00, 0x00, 0x88, 0x6d, 0x94, 0x04, + 0x10, 0x00, 0x00, 0x00, 0x35, 0xed, 0x00, 0x00, + 0x13, 0x00, 0x76, 0x00, 0x48, 0xed, 0x00, 0x00, + 0xfb, 0x6a, 0x01, 0x00, 0x28, 0xc1, 0x6c, 0x77, + 0x10, 0x00, 0x00, 0x00, 0xfb, 0x6a, 0x01, 0x00, + 0x11, 0x00, 0x76, 0x00, 0x10, 0x6b, 0x01, 0x00, + 0xae, 0x78, 0x01, 0x00, 0x72, 0x56, 0x90, 0x94, + 0x10, 0x00, 0x00, 0x00, 0xae, 0x78, 0x01, 0x00, + 0x0b, 0x00, 0x76, 0x00, 0xc0, 0x78, 0x01, 0x00, + 0x9b, 0x87, 0x01, 0x00, 0x80, 0x54, 0xc3, 0x1f, + 0x10, 0x00, 0x00, 0x00, 0x9b, 0x87, 0x01, 0x00, + 0x14, 0x00, 0x76, 0x00, 0xb0, 0x87, 0x01, 0x00, + 0x20, 0x91, 0x01, 0x00, 0x04, 0xd4, 0xaa, 0x73, + 0x10, 0x00, 0x00, 0x00, 0x20, 0x91, 0x01, 0x00, + 0x13, 0x00, 0x76, 0x00, 0x38, 0x91, 0x01, 0x00, + 0x73, 0x98, 0x01, 0x00, 0xb8, 0xb3, 0x0b, 0x25, + 0x10, 0x00, 0x00, 0x00, 0x73, 0x98, 0x01, 0x00, + 0x12, 0x00, 0x76, 0x00, 0x88, 0x98, 0x01, 0x00, + 0xf7, 0xa2, 0x01, 0x00, 0x4a, 0x73, 0x75, 0xe5, + 0x15, 0x00, 0x00, 0x00, 0xf7, 0xa2, 0x01, 0x00, + 0x09, 0x00, 0x4c, 0x00, 0x00, 0xa3, 0x01, 0x00, + 0x60, 0xa3, 0x01, 0x00, 0x4b, 0x50, 0x90, 0x0b, + 0x1a, 0x00, 0x00, 0x00, 0x60, 0xa3, 0x01, 0x00, + 0x04, 0x00, 0x4c, 0x00, 0x64, 0xa3, 0x01, 0x00, + 0x68, 0xa3, 0x01, 0x00, 0xf6, 0x40, 0x9c, 0x48, + 0x10, 0x00, 0x00, 0x00, 0x68, 0xa3, 0x01, 0x00, + 0x13, 0x00, 0x76, 0x00, 0x80, 0xa3, 0x01, 0x00, + 0xc7, 0xab, 0x01, 0x00, 0x54, 0xcd, 0x62, 0x45, + 0x10, 0x00, 0x00, 0x00, 0xc7, 0xab, 0x01, 0x00, + 0x0f, 0x00, 0x76, 0x00, 0xd8, 0xab, 0x01, 0x00, + 0x51, 0xb8, 0x01, 0x00, 0x02, 0x36, 0x11, 0x53, + 0x10, 0x00, 0x00, 0x00, 0x51, 0xb8, 0x01, 0x00, + 0x15, 0x00, 0x76, 0x00, 0x68, 0xb8, 0x01, 0x00, + 0xba, 0xc4, 0x01, 0x00, 0xb0, 0xb7, 0x24, 0x30, + 0x11, 0x00, 0x00, 0x00, 0xba, 0xc4, 0x01, 0x00, + 0x06, 0x00, 0x4c, 0x00, 0xc0, 0xc4, 0x01, 0x00, + 0xc4, 0xc4, 0x01, 0x00, 0x1d, 0x6f, 0xbf, 0x50, + 0x10, 0x00, 0x00, 0x00, 0xc4, 0xc4, 0x01, 0x00, + 0x10, 0x00, 0x76, 0x00, 0xd8, 0xc4, 0x01, 0x00, + 0x49, 0xc9, 0x01, 0x00, 0xa3, 0xa7, 0x27, 0x29, + 0x10, 0x00, 0x00, 0x00, 0x49, 0xc9, 0x01, 0x00, + 0x0d, 0x00, 0x76, 0x00, 0x58, 0xc9, 0x01, 0x00, + 0x73, 0xdb, 0x01, 0x00, 0xfd, 0x9c, 0x35, 0xc7, + 0x10, 0x00, 0x00, 0x00, 0x73, 0xdb, 0x01, 0x00, + 0x0f, 0x00, 0x76, 0x00, 0x88, 0xdb, 0x01, 0x00, + 0x73, 0xe4, 0x01, 0x00, 0x44, 0xc7, 0x68, 0xfb, + 0x10, 0x00, 0x00, 0x00, 0x73, 0xe4, 0x01, 0x00, + 0x11, 0x00, 0x76, 0x00, 0x88, 0xe4, 0x01, 0x00, + 0x0c, 0x15, 0x02, 0x00, 0xd4, 0xb5, 0x02, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x0c, 0x15, 0x02, 0x00, + 0x01, 0x00, 0x4c, 0x00, 0x10, 0x15, 0x02, 0x00, + 0x14, 0x15, 0x02, 0x00, 0x2c, 0x27, 0x30, 0xfc, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x15, 0x02, 0x00, + 0x14, 0x00, 0x76, 0x00, 0x28, 0x15, 0x02, 0x00, + 0x6c, 0x1c, 0x02, 0x00, 0xa4, 0x68, 0x60, 0x4f, + 0x10, 0x00, 0x00, 0x00, 0x6c, 0x1c, 0x02, 0x00, + 0x16, 0x00, 0x76, 0x00, 0x88, 0x1c, 0x02, 0x00, + 0x3d, 0x2a, 0x02, 0x00, 0x67, 0x74, 0x6b, 0x2f, 0x09, 0x00, 0x00, 0x00, 0x61, 0x70, 0x70, 0x2d, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, @@ -7057,7 +7057,7 @@ 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, 0x74, 0x6b, 0x2d, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x2e, 0x63, 0x73, 0x73, 0x00, 0x00, - 0x45, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x2e, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x2d, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x2d, 0x62, 0x6f, 0x78, 0x20, @@ -7410,59 +7410,101 @@ 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x30, 0x70, 0x78, 0x3b, 0x0a, 0x09, 0x70, 0x61, 0x64, 0x64, 0x69, - 0x6e, 0x67, 0x3a, 0x20, 0x30, 0x3b, 0x0a, 0x7d, - 0x0a, 0x0a, 0x2e, 0x73, 0x74, 0x61, 0x72, 0x20, - 0x7b, 0x0a, 0x09, 0x63, 0x6f, 0x6c, 0x6f, 0x72, - 0x3a, 0x20, 0x23, 0x38, 0x38, 0x38, 0x61, 0x38, - 0x35, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2e, 0x73, - 0x74, 0x61, 0x72, 0x2d, 0x75, 0x73, 0x65, 0x72, - 0x20, 0x7b, 0x0a, 0x09, 0x63, 0x6f, 0x6c, 0x6f, - 0x72, 0x3a, 0x20, 0x23, 0x65, 0x64, 0x64, 0x34, - 0x30, 0x30, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2e, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x74, 0x65, 0x78, 0x74, - 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x3a, - 0x20, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, - 0x3a, 0x20, 0x40, 0x74, 0x68, 0x65, 0x6d, 0x65, - 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, - 0x64, 0x5f, 0x66, 0x67, 0x5f, 0x63, 0x6f, 0x6c, - 0x6f, 0x72, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, - 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, - 0x3a, 0x20, 0x6d, 0x69, 0x78, 0x28, 0x40, 0x74, - 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x6c, - 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x67, - 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x2c, 0x20, - 0x40, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x73, - 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, - 0x66, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, - 0x2c, 0x20, 0x30, 0x2e, 0x33, 0x29, 0x3b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, - 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x3a, 0x20, 0x73, - 0x6d, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x3b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x2d, 0x72, 0x61, 0x64, 0x69, 0x75, - 0x73, 0x3a, 0x20, 0x34, 0x70, 0x78, 0x3b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x64, 0x64, - 0x69, 0x6e, 0x67, 0x3a, 0x20, 0x30, 0x70, 0x78, - 0x20, 0x34, 0x70, 0x78, 0x3b, 0x0a, 0x7d, 0x0a, + 0x6e, 0x67, 0x3a, 0x20, 0x30, 0x3b, 0x0a, 0x09, + 0x62, 0x6f, 0x78, 0x2d, 0x73, 0x68, 0x61, 0x64, + 0x6f, 0x77, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, 0x65, + 0x3b, 0x0a, 0x09, 0x6f, 0x75, 0x74, 0x6c, 0x69, + 0x6e, 0x65, 0x2d, 0x6f, 0x66, 0x66, 0x73, 0x65, + 0x74, 0x3a, 0x20, 0x2d, 0x31, 0x70, 0x78, 0x3b, + 0x0a, 0x7d, 0x0a, 0x0a, 0x2e, 0x73, 0x74, 0x61, + 0x72, 0x20, 0x7b, 0x0a, 0x09, 0x63, 0x6f, 0x6c, + 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x38, 0x38, 0x38, + 0x61, 0x38, 0x35, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, + 0x2e, 0x73, 0x74, 0x61, 0x72, 0x2d, 0x75, 0x73, + 0x65, 0x72, 0x20, 0x7b, 0x0a, 0x09, 0x63, 0x6f, + 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x40, 0x74, 0x68, + 0x65, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x6c, 0x65, + 0x63, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x67, 0x5f, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, 0x0a, 0x7d, + 0x0a, 0x0a, 0x2e, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x65, 0x72, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x74, + 0x65, 0x78, 0x74, 0x2d, 0x73, 0x68, 0x61, 0x64, + 0x6f, 0x77, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, 0x65, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6f, + 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x40, 0x74, 0x68, + 0x65, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x6c, 0x65, + 0x63, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x67, 0x5f, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, + 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, + 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x6d, 0x69, 0x78, + 0x28, 0x40, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x5f, + 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, + 0x5f, 0x62, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, + 0x72, 0x2c, 0x20, 0x40, 0x74, 0x68, 0x65, 0x6d, + 0x65, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, + 0x65, 0x64, 0x5f, 0x66, 0x67, 0x5f, 0x63, 0x6f, + 0x6c, 0x6f, 0x72, 0x2c, 0x20, 0x30, 0x2e, 0x33, + 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, + 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x69, 0x7a, 0x65, + 0x3a, 0x20, 0x73, 0x6d, 0x61, 0x6c, 0x6c, 0x65, + 0x72, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x72, 0x61, + 0x64, 0x69, 0x75, 0x73, 0x3a, 0x20, 0x34, 0x70, + 0x78, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, + 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x3a, 0x20, + 0x30, 0x70, 0x78, 0x20, 0x34, 0x70, 0x78, 0x3b, + 0x0a, 0x7d, 0x0a, 0x0a, 0x2e, 0x63, 0x61, 0x74, + 0x65, 0x67, 0x6f, 0x72, 0x79, 0x2d, 0x73, 0x69, + 0x64, 0x65, 0x62, 0x61, 0x72, 0x20, 0x7b, 0x0a, + 0x09, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, + 0x72, 0x61, 0x64, 0x69, 0x75, 0x73, 0x3a, 0x20, + 0x30, 0x3b, 0x0a, 0x09, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x2d, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, + 0x20, 0x30, 0x3b, 0x0a, 0x09, 0x62, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x2d, 0x74, 0x6f, 0x70, 0x2d, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x30, + 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2e, 0x63, 0x61, + 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x2d, 0x73, + 0x69, 0x64, 0x65, 0x62, 0x61, 0x72, 0x20, 0x47, + 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, + 0x78, 0x20, 0x7b, 0x0a, 0x09, 0x62, 0x61, 0x63, + 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x40, + 0x74, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x62, 0x67, + 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, 0x0a, + 0x7d, 0x0a, 0x0a, 0x2e, 0x63, 0x61, 0x74, 0x65, + 0x67, 0x6f, 0x72, 0x79, 0x2d, 0x73, 0x69, 0x64, + 0x65, 0x62, 0x61, 0x72, 0x20, 0x47, 0x74, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, + 0x6f, 0x77, 0x20, 0x7b, 0x0a, 0x09, 0x70, 0x61, + 0x64, 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x6c, 0x65, + 0x66, 0x74, 0x3a, 0x20, 0x36, 0x70, 0x78, 0x3b, + 0x0a, 0x09, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x0a, 0x09, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, + 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2e, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x2d, 0x73, 0x69, 0x64, 0x65, 0x62, - 0x61, 0x72, 0x20, 0x7b, 0x0a, 0x09, 0x62, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x2d, 0x72, 0x61, 0x64, - 0x69, 0x75, 0x73, 0x3a, 0x20, 0x30, 0x3b, 0x0a, - 0x09, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x2d, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x30, 0x3b, - 0x0a, 0x09, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x2d, 0x74, 0x6f, 0x70, 0x2d, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x3a, 0x20, 0x30, 0x3b, 0x0a, 0x7d, - 0x0a, 0x0a, 0x2e, 0x63, 0x61, 0x74, 0x65, 0x67, - 0x6f, 0x72, 0x79, 0x2d, 0x73, 0x69, 0x64, 0x65, - 0x62, 0x61, 0x72, 0x20, 0x47, 0x74, 0x6b, 0x4c, - 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x20, 0x7b, + 0x61, 0x72, 0x20, 0x47, 0x74, 0x6b, 0x4c, 0x69, + 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, + 0x3a, 0x64, 0x69, 0x72, 0x28, 0x72, 0x74, 0x6c, + 0x29, 0x20, 0x7b, 0x0a, 0x09, 0x70, 0x61, 0x64, + 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x72, 0x69, 0x67, + 0x68, 0x74, 0x3a, 0x20, 0x36, 0x70, 0x78, 0x3b, + 0x0a, 0x09, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x0a, 0x09, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, + 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x0a, 0x7d, 0x0a, + 0x0a, 0x2e, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, + 0x72, 0x79, 0x2d, 0x73, 0x69, 0x64, 0x65, 0x62, + 0x61, 0x72, 0x20, 0x47, 0x74, 0x6b, 0x4c, 0x69, + 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, + 0x3a, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x7b, 0x0a, 0x09, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x40, 0x74, 0x68, 0x65, @@ -7471,52 +7513,17 @@ 0x2e, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x2d, 0x73, 0x69, 0x64, 0x65, 0x62, 0x61, 0x72, 0x20, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, - 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x20, - 0x7b, 0x0a, 0x09, 0x70, 0x61, 0x64, 0x64, 0x69, - 0x6e, 0x67, 0x2d, 0x6c, 0x65, 0x66, 0x74, 0x3a, - 0x20, 0x36, 0x70, 0x78, 0x3b, 0x0a, 0x09, 0x61, - 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x3a, 0x20, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x0a, - 0x09, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, - 0x65, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2e, 0x63, - 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x2d, - 0x73, 0x69, 0x64, 0x65, 0x62, 0x61, 0x72, 0x20, - 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, - 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x3a, 0x64, 0x69, - 0x72, 0x28, 0x72, 0x74, 0x6c, 0x29, 0x20, 0x7b, - 0x0a, 0x09, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, - 0x67, 0x2d, 0x72, 0x69, 0x67, 0x68, 0x74, 0x3a, - 0x20, 0x36, 0x70, 0x78, 0x3b, 0x0a, 0x09, 0x61, - 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x3a, 0x20, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x0a, - 0x09, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, - 0x65, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2e, 0x63, - 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x2d, - 0x73, 0x69, 0x64, 0x65, 0x62, 0x61, 0x72, 0x20, - 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, - 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x3a, 0x68, 0x6f, - 0x76, 0x65, 0x72, 0x20, 0x7b, 0x0a, 0x09, 0x62, - 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, - 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, - 0x20, 0x40, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x5f, - 0x62, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, - 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2e, 0x63, 0x61, - 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x2d, 0x73, - 0x69, 0x64, 0x65, 0x62, 0x61, 0x72, 0x20, 0x47, - 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, - 0x78, 0x52, 0x6f, 0x77, 0x3a, 0x73, 0x65, 0x6c, - 0x65, 0x63, 0x74, 0x65, 0x64, 0x3a, 0x68, 0x6f, - 0x76, 0x65, 0x72, 0x20, 0x7b, 0x0a, 0x09, 0x62, - 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, - 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, - 0x20, 0x40, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x5f, + 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x3a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, - 0x5f, 0x62, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, - 0x72, 0x3b, 0x0a, 0x7d, 0x0a, 0x00, 0x00, 0x28, - 0x75, 0x75, 0x61, 0x79, 0x29, 0x6d, 0x65, 0x6e, - 0x75, 0x73, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, + 0x3a, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x7b, + 0x0a, 0x09, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, + 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, + 0x6f, 0x72, 0x3a, 0x20, 0x40, 0x74, 0x68, 0x65, + 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, + 0x74, 0x65, 0x64, 0x5f, 0x62, 0x67, 0x5f, 0x63, + 0x6f, 0x6c, 0x6f, 0x72, 0x3b, 0x0a, 0x7d, 0x0a, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x2e, 0x75, 0x69, 0x3d, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/src/gs-shell-details.c new/gnome-software-3.14.2/src/gs-shell-details.c --- old/gnome-software-3.14.1/src/gs-shell-details.c 2014-10-10 10:35:16.000000000 +0200 +++ new/gnome-software-3.14.2/src/gs-shell-details.c 2014-10-24 14:51:36.000000000 +0200 @@ -880,6 +880,7 @@ g_debug ("%s", app_dump); g_free (app_dump); + gs_shell_details_refresh_screenshots (shell_details); gs_shell_details_refresh_addons (shell_details); gs_shell_details_refresh_all (shell_details); gs_shell_details_set_state (shell_details, GS_SHELL_DETAILS_STATE_READY); @@ -1011,9 +1012,6 @@ shell_details, 0); gs_shell_details_load (shell_details); - /* set screenshots */ - gs_shell_details_refresh_screenshots (shell_details); - /* change widgets */ gs_shell_details_refresh_all (shell_details); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/src/gs-shell-overview.c new/gnome-software-3.14.2/src/gs-shell-overview.c --- old/gnome-software-3.14.1/src/gs-shell-overview.c 2014-10-07 09:53:23.000000000 +0200 +++ new/gnome-software-3.14.2/src/gs-shell-overview.c 2014-11-10 16:48:13.000000000 +0100 @@ -109,6 +109,7 @@ /* get popular apps */ list = gs_plugin_loader_get_popular_finish (plugin_loader, res, &error); + gtk_widget_set_visible (priv->box_popular, list != NULL); gtk_widget_set_visible (priv->popular_heading, list != NULL); if (list == NULL) { if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/src/gtk-style.css new/gnome-software-3.14.2/src/gtk-style.css --- old/gnome-software-3.14.1/src/gtk-style.css 2014-10-07 09:53:23.000000000 +0200 +++ new/gnome-software-3.14.2/src/gtk-style.css 2014-11-10 16:47:58.000000000 +0100 @@ -136,6 +136,8 @@ border-radius: 0; border-width: 0px; padding: 0; + box-shadow: none; + outline-offset: -1px; } .star { @@ -143,7 +145,7 @@ } .star-user { - color: #edd400; + color: @theme_selected_bg_color; } .counter-label { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/src/plugins/gs-plugin-appstream.c new/gnome-software-3.14.2/src/plugins/gs-plugin-appstream.c --- old/gnome-software-3.14.1/src/plugins/gs-plugin-appstream.c 2014-10-10 18:21:16.000000000 +0200 +++ new/gnome-software-3.14.2/src/plugins/gs-plugin-appstream.c 2014-11-10 16:48:10.000000000 +0100 @@ -126,14 +126,66 @@ } /** + * gs_plugin_appstream_get_origins_hash: + * + * Returns: A hash table with a string key of the application origin and a + * value of the guint percentage of the store is made up by that origin. + */ +static GHashTable * +gs_plugin_appstream_get_origins_hash (GPtrArray *array) +{ + AsApp *app; + GHashTable *origins = NULL; + GList *keys = NULL; + GList *l; + const gchar *tmp; + gdouble perc; + guint *cnt; + guint i; + + /* create a hash table with origin:cnt */ + origins = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, g_free); + for (i = 0; i < array->len; i++) { + app = g_ptr_array_index (array, i); + tmp = as_app_get_origin (app); + if (tmp == NULL) + continue; + cnt = g_hash_table_lookup (origins, tmp); + if (cnt == NULL) { + cnt = g_new0 (guint, 1); + g_hash_table_insert (origins, g_strdup (tmp), cnt); + } + (*cnt)++; + } + + /* convert the cnt to a percentage */ + keys = g_hash_table_get_keys (origins); + for (l = keys; l != NULL; l = l->next) { + tmp = l->data; + cnt = g_hash_table_lookup (origins, tmp); + perc = (100.f / (gdouble) array->len) * (gdouble) (*cnt); + g_debug ("origin %s provides %i apps (%.0f%%)", tmp, *cnt, perc); + *cnt = perc; + } + + g_list_free (keys); + return origins; +} + +/** * gs_plugin_startup: */ static gboolean gs_plugin_startup (GsPlugin *plugin, GError **error) { + AsApp *app; + GHashTable *origins = NULL; GPtrArray *items; gboolean ret; + const gchar *origin; gchar *tmp; + guint *perc; #if AS_CHECK_VERSION(0,3,1) guint i; #endif @@ -174,10 +226,24 @@ goto out; } + /* add search terms for apps not in the main source */ + origins = gs_plugin_appstream_get_origins_hash (items); + for (i = 0; i < items->len; i++) { + app = g_ptr_array_index (items, i); + origin = as_app_get_origin (app); + if (origin == NULL) + continue; + perc = g_hash_table_lookup (origins, origin); + if (*perc < 10) { + g_debug ("Adding keyword '%s' to %s", + origin, as_app_get_id (app)); + as_app_add_keyword (app, NULL, origin, -1); + } + } + /* look for any application with a HiDPI icon kudo */ #if AS_CHECK_VERSION(0,3,1) for (i = 0; i < items->len; i++) { - AsApp *app; app = g_ptr_array_index (items, i); if (as_app_has_kudo_kind (app, AS_KUDO_KIND_HI_DPI_ICON)) { plugin->priv->has_hi_dpi_support = TRUE; @@ -186,6 +252,8 @@ } #endif out: + if (origins != NULL) + g_hash_table_unref (origins); gs_profile_stop (plugin->profile, "appstream::startup"); return ret; } @@ -208,6 +276,7 @@ gs_app_set_icon (app, as_icon_get_name (icon)); break; case AS_ICON_KIND_STOCK: + case AS_ICON_KIND_LOCAL: gs_app_set_icon (app, as_icon_get_name (icon)); ret = gs_app_load_icon (app, plugin->scale, &error); if (!ret) { @@ -309,6 +378,9 @@ case AS_ICON_KIND_REMOTE: gs_app_set_icon (app, icon); break; +#if AS_CHECK_VERSION(0,2,7) + case AS_ICON_KIND_LOCAL: +#endif case AS_ICON_KIND_STOCK: gs_app_set_icon (app, icon); ret = gs_app_load_icon (app, plugin->scale, &error); @@ -641,6 +713,7 @@ if (tmp != NULL) { from_xml = as_markup_convert_simple (tmp, -1, error); if (from_xml == NULL) { + g_prefix_error (error, "trying to parse '%s': ", tmp); ret = FALSE; goto out; } @@ -1192,9 +1265,9 @@ GError **error) { AsApp *item; + GError *error_local = NULL; GPtrArray *array; GsApp *app; - gboolean ret = TRUE; guint i; /* search categories for the search term */ @@ -1224,9 +1297,14 @@ /* add application */ app = gs_app_new (as_app_get_id_full (item)); - ret = gs_plugin_refine_item (plugin, app, item, error); - if (!ret) - goto out; + if (!gs_plugin_refine_item (plugin, app, item, &error_local)) { + g_warning ("Failed to refine %s: %s", + as_app_get_id (item), + error_local->message); + g_clear_error (&error_local); + g_object_unref (app); + continue; + } /* only suggest awesome applications */ if (gs_plugin_appstream_is_app_awesome (app)) { @@ -1239,8 +1317,7 @@ } g_object_unref (app); } -out: - return ret; + return TRUE; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-software-3.14.1/src/plugins/gs-plugin-epiphany.c new/gnome-software-3.14.2/src/plugins/gs-plugin-epiphany.c --- old/gnome-software-3.14.1/src/plugins/gs-plugin-epiphany.c 2014-10-07 09:53:23.000000000 +0200 +++ new/gnome-software-3.14.2/src/plugins/gs-plugin-epiphany.c 2014-10-21 12:43:10.000000000 +0200 @@ -554,6 +554,14 @@ /* create the GET data */ msg = soup_message_new (SOUP_METHOD_GET, uri); + if (msg == NULL) { + ret = FALSE; + g_set_error (error, + GS_PLUGIN_ERROR, + GS_PLUGIN_ERROR_FAILED, + "%s is not a valid URL", uri); + goto out; + } /* ensure networking is set up */ ret = gs_plugin_setup_networking (plugin, error); @@ -617,6 +625,7 @@ gchar *filename_icon = NULL; gchar *hash; GError *error_local = NULL; + GFile *file = NULL; /* this is not yet installed */ gs_app_set_state (app, AS_APP_STATE_AVAILABLE); @@ -634,10 +643,18 @@ ret = gs_mkdir_parent (filename_icon, error); if (!ret) goto out; - ret = gs_plugin_epiphany_download (plugin, - gs_app_get_icon (app), - filename_icon, - &error_local); + if (g_str_has_prefix (gs_app_get_icon (app), "/")) { + file = g_file_new_for_path (filename_icon); + ret = g_file_make_symbolic_link (file, + gs_app_get_icon (app), + NULL, + &error_local); + } else { + ret = gs_plugin_epiphany_download (plugin, + gs_app_get_icon (app), + filename_icon, + &error_local); + } if (!ret) { /* this isn't a fatal error */ gs_app_set_state (app, AS_APP_STATE_UNKNOWN); @@ -670,6 +687,8 @@ gs_plugin_add_app (&plugin->priv->list, app); gs_app_set_management_plugin (app, "Epiphany"); out: + if (file != NULL) + g_object_unref (file); g_free (hash); g_free (path); g_free (filename_icon); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
