diffstat of debian/ for gnome-software_3.25.91-1 gnome-software_3.26.1-0ubuntu2 README.source | 9 changelog | 345 + control | 56 control.in | 54 gnome-software-common.install | 1 gnome-software-plugin-flatpak.install | 2 gnome-software.gsettings-override.in | 2 icons/hicolor/128x128/apps/ubuntusoftware.svg | 2293 ++++++++++ icons/hicolor/16x16/apps/ubuntusoftware.svg | 564 ++ icons/hicolor/24x24/apps/ubuntusoftware.svg | 678 ++ icons/hicolor/48x48/apps/ubuntusoftware.svg | 666 ++ icons/hicolor/scalable/apps/ubuntusoftware.svg | 2293 ++++++++++ patches/0001-Construct-the-Software-Sources-menu-item-dynamically.patch | 70 patches/0001-snap-Fix-crash-authenticating-with-Ubuntu-One.patch | 36 patches/0002-Hide-licence-updated-and-category-fields-if-they-are.patch | 53 patches/0003-Download-changelog-information-on-demand-this-stops-.patch | 113 patches/0004-Sort-snaps-before-other-apps.patch | 29 patches/0005-Hide-Kudo-details-since-we-don-t-have-good-data.patch | 43 patches/0006-packagekit-Disable-updates.patch | 28 patches/0007-snap-Only-feature-snaps.patch | 65 patches/0008-Don-t-randomize-editors-picks.patch | 29 patches/0009-Display-a-warning-for-non-sandboxed-snaps.patch | 121 patches/0010-snap-Install-classic-snaps.patch | 59 patches/0011-snap-Correct-the-app-origin.patch | 93 patches/0012-details-Show-an-in-app-notification-when-passed-an-i.patch | 193 patches/series | 13 rules | 25 source_gnome-software.py | 7 ubuntu-software.install | 2 ubuntu-software.links | 2 30 files changed, 7903 insertions(+), 41 deletions(-) diff -Nru gnome-software-3.25.91/debian/README.source gnome-software-3.26.1/debian/README.source --- gnome-software-3.25.91/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/README.source 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,9 @@ +The Ubuntu packaging is maintained at +https://code.launchpad.net/~ubuntu-desktop/gnome-software/ubuntu + +Patches are maintained at https://git.gnome.org/gnome-software +in wip/ubuntu-* branches. These branches are regularly rebased. + +To inspect these changes individually, please issue + + $ git clone -b wip/ubuntu-3-26 git://git.gnome.org/gnome-software diff -Nru gnome-software-3.25.91/debian/changelog gnome-software-3.26.1/debian/changelog --- gnome-software-3.25.91/debian/changelog 2017-08-24 15:33:38.000000000 +0000 +++ gnome-software-3.26.1/debian/changelog 2017-10-16 20:33:05.000000000 +0000 @@ -1,3 +1,93 @@ +gnome-software (3.26.1-0ubuntu2) artful; urgency=medium + + * debian/patches/0001-snap-Fix-crash-authenticating-with-Ubuntu-One.patch: + - Fix crash authenticating with Ubuntu One (LP: #1723312) + + -- Robert Ancell Tue, 17 Oct 2017 09:33:05 +1300 + +gnome-software (3.26.1-0ubuntu1) artful; urgency=medium + + * New upstream stable release: (LP: #1721308) + - Fixes snap plugin not working after snap restart (LP: #1718170) + * debian/patches/0001-gs_details_page_set_url-Pass-helper-to-gs_plugin_loa.patch + - Applied upstream + + -- Robert Ancell Wed, 11 Oct 2017 10:36:26 +1300 + +gnome-software (3.26.0-0ubuntu3) artful; urgency=medium + + * debian/patches/0001-gs_details_page_set_url-Pass-helper-to-gs_plugin_loa.patch + - Fix crash loading snap URLs (LP: #1720227) + + -- Robert Ancell Fri, 29 Sep 2017 10:30:11 -0400 + +gnome-software (3.26.0-0ubuntu2) artful; urgency=medium + + * debian/ubuntu-software.links: + - Ensure xorg session also displays "Ubuntu Software" name and icon. + + -- Didier Roche Tue, 19 Sep 2017 16:54:31 +0200 + +gnome-software (3.26.0-0ubuntu1) artful; urgency=medium + + * New upstream stable release + * debian/patches/0001-Do-not-crash-if-a-GsPluginEvent-has-no-unique-ID.patch: + * debian/patches/0001-Fix-GObject-arguments-not-working-on-32-bit-systems.patch: + * debian/patches/0001-snap-Use-the-global-cache-to-store-snap-GsApp-object.patch: + - Applied upstream + + -- Robert Ancell Fri, 15 Sep 2017 09:32:27 +1200 + +gnome-software (3.25.91-1ubuntu5) artful; urgency=medium + + * debian/patches/0012-snap-Correct-the-app-origin.patch: + - Store is now called "Snap Store" + + -- Robert Ancell Thu, 07 Sep 2017 09:09:54 +1200 + +gnome-software (3.25.91-1ubuntu4) artful; urgency=medium + + * debian/patches/0001-snap-Correct-the-app-origin.patch: + - Set correct store name (LP: #1706500) + * debian/patches/0001-Do-not-crash-if-a-GsPluginEvent-has-no-unique-ID.patch: + - Fix common crash (LP: #1706043) + + -- Robert Ancell Wed, 06 Sep 2017 12:14:00 +1200 + +gnome-software (3.25.91-1ubuntu3) artful; urgency=medium + + * debian/patches/0001-snap-Use-the-global-cache-to-store-snap-GsApp-object.patch: + - Fix shell search results not showing (LP: #1713929) + + -- Robert Ancell Fri, 01 Sep 2017 16:42:47 +1200 + +gnome-software (3.25.91-1ubuntu2) artful; urgency=medium + + * debian/patches/0001-Fix-GObject-arguments-not-working-on-32-bit-systems.patch: + - Fix crash running on i386 (LP: #1708998) + + -- Robert Ancell Wed, 30 Aug 2017 15:51:51 +1200 + +gnome-software (3.25.91-1ubuntu1) artful; urgency=medium + + * Merge with Debian, remaining changes: + + debian/patches/*.patch: Various Ubuntu changes from wip/ubuntu-master + branch - see patch headers for more information. + + Add an "ubuntu-software" package with some branding for Ubuntu. + + debian/control{,.in}, debian/rules, debian/gnome-software-plugin-snap.*: + Enable the Snap plugin and build it into a gnome-software-plugin-snap + binary package + + debian/gnome-software.gsettings-override.in: Mark universe packages as + Free. + + debian/rules: Strip -Wl,-Bsymbolic-functions from LDFLAGS so that + plugins can be loaded properly. + + debian/source_gnome-software.py: Add an Apport hook to report which + plugins are installed. + * GNOME Software provides the PackageKit session interface. Sessioninstaller + wants to do that too - Conflict with it to get it off user systems. + + -- Iain Lane Thu, 24 Aug 2017 18:11:03 +0100 + gnome-software (3.25.91-1) experimental; urgency=medium * debian/compat: Bump to 10, mainly to get --parallel by default. @@ -7,6 +97,70 @@ -- Iain Lane Thu, 24 Aug 2017 16:33:38 +0100 +gnome-software (3.25.90-0ubuntu2) artful; urgency=medium + + * debian/patches/0003-snap-Handle-suffixes-being-added-to-banner-screensho.patch: + - Handle suffixes on featured snap screenshots + + -- Robert Ancell Mon, 21 Aug 2017 15:29:33 +1200 + +gnome-software (3.25.90-0ubuntu1) artful; urgency=medium + + * New upstream release + * debian/patches/0001-snap-Use-first-featured-snap-as-featured-app.patch: + - Show snap in "Featured" section (LP: #1706478) + * debian/patches/0002-Make-gs_app_list_filter_duplicates-not-change-app-or.patch: + * debian/patches/0008-snap-Only-feature-snaps.patch: + * debian/patches/0009-Don-t-randomize-editors-picks.patch: + - Show only snaps in "Editor's Picks" (LP: #1705953) + + -- Robert Ancell Fri, 18 Aug 2017 16:36:01 +1200 + +gnome-software (3.25.4-1ubuntu4) artful; urgency=medium + + * debian/ubuntu-software.links: + - include an ubuntu-software branded desktop entry for the + ubuntu-wayland session as well + + -- Sebastien Bacher Fri, 11 Aug 2017 09:26:00 +0200 + +gnome-software (3.25.4-1ubuntu3) artful; urgency=medium + + * debian/rules: use a different workaround for 3.25, + the build system changed again + + -- Sebastien Bacher Mon, 07 Aug 2017 18:39:31 +0200 + +gnome-software (3.25.4-1ubuntu2) artful; urgency=medium + + * debian/rules: + - workaround an upstream build system issue that leadsz to have + the translations template not refreshed (lp: #1702522) + + -- Sebastien Bacher Mon, 07 Aug 2017 17:49:24 +0200 + +gnome-software (3.25.4-1ubuntu1) artful; urgency=medium + + * Merge with Debian, remaining changes: + + debian/patches/*.patch: Various Ubuntu changes from wip/ubuntu-master + branch - see patch headers for more information. + + Add an "ubuntu-software" package with some branding for Ubuntu. + + debian/control{,.in}, debian/rules, debian/gnome-software-plugin-snap.*: + Enable the Snap plugin and build it into a gnome-software-plugin-snap + binary package + + debian/gnome-software.gsettings-override.in: Mark universe packages as + Free. + + debian/rules: Strip -Wl,-Bsymbolic-functions from LDFLAGS so that + plugins can be loaded properly. + + debian/source_gnome-software.py: Add an Apport hook to report which + plugins are installed. + * GNOME Software provides the PackageKit session interface. Sessioninstaller + wants to do that too - Conflict with it to get it off user systems. + * debian/control{,.in}: Bump snapd-glib BD to 1.16, per upstream. + * debian/compat: Bump to 10, mainly so we get --parallel by default. + + -- Iain Lane Wed, 26 Jul 2017 18:02:51 +0100 + gnome-software (3.25.4-1) experimental; urgency=medium * New upstream release 3.25.4 @@ -50,6 +204,197 @@ -- Iain Lane Fri, 05 May 2017 17:31:43 +0100 +gnome-software (3.24.3-0ubuntu7) artful; urgency=medium + + [ Robert Ancell ] + * debian/patches/0001-snap-Use-title-field-if-available.patch: + - Use new title field from snapd (LP: #1555569) + * debian/patches/0001-snap-Mark-non-app-snaps-as-runtimes.patch: + - Stop 'core' snap showing as an app (LP: #1704904) + + [ Didier Roche ] + * debian/rules: + - Change regexp to use ubuntu software icon in the ubuntu session + even when using non en local (we needed to match translated icon + names). (LP: #1703849) + + -- Didier Roche Wed, 19 Jul 2017 15:34:17 +0200 + +gnome-software (3.24.3-0ubuntu6) artful; urgency=medium + + * debian/patches/0001-snap-Fix-crash-when-fail-to-use-icon-from-cache.patch: + - Fix crash when failing to load icons from cache (LP: #1702122) + + -- Robert Ancell Wed, 12 Jul 2017 16:06:19 +1200 + +gnome-software (3.24.3-0ubuntu5) artful; urgency=medium + + * Add 0015-Ensure-valid-AppStream-files-get-the-fake-Addon-grou.patch + - Backport 3.25 commit to enable Add-ons subcategories (LP: #1655641) + + -- Jeremy Bicha Fri, 16 Jun 2017 23:42:30 -0400 + +gnome-software (3.24.3-0ubuntu4) artful; urgency=medium + + * debian/patches/0001-snap-Fix-icons-not-being-converted-to-pixbufs.patch: + - Fix snaps without icons not showing reliably (LP: #1697565) + * debian/patches/0001-snap-Mark-snaps-as-sandboxed.patch: + * debian/patches/0001-snap-Backport-fixes-from-master.patch: + - Show featured snaps (LP: #1663097) + + -- Robert Ancell Thu, 15 Jun 2017 16:55:26 +1200 + +gnome-software (3.24.3-0ubuntu3) artful; urgency=medium + + * debian/patches/0006-Add-an-APT-plugin.patch: + - Handle multiple debconf connections (LP: #1688721) + + -- Robert Ancell Tue, 23 May 2017 21:28:12 +1200 + +gnome-software (3.24.3-0ubuntu2) artful; urgency=medium + + * Merge following changes from Debian experimental: + * debian/control{,.in}, debian/gnome-software-{dev,doc}.install: Install the + headers and gtk-doc documentation so that external plugins can be built. + * debian/rules: Build with --fail-missing. + + -- Jeremy Bicha Fri, 19 May 2017 10:38:12 -0400 + +gnome-software (3.24.3-0ubuntu1) artful; urgency=medium + + * New upstream release (LP: #1690654) + * Recommend instead of depend on gnome-software-plugin-snap (LP: #1691620) + * Add basic apport hook to report which GNOME Software plugins are + installed + * Update patches from wip/ubuntu-3-24 branch + + -- Jeremy Bicha Wed, 17 May 2017 23:17:38 -0400 + +gnome-software (3.24.1-0ubuntu5) artful; urgency=medium + + * Move appstream metadata for Flatpak and Snap addons to their plugin + packages + + -- Jeremy Bicha Wed, 17 May 2017 17:37:46 -0400 + +gnome-software (3.24.1-0ubuntu4) artful; urgency=medium + + * debian/patches/0006-Add-an-APT-plugin.patch: + - Fix crash when debconf socket fails (LP: #1689425) + + -- Robert Ancell Tue, 09 May 2017 16:41:57 +1200 + +gnome-software (3.24.1-0ubuntu3) artful; urgency=medium + + * debian/control: + - Bump build-depends on flatpak + * debian/patches/flatpak-version.patch: + - Don't require updated version of flatpak for tests - we don't run them + anyway. + + -- Robert Ancell Fri, 05 May 2017 13:02:52 +1200 + +gnome-software (3.24.1-0ubuntu2) artful; urgency=medium + + * debian/control: + - Add missing build-depends on valgrind + + -- Robert Ancell Fri, 05 May 2017 12:50:00 +1200 + +gnome-software (3.24.1-0ubuntu1) artful; urgency=medium + + * New upstream release + * debian/control: + - Add Vcs-Bzr link + * debian/patches: + - Replace patches with patches from wip/ubuntu-3-24 branch + + -- Robert Ancell Fri, 05 May 2017 11:24:11 +1200 + +gnome-software (3.22.7-0ubuntu5) artful; urgency=medium + + * debian/patches/0017-Use-snap-name-field-for-app-name.patch: + - Use the snap name field for app names (LP: #1688407) + + -- Robert Ancell Fri, 05 May 2017 10:02:44 +1200 + +gnome-software (3.22.7-0ubuntu4) artful; urgency=medium + + * debian/patches/0002-Add-an-APT-plugin.patch: + - Support debconf prompts (LP: #1679435) + * debian/patches/0015-dpkg-Mark-local-.debs-as-managed-by-APT.patch: + * debian/patches/0016-Make-filename-passed-with-local-filename-absolute.patch: + - Fix local .deb files not being installable: (LP: #1672424) + + -- Robert Ancell Wed, 26 Apr 2017 15:47:47 +1200 + +gnome-software (3.22.7-0ubuntu3) zesty; urgency=medium + + * Make gnome-software Recommend: libgtk2-perl, without which debconf + prompts from packages can never be shown. LP: #1679435. + + -- Steve Langasek Mon, 10 Apr 2017 13:29:18 -0700 + +gnome-software (3.22.7-0ubuntu2) zesty; urgency=medium + + * Explicitly disable packagekit. The packagekit dbus service that + was being installed broke sessioninstaller's ability to install + codecs. Thanks seb128 for identifying the root cause. (LP: #1661371) + + -- Jeremy Bicha Wed, 22 Mar 2017 09:20:38 -0400 + +gnome-software (3.22.7-0ubuntu1) zesty; urgency=medium + + * New upstream release + + -- Jeremy Bicha Tue, 14 Mar 2017 10:00:52 -0400 + +gnome-software (3.22.6-0ubuntu2) zesty; urgency=medium + + * debian/patches/0014-snap-URL.patch: + - Add handler for snap:// URLs (LP: #1621971) + + -- Robert Ancell Tue, 14 Mar 2017 12:36:41 +1300 + +gnome-software (3.22.6-0ubuntu1) zesty; urgency=medium + + * New upstream release + * Rebase and refresh patches + * Drop patches folded into 0002-Add-an-APT-plugin.patch + - 0007-apt-Don-t-set-origin-multiple-times.patch + - 0013-apt-Adopt-system-packages.patch + * Add patches: + - 0007-Handle-apt-URLs-of-the-form-apt-packagename.patch + - 0013-Use-correct-form-when-handling-APT-URLs.patch + * Add back debian/README.source to mention that patches + are maintained at git.gnome.org/gnome-software + + -- Jeremy Bicha Wed, 08 Mar 2017 13:14:02 -0500 + +gnome-software (3.22.5+really-3.22.5-0ubuntu1) zesty; urgency=medium + + * Merge with Debian. Remaining changes: + - Add "Ubuntu Software" package + - debian/control.in: + + Build-Depend on libsnapd-glib-dev and enable snap plugin + + Build-Depend on libapt-pkg-dev + + Depend on aptdaemon + + Depend on gnome-software-plugin-snap + + Bump gnome-software-plugin-snap's Breaks/Replaces + since we took the split later + - debian/rules: + + Don't enable PackageKit + + Build without symbolic functions to fix Flatpak plugin + - debian/gnome-software.gsettings-override.in, debian/rules: + + Add 'universe' to free-sources + - Add patches numbered 0001-0013 from the git branch. + Read the patch descriptions for more information. + * Drop 1001-trivial-Fix-a-deadlock-when-setting-the-origin-multi.patch: + - Applied in new release + * Refresh 0002-Add-an-APT-plugin.patch + + -- Jeremy Bicha Mon, 23 Jan 2017 09:14:30 -0500 + gnome-software (3.22.5-1) unstable; urgency=medium * New upstream bugfix release: 3.22.5 diff -Nru gnome-software-3.25.91/debian/control gnome-software-3.26.1/debian/control --- gnome-software-3.25.91/debian/control 2017-07-25 11:58:55.000000000 +0000 +++ gnome-software-3.26.1/debian/control 2017-10-16 20:33:05.000000000 +0000 @@ -5,9 +5,10 @@ Source: gnome-software Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Matthias Klumpp , - Iain Lane , Laurent Bigonville , Michael Biebl + Iain Lane , Laurent Bigonville , Matthias Klumpp , Sebastien Bacher Build-Depends: appstream, appstream-util, debhelper (>= 10.4), @@ -31,6 +32,7 @@ libpolkit-gobject-1-dev, libsecret-1-dev, libsoup2.4-dev (>= 2.52), + libsnapd-glib-dev (>= 1.16), libsqlite3-dev, libxml2-utils, meson (>= 0.37), @@ -53,6 +55,8 @@ ${shlibs:Depends} Replaces: gnome-packagekit-session (<< 3.16.0-2~) Breaks: gnome-packagekit-session (<< 3.16.0-2~) +Conflicts: sessioninstaller +Recommends: gnome-software-plugin-snap [linux-any], Suggests: fwupd [amd64 arm64 armhf i386], gnome-software-plugin-flatpak [linux-any], gnome-software-plugin-limba [linux-any] @@ -116,23 +120,23 @@ . This package contains the Limba plugin. -#Package: gnome-software-plugin-snap -#Architecture: linux-any -#Depends: gnome-software (= ${binary:Version}), -# ${misc:Depends}, -# ${shlibs:Depends} -#Breaks: gnome-software (<< 3.22.3) -#Replaces: gnome-software (<< 3.22.3) -#Description: Snap support for GNOME Software -# Software lets you install and update applications and system extensions. -# . -# Software uses a plugin architecture to separate the frontend from the -# technologies that are used underneath. Currently, a PackageKit plugin provides -# data from a number of traditional packaging systems, such as rpm or apt. An -# appdata plugin provides additional metadata from locally installed data in the -# appdata format. -# . -# This package contains the Snap plugin. +Package: gnome-software-plugin-snap +Architecture: linux-any +Depends: gnome-software (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Breaks: gnome-software (<< 3.22.3) +Replaces: gnome-software (<< 3.22.3) +Description: Snap support for GNOME Software + Software lets you install and update applications and system extensions. + . + Software uses a plugin architecture to separate the frontend from the + technologies that are used underneath. Currently, a PackageKit plugin provides + data from a number of traditional packaging systems, such as rpm or apt. An + appdata plugin provides additional metadata from locally installed data in the + appdata format. + . + This package contains the Snap plugin. Package: gnome-packagekit-session Architecture: all @@ -171,3 +175,17 @@ . This package contains documentation for use when developing plugins for Software. + +Package: ubuntu-software +Architecture: all +Depends: gnome-software (>= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: Utility for browsing, installing, and removing software + Ubuntu Software lets you browse and install the applications available for + Ubuntu. You can view available software by category, or search by name + or description. You can also examine the software already installed, and + remove items you no longer need. + . + To install or remove software using Ubuntu Software, you need administrator + access on the computer. diff -Nru gnome-software-3.25.91/debian/control.in gnome-software-3.26.1/debian/control.in --- gnome-software-3.25.91/debian/control.in 2017-07-25 11:58:55.000000000 +0000 +++ gnome-software-3.26.1/debian/control.in 2017-10-16 20:33:05.000000000 +0000 @@ -1,7 +1,8 @@ Source: gnome-software Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Matthias Klumpp , @GNOME_TEAM@ Build-Depends: appstream, @@ -27,6 +28,7 @@ libpolkit-gobject-1-dev, libsecret-1-dev, libsoup2.4-dev (>= 2.52), + libsnapd-glib-dev (>= 1.16), libsqlite3-dev, libxml2-utils, meson (>= 0.37), @@ -49,6 +51,8 @@ ${shlibs:Depends} Replaces: gnome-packagekit-session (<< 3.16.0-2~) Breaks: gnome-packagekit-session (<< 3.16.0-2~) +Conflicts: sessioninstaller +Recommends: gnome-software-plugin-snap [linux-any], Suggests: fwupd [amd64 arm64 armhf i386], gnome-software-plugin-flatpak [linux-any], gnome-software-plugin-limba [linux-any] @@ -112,23 +116,23 @@ . This package contains the Limba plugin. -#Package: gnome-software-plugin-snap -#Architecture: linux-any -#Depends: gnome-software (= ${binary:Version}), -# ${misc:Depends}, -# ${shlibs:Depends} -#Breaks: gnome-software (<< 3.22.3) -#Replaces: gnome-software (<< 3.22.3) -#Description: Snap support for GNOME Software -# Software lets you install and update applications and system extensions. -# . -# Software uses a plugin architecture to separate the frontend from the -# technologies that are used underneath. Currently, a PackageKit plugin provides -# data from a number of traditional packaging systems, such as rpm or apt. An -# appdata plugin provides additional metadata from locally installed data in the -# appdata format. -# . -# This package contains the Snap plugin. +Package: gnome-software-plugin-snap +Architecture: linux-any +Depends: gnome-software (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Breaks: gnome-software (<< 3.22.3) +Replaces: gnome-software (<< 3.22.3) +Description: Snap support for GNOME Software + Software lets you install and update applications and system extensions. + . + Software uses a plugin architecture to separate the frontend from the + technologies that are used underneath. Currently, a PackageKit plugin provides + data from a number of traditional packaging systems, such as rpm or apt. An + appdata plugin provides additional metadata from locally installed data in the + appdata format. + . + This package contains the Snap plugin. Package: gnome-packagekit-session Architecture: all @@ -167,3 +171,17 @@ . This package contains documentation for use when developing plugins for Software. + +Package: ubuntu-software +Architecture: all +Depends: gnome-software (>= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: Utility for browsing, installing, and removing software + Ubuntu Software lets you browse and install the applications available for + Ubuntu. You can view available software by category, or search by name + or description. You can also examine the software already installed, and + remove items you no longer need. + . + To install or remove software using Ubuntu Software, you need administrator + access on the computer. diff -Nru gnome-software-3.25.91/debian/gnome-software-common.install gnome-software-3.26.1/debian/gnome-software-common.install --- gnome-software-3.25.91/debian/gnome-software-common.install 2017-06-23 16:44:55.000000000 +0000 +++ gnome-software-3.26.1/debian/gnome-software-common.install 2017-10-16 20:33:05.000000000 +0000 @@ -2,3 +2,4 @@ usr/share/gnome-software/ usr/share/icons/ usr/share/locale/ +debian/source_gnome-software.py /usr/share/apport/package-hooks diff -Nru gnome-software-3.25.91/debian/gnome-software-plugin-flatpak.install gnome-software-3.26.1/debian/gnome-software-plugin-flatpak.install --- gnome-software-3.25.91/debian/gnome-software-plugin-flatpak.install 2017-06-23 16:44:55.000000000 +0000 +++ gnome-software-3.26.1/debian/gnome-software-plugin-flatpak.install 2017-10-16 20:33:05.000000000 +0000 @@ -1,3 +1,3 @@ -#usr/lib/*/gs-plugins-*/libgs_plugin_ostree*.so +usr/lib/*/gs-plugins-*/libgs_plugin_ostree*.so usr/share/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml usr/lib/*/gs-plugins-*/libgs_plugin_flatpak*.so diff -Nru gnome-software-3.25.91/debian/gnome-software.gsettings-override.in gnome-software-3.26.1/debian/gnome-software.gsettings-override.in --- gnome-software-3.25.91/debian/gnome-software.gsettings-override.in 2016-11-18 22:57:17.000000000 +0000 +++ gnome-software-3.26.1/debian/gnome-software.gsettings-override.in 2017-10-16 20:33:05.000000000 +0000 @@ -1,4 +1,4 @@ [org.gnome.software] official-sources=['@DISTRO@-*'] -free-sources=['@DISTRO@-*-main'] +free-sources=['@DISTRO@-*-main', '@DISTRO@-*-universe'] free-sources-url='@URL@' diff -Nru gnome-software-3.25.91/debian/icons/hicolor/128x128/apps/ubuntusoftware.svg gnome-software-3.26.1/debian/icons/hicolor/128x128/apps/ubuntusoftware.svg --- gnome-software-3.25.91/debian/icons/hicolor/128x128/apps/ubuntusoftware.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/icons/hicolor/128x128/apps/ubuntusoftware.svg 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,2293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru gnome-software-3.25.91/debian/icons/hicolor/16x16/apps/ubuntusoftware.svg gnome-software-3.26.1/debian/icons/hicolor/16x16/apps/ubuntusoftware.svg --- gnome-software-3.25.91/debian/icons/hicolor/16x16/apps/ubuntusoftware.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/icons/hicolor/16x16/apps/ubuntusoftware.svg 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,564 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru gnome-software-3.25.91/debian/icons/hicolor/24x24/apps/ubuntusoftware.svg gnome-software-3.26.1/debian/icons/hicolor/24x24/apps/ubuntusoftware.svg --- gnome-software-3.25.91/debian/icons/hicolor/24x24/apps/ubuntusoftware.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/icons/hicolor/24x24/apps/ubuntusoftware.svg 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,678 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru gnome-software-3.25.91/debian/icons/hicolor/48x48/apps/ubuntusoftware.svg gnome-software-3.26.1/debian/icons/hicolor/48x48/apps/ubuntusoftware.svg --- gnome-software-3.25.91/debian/icons/hicolor/48x48/apps/ubuntusoftware.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/icons/hicolor/48x48/apps/ubuntusoftware.svg 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,666 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru gnome-software-3.25.91/debian/icons/hicolor/scalable/apps/ubuntusoftware.svg gnome-software-3.26.1/debian/icons/hicolor/scalable/apps/ubuntusoftware.svg --- gnome-software-3.25.91/debian/icons/hicolor/scalable/apps/ubuntusoftware.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/icons/hicolor/scalable/apps/ubuntusoftware.svg 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,2293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru gnome-software-3.25.91/debian/patches/0001-Construct-the-Software-Sources-menu-item-dynamically.patch gnome-software-3.26.1/debian/patches/0001-Construct-the-Software-Sources-menu-item-dynamically.patch --- gnome-software-3.25.91/debian/patches/0001-Construct-the-Software-Sources-menu-item-dynamically.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0001-Construct-the-Software-Sources-menu-item-dynamically.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,70 @@ +From cef4cf740daba8f7f1f2abeb4740575c779799a2 Mon Sep 17 00:00:00 2001 +From: Iain Lane +Date: Mon, 23 Jan 2017 16:22:09 +0000 +Subject: [PATCH 01/12] Construct the "Software Sources" menu item dynamically + +If we have software-properties-gtk, we'll launch that. In that case, +call the menu item "Software & Updates", since that more accurately +reflects what it does. +--- + src/gs-application.c | 21 +++++++++++++++++++++ + src/gs-menus.ui | 8 +------- + 2 files changed, 22 insertions(+), 7 deletions(-) + +diff --git a/src/gs-application.c b/src/gs-application.c +index 264443e1..79c44833 100644 +--- a/src/gs-application.c ++++ b/src/gs-application.c +@@ -769,9 +769,30 @@ gs_application_setup_search_provider (GsApplication *app) + static void + gs_application_startup (GApplication *application) + { ++ g_autofree gchar *software_properties = NULL; ++ const gchar *label = NULL; ++ g_autoptr(GMenu) menu = NULL; ++ g_autoptr(GMenu) new = NULL; ++ + GSettings *settings; + G_APPLICATION_CLASS (gs_application_parent_class)->startup (application); + ++ /* This follows the behaviour in src/gs-shell.c; when we have s-p-gtk, ++ * we will launch it. It provides a UI to manage update behaviour too. ++ */ ++ software_properties = g_find_program_in_path ("software-properties-gtk"); ++ ++ if (!software_properties) ++ label = _("Software Sources"); ++ else ++ label = _("Software & Updates"); ++ ++ menu = gtk_application_get_menu_by_id (GTK_APPLICATION (application), ++ "app-menu"); ++ new = g_menu_new (); ++ g_menu_append (new, label, "app.sources"); ++ g_menu_prepend_section (menu, NULL, G_MENU_MODEL (new)); ++ + g_action_map_add_action_entries (G_ACTION_MAP (application), + actions, G_N_ELEMENTS (actions), + application); +diff --git a/src/gs-menus.ui b/src/gs-menus.ui +index af7f63bc..59e0b1e8 100644 +--- a/src/gs-menus.ui ++++ b/src/gs-menus.ui +@@ -2,13 +2,7 @@ + + + +-
+- +- _Software Sources +- app.sources +- action-disabled +- +-
++ +
+ + _About +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0001-snap-Fix-crash-authenticating-with-Ubuntu-One.patch gnome-software-3.26.1/debian/patches/0001-snap-Fix-crash-authenticating-with-Ubuntu-One.patch --- gnome-software-3.25.91/debian/patches/0001-snap-Fix-crash-authenticating-with-Ubuntu-One.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0001-snap-Fix-crash-authenticating-with-Ubuntu-One.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,36 @@ +From 50d50436a4775dd45f7180e4cbc3c69d4ebd23de Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Mon, 16 Oct 2017 11:57:18 +1300 +Subject: [PATCH 01/13] snap: Fix crash authenticating with Ubuntu One. + +This regression was introduced in 47c55397b. +--- + plugins/snap/gs-plugin-snap.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/plugins/snap/gs-plugin-snap.c b/plugins/snap/gs-plugin-snap.c +index 1b95f93c..fba35f0a 100644 +--- a/plugins/snap/gs-plugin-snap.c ++++ b/plugins/snap/gs-plugin-snap.c +@@ -907,7 +907,6 @@ gs_plugin_auth_login (GsPlugin *plugin, GsAuth *auth, + GCancellable *cancellable, GError **error) + { + GsPluginData *priv = gs_plugin_get_data (plugin); +- g_autoptr(SnapdAuthData) auth_data = NULL; + g_autoptr(GVariant) macaroon_variant = NULL; + g_autofree gchar *serialized_macaroon = NULL; + +@@ -922,8 +921,8 @@ gs_plugin_auth_login (GsPlugin *plugin, GsAuth *auth, + } + + macaroon_variant = g_variant_new ("(s^as)", +- snapd_auth_data_get_macaroon (auth_data), +- snapd_auth_data_get_discharges (auth_data)); ++ snapd_auth_data_get_macaroon (priv->auth_data), ++ snapd_auth_data_get_discharges (priv->auth_data)); + serialized_macaroon = g_variant_print (macaroon_variant, FALSE); + gs_auth_add_metadata (auth, "macaroon", serialized_macaroon); + +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0002-Hide-licence-updated-and-category-fields-if-they-are.patch gnome-software-3.26.1/debian/patches/0002-Hide-licence-updated-and-category-fields-if-they-are.patch --- gnome-software-3.25.91/debian/patches/0002-Hide-licence-updated-and-category-fields-if-they-are.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0002-Hide-licence-updated-and-category-fields-if-they-are.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,53 @@ +From d830acef4535661727cd871676e986fd3c4e93d5 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Tue, 29 Mar 2016 11:30:08 +1300 +Subject: [PATCH 02/12] Hide licence, updated and category fields if they + aren't set + +--- + src/gs-details-page.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/gs-details-page.c b/src/gs-details-page.c +index 25a26e56..d2619408 100644 +--- a/src/gs-details-page.c ++++ b/src/gs-details-page.c +@@ -105,6 +105,7 @@ struct _GsDetailsPage + GtkWidget *label_details_size_installed_value; + GtkWidget *label_details_size_download_title; + GtkWidget *label_details_size_download_value; ++ GtkWidget *label_details_updated_title; + GtkWidget *label_details_updated_value; + GtkWidget *label_details_version_value; + GtkWidget *label_failed; +@@ -909,8 +910,8 @@ gs_details_page_refresh_all (GsDetailsPage *self) + updated = gs_app_get_install_date (self->app); + if (updated == GS_APP_INSTALL_DATE_UNKNOWN || + updated == GS_APP_INSTALL_DATE_UNSET) { +- /* TRANSLATORS: this is where the updated date is not known */ +- gtk_label_set_label (GTK_LABEL (self->label_details_updated_value), C_("updated", "Never")); ++ gtk_widget_set_visible (self->label_details_updated_title, FALSE); ++ gtk_widget_set_visible (self->label_details_updated_value, FALSE); + } else { + g_autoptr(GDateTime) dt = NULL; + g_autofree gchar *updated_str = NULL; +@@ -929,6 +930,8 @@ gs_details_page_refresh_all (GsDetailsPage *self) + gtk_label_set_markup (GTK_LABEL (self->label_details_updated_value), url->str); + g_string_free (url, TRUE); + } ++ gtk_widget_set_visible (self->label_details_updated_title, TRUE); ++ gtk_widget_set_visible (self->label_details_updated_value, TRUE); + } + + /* set the category */ +@@ -2330,6 +2333,7 @@ gs_details_page_class_init (GsDetailsPageClass *klass) + gtk_widget_class_bind_template_child (widget_class, GsDetailsPage, label_details_size_download_value); + gtk_widget_class_bind_template_child (widget_class, GsDetailsPage, label_details_size_installed_title); + gtk_widget_class_bind_template_child (widget_class, GsDetailsPage, label_details_size_installed_value); ++ gtk_widget_class_bind_template_child (widget_class, GsDetailsPage, label_details_updated_title); + gtk_widget_class_bind_template_child (widget_class, GsDetailsPage, label_details_updated_value); + gtk_widget_class_bind_template_child (widget_class, GsDetailsPage, label_details_version_value); + gtk_widget_class_bind_template_child (widget_class, GsDetailsPage, label_failed); +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0003-Download-changelog-information-on-demand-this-stops-.patch gnome-software-3.26.1/debian/patches/0003-Download-changelog-information-on-demand-this-stops-.patch --- gnome-software-3.25.91/debian/patches/0003-Download-changelog-information-on-demand-this-stops-.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0003-Download-changelog-information-on-demand-this-stops-.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,113 @@ +From b26d9de6f00532f20c86915a0d76a89eb6c72447 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Mon, 7 Nov 2016 16:55:18 +1300 +Subject: [PATCH 03/12] Download changelog information on demand - this stops + the UI blocking on startup + +--- + lib/gs-plugin-types.h | 2 ++ + src/gs-update-dialog.c | 40 +++++++++++++++++++++++++++++++++++++--- + 2 files changed, 39 insertions(+), 3 deletions(-) + +diff --git a/lib/gs-plugin-types.h b/lib/gs-plugin-types.h +index f31dbf94..759ef49c 100644 +--- a/lib/gs-plugin-types.h ++++ b/lib/gs-plugin-types.h +@@ -149,6 +149,7 @@ typedef enum { + * @GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN_UI: Require the origin for UI + * @GS_PLUGIN_REFINE_FLAGS_REQUIRE_RUNTIME: Require the runtime + * @GS_PLUGIN_REFINE_FLAGS_REQUIRE_SCREENSHOTS: Require screenshot information ++ * @GS_PLUGIN_REFINE_FLAGS_REQUIRE_CHANGELOG: Require the changelog + * + * The refine flags. + **/ +@@ -180,6 +181,7 @@ typedef enum { + #define GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN_UI ((guint64) 1 << 24) + #define GS_PLUGIN_REFINE_FLAGS_REQUIRE_RUNTIME ((guint64) 1 << 25) + #define GS_PLUGIN_REFINE_FLAGS_REQUIRE_SCREENSHOTS ((guint64) 1 << 26) ++#define GS_PLUGIN_REFINE_FLAGS_REQUIRE_CHANGELOG ((guint64) 1 << 27) + typedef guint64 GsPluginRefineFlags; + + /** +diff --git a/src/gs-update-dialog.c b/src/gs-update-dialog.c +index c607a6a3..ff8d9286 100644 +--- a/src/gs-update-dialog.c ++++ b/src/gs-update-dialog.c +@@ -49,6 +49,7 @@ struct _GsUpdateDialog + GQueue *back_entry_stack; + GCancellable *cancellable; + GsPluginLoader *plugin_loader; ++ GsApp *app; + GtkWidget *box_header; + GtkWidget *button_back; + GtkWidget *image_icon; +@@ -94,6 +95,25 @@ back_entry_free (BackEntry *entry) + g_slice_free (BackEntry, entry); + } + ++static void ++refine_cb (GsPluginLoader *plugin_loader, GAsyncResult *res, GsUpdateDialog *dialog) ++{ ++ const gchar *update_details; ++ g_autoptr(GError) error = NULL; ++ ++ if (!gs_plugin_loader_job_action_finish (plugin_loader, res, &error)) ++ g_warning ("Failed to get changelog information: %s", error->message); ++ ++ update_details = gs_app_get_update_details (dialog->app); ++ if (update_details == NULL) { ++ /* TRANSLATORS: this is where the packager did not write ++ * a description for the update */ ++ update_details = _("No update description available."); ++ } ++ ++ gtk_label_set_label (GTK_LABEL (dialog->label_details), update_details); ++} ++ + static void + set_updates_description_ui (GsUpdateDialog *dialog, GsApp *app) + { +@@ -101,6 +121,8 @@ set_updates_description_ui (GsUpdateDialog *dialog, GsApp *app) + const GdkPixbuf *pixbuf; + const gchar *update_details; + ++ g_set_object (&dialog->app, app); ++ + /* set window title */ + kind = gs_app_get_kind (app); + if (kind == AS_APP_KIND_OS_UPDATE) { +@@ -124,9 +146,20 @@ set_updates_description_ui (GsUpdateDialog *dialog, GsApp *app) + gtk_widget_set_visible (dialog->box_header, kind == AS_APP_KIND_DESKTOP); + update_details = gs_app_get_update_details (app); + if (update_details == NULL) { +- /* TRANSLATORS: this is where the packager did not write +- * a description for the update */ +- update_details = _("No update description available."); ++ g_autoptr(GsPluginJob) plugin_job = NULL; ++ ++ /* TRANSLATORS: this is displayed while the changelog is being downloaded */ ++ update_details = _("Downloading change information…"); ++ ++ plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_REFINE, ++ "app", app, ++ "refine-flags", GS_PLUGIN_REFINE_FLAGS_REQUIRE_CHANGELOG, ++ NULL); ++ gs_plugin_loader_job_process_async (dialog->plugin_loader, ++ plugin_job, ++ dialog->cancellable, ++ (GAsyncReadyCallback) refine_cb, ++ dialog); + } + gtk_label_set_label (GTK_LABEL (dialog->label_details), update_details); + gtk_label_set_label (GTK_LABEL (dialog->label_name), gs_app_get_name (app)); +@@ -652,6 +685,7 @@ gs_update_dialog_dispose (GObject *object) + } + + g_clear_object (&dialog->plugin_loader); ++ g_clear_object (&dialog->app); + + G_OBJECT_CLASS (gs_update_dialog_parent_class)->dispose (object); + } +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0004-Sort-snaps-before-other-apps.patch gnome-software-3.26.1/debian/patches/0004-Sort-snaps-before-other-apps.patch --- gnome-software-3.25.91/debian/patches/0004-Sort-snaps-before-other-apps.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0004-Sort-snaps-before-other-apps.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,29 @@ +From 81c38563f6e835846cecad0985435276f78e0fc6 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Wed, 30 Mar 2016 15:55:47 +1300 +Subject: [PATCH 04/12] Sort snaps before other apps + +--- + src/gs-search-page.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/gs-search-page.c b/src/gs-search-page.c +index c93e70ad..16d5d024 100644 +--- a/src/gs-search-page.c ++++ b/src/gs-search-page.c +@@ -203,6 +203,12 @@ gs_search_page_get_app_sort_key (GsApp *app) + { + GString *key = g_string_sized_new (64); + ++ /* sort snaps before other apps */ ++ if (g_strcmp0 (gs_app_get_management_plugin (app), "snap") == 0) ++ g_string_append (key, "9:"); ++ else ++ g_string_append (key, "1:"); ++ + /* sort apps before runtimes and extensions */ + switch (gs_app_get_kind (app)) { + case AS_APP_KIND_DESKTOP: +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0005-Hide-Kudo-details-since-we-don-t-have-good-data.patch gnome-software-3.26.1/debian/patches/0005-Hide-Kudo-details-since-we-don-t-have-good-data.patch --- gnome-software-3.25.91/debian/patches/0005-Hide-Kudo-details-since-we-don-t-have-good-data.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0005-Hide-Kudo-details-since-we-don-t-have-good-data.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,43 @@ +From 80fcebf5138736d012baa985d43cf8be226d7f3d Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Tue, 8 Nov 2016 09:58:05 +1300 +Subject: [PATCH 05/12] Hide Kudo details since we don't have good data + +--- + src/gs-details-page.c | 5 +++-- + src/gs-details-page.ui | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/gs-details-page.c b/src/gs-details-page.c +index d2619408..6914319d 100644 +--- a/src/gs-details-page.c ++++ b/src/gs-details-page.c +@@ -994,9 +994,10 @@ gs_details_page_refresh_all (GsDetailsPage *self) + + /* hide the kudo details for non-desktop software */ + switch (gs_app_get_kind (self->app)) { +- case AS_APP_KIND_DESKTOP: ++ // Hidden on Ubuntu since don't have appropriate information ++ /*case AS_APP_KIND_DESKTOP: + gtk_widget_set_visible (self->grid_details_kudo, TRUE); +- break; ++ break;*/ + default: + gtk_widget_set_visible (self->grid_details_kudo, FALSE); + break; +diff --git a/src/gs-details-page.ui b/src/gs-details-page.ui +index 36a43b00..527087af 100644 +--- a/src/gs-details-page.ui ++++ b/src/gs-details-page.ui +@@ -623,7 +623,7 @@ + 30 + + +- True ++ False + False + 9 + 12 +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0006-packagekit-Disable-updates.patch gnome-software-3.26.1/debian/patches/0006-packagekit-Disable-updates.patch --- gnome-software-3.25.91/debian/patches/0006-packagekit-Disable-updates.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0006-packagekit-Disable-updates.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,28 @@ +From 05e46186d421f79e8f76b397fe1f35404ac5ab0e Mon Sep 17 00:00:00 2001 +From: Iain Lane +Date: Thu, 20 Jul 2017 10:12:58 +0100 +Subject: [PATCH 06/12] packagekit: Disable updates + +In Ubuntu we use Update Manager for this currently. The long term plan +is to use Software, but we're not there yet. +--- + plugins/packagekit/gs-plugin-systemd-updates.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/plugins/packagekit/gs-plugin-systemd-updates.c b/plugins/packagekit/gs-plugin-systemd-updates.c +index 57beae9d..e2a466ad 100644 +--- a/plugins/packagekit/gs-plugin-systemd-updates.c ++++ b/plugins/packagekit/gs-plugin-systemd-updates.c +@@ -151,6 +151,9 @@ gs_plugin_add_updates (GsPlugin *plugin, + g_autoptr(GError) error_local = NULL; + g_auto(GStrv) package_ids = NULL; + ++ /* In Ubuntu we're using Update Manager for this, for now. */ ++ return TRUE; ++ + /* get the id's if the file exists */ + package_ids = pk_offline_get_prepared_ids (&error_local); + if (package_ids == NULL) { +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0007-snap-Only-feature-snaps.patch gnome-software-3.26.1/debian/patches/0007-snap-Only-feature-snaps.patch --- gnome-software-3.25.91/debian/patches/0007-snap-Only-feature-snaps.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0007-snap-Only-feature-snaps.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,65 @@ +From f3d38b53aeb5cee87ce91daedbe83f42f07dd717 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Wed, 9 Aug 2017 15:43:02 +1200 +Subject: [PATCH 07/12] snap: Only feature snaps + +Run after the other plugins that populate featured/popular apps and remove +them when we set ours. +--- + plugins/snap/gs-plugin-snap.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/plugins/snap/gs-plugin-snap.c b/plugins/snap/gs-plugin-snap.c +index 1b95f93c..ae3ae27a 100644 +--- a/plugins/snap/gs-plugin-snap.c ++++ b/plugins/snap/gs-plugin-snap.c +@@ -75,11 +75,13 @@ gs_plugin_initialize (GsPlugin *plugin) + + gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "desktop-categories"); + gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "ubuntu-reviews"); ++ gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream"); + gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_BETTER_THAN, "packagekit"); + gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_BEFORE, "icons"); + + /* Override hardcoded popular apps */ +- gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_BEFORE, "hardcoded-popular"); ++ gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "hardcoded-popular"); ++ gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "hardcoded-featured"); + + /* set plugin flags */ + gs_plugin_add_flags (plugin, GS_PLUGIN_FLAGS_GLOBAL_CACHE); +@@ -370,6 +372,12 @@ is_banner_icon_image (const gchar *filename) + return g_regex_match_simple ("^banner-icon(?:_[a-zA-Z0-9]{7})?\\.(?:png|jpg)$", filename, 0, 0); + } + ++static gboolean ++remove_cb (GsApp *app, gpointer user_data) ++{ ++ return FALSE; ++} ++ + gboolean + gs_plugin_add_featured (GsPlugin *plugin, + GsAppList *list, +@@ -438,6 +446,8 @@ gs_plugin_add_featured (GsPlugin *plugin, + background_css->str); + gs_app_set_metadata (app, "GnomeSoftware::FeatureTile-css", css); + ++ /* replace any other featured apps with our one */ ++ gs_app_list_filter (list, remove_cb, NULL); + gs_app_list_add (list, app); + + return TRUE; +@@ -456,6 +466,9 @@ gs_plugin_add_popular (GsPlugin *plugin, + if (snaps == NULL) + return FALSE; + ++ /* replace any other popular apps with our one */ ++ gs_app_list_filter (list, remove_cb, NULL); ++ + /* skip first snap - it is used as the featured app */ + for (i = 1; i < snaps->len; i++) { + g_autoptr(GsApp) app = snap_to_app (plugin, g_ptr_array_index (snaps, i)); +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0008-Don-t-randomize-editors-picks.patch gnome-software-3.26.1/debian/patches/0008-Don-t-randomize-editors-picks.patch --- gnome-software-3.25.91/debian/patches/0008-Don-t-randomize-editors-picks.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0008-Don-t-randomize-editors-picks.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,29 @@ +From 4cca0fd56db63ecb40b472310922b88892d50ec5 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Fri, 18 Aug 2017 16:27:26 +1200 +Subject: [PATCH 08/12] Don't randomize editors picks. + +The featured snaps are provided in a significant order. +https://bugs.launchpad.net/bugs/1705953 +--- + src/gs-overview-page.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/gs-overview-page.c b/src/gs-overview-page.c +index 385c29ee..338c7455 100644 +--- a/src/gs-overview-page.c ++++ b/src/gs-overview-page.c +@@ -176,7 +176,9 @@ gs_overview_page_get_popular_cb (GObject *source_object, + } + /* Don't show apps from the category that's currently featured as the category of the day */ + gs_app_list_filter (list, filter_category, priv->category_of_day); +- gs_app_list_randomize (list); ++ /* Disabled on Ubuntu as we only show snaps and the order is significant ++ * https://bugs.launchpad.net/bugs/1705953 */ ++ //gs_app_list_randomize (list); + + gs_container_remove_all (GTK_CONTAINER (priv->box_popular)); + +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0009-Display-a-warning-for-non-sandboxed-snaps.patch gnome-software-3.26.1/debian/patches/0009-Display-a-warning-for-non-sandboxed-snaps.patch --- gnome-software-3.25.91/debian/patches/0009-Display-a-warning-for-non-sandboxed-snaps.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0009-Display-a-warning-for-non-sandboxed-snaps.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,121 @@ +From ae9d117639c2f8fe56cf026c482d75410a16c30c Mon Sep 17 00:00:00 2001 +From: James Henstridge +Date: Fri, 23 Jun 2017 11:22:36 +0800 +Subject: [PATCH 09/12] Display a warning for non-sandboxed snaps. + +--- + src/gs-details-page.c | 14 ++++++++++++++ + src/gs-details-page.ui | 44 ++++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 56 insertions(+), 2 deletions(-) + +diff --git a/src/gs-details-page.c b/src/gs-details-page.c +index 6914319d..730a3506 100644 +--- a/src/gs-details-page.c ++++ b/src/gs-details-page.c +@@ -143,6 +143,7 @@ struct _GsDetailsPage + GtkWidget *label_content_rating_none; + GtkWidget *button_details_rating_value; + GtkWidget *label_details_rating_title; ++ GtkWidget *box_not_sandboxed_warning; + }; + + G_DEFINE_TYPE (GsDetailsPage, gs_details_page, GS_TYPE_PAGE) +@@ -1003,6 +1004,18 @@ gs_details_page_refresh_all (GsDetailsPage *self) + break; + } + ++ /* Display a warning about non-sandboxed apps that may come ++ * from third party sources. Currently only checking snaps. */ ++ ret = FALSE; ++ switch (gs_app_get_bundle_kind (self->app)) { ++ case AS_BUNDLE_KIND_SNAP: ++ ret |= (kudos & GS_APP_KUDO_SANDBOXED) == 0; ++ break; ++ default: ++ break; ++ } ++ gtk_widget_set_visible (self->box_not_sandboxed_warning, ret); ++ + /* are we trying to replace something in the baseos */ + gtk_widget_set_visible (self->infobar_details_package_baseos, + gs_app_has_quirk (self->app, AS_APP_QUIRK_COMPULSORY) && +@@ -2372,6 +2385,7 @@ gs_details_page_class_init (GsDetailsPageClass *klass) + gtk_widget_class_bind_template_child (widget_class, GsDetailsPage, label_content_rating_none); + gtk_widget_class_bind_template_child (widget_class, GsDetailsPage, button_details_rating_value); + gtk_widget_class_bind_template_child (widget_class, GsDetailsPage, label_details_rating_title); ++ gtk_widget_class_bind_template_child (widget_class, GsDetailsPage, box_not_sandboxed_warning); + } + + static void +diff --git a/src/gs-details-page.ui b/src/gs-details-page.ui +index 527087af..d1344e0b 100644 +--- a/src/gs-details-page.ui ++++ b/src/gs-details-page.ui +@@ -615,6 +615,46 @@ + 11 + + ++ ++ ++ False ++ False ++ 30 ++ ++ ++ True ++ False ++ 16 ++ dialog-warning ++ 6 ++ ++ ++ False ++ True ++ 0 ++ ++ ++ ++ ++ True ++ False ++ This third party package is not sandboxed. It will have access to your documents. ++ 0 ++ 0.5 ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ True ++ True ++ 12 ++ ++ + + + True +@@ -1150,7 +1190,7 @@ + + False + True +- 12 ++ 13 + + + +@@ -1213,7 +1253,7 @@ + + False + True +- 13 ++ 14 + + + +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0010-snap-Install-classic-snaps.patch gnome-software-3.26.1/debian/patches/0010-snap-Install-classic-snaps.patch --- gnome-software-3.25.91/debian/patches/0010-snap-Install-classic-snaps.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0010-snap-Install-classic-snaps.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,59 @@ +From 0a2deb0035a88d10f87d9a467ceadba5f9503b44 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Thu, 24 Aug 2017 14:26:16 +1200 +Subject: [PATCH 10/12] snap: Install classic snaps + +--- + plugins/snap/gs-plugin-snap.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/plugins/snap/gs-plugin-snap.c b/plugins/snap/gs-plugin-snap.c +index ae3ae27a..9114176e 100644 +--- a/plugins/snap/gs-plugin-snap.c ++++ b/plugins/snap/gs-plugin-snap.c +@@ -277,6 +277,8 @@ snap_to_app (GsPlugin *plugin, SnapdSnap *snap) + g_autofree gchar *unique_id = NULL; + GsApp *cached_app; + g_autoptr(GsApp) app = NULL; ++ SnapdConfinement confinement; ++ GEnumClass *enum_class; + + switch (snapd_snap_get_snap_type (snap)) { + case SNAPD_SNAP_TYPE_APP: +@@ -307,7 +309,13 @@ snap_to_app (GsPlugin *plugin, SnapdSnap *snap) + gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE); + if (gs_plugin_check_distro_id (plugin, "ubuntu")) + gs_app_add_quirk (app, AS_APP_QUIRK_PROVENANCE); +- if (priv->system_confinement == SNAPD_SYSTEM_CONFINEMENT_STRICT && snapd_snap_get_confinement (snap) == SNAPD_CONFINEMENT_STRICT) ++ ++ confinement = snapd_snap_get_confinement (snap); ++ enum_class = g_type_class_ref (SNAPD_TYPE_CONFINEMENT); ++ gs_app_set_metadata (app, "snap::confinement", g_enum_get_value (enum_class, confinement)->value_nick); ++ g_type_class_unref (enum_class); ++ ++ if (priv->system_confinement == SNAPD_SYSTEM_CONFINEMENT_STRICT && confinement == SNAPD_CONFINEMENT_STRICT) + gs_app_add_kudo (app, GS_APP_KUDO_SANDBOXED); + + return g_steal_pointer (&app); +@@ -790,6 +798,7 @@ gs_plugin_app_install (GsPlugin *plugin, + GError **error) + { + g_autoptr(SnapdClient) client = NULL; ++ SnapdInstallFlags flags = SNAPD_INSTALL_FLAGS_NONE; + + /* We can only install apps we know of */ + if (g_strcmp0 (gs_app_get_management_plugin (app), "snap") != 0) +@@ -800,7 +809,9 @@ gs_plugin_app_install (GsPlugin *plugin, + return FALSE; + + gs_app_set_state (app, AS_APP_STATE_INSTALLING); +- if (!snapd_client_install2_sync (client, SNAPD_INSTALL_FLAGS_NONE, gs_app_get_id (app), NULL, NULL, progress_cb, app, cancellable, error)) { ++ if (g_strcmp0 (gs_app_get_metadata_item (app, "snap::confinement"), "classic") == 0) ++ flags |= SNAPD_INSTALL_FLAGS_CLASSIC; ++ if (!snapd_client_install2_sync (client, flags, gs_app_get_id (app), NULL, NULL, progress_cb, app, cancellable, error)) { + gs_app_set_state_recover (app); + snapd_error_convert (error); + return FALSE; +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0011-snap-Correct-the-app-origin.patch gnome-software-3.26.1/debian/patches/0011-snap-Correct-the-app-origin.patch --- gnome-software-3.25.91/debian/patches/0011-snap-Correct-the-app-origin.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0011-snap-Correct-the-app-origin.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,93 @@ +From f607dbfadfd1987e6f793faae2a880ed4734098d Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Wed, 6 Sep 2017 11:09:45 +1200 +Subject: [PATCH 11/12] snap: Correct the app origin + +--- + plugins/snap/gs-plugin-snap.c | 21 +++++++++------------ + po/POTFILES.in | 1 + + 2 files changed, 10 insertions(+), 12 deletions(-) + +diff --git a/plugins/snap/gs-plugin-snap.c b/plugins/snap/gs-plugin-snap.c +index 9114176e..358a2167 100644 +--- a/plugins/snap/gs-plugin-snap.c ++++ b/plugins/snap/gs-plugin-snap.c +@@ -22,11 +22,13 @@ + #include + + #include ++#include + #include + #include + + struct GsPluginData { + SnapdAuthData *auth_data; ++ gchar *store_name; + SnapdSystemConfinement system_confinement; + GsAuth *auth; + GHashTable *store_snaps; +@@ -200,6 +202,10 @@ gs_plugin_setup (GsPlugin *plugin, GCancellable *cancellable, GError **error) + system_information = snapd_client_get_system_information_sync (client, cancellable, error); + if (system_information == NULL) + return FALSE; ++ priv->store_name = g_strdup (snapd_system_information_get_store (system_information)); ++ if (priv->store_name == NULL) ++ priv->store_name = g_strdup (/* TRANSLATORS: default snap store name */ ++ _("Snap Store")); + priv->system_confinement = snapd_system_information_get_confinement (system_information); + + /* load from disk */ +@@ -354,6 +360,7 @@ void + gs_plugin_destroy (GsPlugin *plugin) + { + GsPluginData *priv = gs_plugin_get_data (plugin); ++ g_free (priv->store_name); + g_clear_object (&priv->auth); + g_clear_pointer (&priv->store_snaps, g_hash_table_unref); + } +@@ -700,7 +707,7 @@ gs_plugin_refine_app (GsPlugin *plugin, + store_snap = get_store_snap (plugin, id, cancellable, NULL); + if (store_snap != NULL) { + GPtrArray *screenshots; +- const gchar *name, *screenshot_url = NULL; ++ const gchar *name; + + if (gs_app_get_state (app) == AS_APP_STATE_UNKNOWN) + gs_app_set_state (app, AS_APP_STATE_AVAILABLE); +@@ -746,20 +753,10 @@ gs_plugin_refine_app (GsPlugin *plugin, + as_image_set_height (image, snapd_screenshot_get_height (screenshot)); + as_screenshot_add_image (ss, image); + gs_app_add_screenshot (app, ss); +- +- /* fall back to the screenshot */ +- if (screenshot_url == NULL) +- screenshot_url = snapd_screenshot_get_url (screenshot); + } + } + +- /* use some heuristics to guess the application origin */ +- if (gs_app_get_origin_hostname (app) == NULL) { +- if (icon_url != NULL && !g_str_has_prefix (icon_url, "/")) +- gs_app_set_origin_hostname (app, icon_url); +- else if (screenshot_url != NULL) +- gs_app_set_origin_hostname (app, screenshot_url); +- } ++ gs_app_set_origin (app, priv->store_name); + } + + /* load icon if requested */ +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 111da1de..965afbdf 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -85,6 +85,7 @@ plugins/limba/org.gnome.Software.Plugin.Limba.metainfo.xml.in + plugins/odrs/gs-plugin-odrs.c + plugins/odrs/org.gnome.Software.Plugin.Odrs.metainfo.xml.in + plugins/shell-extensions/gs-plugin-shell-extensions.c ++plugins/snap/gs-plugin-snap.c + plugins/snap/org.gnome.Software.Plugin.Snap.metainfo.xml.in + plugins/steam/gs-plugin-steam.c + plugins/steam/org.gnome.Software.Plugin.Steam.metainfo.xml.in +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/0012-details-Show-an-in-app-notification-when-passed-an-i.patch gnome-software-3.26.1/debian/patches/0012-details-Show-an-in-app-notification-when-passed-an-i.patch --- gnome-software-3.25.91/debian/patches/0012-details-Show-an-in-app-notification-when-passed-an-i.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/0012-details-Show-an-in-app-notification-when-passed-an-i.patch 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,193 @@ +From b7576f7d5cde0cd114995c7e04a269cee1c7e312 Mon Sep 17 00:00:00 2001 +From: Iain Lane +Date: Tue, 4 Apr 2017 13:25:33 +0100 +Subject: [PATCH 12/12] details: Show an in-app notification when passed an + invalid file or URL + +Previously there was no feedback when gnome-software was fed a bad URL +on the commandline - show a message. + +https://bugzilla.gnome.org/show_bug.cgi?id=788424 +--- + src/gs-details-page.c | 46 +++++++++++++++++++++++++++++++++++++++++----- + src/gs-shell.c | 12 +----------- + src/gs-shell.h | 13 +++++++++++++ + 3 files changed, 55 insertions(+), 16 deletions(-) + +diff --git a/src/gs-details-page.c b/src/gs-details-page.c +index 730a3506..4660f8ed 100644 +--- a/src/gs-details-page.c ++++ b/src/gs-details-page.c +@@ -1579,23 +1579,47 @@ set_app (GsDetailsPage *self, GsApp *app) + gs_details_page_app_refine2 (self); + } + ++typedef struct { ++ GsDetailsPage *page; ++ gchar *url; ++} GsDetailsFileHelper; ++ ++static void ++gs_details_page_file_helper_free (GsDetailsFileHelper *helper) ++{ ++ g_object_unref (helper->page); ++ g_free (helper->url); ++ g_free (helper); ++} ++ ++G_DEFINE_AUTOPTR_CLEANUP_FUNC(GsDetailsFileHelper, gs_details_page_file_helper_free); ++ + static void + gs_details_page_file_to_app_cb (GObject *source, + GAsyncResult *res, + gpointer user_data) + { + GsPluginLoader *plugin_loader = GS_PLUGIN_LOADER (source); +- GsDetailsPage *self = GS_DETAILS_PAGE (user_data); ++ g_autoptr(GsDetailsFileHelper) helper = user_data; ++ GsDetailsPage *self = helper->page; + g_autoptr(GsAppList) list = NULL; + g_autoptr(GError) error = NULL; ++ g_autofree gchar *msg = NULL; + + list = gs_plugin_loader_job_process_finish (plugin_loader, + res, + &error); + if (list == NULL) { ++ /* TRANSLATORS: This message is shown when opening ++ * gnome-software with a path to an unhandled app, e.g. ++ * /no/such/file */ ++ msg = g_strdup_printf (_("Don't know how to handle ‘%s’"), helper->url); + g_warning ("failed to convert file to GsApp: %s", error->message); + /* go back to the overview */ + gs_shell_change_mode (self->shell, GS_SHELL_MODE_OVERVIEW, NULL, FALSE); ++ gs_shell_show_event_app_notify (self->shell, ++ msg, ++ GS_SHELL_EVENT_BUTTON_NONE); + } else { + GsApp *app = gs_app_list_index (list, 0); + set_app (self, app); +@@ -1608,17 +1632,23 @@ gs_details_page_url_to_app_cb (GObject *source, + gpointer user_data) + { + GsPluginLoader *plugin_loader = GS_PLUGIN_LOADER (source); +- GsDetailsPage *self = GS_DETAILS_PAGE (user_data); ++ g_autoptr(GsDetailsFileHelper) helper = user_data; ++ GsDetailsPage *self = helper->page; + g_autoptr(GsAppList) list = NULL; + g_autoptr(GError) error = NULL; ++ g_autofree gchar *msg = NULL; + + list = gs_plugin_loader_job_process_finish (plugin_loader, + res, + &error); + if (list == NULL) { ++ msg = g_strdup_printf (_("Don't know how to handle ‘%s’"), helper->url); + g_warning ("failed to convert URL to GsApp: %s", error->message); + /* go back to the overview */ + gs_shell_change_mode (self->shell, GS_SHELL_MODE_OVERVIEW, NULL, FALSE); ++ gs_shell_show_event_app_notify (self->shell, ++ msg, ++ GS_SHELL_EVENT_BUTTON_NONE); + } else { + GsApp *app = gs_app_list_index (list, 0); + set_app (self, app); +@@ -1629,6 +1659,9 @@ void + gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) + { + g_autoptr(GsPluginJob) plugin_job = NULL; ++ GsDetailsFileHelper *helper = g_new0 (GsDetailsFileHelper, 1); ++ helper->page = g_object_ref (self); ++ helper->url = g_file_get_uri (file); + gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); + plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_FILE_TO_APP, + "file", file, +@@ -1651,13 +1684,16 @@ gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) + gs_plugin_loader_job_process_async (self->plugin_loader, plugin_job, + self->cancellable, + gs_details_page_file_to_app_cb, +- self); ++ helper); + } + + void + gs_details_page_set_url (GsDetailsPage *self, const gchar *url) + { + g_autoptr(GsPluginJob) plugin_job = NULL; ++ GsDetailsFileHelper *helper = g_new0 (GsDetailsFileHelper, 1); ++ helper->page = g_object_ref (self); ++ helper->url = g_strdup (url); + gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); + plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_URL_TO_APP, + "search", url, +@@ -1676,11 +1712,11 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url) + GS_PLUGIN_REFINE_FLAGS_REQUIRE_RUNTIME | + GS_PLUGIN_REFINE_FLAGS_REQUIRE_PERMISSIONS | + GS_PLUGIN_REFINE_FLAGS_REQUIRE_SCREENSHOTS, +- NULL); ++ helper); + gs_plugin_loader_job_process_async (self->plugin_loader, plugin_job, + self->cancellable, + gs_details_page_url_to_app_cb, +- self); ++ helper); + } + + static void +diff --git a/src/gs-shell.c b/src/gs-shell.c +index 7a68492b..22544acf 100644 +--- a/src/gs-shell.c ++++ b/src/gs-shell.c +@@ -743,17 +743,7 @@ gs_shell_allow_updates_notify_cb (GsPluginLoader *plugin_loader, + priv->mode == GS_SHELL_MODE_UPDATES); + } + +-typedef enum { +- GS_SHELL_EVENT_BUTTON_NONE = 0, +- GS_SHELL_EVENT_BUTTON_SOURCES = 1 << 0, +- GS_SHELL_EVENT_BUTTON_NO_SPACE = 1 << 1, +- GS_SHELL_EVENT_BUTTON_NETWORK_SETTINGS = 1 << 2, +- GS_SHELL_EVENT_BUTTON_MORE_INFO = 1 << 3, +- GS_SHELL_EVENT_BUTTON_RESTART_REQUIRED = 1 << 4, +- GS_SHELL_EVENT_BUTTON_LAST +-} GsShellEventButtons; +- +-static void ++void + gs_shell_show_event_app_notify (GsShell *shell, + const gchar *title, + GsShellEventButtons buttons) +diff --git a/src/gs-shell.h b/src/gs-shell.h +index b3ba20e2..267e5300 100644 +--- a/src/gs-shell.h ++++ b/src/gs-shell.h +@@ -39,6 +39,16 @@ struct _GsShellClass + void (* loaded) (GsShell *shell); + }; + ++typedef enum { ++ GS_SHELL_EVENT_BUTTON_NONE = 0, ++ GS_SHELL_EVENT_BUTTON_SOURCES = 1 << 0, ++ GS_SHELL_EVENT_BUTTON_NO_SPACE = 1 << 1, ++ GS_SHELL_EVENT_BUTTON_NETWORK_SETTINGS = 1 << 2, ++ GS_SHELL_EVENT_BUTTON_MORE_INFO = 1 << 3, ++ GS_SHELL_EVENT_BUTTON_RESTART_REQUIRED = 1 << 4, ++ GS_SHELL_EVENT_BUTTON_LAST ++} GsShellEventButtons; ++ + typedef enum { + GS_SHELL_MODE_UNKNOWN, + GS_SHELL_MODE_OVERVIEW, +@@ -98,6 +108,9 @@ void gs_shell_show_extras_search (GsShell *shell, + gchar **resources); + void gs_shell_show_uri (GsShell *shell, + const gchar *url); ++void gs_shell_show_event_app_notify (GsShell *shell, ++ const gchar *title, ++ GsShellEventButtons buttons); + void gs_shell_setup (GsShell *shell, + GsPluginLoader *plugin_loader, + GCancellable *cancellable); +-- +2.14.1 + diff -Nru gnome-software-3.25.91/debian/patches/series gnome-software-3.26.1/debian/patches/series --- gnome-software-3.25.91/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/patches/series 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,13 @@ +0001-snap-Fix-crash-authenticating-with-Ubuntu-One.patch +0001-Construct-the-Software-Sources-menu-item-dynamically.patch +0002-Hide-licence-updated-and-category-fields-if-they-are.patch +0003-Download-changelog-information-on-demand-this-stops-.patch +0004-Sort-snaps-before-other-apps.patch +0005-Hide-Kudo-details-since-we-don-t-have-good-data.patch +0006-packagekit-Disable-updates.patch +0007-snap-Only-feature-snaps.patch +0008-Don-t-randomize-editors-picks.patch +0009-Display-a-warning-for-non-sandboxed-snaps.patch +0010-snap-Install-classic-snaps.patch +0011-snap-Correct-the-app-origin.patch +0012-details-Show-an-in-app-notification-when-passed-an-i.patch diff -Nru gnome-software-3.25.91/debian/rules gnome-software-3.26.1/debian/rules --- gnome-software-3.25.91/debian/rules 2017-07-25 11:58:55.000000000 +0000 +++ gnome-software-3.26.1/debian/rules 2017-10-16 20:33:05.000000000 +0000 @@ -5,9 +5,10 @@ GS_CONFIGURE_FLAGS = \ -Denable-gnome-desktop=true \ -Denable-odrs=true \ - -Denable-ostree=false \ + -Denable-ostree=true \ -Denable-packagekit=true \ -Denable-rpm=false \ + -Denable-snap=true # these are conditionally re-enabled later GS_CONFIGURE_FLAGS += \ @@ -38,6 +39,12 @@ DISTRO_ID = pureos endif +# Install target dir +INSTALLDIR = $(CURDIR)/debian/tmp + +# Fix the Flatpak plugin: https://launchpad.net/bugs/1650783 +export DEB_LDFLAGS_MAINT_STRIP := -Wl,-Bsymbolic-functions + %: dh $@ --with gnome --buildsystem=meson @@ -48,7 +55,7 @@ override_dh_auto_install: dh_auto_install ifneq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) - rm -f debian/tmp/usr/lib/*/gs-plugins-*/libgs_plugin_ubuntu* + rm -f $(INSTALLDIR)/usr/lib/*/gs-plugins-*/libgs_plugin_ubuntu* endif override_dh_installgsettings: @@ -63,6 +70,13 @@ rm -f debian/tmp/usr/lib/*/gs-plugins-*/libgs_plugin_fedora* dh_install +# workaround upstream issue in the new build system +# https://bugzilla.gnome.org/show_bug.cgi?id=785134 +# https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1702522 +override_dh_translations: + ninja -C obj-$(DEB_HOST_GNU_TYPE) gnome-software-pot + dh_translations + override_dh_missing: dh_missing --fail-missing @@ -75,6 +89,13 @@ rm -f debian/gnome-software/usr/share/metainfo/org.gnome.Software.Plugin.Limba.metainfo.xml rm -f debian/gnome-software/usr/share/metainfo/org.gnome.Software.Plugin.Snap.metainfo.xml +override_dh_install-indep: + # Change the name and icon for Unity sessions + # Also needs override_dh_install renamed to override_dh_install-arch + dh_install + sed -i 's/Name=Software/Name=Ubuntu Software/' debian/ubuntu-software/usr/share/ubuntu/applications/org.gnome.Software.desktop + sed -i 's/Icon\(.*\)=\(org.gnome.Software\)/Icon\1=ubuntusoftware/' debian/ubuntu-software/usr/share/ubuntu/applications/org.gnome.Software.desktop + override_dh_makeshlibs: dh_makeshlibs -Xlibgs_plugin diff -Nru gnome-software-3.25.91/debian/source_gnome-software.py gnome-software-3.26.1/debian/source_gnome-software.py --- gnome-software-3.25.91/debian/source_gnome-software.py 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/source_gnome-software.py 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,7 @@ +import apport.packaging + +def add_info(report, ui): + report["InstalledPlugins"] = apport.hookutils.package_versions( + 'gnome-software-plugin-flatpak', + 'gnome-software-plugin-limba', + 'gnome-software-plugin-snap') diff -Nru gnome-software-3.25.91/debian/ubuntu-software.install gnome-software-3.26.1/debian/ubuntu-software.install --- gnome-software-3.25.91/debian/ubuntu-software.install 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/ubuntu-software.install 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,2 @@ +usr/share/applications/org.gnome.Software.desktop usr/share/ubuntu/applications/ +debian/icons/hicolor usr/share/icons/ diff -Nru gnome-software-3.25.91/debian/ubuntu-software.links gnome-software-3.26.1/debian/ubuntu-software.links --- gnome-software-3.25.91/debian/ubuntu-software.links 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.26.1/debian/ubuntu-software.links 2017-10-16 20:33:05.000000000 +0000 @@ -0,0 +1,2 @@ +usr/bin/gnome-software usr/bin/ubuntu-software +usr/share/ubuntu/applications/org.gnome.Software.desktop usr/share/ubuntu-xorg/applications/org.gnome.Software.desktop