From e22fcdefde8d1a3463790bb511697077fb9fe06c Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 27 Mar 2020 17:21:17 +0100 Subject: [PATCH 1/3] Fix calculation of extra-data total size This is a bug introduced in b03916f5bdf878ba42af7ccf569233b839d4b3d2 where we check the extra_data refs against app/ or runtime/ prefix with arguments in the wrong order. (cherry picked from commit ed3ba39a06d47d384a50e3a6264d411f3bf20a5d) --- common/flatpak-dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index c28e5098..054db04b 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -4942,7 +4942,7 @@ flatpak_dir_setup_extra_data (FlatpakDir *self, g_assert (results == NULL || rev != NULL); /* ostree-metadata and appstreams never have extra data, so ignore those */ - if (g_str_has_prefix ("app/", ref) || g_str_has_prefix ("runtime/", ref)) + if (g_str_has_prefix (ref, "app/") || g_str_has_prefix (ref, "runtime/")) { extra_data_sources = flatpak_repo_get_extra_data_sources (repo, rev, cancellable, NULL); if (extra_data_sources == NULL) From 91cde831c46ce0cafb2b1f3cc479f79eb6a6e88c Mon Sep 17 00:00:00 2001 From: Matthew Leeds Date: Wed, 26 Feb 2020 19:35:35 -0800 Subject: [PATCH 2/3] Add .lgtm.yml Without this, lgtm.com can't successfully build the C code in Flatpak. (cherry picked from commit 8fb7876305772faccdc0dbca33164eb69f39dea5) --- .lgtm.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .lgtm.yml diff --git a/.lgtm.yml b/.lgtm.yml new file mode 100644 index 00000000..8e9cd253 --- /dev/null +++ b/.lgtm.yml @@ -0,0 +1,40 @@ +# vi: ts=2 sw=2 et: + +extraction: + cpp: + prepare: + # package list copied from .github/workflows/check.yml + packages: + - libglib2.0 + - attr + - automake + - gettext + - autopoint + - bison + - dbus + - gtk-doc-tools + - libfuse-dev + - ostree + - libostree-dev + - libarchive-dev + - libcap-dev + - libattr1-dev + - libdw-dev + - libelf-dev + - python3-pyparsing + - libjson-glib-dev + - shared-mime-info + - desktop-file-utils + - libpolkit-agent-1-dev + - libpolkit-gobject-1-dev + - libseccomp-dev + - libsoup2.4-dev + - libsystemd-dev + - libxml2-utils + - libgpgme11-dev + - gobject-introspection + - libgirepository1.0-dev + - libappstream-glib-dev + - libdconf-dev + - socat + - libdbus-1-dev From 09011d8aea512085b1ea5987d62120669587bc46 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 17 Jan 2020 16:08:11 +0100 Subject: [PATCH 3/3] CI: Add python3-pyparsing deps (cherry picked from commit 966c6e2a255a821a03056c11df51ebc74d0c2292) --- .github/workflows/check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index e4633ca5..bbd9f0e6 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -27,7 +27,7 @@ jobs: sudo add-apt-repository ppa:alexlarsson/glib260 sudo apt-get update sudo apt-get install -y libglib2.0 attr automake gettext autopoint bison dbus gtk-doc-tools \ - libfuse-dev ostree libostree-dev libarchive-dev libcap-dev libattr1-dev libdw-dev libelf-dev \ + libfuse-dev ostree libostree-dev libarchive-dev libcap-dev libattr1-dev libdw-dev libelf-dev python3-pyparsing \ libjson-glib-dev shared-mime-info desktop-file-utils libpolkit-agent-1-dev libpolkit-gobject-1-dev \ libseccomp-dev libsoup2.4-dev libsystemd-dev libxml2-utils libgpgme11-dev gobject-introspection \ libgirepository1.0-dev libappstream-glib-dev libdconf-dev clang socat meson libdbus-1-dev @@ -83,7 +83,7 @@ jobs: sudo add-apt-repository ppa:alexlarsson/glib260 sudo apt-get update sudo apt-get install -y libglib2.0 attr automake gettext autopoint bison dbus gtk-doc-tools \ - libfuse-dev ostree libostree-dev libarchive-dev libcap-dev libattr1-dev libdw-dev libelf-dev \ + libfuse-dev ostree libostree-dev libarchive-dev libcap-dev libattr1-dev libdw-dev libelf-dev python3-pyparsing \ libjson-glib-dev shared-mime-info desktop-file-utils libpolkit-agent-1-dev libpolkit-gobject-1-dev \ libseccomp-dev libsoup2.4-dev libsystemd-dev libxml2-utils libgpgme11-dev gobject-introspection \ libgirepository1.0-dev libappstream-glib-dev libdconf-dev clang @@ -109,7 +109,7 @@ jobs: sudo add-apt-repository ppa:alexlarsson/flatpak sudo apt-get update sudo apt-get install -y libglib2.0 attr automake gettext autopoint bison dbus gtk-doc-tools \ - libfuse-dev ostree libostree-dev libarchive-dev libcap-dev libattr1-dev libdw-dev libelf-dev \ + libfuse-dev ostree libostree-dev libarchive-dev libcap-dev libattr1-dev libdw-dev libelf-dev python3-pyparsing \ libjson-glib-dev shared-mime-info desktop-file-utils libpolkit-agent-1-dev libpolkit-gobject-1-dev \ libseccomp-dev libsoup2.4-dev libsystemd-dev libxml2-utils libgpgme11-dev gobject-introspection \ libgirepository1.0-dev libappstream-glib-dev libdconf-dev clang