Merge branch 'pureos-3-36-1' into 'pureos/sloppy'

Rebase on GNOME Software 3.36.1

See merge request !3

RELEASE

@@ -2,14 +2,14 @@ GNOME Software Release Notes
 
 Write release entries:
 
-git log --format="%s" --cherry-pick --right-only 3.32.4... | grep -i -v trivial | grep -v Merge | sort | uniq
+git log --format="%s" --cherry-pick --right-only 3.36.0... | grep -i -v trivial | grep -v Merge | sort | uniq
 Add any user visible changes into data/appdata/org.gnome.Software.appdata.xml.in
 
 Generate NEWS file:
 appstream-util appdata-to-news ../data/appdata/org.gnome.Software.appdata.xml.in > NEWS
 
-git commit -a -m "Release version 3.34.0"
-git tag -s 3.34.0 -m "==== Version 3.34.0 ===="
+git commit -a -m "Release version 3.36.1"
+git tag -s 3.36.1 -m "==== Version 3.36.1 ===="
 <enter password>
 
 ninja-build dist

contrib/gnome-software.spec.in

-%global glib2_version 2.46.0
+%global glib2_version 2.61.1
 %global gtk3_version 3.22.4
 %global json_glib_version 1.2.0
 %global packagekit_version 1.1.1
-%global appstream_glib_version 0.7.11
+%global appstream_glib_version 0.7.15
 %global libsoup_version 2.52.0
 %global gsettings_desktop_schemas_version 3.12.0
 %global gnome_desktop_version 3.18.0
-%global fwupd_version 1.0.7
-%global flatpak_version 0.9.4
+%global fwupd_version 1.2.10
+%global flatpak_version 1.1.3
+%global libxmlb_version 0.1.7
 
 %define alphatag                        #ALPHATAG#
 
@@ -18,7 +19,7 @@ Summary:   A software center for GNOME
 
 License:   GPLv2+
 URL:       https://wiki.gnome.org/Apps/Software
-Source0:   https://download.gnome.org/sources/gnome-software/3.31/%{name}-%{version}.tar.xz
+Source0:   https://download.gnome.org/sources/gnome-software/3.34/%{name}-%{version}.tar.xz
 
 BuildRequires: gcc
 BuildRequires: gettext
@@ -28,14 +29,16 @@ BuildRequires: desktop-file-utils
 BuildRequires: fwupd-devel >= %{fwupd_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-desktop3-devel
+BuildRequires: gnome-online-accounts-devel
 BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version}
 BuildRequires: gspell-devel
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk-doc
 BuildRequires: json-glib-devel >= %{json_glib_version}
 BuildRequires: libappstream-glib-devel >= %{appstream_glib_version}
-BuildRequires: gnome-online-accounts-devel
+BuildRequires: libdnf-devel
 BuildRequires: libsoup-devel
+BuildRequires: libxmlb-devel >= %{libxmlb_version}
 BuildRequires: meson
 BuildRequires: PackageKit-glib-devel >= %{packagekit_version}
 BuildRequires: polkit-devel
@@ -45,15 +48,8 @@ BuildRequires: rpm-devel
 BuildRequires: rpm-ostree-devel
 BuildRequires: libgudev1-devel
 BuildRequires: valgrind-devel
-BuildRequires: liboauth-devel
-%if 0%{?fedora}
-BuildRequires: snapd-glib-devel >= 1.49
-%endif
 
 Requires: appstream-data
-%if 0%{?fedora}
-Requires: epiphany-runtime
-%endif
 Requires: flatpak%{?_isa} >= %{flatpak_version}
 Requires: flatpak-libs%{?_isa} >= %{flatpak_version}
 Requires: fwupd%{?_isa} >= %{fwupd_version}
@@ -69,7 +65,12 @@ Requires: libappstream-glib%{?_isa} >= %{appstream_glib_version}
 # librsvg2 is needed for gdk-pixbuf svg loader
 Requires: librsvg2%{?_isa}
 Requires: libsoup%{?_isa} >= %{libsoup_version}
-Requires: PackageKit%{?_isa} >= %{packagekit_version}
+Requires: libxmlb%{?_isa} >= %{libxmlb_version}
+
+Recommends: PackageKit%{?_isa} >= %{packagekit_version}
+
+Obsoletes: gnome-software-snap < 3.33.1
+Obsoletes: gnome-software-editor < 3.35.1
 
 # this is not a library version
 %define gs_plugin_version               13
@@ -86,33 +87,24 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 These development files are for building gnome-software plugins outside
 the source tree. Most users do not need this subpackage installed.
 
-%package editor
-Summary: Banner designer for GNOME Software
+%package rpm-ostree
+Summary: rpm-ostree backend for gnome-software
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: rpm-ostree%{?_isa}
+Supplements: (gnome-software%{?_isa} and rpm-ostree%{?_isa})
 
-%description editor
-Editor for designing banners for GNOME Software.
-
-%if 0%{?fedora}
-%package snap
-Summary: Support for Ubuntu Snap packages
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Supplements: (gnome-software%{?_isa} and snapd%{?_isa})
+%description rpm-ostree
+gnome-software is an application that makes it easy to add, remove
+and update software in the GNOME desktop.
 
-%description snap
-Adds support for Snap packages from the Snap store.
-%endif
+This package includes the rpm-ostree backend.
 
 %prep
 %autosetup -p1
 
 %build
 %meson \
-%if 0%{?fedora}
-    -Dsnap=true \
-%else
     -Dsnap=false \
-%endif
     -Dgudev=true \
     -Dpackagekit=true \
     -Dexternal_appstream=false \
@@ -123,6 +115,9 @@ Adds support for Snap packages from the Snap store.
 %install
 %meson_install
 
+# remove unneeded dpkg plugin
+rm %{buildroot}%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dpkg.so
+
 # make the software center load faster
 desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.desktop \
     --set-key=X-AppInstall-Package --set-value=%{name}
@@ -130,7 +125,7 @@ desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.deskto
 # set up for Fedora
 cat >> %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.software-fedora.gschema.override << FOE
 [org.gnome.software]
-official-repos = [ 'fedora', 'fedora-debuginfo', 'fedora-source', 'koji-override-0', 'koji-override-1', 'rawhide', 'rawhide-debuginfo', 'rawhide-source', 'updates', 'updates-debuginfo', 'updates-source', 'updates-testing', 'updates-testing-debuginfo', 'updates-testing-source', 'fedora-modular', 'fedora-modular-debuginfo', 'fedora-modular-source', 'rawhide-modular', 'rawhide-modular-debuginfo', 'rawhide-modular-source' ]
+official-repos = [ 'anaconda', 'fedora', 'fedora-debuginfo', 'fedora-source', 'koji-override-0', 'koji-override-1', 'rawhide', 'rawhide-debuginfo', 'rawhide-source', 'updates', 'updates-debuginfo', 'updates-source', 'updates-testing', 'updates-testing-debuginfo', 'updates-testing-source', 'fedora-modular', 'fedora-modular-debuginfo', 'fedora-modular-source', 'rawhide-modular', 'rawhide-modular-debuginfo', 'rawhide-modular-source' ]
 FOE
 
 %find_lang %name --with-gnome
@@ -153,7 +148,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/gnome-software/featured-*.svg
 %{_datadir}/gnome-software/featured-*.jpg
 %{_datadir}/metainfo/org.gnome.Software.appdata.xml
-%{_datadir}/metainfo/org.gnome.Software.Plugin.Epiphany.metainfo.xml
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Fwupd.metainfo.xml
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Odrs.metainfo.xml
@@ -161,16 +155,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_appstream.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-categories.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-menu-path.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dpkg.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dummy.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_epiphany.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora_langpacks.so
+%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-langpacks.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-pkgdb-collections.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_flatpak.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fwupd.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_generic-updates.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-blacklist.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-featured.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-popular.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_icons.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_key-colors-metadata.so
@@ -192,8 +183,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_provenance.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_repos.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_rewrite-resource.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_rpm-ostree.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_shell-extensions.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_systemd-updates.so
 %{_sysconfdir}/xdg/autostart/gnome-software-service.desktop
 %{_datadir}/app-info/xmls/org.gnome.Software.Featured.xml
@@ -205,11 +194,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_libexecdir}/gnome-software-cmd
 %{_libexecdir}/gnome-software-restarter
 
-%if 0%{?fedora}
-%files snap
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_snap.so
-%{_datadir}/metainfo/org.gnome.Software.Plugin.Snap.metainfo.xml
-%endif
+%files rpm-ostree
+%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_rpm-ostree.so
 
 %files devel
 %{_libdir}/pkgconfig/gnome-software.pc
@@ -217,11 +203,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_includedir}/gnome-software/*.h
 %{_datadir}/gtk-doc/html/gnome-software
 
-%files editor
-%{_bindir}/gnome-software-editor
-%{_datadir}/applications/org.gnome.Software.Editor.desktop
-%{_mandir}/man1/gnome-software-editor.1*
-
 %changelog
 * #LONGDATE# Richard Hughes <richard@hughsie.com> #VERSION#-0.#BUILD##ALPHATAG#
 - Update from GIT

data/appdata/org.gnome.Software.appdata.xml.in

@@ -46,6 +46,110 @@
    Validate with `appstream-util validate *.appdata.xml`
   -->
   <releases>
+    <release date="2020-05-22" version="3.36.1">
+      <description>
+        <p>
+          This is a stable release with the following changes:
+        </p>
+        <ul>
+          <li>Add distro upgrade css for the HC theme</li>
+          <li>Check if a stock icon actually exists in the theme</li>
+          <li>Correctly mark layered local packages as removable</li>
+          <li>Fine-tune F32 upgrade banner position and font</li>
+          <li>Fix loading if applications directory does not exist</li>
+          <li>Fix the progress info required for the loading page</li>
+          <li>Handle invalid snap auth data</li>
+          <li>Improve performance when showing lots of applications</li>
+          <li>Only delete the installed firmware archive if we downloaded it</li>
+          <li>Properly check if an flatpak application is a runtime</li>
+          <li>Show the correct state for local packages without AppData</li>
+        </ul>
+        <p>This release also adds and updates existing translations.</p>
+      </description>
+    </release>
+    <release date="2020-03-11" version="3.36.0">
+      <description>
+        <p>
+          This is the first stable release for GNOME 3.36.
+        </p>
+      </description>
+    </release>
+    <release date="2020-03-04" version="3.35.92">
+      <description>
+        <p>
+          This is an unstable stable release with the following changes:
+        </p>
+        <ul>
+          <li>Fix crash when viewing application details</li>
+          <li>Fix “thrice daily” check running every 3 days</li>
+          <li>Improve the appearance of the front page banners</li>
+          <li>Show the correct upgrade banner contents when a reboot is requried</li>
+        </ul>
+        <p>This release also updates existing translations.</p>
+      </description>
+    </release>
+    <release date="2020-02-19" version="3.35.91">
+      <description>
+        <p>
+          This is an unstable stable release with the following changes:
+        </p>
+        <ul>
+          <li>Add an info bar about automatic updates</li>
+          <li>Avoid rpm-ostree downgrade error when doing distro upgrade</li>
+          <li>Click on stars to open review dialog in the details view</li>
+          <li>Fix loading of icons from AppStream YAML</li>
+          <li>Fix weird font sizes in the batter</li>
+          <li>Hide any in-app notifications when closing the main window</li>
+          <li>Integrate better with snapd</li>
+          <li>Only ignore flatpak estimated progress if >10%</li>
+          <li>Remove color stripes on categories in the Explore page</li>
+          <li>Remove support for Shell extensions</li>
+          <li>Remove webapp support</li>
+          <li>Reset star rating when loading an unrated app</li>
+          <li>Sort applications using locale based algorithms</li>
+          <li>Stop snaps from being automatically updated</li>
+        </ul>
+        <p>This release also adds and updates existing translations.</p>
+      </description>
+    </release>
+    <release date="2019-11-25" version="3.35.2">
+      <description>
+        <p>
+          This is an unstable stable release with the following changes:
+        </p>
+        <ul>
+          <li>Add missing OARS content rating descriptions</li>
+          <li>Add new plugin for restricting access to apps</li>
+          <li>Avoid a UI crash when switching modes</li>
+          <li>Build libmalcontent dependency on Fedora CI</li>
+          <li>Correctly distinguish empty content ratings from missing ones</li>
+          <li>Correctly set the application state if autoupdate is in progress</li>
+          <li>Do not show a crazy error when installing packages</li>
+          <li>Do not show non-applications in the installed panel</li>
+          <li>Download Flatpak updates in the correct installation</li>
+          <li>Expose snap channels as app alternates</li>
+          <li>Fix a crash on 32-bit systems</li>
+          <li>Fix langpacks autoinstall on Fedora SilverBlue</li>
+          <li>Fix manual detach when updating removable device firmware</li>
+          <li>Fix third party repo enabling not working</li>
+          <li>Hide add/remove shortcut buttons for parentally filtered apps</li>
+          <li>Improve some front page banners</li>
+          <li>Invalidate caches when adding or removing remotes</li>
+          <li>Make flatpak more thread-safe to fix some crashes</li>
+          <li>Match the exact ID when refining a wildcard</li>
+          <li>Only set the app row's buttons as destructive when they remove an app</li>
+          <li>Remove hardcoded-featured plugin</li>
+          <li>Remove the app folder functionality as this is now built-in to the shell</li>
+          <li>Remove the banner editor as this is now an app on it's own</li>
+          <li>Rework age ratings handling to avoid hard-coded list</li>
+          <li>Set the shell extension origin correctly in all cases</li>
+          <li>Show the channel for snaps</li>
+          <li>Speed up the flatpak plugin in some situations</li>
+          <li>Use plugin API to launch apps from install notification.</li>
+        </ul>
+        <p>This release also adds and updates existing translations.</p>
+      </description>
+    </release>
     <release date="2019-09-09" version="3.34.0">
       <description>
         <p>

data/assets/featured-foliate.svg

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" version="1.0"><defs><linearGradient id="c"><stop offset="0" stop-color="#cfcfcc"/><stop offset=".037" stop-color="#e8e8e8" stop-opacity=".98"/><stop offset=".074" stop-color="#d0d0cc"/><stop offset=".923" stop-color="#d0d0cc"/><stop offset=".962" stop-color="#e8e8e8"/><stop offset="1" stop-color="#d0d0cc"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#f6f5f4"/><stop offset="1" stop-color="#e1dfdd"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#f6f5f4"/><stop offset=".333" stop-color="#fdfdfd"/><stop offset="1" stop-color="#c9c6c1"/></linearGradient><linearGradient xlink:href="#a" id="f" x1="55" y1="65" x2="64" y2="65" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#b" id="e" x1="73" y1="65" x2="65" y2="65" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#c" id="d" gradientUnits="userSpaceOnUse" x1="10" y1="106" x2="118" y2="106"/></defs><g transform="translate(-27.476 -777.141) scale(4.43452)"><rect ry="8" y="208" x="63" height="80" width="57" fill="#20baba"/><rect width="57" height="80" x="8" y="36" ry="8" transform="translate(0 172)" fill="#20baba"/><path transform="translate(0 172)" d="M18 36h92c4.432 0 8 3.568 8 8v60c0 4.432-3.568 8-8 8H18c-4.432 0-8-3.568-8-8V44c0-4.432 3.568-8 8-8z" fill="url(#d)"/><path style="marker:none" d="M72 28c-4.432 0-8 3.568-8 8v76c0-4.432 3.568-8 8-8h38c4.432 0 8-3.568 8-8V36c0-4.432-3.568-8-8-8z" transform="translate(0 172)" fill="url(#e)"/><path d="M56 28c4.432 0 8 3.568 8 8v76c0-4.432-3.568-8-8-8H18c-4.432 0-8-3.568-8-8V36c0-4.432 3.568-8 8-8z" style="marker:none" transform="translate(0 172)" fill="url(#f)"/><rect width="24" height="4" x="76" y="212" ry="0" fill="#0cc"/><rect width="32" height="4" x="76" y="48" ry="0" transform="translate(0 172)" fill="#deddda"/><rect ry="0" y="56" x="76" height="4" width="32" transform="translate(0 172)" fill="#deddda"/><rect width="32" height="4" x="76" y="64" ry="0" transform="translate(0 172)" fill="#deddda"/><rect ry="0" y="72" x="76" height="4" width="32" transform="translate(0 172)" fill="#deddda"/><rect width="32" height="4" x="76" y="80" ry="0" transform="translate(0 172)" fill="#deddda"/><rect ry="0" y="88" x="76" height="4" width="21.333" transform="translate(0 172)" fill="#deddda"/><rect ry="0" y="64" x="20" height="4" width="32" transform="translate(0 172)" fill="#deddda"/><rect width="32" height="4" x="20" y="72" ry="0" transform="translate(0 172)" fill="#deddda"/><rect ry="0" y="80" x="20" height="4" width="32" transform="translate(0 172)" fill="#deddda"/><rect width="21.333" height="4" x="20" y="88" ry="0" transform="translate(0 172)" fill="#deddda"/><rect width="32" height="4" x="20" y="64" ry="0" transform="translate(0 172)" fill="#deddda"/><rect ry="0" y="72" x="20" height="4" width="32" transform="translate(0 172)" fill="#deddda"/><rect width="32" height="4" x="20" y="80" ry="0" transform="translate(0 172)" fill="#deddda"/><rect ry="0" y="88" x="20" height="4" width="32" transform="translate(0 172)" fill="#deddda"/><path d="M26.089 186.835s-8.232 20.437-8.208 31.187c.018 8 1.102 17.027 6.212 23.182 3.926 4.729 16.629 7.967 16.629 7.967l4.14 15.455 3.864-1.035-4.14-15.455s9.38-9.156 10.416-15.214c1.348-7.886-2.227-16.246-6.211-23.183-5.354-9.321-22.702-22.904-22.702-22.904z" fill="#0cc"/><path d="M44.8 264.673l3.864-1.036-7.247-27.046 7.071-12.247-2.45-1.414-5.656 9.798-2.07-7.728 5.656-9.798-2.45-1.414-4.242 7.349-1.553-5.796 4.243-7.348-2.45-1.415-2.828 4.9L31 198l-3.864 1.035 3.688 13.478-4.899-2.829-1.414 2.45 7.349 4.242 1.553 5.796-7.349-4.243-1.414 2.45 9.798 5.657 2.07 7.727-9.798-5.657-1.414 2.45 12.248 7.07z" fill="#20baba"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="512" version="1.0"><defs><linearGradient id="c"><stop offset="0" stop-color="#cfcfcc"/><stop offset=".037" stop-color="#e8e8e8" stop-opacity=".98"/><stop offset=".074" stop-color="#d0d0cc"/><stop offset=".923" stop-color="#d0d0cc"/><stop offset=".962" stop-color="#e8e8e8"/><stop offset="1" stop-color="#d0d0cc"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#f6f5f4"/><stop offset="1" stop-color="#e1dfdd"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#f6f5f4"/><stop offset=".333" stop-color="#fdfdfd"/><stop offset="1" stop-color="#c9c6c1"/></linearGradient></defs><path d="M69.293 35.105S21.305 154.242 21.445 216.909c.105 46.635 6.424 99.258 36.213 135.139 22.886 27.567 96.938 46.443 96.938 46.443l24.134 90.095 22.525-6.034-24.134-90.094s54.68-53.375 60.72-88.69c7.858-45.971-12.982-94.706-36.207-135.145-31.211-54.337-132.34-133.518-132.34-133.518z" fill="#0cc"/><path d="M178.369 488.86l22.525-6.04-42.247-157.664 41.22-71.393-14.282-8.243-32.971 57.117-12.067-45.05 32.971-57.118-14.282-8.242-24.728 42.84-9.054-33.787 24.735-42.835-14.282-8.249-16.486 28.565-21.5-78.57-22.524 6.033 21.499 78.57-28.559-16.492-8.243 14.283 42.841 24.728 9.053 33.788-42.84-24.735-8.243 14.283 57.117 32.977 12.067 45.044-57.117-32.977-8.243 14.282 71.4 41.215z" fill="#20baba"/></svg>
\ No newline at end of file

data/assets/featured-maps-bg.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="1280" height="350"><path d="M-23.234-27.797h1321.28v405.071H-23.234z" style="marker:none" fill="#c7ddf7"/><path d="M148.492 151H734.38v127.279H148.492z" style="marker:none" fill="#f3ebe5"/><path d="M-55.558-90.427h561.645v491.944H-55.558z" style="marker:none" fill="#f3ebe5"/><path d="M148.492 73.218h555.584v43.437H148.492z" style="marker:none" fill="#f3ebe5"/><path d="M265.63-217.336c0-23.504-18.923-42.426-42.427-42.426H107.036c-23.505 0-42.427 18.922-42.427 42.426V150.36c0 23.504 18.922 42.426 42.427 42.426h116.167c23.504 0 42.427-18.922 42.427-42.426" style="marker:none" fill="none" stroke="#ffa348" stroke-width="6" stroke-linecap="round"/><path style="marker:none" d="M213.142-60.122c0-23.505-18.922-42.427-42.426-42.427H54.548c-23.504 0-42.426 18.922-42.426 42.427v367.695c0 23.504 18.922 42.427 42.426 42.427h116.168c23.504 0 42.426-18.923 42.426-42.427" fill="none" stroke="#f8e45c" stroke-width="6" stroke-linecap="round"/><path style="marker:none" d="M112.127-102.549c0-23.504 18.922-42.426 42.426-42.426h116.168c23.504 0 42.426 18.922 42.426 42.426v367.696c0 23.504-18.922 42.426-42.426 42.426H154.553c-23.504 0-42.426-18.922-42.426-42.426" fill="none" stroke="#fff" stroke-width="4" stroke-linecap="round"/><path style="marker:none" d="M265.63 150.36c0-23.504 18.922-42.426 42.426-42.426h116.167c23.505 0 42.427 18.922 42.427 42.426v367.695c0 23.505-18.922 42.427-42.427 42.427H308.056c-23.504 0-42.426-18.922-42.426-42.426" fill="none" stroke="#ffa348" stroke-width="6" stroke-linecap="round"/><path d="M112.127 265.147c0-23.504-18.922-42.427-42.426-42.427H-46.467c-23.504 0-42.426 18.923-42.426 42.427v367.695c0 23.504 18.922 42.427 42.426 42.427H69.701c23.504 0 42.426-18.922 42.426-42.427m101.015-325.269c0-23.504 18.922-42.426 42.427-42.426h116.167c23.504 0 42.427 18.922 42.427 42.426v367.696c0 23.504-18.923 42.426-42.427 42.426H255.57c-23.505 0-42.427-18.922-42.427-42.426M313.652 6.043c23.505 0 42.427 18.922 42.427 42.426v116.168c0 23.504-18.922 42.426-42.427 42.426H-54.043c-23.504 0-42.427-18.922-42.427-42.426V48.469c0-23.504 18.923-42.426 42.427-42.426" style="marker:none" fill="none" stroke="#fff" stroke-width="4" stroke-linecap="round"/><path d="M466.619 217.955l-19.4 46.528 19.4-8.414 18.671 9.405z" fill="#f5c211" stroke="#fff" stroke-width="4"/><path d="M466.619 253.819l.006-30.57 14.937 38.157z" fill="#e5a50a"/><path d="M145 177h44.193v38H145z" style="marker:none" fill="#1a5fb4"/><path d="M158.961 204.571h3.97v-15.929h-2.363l-6.404 3.19 1.492 2.847 3.305-1.377zm11.682.229c4.293 0 7.116-1.859 7.116-4.682 0-2.02-1.355-3.534-3.466-3.947 1.584-.414 2.57-1.699 2.57-3.49 0-2.662-2.111-4.268-5.646-4.268-1.882 0-3.764.459-5.508 1.4l.895 2.96c1.423-.619 2.662-.963 3.787-.963 1.423 0 2.341.55 2.341 1.469 0 1.055-1.17 1.767-2.915 1.767h-1.101v2.984h1.101c2.318 0 3.81.757 3.81 1.905 0 .94-1.01 1.469-2.823 1.469-1.4 0-2.96-.299-4.292-.85l-.918 3.099c1.698.803 3.167 1.148 5.05 1.148z" word-spacing="0" letter-spacing="0" font-size="22.952" font-weight="800" aria-label="13" font-family="Cantarell" fill="#fff"/><path d="M98 330h32.193v38H98z" style="marker:none" fill="#1a5fb4"/><path word-spacing="0" letter-spacing="0" font-size="22.952" font-weight="800" aria-label="9" d="M113.728 341.413c-3.672 0-6.105 2.226-6.105 5.554 0 2.984 1.905 4.912 4.751 4.912 1.515 0 2.8-.528 3.787-1.56-.23 2.776-1.584 4.268-3.993 4.268-1.033 0-2.342-.275-3.283-.688l-1.01 2.96c1.217.597 2.732.942 4.453.942 5.073 0 7.758-3.099 7.758-8.584 0-5.119-2.318-7.804-6.358-7.804zm-2.249 5.256c0-1.194.78-1.974 1.974-1.974 1.354 0 2.226 1.056 2.57 2.938-.642.688-1.537 1.102-2.41 1.102-1.285 0-2.134-.827-2.134-2.066z" font-family="Cantarell" fill="#fff"/><rect style="marker:none" width="223.244" height="97.401" x="-1215.967" y="31.68" rx="22.223" ry="22.223"/><text word-spacing="0" letter-spacing="0" font-size="48.162" font-weight="800" style="line-height:1.25;-inkscape-font-specification:'Cantarell, Ultra-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start" x="-1144.597" y="100.319" font-family="Cantarell" fill="#fff"><tspan x="-1144.597" y="100.319">852<tspan font-size="48.163" font-weight="400" style="-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start">m</tspan> </tspan></text><g fill="#fff" stroke-width=".422" font-weight="400" color="#000" font-family="Sans"><path overflow="visible" style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" d="M-1179.208 72.598l-5.035 5.035 9.478 9.55 5.035-5.034z" opacity=".35"/><path overflow="visible" style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" d="M-1168.841 72.162l3.407 3.407-10.516 10.511v14.504h7.109V89.042l8.442-8.442 3.405 3.41V72.162z"/></g><path d="M-1104.23 177h44.192v38h-44.193z" style="marker:none" fill="#1a5fb4"/><text word-spacing="0" letter-spacing="0" font-size="22.952" font-weight="800" y="204.571" x="-1095.319" style="line-height:1.25;-inkscape-font-specification:'Cantarell, Ultra-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start" font-family="Cantarell" fill="#fff"><tspan y="204.571" x="-1095.319">13</tspan></text><path d="M843 543h325v205H843z" style="marker:none" fill="#613583"/></svg>
\ No newline at end of file

data/assets/featured-maps-overlay.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="240" height="105"><g transform="translate(-8.801 -211.646)"><rect ry="20.88" rx="20.88" y="212.778" x="8.801" height="103.868" width="238.067" style="marker:none"/><g word-spacing="0" letter-spacing="0" font-size="48.162" font-weight="800" style="line-height:1.25;-inkscape-font-specification:'Cantarell, Ultra-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start" aria-label="852m" font-family="Cantarell" fill="#fff" stroke-width=".248"><path d="M100.626 286.487c8.731 0 14.484-4.416 14.484-10.939 0-4.827-3.236-7.138-7.037-8.68 3.75-1.848 5.855-4.725 5.855-8.062 0-5.394-5.239-8.99-12.736-8.99-8.218 0-13.61 4.367-13.61 10.838 0 4.006 2.155 6.317 4.98 7.91-3.8 1.489-5.957 4.365-5.957 8.011 0 5.907 5.701 9.913 14.021 9.913zm-4.417-26.295c0-1.9 1.746-3.288 4.52-3.288 2.772 0 4.571 1.387 4.571 3.544 0 2.106-1.798 3.596-4.468 3.955-2.671-.976-4.623-2.106-4.623-4.212zm-.975 14.74c0-2.054 1.335-3.39 3.8-3.852 3.954 1.233 7.447 2.26 7.447 4.982 0 1.952-2.003 3.338-5.29 3.338-3.595 0-5.957-1.746-5.957-4.468zm34.257 11.555c9.399 0 15.407-4.622 15.407-12.325 0-6.78-4.828-10.581-13.456-10.581-.77 0-1.439.051-2.003.103l.256-5.598h13.303v-7.756h-21.982l-.925 20.903c2.209-.41 5.034-.718 7.14-.718 5.341 0 8.422 1.695 8.422 4.571 0 2.414-2.207 3.698-6.214 3.698-3.082 0-6.523-.72-9.09-1.952l-2.415 6.985c3.441 1.747 7.345 2.671 11.557 2.671zm19.26-.513h25.166v-7.703h-12.224c7.55-6.01 11.3-11.763 11.3-17.411 0-6.677-5.24-11.043-13.303-11.043-4.622 0-8.834 1.438-12.274 4.262l2.26 6.524c2.875-2.003 5.7-3.031 8.268-3.031 3.544 0 5.803 1.9 5.803 4.674 0 4.417-5.7 9.757-14.996 17.462z"/><path font-size="48.163" font-weight="400" style="-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start" d="M180.234 285.974h4.109v-19.362c1.849-1.49 4.057-2.312 6.42-2.312 3.955 0 6.112 2.26 6.112 6.266v15.408h4.109v-16.23c0-1.027-.104-1.952-.36-2.824 1.9-1.696 4.263-2.62 6.78-2.62 3.954 0 6.111 2.26 6.111 6.266v15.408h4.109v-16.23c0-5.495-3.595-9.04-9.09-9.04-3.288 0-6.523 1.336-9.04 3.7-1.54-2.364-4.16-3.7-7.55-3.7-2.825 0-5.599.977-7.91 2.671l-.924-2.156h-2.876z"/></g><g fill="#fff" stroke-width=".105" font-weight="400" color="#000" font-family="Sans"><path overflow="visible" d="M48 256.413l-5.369 5.37 10.107 10.182 5.37-5.367z" style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" opacity=".35"/><path overflow="visible" d="M59.056 255.948l3.633 3.633-11.214 11.21v15.466h7.58v-12.308l9.004-9.003 3.63 3.636v-12.634z" style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none"/></g></g></svg>
\ No newline at end of file

data/assets/featured-maps.svg

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" version="1.0"><defs><clipPath clipPathUnits="userSpaceOnUse" id="c"><path style="marker:none" d="M64-148h64l64-64 64 64h192c17.728 0 32 14.272 32 32v288c0 17.728-14.272 32-32 32H256l-64-64-64 64H64c-17.728 0-32-14.272-32-32v-288c0-17.728 14.409-34.199 32-32z" fill="none" stroke="#000" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></clipPath><linearGradient id="b"><stop offset="0" stop-color="#a51d2d"/><stop offset="1" stop-color="#ce1921"/></linearGradient><linearGradient xlink:href="#a" id="e" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.25 0 0 .25 8 225)" x1="336" y1="62" x2="336" y2="-180"/><linearGradient id="a"><stop offset="0" stop-color="#d81d25"/><stop offset="1" stop-color="#f66151"/></linearGradient><linearGradient xlink:href="#b" id="d" x1="320.5" y1="-68" x2="415.5" y2="-68" gradientUnits="userSpaceOnUse" gradientTransform="translate(115.032 109.18) scale(.25263)"/></defs><g transform="translate(0 250.693) scale(.98988)" clip-path="url(#c)"><path style="marker:none" d="M256 124h160v-272h96v384H256l-64-64-64 64H0V124h128l64-64z" fill="#cdab8f"/><path d="M0 123.975l128 .05V-148H0z" style="marker:none" fill="#55a7eb"/><path d="M144-164v272l48-48 64 64.058h144L416 108v-256H256l-64-64z" fill="#2ec27e"/><path style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" d="M399.898-147.89v238c0 10.027-9.373 17.948-16.949 17.948H256L192 44.59l-39.375 39.535L152-211.942h-24V108l-128 .058v32.102h127L192 76l64 64.16h126.95c26.424 0 47.962-22.048 49.05-50.05v-238z" color="#000" font-weight="400" font-family="sans-serif" overflow="visible" fill="#fff"/><path style="marker:none" d="M128 267.975l64 .05V-212h-64z" opacity=".3" fill="#fff"/><path d="M192 267.975l64 .05V-212h-64z" style="marker:none" opacity=".15"/></g><g transform="translate(0 -687.715) scale(3.95953)"><circle r="12" transform="matrix(0 1 1 0 0 0)" cy="92" cx="208" fill="url(#d)"/><path style="marker:none" d="M92 182a27.912 27.912 0 0 0-19.799 8.201c-10.934 10.935-10.934 28.663 0 39.598l19.8 19.8s13.82-13.823 19.798-19.8c10.935-10.935 10.935-28.663 0-39.598A27.912 27.912 0 0 0 92 182zm0 18a10 10 0 0 1 10 10 10 10 0 0 1-10 10 10 10 0 0 1-10-10 10 10 0 0 1 10-10z" fill="#a51d2d"/><path d="M92 180a27.912 27.912 0 0 0-19.799 8.201c-10.934 10.935-10.934 28.663 0 39.598l19.8 19.8s13.82-13.823 19.798-19.8c10.935-10.935 10.935-28.663 0-39.598A27.912 27.912 0 0 0 92 180zm0 18a10 10 0 0 1 10 10 10 10 0 0 1-10 10 10 10 0 0 1-10-10 10 10 0 0 1 10-10z" style="marker:none" fill="url(#e)"/></g></svg>
\ No newline at end of file

data/assets/featured-polari.svg

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1200"
-   height="471.466"
-   viewBox="0 0 1125 442"
-   version="1.1"
-   id="svg5756"
-   sodipodi:docname="featured-polari.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <metadata
-     id="metadata5762">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs5760" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview5758"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="716.85619"
-     inkscape:cy="-69.281817"
-     inkscape:current-layer="svg5756" />
-  <path
-     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#33d17a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.14629614;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="m 306.51584,65.946597 c -46.18909,0 -83.37401,37.184883 -83.37401,83.374013 v 15.1587 c 0,46.18911 37.18492,83.37401 83.37401,83.37401 h 621.34107 l 45.4785,45.47852 v -45.47852 h 7.5782 c 46.18899,0 83.37389,-37.1849 83.37389,-83.37401 v -15.1587 c 0,-46.18913 -37.1849,-83.374013 -83.37389,-83.374013 z"
-     id="rect1128-7"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="sssscccsssss" />
-  <path
-     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#228f5d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.14629614;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="m 223.14091,156.90073 v 7.57946 c 0,46.18912 37.18474,83.37385 83.37386,83.37385 h 621.34354 l 45.4766,45.47665 v -7.57943 L 927.85831,240.2746 H 306.51477 c -46.18912,0 -83.37386,-37.18474 -83.37386,-83.37387 z m 841.14729,0 c 0,46.18913 -37.1848,83.37387 -83.37389,83.37387 h -7.5794 v 7.57944 h 7.5794 c 46.18909,0 83.37389,-37.18473 83.37389,-83.37385 z"
-     id="rect1362-3"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cssccccsccsccssc" />
-  <path
-     style="display:inline;fill:#f6f5f4;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.05352132px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
-     d="m 175.44355,156.90117 c -46.18913,0 -83.37403,37.1849 -83.37403,83.37401 v 15.15869 c 0,46.18913 37.1849,83.37403 83.37403,83.37403 h 22.73925 v 45.47607 l 45.47608,-45.47607 h 386.43846 c 46.18912,0 83.3716,-37.1849 83.3716,-83.37403 v -15.15869 c 0,-46.18911 -37.18248,-83.37401 -83.3716,-83.37401 z"
-     id="path1038-5"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="sssscccsssss" />
-  <path
-     inkscape:connector-curvature="0"
-     style="display:inline;fill:#deddda;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.05352132px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
-     d="m 92.16585,251.64377 c -0.0558,1.25773 -0.0963,2.51773 -0.0963,3.78972 0,46.18911 37.18473,83.37386 83.37385,83.37386 h 22.73833 v -7.57944 h -22.73829 c -44.91714,0 -81.30679,-35.17005 -83.27764,-79.58414 z m 621.20799,0 c 0,41.70037 -38.3605,79.58414 -83.27764,79.58414 H 243.65848 l -45.47666,45.47665 v 7.57944 l 45.47666,-45.47665 H 630.0962 c 46.18912,0 83.37387,-37.18475 83.37387,-83.37386 0,-1.27199 -0.0404,-2.53199 -0.0963,-3.78972 z"
-     id="path1354-2"
-     sodipodi:nodetypes="cssccscccsccccsscc" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="2000" height="470" viewBox="0 0 1875 440.626"><path style="marker:none" d="M1048.979 64.572c-46.19 0-83.374 37.185-83.374 83.374v15.159c0 46.189 37.185 83.374 83.374 83.374h621.341l45.479 45.478V246.48h7.578c46.189 0 83.374-37.185 83.374-83.374v-15.159c0-46.189-37.185-83.374-83.374-83.374z" color="#000" overflow="visible" fill="#33d17a"/><path style="marker:none" d="M965.604 155.526v7.58c0 46.189 37.185 83.374 83.374 83.374h621.343l45.477 45.476v-7.58l-45.477-45.476h-621.343c-46.19 0-83.374-37.185-83.374-83.374zm841.147 0c0 46.19-37.184 83.374-83.373 83.374h-7.58v7.58h7.58c46.189 0 83.373-37.185 83.373-83.374z" color="#000" overflow="visible" fill="#228f5d"/><path d="M175.444 155.527c-46.19 0-83.374 37.185-83.374 83.374v15.158c0 46.19 37.184 83.375 83.374 83.375h22.739v45.476l45.476-45.476h386.438c46.19 0 83.372-37.185 83.372-83.375v-15.158c0-46.19-37.183-83.374-83.372-83.374z" fill="#f6f5f4" fill-rule="evenodd"/><path d="M92.166 250.27a85.333 85.333 0 00-.096 3.79c0 46.188 37.184 83.373 83.373 83.373h22.739v-7.58h-22.739c-44.917 0-81.306-35.17-83.277-79.584zm621.208 0c0 41.7-38.36 79.584-83.278 79.584H243.658l-45.476 45.476v7.58l45.476-45.477h386.438c46.19 0 83.374-37.185 83.374-83.374 0-1.272-.04-2.532-.096-3.79z" fill="#deddda" fill-rule="evenodd"/></svg>
\ No newline at end of file

data/assets/meson.build

@@ -7,6 +7,7 @@ install_data([
   'featured-dropbox.png',
   'featured-FeedReader.svg',
   'featured-foliate.svg',
+  'featured-foliate-bg.jpg',
   'featured-fondo-bg.jpg',
   'featured-gimp.png',
   'featured-gnome-sudoku.png',
@@ -14,8 +15,8 @@ install_data([
   'featured-inkscape.svg',
   'featured-kdenlive-bg.jpg',
   'featured-klavaro-bg.jpg',
-  'featured-maps.svg',
-  'featured-maps-bg.png',
+  'featured-maps-bg.svg',
+  'featured-maps-overlay.svg',
   'featured-marker-bg.jpg',
   'featured-mypaint.svg',
   'featured-pdf-slicer.svg',
@@ -33,6 +34,8 @@ install_data([
   install_dir : 'share/gnome-software'
 )
 
-install_data('org.gnome.Software.Featured.xml',
-  install_dir : 'share/app-info/xmls'
-)
+if get_option('default_featured_apps')
+  install_data('org.gnome.Software.Featured.xml',
+    install_dir : 'share/app-info/xmls'
+  )
+endif

data/icons/hicolor/scalable/org.gnome.Software.Devel.svg

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><clipPath id="a"><path d="M0 0h128v128H0z"/></clipPath><clipPath id="b"><path d="M0 0h128v128H0z"/></clipPath><clipPath id="h"><path d="M0 0h128v128H0z"/></clipPath><clipPath id="f"><path d="M0 0h128v128H0z"/></clipPath><g id="e" clip-path="url(#b)" filter="url(#c)"><use xlink:href="#d"/></g><g id="i" clip-path="url(#f)"><path d="M128 80.64V128H0V80.64zm0 0" fill="url(#g)"/><path d="M13.309 80.64L60.664 128H81.88l-47.36-47.36zm42.421 0L103.094 128h21.215L76.945 80.64zm42.43 0L128 110.48V89.27l-8.629-8.63zM0 88.548v21.215L18.238 128h21.215zm0 0"/></g><g id="d" clip-path="url(#a)"><path d="M20 72h88a8 8 0 018 8v28a8 8 0 01-8 8H20a8 8 0 01-8-8V80a8 8 0 018-8zm0 0" fill="#98c1f1"/><path d="M12 20h104v88H12zm0 0" fill="#e7f0fc"/><path d="M55 29a5 5 0 11-10 0 5 5 0 0110 0zm0 0M83 29a5 5 0 11-10 0 5 5 0 0110 0zm0 0" fill="#1a5fb4"/><path d="M50 28v-8c0-7.758 6.242-14 14-14s14 6.242 14 14v8" fill="none" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke="#62a0ea"/><path d="M64 44c-11.047 0-20 8.953-20 20s8.953 20 20 20 20-8.953 20-20-8.953-20-20-20zm-8 10a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm-16 8a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm-16 8a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm0 0" fill="#3584e4"/></g><g id="k" clip-path="url(#h)"><use xlink:href="#i" mask="url(#j)"/></g><mask id="l"><use xlink:href="#e"/></mask><mask id="j"><g filter="url(#c)"><path fill-opacity=".8" d="M0 0h128v128H0z"/></g></mask><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="300" y1="235" x2="428" y2="235" gradientTransform="matrix(0 .37 -.98462 0 295.385 -30.36)"><stop offset="0" stop-color="#f9f06b"/><stop offset="1" stop-color="#f5c211"/></linearGradient><filter id="c" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%"><feColorMatrix in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/></filter></defs><path d="M20 72h88a8 8 0 018 8v28a8 8 0 01-8 8H20a8 8 0 01-8-8V80a8 8 0 018-8zm0 0" fill="#98c1f1"/><path d="M12 20h104v88H12zm0 0" fill="#e7f0fc"/><path d="M55 29a5 5 0 11-10 0 5 5 0 0110 0zm0 0M83 29a5 5 0 11-10 0 5 5 0 0110 0zm0 0" fill="#1a5fb4"/><path d="M50 28v-8c0-7.758 6.242-14 14-14s14 6.242 14 14v8" fill="none" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke="#62a0ea"/><path d="M64 44c-11.047 0-20 8.953-20 20s8.953 20 20 20 20-8.953 20-20-8.953-20-20-20zm-8 10a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm-16 8a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm-16 8a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm8 0a1.999 1.999 0 110 4 1.999 1.999 0 110-4zm0 0" fill="#3584e4"/><use xlink:href="#k" mask="url(#l)"/></svg>
\ No newline at end of file

data/org.gnome.software.gschema.xml

@@ -102,10 +102,6 @@
       <default>true</default>
       <summary>Install bundled applications for all users on the system where possible</summary>
     </key>
-    <key name="show-folder-management" type="b">
-      <default>true</default>
-      <summary>Show the folder management UI</summary>
-    </key>
     <key name="enable-repos-dialog" type="b">
       <default>true</default>
       <summary>Allow access to the Software Repositories dialog</summary>

debian/changelog

-gnome-software (3.34.0-1) UNRELEASED; urgency=medium
+gnome-software (3.36.1-2) unstable; urgency=medium
+
+  * Enable malcontent on supported architectures
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 05 Jul 2020 18:24:31 +0200
+
+gnome-software (3.36.1-1) unstable; urgency=medium
+
+  * New upstream release
+    - Drop patches that were cherry-picked from upstream
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 07 Jun 2020 11:25:25 +0200
+
+gnome-software (3.36.0-3) unstable; urgency=medium
+
+  * Fix missing icons in the store, patch from upstream.
+    Thanks to Matthias Klumpp <matthias@tenstral.net>
+  * Do not fail to load the appstream plugin if any of the metadata
+    directories doesn't exist (Closes: #958915)
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 27 Apr 2020 15:13:57 +0200
+
+gnome-software (3.36.0-2) unstable; urgency=medium
+
+  * Add fix-appstream-featured-data.patch
+    - This restores a regression fix that was accidentally reverted
+      in the 3.36.0 release. The issue caused invalid AppStream data to
+      be added to the global metadata pool, resulting in a confusing
+      warning to people using APT or an AppStream cache (Closes: #932747)
+
+ -- Matthias Klumpp <mak@debian.org>  Thu, 02 Apr 2020 18:16:58 +0200
+
+gnome-software (3.36.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 11 Mar 2020 14:35:17 +0100
+
+gnome-software (3.35.91-1) experimental; urgency=medium
+
+  * New upstream release
+    - Drop d/p/0001-gs-appstream-Fix-loading-of-icons-from-AppStream-YAM.patch
+      and d/p/snap-Don-t-try-to-get-alternatives-for-non-snaps.patch, applied
+      upstream
+    - debian/control.in: Add libostree-dev to the build-dependencies as it's
+      explicityly required by flatpak plugin now
+    - debian/gnome-software.install: Remove the banner editor, it's now a
+      standalone app
+    - debian/control.in: Bump minimal meson to 0.47
+  * Disable malcontent for now as it's not in the archive yet
+  * debian/control.in: Bump Standards-Version to 4.5.0 (no further changes)
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 01 Mar 2020 13:33:18 +0100
+
+gnome-software (3.34.2-2) unstable; urgency=medium
+
+  * Stop overriding libexecdir and move the daemons to /usr/libexec now that
+    this is allowed in the debian policy
+  * d/p/0001-gs-appstream-Fix-loading-of-icons-from-AppStream-YAM.patch:
+    Fix loading of icons from AppStream YAM (Thanks to Robert Ancell)
+  * d/p/snap-Don-t-try-to-get-alternatives-for-non-snaps.patch: Do not try to
+    manage alternative for non-snaps applications (Closes: #947237)
+  * debian/control.in: Add the needed -doc packages to the build-dependencies
+    so the links between the documentation files are properly resolved
+  * debian/control.in: Add Build-Profiles <!nodoc> for the -doc package
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 01 Mar 2020 11:39:19 +0100
+
+gnome-software (3.34.2-1) unstable; urgency=medium
+
+  * debian/rules: Use filter instead of findstring to detect the architecture,
+    this will avoid matching partial names like ppc64 and ppc64el
+  * New upstream release
+    - debian/patches/series: Disable d/p/0011-Support-snap-channels.patch patch
+      for now, it doesn't apply cleanly anymore
+  * debian/control.in: Drop gnome-packagekit-session transitional package,
+    this was released with stretch. (Closes: #939207)
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 17 Dec 2019 18:17:52 +0100
+
+gnome-software (3.34.0-1) unstable; urgency=medium
 
   [ Jeremy Bicha ]
   * New upstream release (3.31.90)
@@ -15,9 +95,15 @@ gnome-software (3.34.0-1) UNRELEASED; urgency=medium
     "Refactor screenshots and hide those unavailable when offline"
   * Massage d/p/0011-Support-snap-channels.patch to apply
   * Let quilt refresh d/p/0011-Support-snap-channels.patch
-  * Let quilt refresh d/p/0021-details-Use-custom-icon-for-verified-developers.patch
+  * Let quilt refresh
+    d/p/0021-details-Use-custom-icon-for-verified-developers.patch
+
+  [ Laurent Bigonville ]
+  * debian/control.in: Bump libsnapd-glib-dev to 1.54 to avoid a bug in the
+    .pc file not setting the include directory
+  * debian/control.in: Bump Standards-Version to 4.4.1 (no further changes)
 
- -- Andreas Henriksson <andreas@fatal.se>  Thu, 19 Sep 2019 01:46:21 +0200
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 04 Dec 2019 13:55:11 +0100
 
 gnome-software (3.30.6-5) unstable; urgency=medium
 

debian/control

@@ -6,7 +6,7 @@ Source: gnome-software
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>
+Uploaders: Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>, Matthias Klumpp <mak@debian.org>
 Build-Depends: appstream,
                appstream-util,
                debhelper-compat (= 12),
@@ -23,19 +23,25 @@ Build-Depends: appstream,
                libgspell-1-dev,
                libgtk-3-dev (>= 3.22.4),
                libgudev-1.0-dev [linux-any],
-               libhandy-0.0-dev (>= 0.0.10),
                libjson-glib-dev (>= 1.2.0),
+               libostree-dev [linux-any],
                libpackagekit-glib2-dev (>= 1.1.11),
                libpolkit-gobject-1-dev,
                libsoup2.4-dev (>= 2.52.0),
-               libxmlb-dev (>= 0.1.7),
                libxml2-utils,
-               meson (>= 0.46),
+               libxmlb-dev (>= 0.1.7),
+               meson (>= 0.47),
                pkg-config,
                valgrind [amd64 arm64 armhf i386 mips mips64 mips64el mipsel powerpc ppc64 ppc64el s390x],
                xsltproc
+Build-Depends-Indep: appstream-glib-doc <!nodoc>,
+                     libgdk-pixbuf2.0-doc <!nodoc>,
+                     libglib2.0-doc <!nodoc>,
+                     libgtk-3-doc <!nodoc>,
+                     libjson-glib-doc <!nodoc>,
+                     libsoup2.4-doc <!nodoc>
 Rules-Requires-Root: no
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-software
 Vcs-Git: https://salsa.debian.org/gnome-team/gnome-software.git
 Homepage: https://wiki.gnome.org/Apps/Software
@@ -48,13 +54,11 @@ Depends: appstream,
          gsettings-desktop-schemas (>= 3.18),
          libgtk3-perl,
          packagekit (>= 1.1.11),
+         software-properties-gtk,
          ${misc:Depends},
          ${shlibs:Depends}
-Replaces: gnome-packagekit-session (<< 3.16.0-2~)
-Breaks: gnome-packagekit-session (<< 3.16.0-2~)
 Conflicts: sessioninstaller
-Recommends: ${plugin:Recommends},
-            fwupd [linux-any]
+Recommends: fwupd [linux-any], ${plugin:Recommends}
 Suggests: apt-config-icons-hidpi,
           gnome-software-plugin-flatpak [amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x hppa powerpc powerpcspe ppc64],
           ${plugin:Suggests}
@@ -83,7 +87,7 @@ Description: Software Center for GNOME (common files)
  This package contains the architecture-independent files.
 
 Package: gnome-software-plugin-flatpak
-Architecture: amd64 arm64 armel armhf i386 mips mips64el ppc64el s390x hppa powerpc powerpcspe ppc64
+Architecture: amd64 arm64 armel armhf hppa i386 mips mips64el powerpc powerpcspe ppc64 ppc64el s390x
 Depends: flatpak,
          gnome-software (= ${binary:Version}),
          ${misc:Depends},
@@ -99,18 +103,6 @@ Description: Flatpak support for GNOME Software
  .
  This package contains the Flatpak plugin.
 
-Package: gnome-packagekit-session
-Architecture: all
-Section: oldlibs
-Depends: gnome-software (>= ${source:Version}),