[arch-commits] Commit in lib32-polkit/trunk (PKGBUILD meson-0.61.diff multilib.diff)

[Jan Steffens]

    Date: Tuesday, July 12, 2022 @ 16:13:32
  Author: heftig
Revision: 1250711

121-1

Modified:
  lib32-polkit/trunk/PKGBUILD
  lib32-polkit/trunk/multilib.diff
Deleted:
  lib32-polkit/trunk/meson-0.61.diff

-----------------+
 PKGBUILD        |   55 +++++++++++++++++++++++-------------------------------
 meson-0.61.diff |   24 -----------------------
 multilib.diff   |   20 ++++++++-----------
 3 files changed, 33 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-12 16:12:27 UTC (rev 1250710)
+++ PKGBUILD	2022-07-12 16:13:32 UTC (rev 1250711)
@@ -1,15 +1,16 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 # Contributor: jtts <jussaar at mbnet.fi>
 # Contributor: GordonGR <gordongr at freemail.gr>
 
 pkgname=lib32-polkit
-pkgver=0.120
-pkgrel=5
-pkgdesc='Application development toolkit for controlling system-wide privileges'
+pkgver=121
+pkgrel=1
+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
@@ -21,51 +22,42 @@
   meson
   git
 )
-_tag=92b910ce2273daf6a76038f6bd764fa6958d4e8e
+provides=(libpolkit-{agent,gobject}-1.so)
+options=(debug)
+_commit=827b0ddac5b1ef00a47fca4526fcf057bee5f1db  # tags/121
 source=(
-  git+https://gitlab.freedesktop.org/polkit/polkit.git#tag=${_tag}
-  meson-0.61.diff
+  "git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=${_commit}"
   multilib.diff
 )
-sha256sums=(
-  SKIP
-  45d08bbb76e1e22ca8e698df04652b7aceaded34f9b76ce6b68152fb26b0de8d
-  7271f97282d22b58b74cf9089fa3a83c799cde184eb6e06a83164692362e50fe
-)
+b2sums=('SKIP'
+        '2ee4018b0429e637429abcecb4855436e072a5d562060bde51d47d7db447a200bfe08ac3d247a0b662e5c345b5641169203c00f3bbe63187b5025c9e8337ef44')
 
 pkgver() {
   cd polkit
-
-  git describe --tags
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd polkit
 
-  # CVE-2021-4034
-  git cherry-pick -n a2bf5c9c83b6ae46cbd5c779d3055bff81ded683
-
-  # CVE-2021-4115
-  git cherry-pick -n 41cb093f554da8772362654a128a84dd8a5542a7
-
-  # Fix build with Meson 0.61.0
-  git apply -3 ../meson-0.61.diff
-
   # Don't build the backend
   git apply -3 ../multilib.diff
 }
 
 build() {
+  local meson_options=(
+    --libdir=/usr/lib32
+    -D introspection=false
+    -D os_type=redhat
+    -D session_tracking=libsystemd-login
+    -D tests=true
+  )
+
   export CC='gcc -m32'
   export CXX='g++ -m32'
   export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
 
-  arch-meson polkit build \
-    --libdir=/usr/lib32 \
-    -D session_tracking=libsystemd-login \
-    -D os_type=redhat \
-    -D tests=true \
-    -D introspection=false
+  arch-meson polkit build "${meson_options[@]}"
   meson compile -C build
 }
 
@@ -74,8 +66,9 @@
 }
 
 package() {
-  meson install -C build --destdir "${pkgdir}"
+  meson install -C build --destdir "$pkgdir"
+
   rm -r "$pkgdir"/{etc,usr/{bin,include,lib,share}}
 }
 
-# vim:set sw=2 et:
+# vim:set sw=2 sts=-1 et:

Deleted: meson-0.61.diff
===================================================================
--- meson-0.61.diff	2022-07-12 16:12:27 UTC (rev 1250710)
+++ meson-0.61.diff	2022-07-12 16:13:32 UTC (rev 1250711)
@@ -1,24 +0,0 @@
-diff --git i/actions/meson.build w/actions/meson.build
-index 2abaaf3..1e3f370 100644
---- i/actions/meson.build
-+++ w/actions/meson.build
-@@ -1,7 +1,6 @@
- policy = 'org.freedesktop.policykit.policy'
- 
- i18n.merge_file(
--  policy,
-   input: policy + '.in',
-   output: '@BASENAME@',
-   po_dir: po_dir,
-diff --git i/src/examples/meson.build w/src/examples/meson.build
-index c6305ab..8c18de5 100644
---- i/src/examples/meson.build
-+++ w/src/examples/meson.build
-@@ -1,7 +1,6 @@
- policy = 'org.freedesktop.policykit.examples.pkexec.policy'
- 
- i18n.merge_file(
--  policy,
-   input: policy + '.in',
-   output: '@BASENAME@',
-   po_dir: po_dir,

Modified: multilib.diff
===================================================================
--- multilib.diff	2022-07-12 16:12:27 UTC (rev 1250710)
+++ multilib.diff	2022-07-12 16:13:32 UTC (rev 1250711)
@@ -1,15 +1,13 @@
-diff --git i/meson.build w/meson.build
-index 858078d..50ae1ac 100644
---- i/meson.build
-+++ w/meson.build
-@@ -133,7 +133,6 @@ expat_dep = dependency('expat')
- assert(cc.has_header('expat.h', dependencies: expat_dep), 'Can\'t find expat.h. Please install expat.')
- assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t find expat library. Please install expat.')
+diff --git i/meson_options.txt w/meson_options.txt
+index 76aa311..174a45e 100644
+--- i/meson_options.txt
++++ w/meson_options.txt
+@@ -16,4 +16,4 @@ option('introspection', type: 'boolean', value: true, description: 'Enable intro
  
--mozjs_dep = dependency('mozjs-78')
- 
- dbus_dep = dependency('dbus-1', required: false)
- dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d'
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+ option('man', type: 'boolean', value: false, description: 'build manual pages')
+-option('js_engine', type: 'combo', choices: ['mozjs', 'duktape'], value: 'duktape', description: 'javascript engine')
++option('js_engine', type: 'combo', choices: ['none'], value: 'none', description: 'javascript engine')
 diff --git i/src/meson.build w/src/meson.build
 index 4073333..c7038f1 100644
 --- i/src/meson.build