[gnome-builder] build: forward port polkit patches to polkit-116

[Christian Hergert <chergert src gnome org>]

commit 797571af1fc123f21315154be1495d6a613c16a9
Author: Christian Hergert <chergert redhat com>
Date:   Mon May 27 11:55:21 2019 -0700

    build: forward port polkit patches to polkit-116

 build-aux/flatpak/org.gnome.Builder.json           |  5 +-
 ...build-Add-option-to-build-without-polkitd.patch | 85 ++++++++++------------
 2 files changed, 43 insertions(+), 47 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 0025a3767..e99a4d5ab 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -145,6 +145,7 @@
                 "--disable-polkitd",
                 "--disable-man-pages",
                 "--disable-introspection",
+                "--enable-libelogind=no",
                 "--enable-libsystemd-login=no",
                 "--with-systemdsystemunitdir=no"
             ],
@@ -160,8 +161,8 @@
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : "http://www.freedesktop.org/software/polkit/releases/polkit-0.113.tar.gz";,
-                    "sha256" : "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81"
+                    "url" : "https://www.freedesktop.org/software/polkit/releases/polkit-0.116.tar.gz";,
+                    "sha256" : "88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1"
                 },
                 {
                     "type" : "patch",
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 f201c2040..181a3d4f2 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,62 +1,57 @@
-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
+From df7a840dee67b307d8b9fb7b5f10496b2d45bba7 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
 
-This is for any consumer that needs libpolkit but does
-not need polkitd. For example an application running in
-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
 ---
- configure.ac     | 29 ++++++++++++++++++++---------
+ configure.ac     | 20 ++++++++++++++++----
  src/Makefile.am  |  6 +++++-
  test/Makefile.am |  6 +++++-
- 3 files changed, 30 insertions(+), 11 deletions(-)
+ 3 files changed, 26 insertions(+), 6 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 97d4222..a08785c 100644
+index 5cedb4e..729d78d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -129,20 +129,30 @@ AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30],
- AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [G_ENCODE_VERSION(2,34)],
-         [Notify us when we'll need to transition away from g_type_init()])
+@@ -79,11 +79,13 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-unix-2.0 >= 2.30.0])
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
  
-+
-+AC_ARG_ENABLE([polkitd],
-+              [AS_HELP_STRING([--disable-polkitd], [Do not build polkitd])],
-+              [enable_polkitd=$enableval], [enable_polkitd=yes])
-+AM_CONDITIONAL(BUILD_POLKITD, [test x${enable_polkitd} = yes])
-+
-+
- AC_ARG_WITH(mozjs, AS_HELP_STRING([--with-mozjs=@<:@mozjs185/mozjs-17.0|auto@:>@],
-                                 [Specify version of Spidermonkey to use]),,
-             with_mozjs=auto)
--AS_IF([test x${with_mozjs} != xauto], [
--  PKG_CHECK_MODULES(LIBJS, ${with_mozjs})
--], [
--  PKG_CHECK_MODULES(LIBJS, [mozjs185], have_mozjs185=yes, have_mozjs185=no)
--  AS_IF([test x${have_mozjs185} = xno], [
--  PKG_CHECK_MODULES(LIBJS, [mozjs-17.0], have_mozjs17=yes,
--   [AC_MSG_ERROR([Could not find mozjs185 or mozjs-17.0; see http://ftp.mozilla.org/pub/mozilla.org/js/])])
-+
+-PKG_CHECK_MODULES(LIBJS, [mozjs-60])
 +AS_IF([test x${enable_polkitd} = yes], [
-+  AS_IF([test x${with_mozjs} != xauto], [
-+    PKG_CHECK_MODULES(LIBJS, ${with_mozjs})
-+  ], [
-+    PKG_CHECK_MODULES(LIBJS, [mozjs185], have_mozjs185=yes, have_mozjs185=no)
-+    AS_IF([test x${have_mozjs185} = xno], [
-+    PKG_CHECK_MODULES(LIBJS, [mozjs-17.0], have_mozjs17=yes,
-+     [AC_MSG_ERROR([Could not find mozjs185 or mozjs-17.0; see 
http://ftp.mozilla.org/pub/mozilla.org/js/])])
-+    ])
-   ])
-+  AC_SUBST(LIBJS_CFLAGS)
-+  AC_SUBST(LIBJS_LIBS)
- ])
++  PKG_CHECK_MODULES(LIBJS, [mozjs-60])
+ 
 -AC_SUBST(LIBJS_CFLAGS)
+-AC_SUBST(LIBJS_CXXFLAGS)
 -AC_SUBST(LIBJS_LIBS)
++  AC_SUBST(LIBJS_CFLAGS)
++  AC_SUBST(LIBJS_CXXFLAGS)
++  AC_SUBST(LIBJS_LIBS)
++])
  
  EXPAT_LIB=""
  AC_ARG_WITH(expat, [  --with-expat=<dir>      Use expat from here],
-@@ -605,6 +615,7 @@ echo "
+@@ -236,6 +238,15 @@ if test "x$with_systemdsystemunitdir" != "xno"; then
+ fi
+ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"])
+ 
++dnl ---------------------------------------------------------------------------
++dnl - Disable polkitd when using library alone
++dnl ---------------------------------------------------------------------------
++
++AC_ARG_ENABLE([polkitd],
++              [AS_HELP_STRING([--disable-polkitd], [Do not build polkitd])],
++              [enable_polkitd=$enableval], [enable_polkitd=yes])
++AM_CONDITIONAL(BUILD_POLKITD, [test x${enable_polkitd} = yes])
++
+ dnl ---------------------------------------------------------------------------
+ dnl - User for running polkitd
+ dnl ---------------------------------------------------------------------------
+@@ -579,6 +590,7 @@ echo "
          Session tracking:           ${SESSION_TRACKING}
          PAM support:                ${have_pam}
          systemdsystemunitdir:       ${systemdsystemunitdir}
@@ -97,5 +92,5 @@ index 59d0680..d43b0fe 100644
  libpolkit_test_helper_la_SOURCES = polkittesthelper.c polkittesthelper.h
  libpolkit_test_helper_la_LIBADD = $(GLIB_LIBS)
 -- 
-2.9.3
+2.21.0