From a960c6488a9f588db9aca68a839f1c8c341bb02c Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Tue, 31 Mar 2020 20:30:46 +0200
Subject: small AppStream and AppImage fixes

---
 CHANGELOG.md                                       | 23 +++++++++++++++++++++-
 appimage/build_appimage.sh                         |  2 +-
 .../content/io.gitlab.LibreWolf.appdata.xml.in     | 10 +++++++---
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a114ce..525a788 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,17 +7,38 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project follows the official Firefox releases, but also uses
 [Arch Linux Package Versioning](https://wiki.archlinux.org/index.php/Arch_package_guidelines#Package_versioning) to mark individual releases in between versions.
 
-## [Unreleased]
+## [74.0-4] - 2020-03-31
+
+### Added
+
+- AppImage and Flatpak improvements (metadata, conventions)
+- (Mostly) we working Flatpak release
+- **Untested**: AppImage and Flatpak releases for `aarch64` are now also built on Ubuntu 16.04
+
+### Known Issues
+
+- AppImage is working properly (and probably not a completely valid AppImage): It creates a new profile in `~/.librewolf` on each launch.
+- AppImage and Flatpak releases cannot be built as PGO/profiled builds at the moment
+- AppStream metadata is not completely valid (missing screenshots)
+- Build scripts are not tested outside of a dockerized environment
+
+## [74.0-3] - 2020-03-31
+
+### Added
+
+- WebRTC enabled for `aarch64` builds
 
 ### Fixed
 
 - Installation of uBlock
 - Removal and addition of search engines via `policies.json`
+- Building the intermediary tarball on Ubuntu 16.04 (Xenial) to ensure AppImage and Flatpak compatibility
 
 ### Known Issues
 
 - Appimage and Flatpak settings loading still needs to be tested
 - Appimage and Flatpak still don't work on older distributions
+- LibreWolf built on Ubuntu 16.04 cannot be a profiled/PGO build at the time.
 
 ## [74.0-2] - 2020-03-10
 
diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index e7f48e7..257e7d2 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -47,7 +47,7 @@ wget $_APPIMAGETOOL_DOWNLOAD_URL -O $_APPIMAGETOOL_FILE;
 chmod +x $_APPIMAGETOOL_FILE;
 
 # add appstream metadata
-install -Dvm644 "$_BINARY_TARBALL_EXTRACTED_FOLDER/io.gitlab.LibreWolf.appdata.xml" "$_BINARY_TARBALL_EXTRACTED_FOLDER/share/metainfo/io.gitlab.LibreWolf.appdata.xml"
+install -Dvm644 "$_BINARY_TARBALL_EXTRACTED_FOLDER/io.gitlab.LibreWolf.appdata.xml" "$_BINARY_TARBALL_EXTRACTED_FOLDER/usr/share/metainfo/io.gitlab.LibreWolf.appdata.xml"
 
 # add libdbus-glib-1.so.2, just in case
 install -Dvm644 "/usr/lib/${CARCH}-linux-gnu/libdbus-glib-1.so.2" "$_BINARY_TARBALL_EXTRACTED_FOLDER/usr/lib/libdbus-glib-1.so."2
diff --git a/binary_tarball/content/io.gitlab.LibreWolf.appdata.xml.in b/binary_tarball/content/io.gitlab.LibreWolf.appdata.xml.in
index d91176c..f47605c 100644
--- a/binary_tarball/content/io.gitlab.LibreWolf.appdata.xml.in
+++ b/binary_tarball/content/io.gitlab.LibreWolf.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
-  <id type="desktop">io.gitlab.LibreWolf</id>
+<component type="desktop-application">
+  <id>io.gitlab.LibreWolf</id>
   <launchable type="desktop-id">io.gitlab.LibreWolf</launchable>
   <name>LibreWolf</name>
   <summary>LibreWolf Web Browser</summary>
@@ -35,4 +35,8 @@
   </keywords>
   <url type="homepage">https://librewolf-community.gitlab.io/</url>
   <url type="bugtracker">https://gitlab.com/groups/librewolf-community/-/issues/</url>
-</application>
+  <provides>
+    <id>io.gitlab.LibreWolf</id>
+  </provides>
+  <content_rating type="oars-1.1" />
+</component>
-- 
cgit