[gnome-build-meta/alatiera/flatpak-update: 1/4] core-deps/eos-updater: avoid dep on ostree-trivial-httpd

[Marge Bot <marge-bot src gnome org>]

commit aec0c188279b5eef7e305cc903a2878fd45c4123
Author: Jordan Petridis <jordan centricular com>
Date:   Tue Jul 12 05:31:45 2022 +0300

    core-deps/eos-updater: avoid dep on ostree-trivial-httpd
    
    This is only installed when ostree is built against libsoup2.
    In order to use the curl backend of ostree we will need to patch
    and temporary break the tests of eos-updater
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1648>

 elements/core-deps/eos-updater.bst      |  2 ++
 files/eos-updater/no-ostree-httpd.patch | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
---
diff --git a/elements/core-deps/eos-updater.bst b/elements/core-deps/eos-updater.bst
index 85d933e04..328f18831 100644
--- a/elements/core-deps/eos-updater.bst
+++ b/elements/core-deps/eos-updater.bst
@@ -3,6 +3,8 @@ kind: meson
 sources:
 - kind: tar
   url: github_files:endlessm/eos-updater/archive/Release_4.0.7.tar.gz
+- kind: patch
+  path: files/eos-updater/no-ostree-httpd.patch
 
 depends:
 - core-deps/NetworkManager.bst
diff --git a/files/eos-updater/no-ostree-httpd.patch b/files/eos-updater/no-ostree-httpd.patch
new file mode 100644
index 000000000..db2837a60
--- /dev/null
+++ b/files/eos-updater/no-ostree-httpd.patch
@@ -0,0 +1,32 @@
+diff --git a/test-common/meson.build b/test-common/meson.build
+index 95e5c49..06f56ac 100644
+--- a/test-common/meson.build
++++ b/test-common/meson.build
+@@ -19,27 +19,12 @@ libeos_updater_test_common_headers = [
+   'utils.h',
+ ]
+
+-# ostree-trivial-httpd is in libexecdir/libostree or
+-# libexecdir/installed-tests/libostree if
+-# https://github.com/ostreedev/ostree/pull/1633 is merged.
+-# Unfortunately, but we don't know where ostree's libexecdir is. Try to
+-# build a path for typical places.
+-ostree_trivial_httpd = find_program(
+-    'ostree-trivial-httpd',
+-    join_paths(libexecdir, 'libostree/ostree-trivial-httpd'),
+-    join_paths(libexecdir, 'installed-tests/libostree/ostree-trivial-httpd'),
+-    '/usr/libexec/libostree/ostree-trivial-httpd',
+-    '/usr/libexec/installed-tests/libostree/ostree-trivial-httpd',
+-    '/usr/lib/libostree/ostree-trivial-httpd',
+-    '/usr/lib/installed-tests/libostree/ostree-trivial-httpd',
+-)
+-
+ libeos_updater_test_common_cppflags = [
+   '-DFLATPAK_BINARY="@0@"'.format(find_program('flatpak').path()),
+   '-DG_LOG_DOMAIN="eos-updater-test-common"',
+   '-DGPG_BINARY="@0@"'.format(find_program('gpg').path()),
+   '-DOSTREE_BINARY="@0@"'.format(find_program('ostree').path()),
+-  '-DOSTREE_TRIVIAL_HTTPD_BINARY="@0@"'.format(ostree_trivial_httpd.path()),
++  '-DOSTREE_TRIVIAL_HTTPD_BINARY="foobar"',
+   '-DOSTREE_WITH_AUTOCLEANUPS',
+ ]
\ No newline at end of file