[gnome-build-meta/valentindavid/pinebook-pro: 18/18] Add missing flatpak user

[Valentin David <valentindavid src gnome org>]

commit 8d83cb946dd619692e21b319cae863fb8f36bdc4
Author: Valentin David <valentin david codethink co uk>
Date:   Wed Apr 22 11:26:27 2020 +0000

    Add missing flatpak user

 elements/core-deps/flatpak.bst     |  2 +
 elements/freedesktop-sdk.bst       |  2 +
 freedesktop-sdk-flatpak-user.patch | 83 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+)
---
diff --git a/elements/core-deps/flatpak.bst b/elements/core-deps/flatpak.bst
index 2f7b4072..125be5d1 100644
--- a/elements/core-deps/flatpak.bst
+++ b/elements/core-deps/flatpak.bst
@@ -3,6 +3,8 @@ kind: autotools
 sources:
 - kind: tar
   url: github_com:flatpak/flatpak/releases/download/1.4.3/flatpak-1.4.3.tar.xz
+- kind: patch
+  path: files/flatpak/sysusers.patch
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index af0f5607..f09cda68 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -12,6 +12,8 @@ sources:
   path: freedesktop-sdk-pulseaudio.patch
 - kind: patch
   path: freedesktop-sdk-pulseaudio-bluez.patch
+- kind: patch
+  path: freedesktop-sdk-flatpak-user.patch
 config:
   options:
     target_arch: '%{arch}'
diff --git a/freedesktop-sdk-flatpak-user.patch b/freedesktop-sdk-flatpak-user.patch
new file mode 100644
index 00000000..1a41d5d6
--- /dev/null
+++ b/freedesktop-sdk-flatpak-user.patch
@@ -0,0 +1,83 @@
+diff --git a/elements/components/flatpak.bst b/elements/components/flatpak.bst
+index 8e928e0f5..848257a7c 100644
+--- a/elements/components/flatpak.bst
++++ b/elements/components/flatpak.bst
+@@ -23,7 +23,8 @@ depends:
+ - filename: components/libseccomp.bst
+ 
+ variables:
+-  conf-local: --disable-system-helper --disable-documentation
++  conf-local: >-
++    --disable-documentation
+ 
+ sources:
+ - kind: git_tag
+@@ -44,3 +45,5 @@ sources:
+     dbus-proxy:
+       checkout: true
+       url: github:flatpak/xdg-dbus-proxy.git
++- kind: patch
++  path: patches/flatpak/sysusers.patch
+diff --git a/patches/flatpak/sysusers.patch b/patches/flatpak/sysusers.patch
+new file mode 100644
+index 000000000..f5c4b1cc9
+--- /dev/null
++++ b/patches/flatpak/sysusers.patch
+@@ -0,0 +1,57 @@
++commit ba7ad5818fee93ad55acf1aa55d67b011a024672
++Author: Valentin David <valentin david codethink co uk>
++Date:   Wed Apr 22 13:18:56 2020 +0200
++
++    Add sysusers.d configuration file
++    
++    This will make systemd create the system-helper user if it is missing.
++
++diff --git a/configure.ac b/configure.ac
++index e149e56a..2df13e61 100644
++--- a/configure.ac
+++++ b/configure.ac
++@@ -342,6 +342,15 @@ AC_ARG_WITH(system-install-dir,
++ SYSTEM_INSTALL_DIR=$with_system_install_dir
++ AC_SUBST(SYSTEM_INSTALL_DIR)
++ 
+++AC_ARG_WITH([sysusersdir],
+++            [AS_HELP_STRING([--with-sysusersdir=DIR],
+++                            [Directory for systemd sysusers.d configuration files 
(default=PREFIX/lib/sysusers.d)])],
+++    [],
+++    dnl This is deliberately not ${libdir}: systemd units always go in
+++    dnl .../lib, never .../lib64 or .../lib/x86_64-linux-gnu
+++    [with_sysusersdir='${prefix}/lib/sysusers.d'])
+++AC_SUBST([sysusersdir], [$with_sysusersdir])
+++
++ AC_ARG_WITH(system-helper-user,
++            [AS_HELP_STRING([--with-system-helper-user=USERNAME],
++                            [Name of the system helper user])],
++diff --git a/system-helper/Makefile.am.inc b/system-helper/Makefile.am.inc
++index 6152ec99..b9f041fc 100644
++--- a/system-helper/Makefile.am.inc
+++++ b/system-helper/Makefile.am.inc
++@@ -35,8 +35,15 @@ polkit_policy_DATA =                                       \
++ %.policy: %.policy.in
++      $(AM_V_GEN) $(MSGFMT) --xml -d $(top_srcdir)/po --template $< -o $@ || cp $< $@
++ 
++-DISTCLEANFILES += system-helper/org.freedesktop.Flatpak.policy system-helper/org.freedesktop.Flatpak.rules 
system-helper/flatpak-system-helper.service system-helper/org.freedesktop.Flatpak.SystemHelper.service
+++sysusers_DATA = system-helper/flatpak.conf
+++
+++%.conf: %.conf.in
+++     $(AM_V_GEN) $(SED) \
+++       -e "s|\@SYSTEM_HELPER_USER\@|$(SYSTEM_HELPER_USER)|" \
+++       $< > $@
+++
+++DISTCLEANFILES += system-helper/org.freedesktop.Flatpak.policy system-helper/org.freedesktop.Flatpak.rules 
system-helper/flatpak-system-helper.service system-helper/org.freedesktop.Flatpak.SystemHelper.service 
system-helper/flatpak.conf
++ 
++ endif
++ 
++-EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in 
system-helper/org.freedesktop.Flatpak.SystemHelper.conf system-helper/org.freedesktop.Flatpak.rules.in 
system-helper/org.freedesktop.Flatpak.SystemHelper.service.in system-helper/flatpak-system-helper.service.in
+++EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in 
system-helper/org.freedesktop.Flatpak.SystemHelper.conf system-helper/org.freedesktop.Flatpak.rules.in 
system-helper/org.freedesktop.Flatpak.SystemHelper.service.in system-helper/flatpak-system-helper.service.in 
system-helper/flatpak.conf.in
++diff --git a/system-helper/flatpak.conf.in b/system-helper/flatpak.conf.in
++new file mode 100644
++index 00000000..9cc212eb
++--- /dev/null
+++++ b/system-helper/flatpak.conf.in
++@@ -0,0 +1 @@
+++u @SYSTEM_HELPER_USER@ - "Flatpak system helper" -