Bug 1627660 - fix Flathub related issues for Flatpak. r=rail
authorMihai Tabara <mtabara@mozilla.com>
Mon, 06 Apr 2020 13:57:11 +0000
changeset 522374 f1ab3757b1cc7593d5cc00a2c1ec1252f80a502c
parent 522373 fedfe4c9d40a356df0435e69cbc16646e79c21be
child 522375 e85c1126616dbfa07ca22734ca3b1bd2f380bea1
push id112102
push usermtabara@mozilla.com
push dateMon, 06 Apr 2020 15:03:30 +0000
treeherderautoland@f1ab3757b1cc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail
bugs1627660
milestone76.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1627660 - fix Flathub related issues for Flatpak. r=rail Differential Revision: https://phabricator.services.mozilla.com/D69814
taskcluster/docker/firefox-flatpak/org.mozilla.firefox.appdata.xml.in
taskcluster/docker/firefox-flatpak/runme.sh
--- a/taskcluster/docker/firefox-flatpak/org.mozilla.firefox.appdata.xml.in
+++ b/taskcluster/docker/firefox-flatpak/org.mozilla.firefox.appdata.xml.in
@@ -2,31 +2,31 @@
 <application>
   <id type="desktop">org.mozilla.firefox</id>
   <launchable type="desktop-id">org.mozilla.firefox.desktop</launchable>
   <name>Firefox</name>
   <summary>Firefox Web Browser</summary>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>MPL-2.0</project_license>
   <description>
-    <p><strong>The new Firefox</strong></p>
+    <p>The new Firefox></p>
     <p>Meet Firefox Quantum. Fast for good.</p>
     <p>Features:</p>
     <ul>
     <li>A powerful, new engine that’s built for rapidfire performance.</li>
     <li>Better, faster page loading that uses less computer memory.</li>
     <li>Gorgeous design and smart features for intelligent browsing.</li>
     </ul>
-    <p><strong>Now 2x faster</strong></p>
+    <p>Now 2x faster></p>
     <p>Crazy powerful browser engine? Check. Less time waiting around for
     pages to load? Also, check. Firefox Quantum is twice as fast as Firefox
     was before.</p>
-    <p><strong>Smooth browsing</strong></p>
+    <p>Smooth browsing</p>
     <p>Whether you’ve opened 10 or 1000, switching between tabs is faster than ever with Firefox’s new, responsive engine.</p>
-    <p><strong>Seriously Private Browsing</strong></p>
+    <p>Seriously Private Browsing</p>
     <p>The most powerful private browsing mode with added tracking protection.</p>
     <ul>
     <li><p>Private Browsing</p>
     <ul>
     <li>Firefox blocks online trackers while you browse and won’t remember your history after you’re done.</li>
     </ul>
     </li>
     <li><p>Tracking Protection</p>
@@ -35,35 +35,35 @@
     </ul>
     </li>
     <li><p>Faster Page Loading</p>
     <ul>
     <li>By blocking some ads and scripts that bog down browsing, pages load up to 44% faster. Now that’s a win-win.</li>
     </ul>
     </li>
     </ul>
-    <p><strong>Customization Features</strong></p>
+    <p>Customization Features</p>
     <ul>
     <li><p>Extensions</p>
     </li>
     <li><p>Customize Firefox with thousands of extensions like LastPass, uBlock Origin, Evernote and more.</p>
     </li>
     <li><p>Themes</p>
     <ul>
     <li>Make over Firefox to suit your mood! Choose a new look from our theme categories or create your own.</li>
     </ul>
     </li>
     </ul>
-    <p><strong>Sync your devices</strong></p>
+    <p>Sync your devices</p>
     <ul>
     <li>Seamlessly access passwords, bookmarks and more. Plus, use our Send
     Tabs feature to instantly share open tabs between desktop, mobile and
     tablet.</li>
     </ul>
-    <p><strong>Browse for good</strong></p>
+    <p>Browse for good</p>
     <p>Firefox is made by Mozilla, the non-profit champions of a healthy
     internet. Mozilla also tackles issues like privacy, misinformation and
     trolling by investing in fellowships, campaigns and new technologies
     designed to make the internet healthier.</p>
   </description>
   <releases>
 	<release version="$VERSION" date="$DATE"/>
   </releases>
--- a/taskcluster/docker/firefox-flatpak/runme.sh
+++ b/taskcluster/docker/firefox-flatpak/runme.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
-
 set -xe
 
 # Future products supporting Flatpaks will set this accordingly
 : PRODUCT                       "${PRODUCT:=firefox}"
 
 # Required env variables
 
 test "$VERSION"
@@ -103,21 +102,24 @@ name=org.mozilla.firefox.Locale
 [ExtensionOf]
 ref=app/org.mozilla.firefox/${ARCH}/${FLATPAK_BRANCH}
 EOF
 
 appdir=build/files
 install -d "${appdir}/lib/"
 (cd "${appdir}/lib/" && tar jxf "${WORKSPACE}/firefox.tar.bz2")
 install -D -m644 -t "${appdir}/share/appdata" org.mozilla.firefox.appdata.xml
-appstream-compose --prefix="${appdir}" --origin=flatpak --basename=org.mozilla.firefox org.mozilla.firefox
 install -D -m644 -t "${appdir}/share/applications" org.mozilla.firefox.desktop
 for size in 16 32 48 64 128; do
     install -D -m644 "${appdir}/lib/firefox/browser/chrome/icons/default/default${size}.png" "${appdir}/share/icons/hicolor/${size}x${size}/apps/org.mozilla.firefox.png"
 done
+
+appstream-compose --prefix="${appdir}" --origin=flatpak --basename=org.mozilla.firefox org.mozilla.firefox
+appstream-util mirror-screenshots "${appdir}"/share/app-info/xmls/org.mozilla.firefox.xml.gz "https://dl.flathub.org/repo/screenshots/org.mozilla.firefox-${FLATPAK_BRANCH}" /tmp "build/screenshots/org.mozilla.firefox-${FLATPAK_BRANCH}"
+
 # XXX: we used to `install -D` before which automatically created the components
 # of target, now we need to manually do this since we're symlinking
 mkdir -p "${appdir}/lib/firefox/distribution/extensions"
 # XXX: we put the langpacks in /app/share/locale/$LANG_CODE and symlink that
 # directory to where Firefox looks them up; this way only subset configured
 # on user system is downloaded vs all locales
 for locale in $locales; do
     install -D -m644 -t "${appdir}/share/runtime/langpack/${locale:0:2}/" "${DISTRIBUTION_DIR}/extensions/langpack-${locale}@firefox.mozilla.org.xpi"