[gnome-builder] build: remove PAM usage from flatpak manifest

[Christian Hergert <chergert src gnome org>]

commit c912173c3d3f20d5bf8172053612475d12e118b0
Author: Christian Hergert <chergert redhat com>
Date:   Thu Aug 1 14:10:12 2019 -0700

    build: remove PAM usage from flatpak manifest
    
    This alters Polkit slightly to avoid building polkit helpers when we are
    not using PAM. It also disables more bits of the build which do not
    matter to us.

 build-aux/flatpak/org.gnome.Builder.json           | 10 ++--
 ...build-Add-option-to-build-without-polkitd.patch | 56 ++++++++++++++++++----
 2 files changed, 53 insertions(+), 13 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 57da6f5b1..99892b49c 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -152,9 +152,13 @@
                 "--disable-polkitd",
                 "--disable-man-pages",
                 "--disable-introspection",
-                "--enable-libelogind=no",
-                "--enable-libsystemd-login=no",
-                "--with-systemdsystemunitdir=no"
+                "--disable-examples",
+                "--disable-gtk-doc",
+                "--disable-libelogind",
+                "--disable-libsystemd-login",
+                "--with-systemdsystemunitdir=no",
+                "--with-authdb=dummy",
+                "--with-authfw=none"
             ],
             "rm-configure" : true,
             "cleanup" : [
diff --git a/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch 
b/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch
index 181a3d4f2..651f53ba3 100644
--- a/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch
+++ b/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch
@@ -1,17 +1,16 @@
-From df7a840dee67b307d8b9fb7b5f10496b2d45bba7 Mon Sep 17 00:00:00 2001
+From 1073a44277316348d40d86ecec908f1d4812f360 Mon Sep 17 00:00:00 2001
 From: Christian Hergert <chergert redhat com>
 Date: Mon, 27 May 2019 11:49:09 -0700
-Subject: [PATCH] forward port of polkit patch
+Subject: [PATCH] flatpak: make polkit suitable for use within flatpak
 
- From dab179770380918462d0d76e08b11e4abe55c933 Mon Sep 17 00:00:00 2001
- From: Patrick Griffis <tingping tingping se>
- Date: Thu, 8 Sep 2016 16:15:54 -0400
- Subject: [PATCH] build: Add option to build without polkitd
+This is based on patches from Patrick Griffis with additional fixes
+to allow us to disable use of PAM within Flaptak.
 ---
- configure.ac     | 20 ++++++++++++++++----
- src/Makefile.am  |  6 +++++-
- test/Makefile.am |  6 +++++-
- 3 files changed, 26 insertions(+), 6 deletions(-)
+ configure.ac                | 20 ++++++++++++++++----
+ src/Makefile.am             |  6 +++++-
+ src/polkitagent/Makefile.am |  5 +++++
+ test/Makefile.am            |  6 +++++-
+ 4 files changed, 31 insertions(+), 6 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 5cedb4e..729d78d 100644
@@ -74,6 +73,43 @@ index 09fc7b3..c6fe91b 100644
  
  if BUILD_EXAMPLES
  SUBDIRS += examples
+diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
+index 49720db..633f9d4 100644
+--- a/src/polkitagent/Makefile.am
++++ b/src/polkitagent/Makefile.am
+@@ -79,6 +79,7 @@ libpolkit_agent_1_la_LIBADD =                                        \
+ 
+ libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
+ 
++if !POLKIT_AUTHFW_NONE
+ libprivdir = $(prefix)/lib/polkit-1
+ libpriv_PROGRAMS = polkit-agent-helper-1
+ 
+@@ -113,6 +114,8 @@ polkit_agent_helper_1_LDFLAGS =                                    \
+       $(AM_LDFLAGS)                                                   \
+       $(NULL)
+ 
++endif # !POLKIT_AUTHFW_NONE
++
+ if HAVE_INTROSPECTION
+ 
+ girdir = $(INTROSPECTION_GIRDIR)
+@@ -142,6 +145,7 @@ include $(INTROSPECTION_MAKEFILE)
+ 
+ endif # HAVE_INTROSPECTION
+ 
++if !POLKIT_AUTHFW_NONE
+ # polkit-agent-helper-1 need to be setuid root because it's used to
+ # authenticate not only the invoking user, but possibly also root
+ # and/or other users.
+@@ -149,6 +153,7 @@ endif # HAVE_INTROSPECTION
+ install-data-hook:
+       -chown root $(DESTDIR)$(libprivdir)/polkit-agent-helper-1
+       -chmod 4755 $(DESTDIR)$(libprivdir)/polkit-agent-helper-1
++endif # !POLKIT_AUTHFW_NONE
+ 
+ EXTRA_DIST = polkitagentmarshal.list polkitagentenumtypes.h.template polkitagentenumtypes.c.template
+ CLEANFILES = $(gir_DATA) $(typelibs_DATA)
 diff --git a/test/Makefile.am b/test/Makefile.am
 index 59d0680..d43b0fe 100644
 --- a/test/Makefile.am