[polkit][lib32-polkit]: upgrade to v122

3 files changed, 67 insertions, 71 deletions

diff --git a/nonsystemd-multilib/lib32-polkit/PKGBUILD b/nonsystemd-multilib/lib32-polkit/PKGBUILD
index f5594d693..43837eda8 100644
--- a/nonsystemd-multilib/lib32-polkit/PKGBUILD
+++ b/nonsystemd-multilib/lib32-polkit/PKGBUILD
@@ -1,78 +1,76 @@
 # Maintainer: David P. <megver83@parabola.nu>
 # Maintainer (arch): Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: jtts <jussaar@mbnet.fi>
 # Contributor: GordonGR <gordongr@freemail.gr>
 
 pkgname=lib32-polkit
-pkgver=0.116
+pkgver=122
 pkgrel=1
 pkgrel+=.nonsystemd1
-pkgdesc='Application development toolkit for controlling system-wide privileges'
+pkgdesc="Application development toolkit for controlling system-wide privileges"
+url="https://gitlab.freedesktop.org/polkit/polkit"
 arch=(x86_64)
 license=(LGPL)
-url=https://www.freedesktop.org/wiki/Software/polkit/
 depends=(
-  lib32-expat
   lib32-glib2
-  lib32-pam
+  lib32-elogind
   polkit
 )
-
 makedepends=(
-  autoconf-archive
   git
-  gobject-introspection
-  gtk-doc
-  intltool
+  lib32-expat
+  lib32-pam
+  meson
+)
+provides=(libpolkit-gobject-1.so)
+options=(debug)
+_commit=da87c5698019897dd731bb2cbb54ebd9c9481f52  # tags/122
+source=(
+  "git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit"
+  multilib.diff
 )
-_commit='941e9329f8d3d43ace8335d206365b212824e686' # tags/0.116^0
-source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit"
-        elogind-configure-fix.patch)
-sha256sums=('SKIP'
-            'd90b2a95aa3e9e1ebf9369c038c144e04900e095c5405bc4ba4901c31bf3f59b')
+b2sums=('SKIP'
+        '9b588509dae8528bfb8aa3cb734bf79b194350587d763ed70fa8e91a1a9fe54bb6cef352e13e31560f3b4ad418157111eb3e2678ae5dd84f052e4dcd9cde53c9')
+
+pkgver() {
+  cd polkit
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
 
 prepare() {
   cd polkit
 
-  patch -Np 1 -i ${srcdir}/elogind-configure-fix.patch
-  NOCONFIGURE=1 ./autogen.sh
+  # Fix post-install script with libs-only=true
+  git apply -3 ../multilib.diff
 }
 
 build() {
-  cd polkit
+  local meson_options=(
+    --libdir=/usr/lib32
+    -D introspection=false
+    -D libs-only=true
+    -D os_type=redhat
+    -D session_tracking=libelogind
+    -D systemdsystemunitdir=no
+    -D tests=true
+  )
 
   export CC='gcc -m32'
   export CXX='g++ -m32'
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libdir=/usr/lib32 \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib32 \
-    --disable-gtk-doc \
-    --disable-static \
-    --enable-libsystemd-login='no' \
-    --enable-libelogind='no' \
-    --with-systemdsystemunitdir='no' \
-    --with-os-type='redhat'
+  export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
 
-#  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  arch-meson polkit build "${meson_options[@]}"
+  meson compile -C build
+}
 
-  make -C src/polkit polkitenumtypes.h
-  make -C src/polkit libpolkit-gobject-1.la
-  make -C src/polkitagent polkitagentenumtypes.h marshal.stamp
-  make -C src/polkitagent libpolkit-agent-1.la
+check() {
+  meson test -C build --print-errorlogs -t 3
 }
 
 package() {
-  cd polkit
+  meson install -C build --destdir "$pkgdir"
 
-  make -C src/polkit DESTDIR="${pkgdir}" lib_LTLIBRARIES=libpolkit-gobject-1.la install-libLTLIBRARIES
-  make -C src/polkitagent DESTDIR="${pkgdir}" lib_LTLIBRARIES=libpolkit-agent-1.la install-libLTLIBRARIES
-  make -C data DESTDIR="${pkgdir}" install-pkgconfigDATA
+  rm -r "$pkgdir"/{etc,usr/{include,share,no}}
 }
-
-# vim: ts=2 sw=2 et:
diff --git a/nonsystemd-multilib/lib32-polkit/elogind-configure-fix.patch b/nonsystemd-multilib/lib32-polkit/elogind-configure-fix.patch
deleted file mode 100644
index 81db3becc..000000000
--- a/nonsystemd-multilib/lib32-polkit/elogind-configure-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 08bb656496cd3d6213bbe9473f63f2d4a110da6e Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <cogitri@exherbo.org>
-Date: Wed, 11 Apr 2018 13:14:14 +0200
-Subject: [PATCH] configure: fix elogind support
-
-HAVE_LIBSYSTEMD is used to determine which source files to use.
-We have to check if either have_libsystemd or have_libelogind is
-true, as both of these need the source files which are used when
-HAVE_LIBSYSTEMD is true.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 36df239..da47ecb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -221,7 +221,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [
-
- AC_SUBST(LIBSYSTEMD_CFLAGS)
- AC_SUBST(LIBSYSTEMD_LIBS)
--AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes"], [Using libsystemd])
-+AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes" ], [Using libsystemd])
-
- dnl ---------------------------------------------------------------------------
- dnl - systemd unit / service files
---
-2.17.0
diff --git a/nonsystemd-multilib/lib32-polkit/multilib.diff b/nonsystemd-multilib/lib32-polkit/multilib.diff
new file mode 100644
index 000000000..1d919c9c6
--- /dev/null
+++ b/nonsystemd-multilib/lib32-polkit/multilib.diff
@@ -0,0 +1,26 @@
+diff --git i/meson_post_install.py w/meson_post_install.py
+index e742310..b8cd360 100644
+--- i/meson_post_install.py
++++ w/meson_post_install.py
+@@ -29,7 +29,9 @@ except KeyError:
+ 
+ dst = os.path.join(bindir, 'pkexec')
+ 
+-if os.geteuid() == 0:
++if not os.path.exists(dst):
++    pass
++elif os.geteuid() == 0:
+     os.chown(dst, 0, -1)
+     os.chmod(dst, 0o4755)
+ else:
+@@ -62,7 +64,9 @@ for dst in dst_dirs:
+ # and/or other users.
+ dst = os.path.join(pkglibdir, 'polkit-agent-helper-1')
+ 
+-if os.geteuid() == 0:
++if not os.path.exists(dst):
++    pass
++elif os.geteuid() == 0:
+     os.chown(dst, 0, -1)
+     os.chmod(dst, 0o4755)
+ else: