Date: Wednesday, October 26, 2022 @ 15:51:46 Author: heftig Revision: 1336364
122-1 Modified: lib32-polkit/trunk/PKGBUILD lib32-polkit/trunk/multilib.diff ---------------+ PKGBUILD | 21 +++++++++++---------- multilib.diff | 51 +++++++++++++++++++++++---------------------------- 2 files changed, 34 insertions(+), 38 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-26 15:47:33 UTC (rev 1336363) +++ PKGBUILD 2022-10-26 15:51:46 UTC (rev 1336364) @@ -5,7 +5,7 @@ # Contributor: GordonGR <[email protected]> pkgname=lib32-polkit -pkgver=121 +pkgver=122 pkgrel=1 pkgdesc="Application development toolkit for controlling system-wide privileges" url="https://gitlab.freedesktop.org/polkit/polkit"; @@ -12,25 +12,25 @@ arch=(x86_64) license=(LGPL) depends=( - lib32-expat lib32-glib2 - lib32-pam lib32-systemd polkit ) makedepends=( + git + lib32-expat + lib32-pam meson - git ) -provides=(libpolkit-{agent,gobject}-1.so) +provides=(libpolkit-gobject-1.so) options=(debug) -_commit=827b0ddac5b1ef00a47fca4526fcf057bee5f1db # tags/121 +_commit=da87c5698019897dd731bb2cbb54ebd9c9481f52 # tags/122 source=( - "git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=${_commit}"; + "git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit"; multilib.diff ) b2sums=('SKIP' - '2ee4018b0429e637429abcecb4855436e072a5d562060bde51d47d7db447a200bfe08ac3d247a0b662e5c345b5641169203c00f3bbe63187b5025c9e8337ef44') + '9b588509dae8528bfb8aa3cb734bf79b194350587d763ed70fa8e91a1a9fe54bb6cef352e13e31560f3b4ad418157111eb3e2678ae5dd84f052e4dcd9cde53c9') pkgver() { cd polkit @@ -40,7 +40,7 @@ prepare() { cd polkit - # Don't build the backend + # Fix post-install script with libs-only=true git apply -3 ../multilib.diff } @@ -48,6 +48,7 @@ local meson_options=( --libdir=/usr/lib32 -D introspection=false + -D libs-only=true -D os_type=redhat -D session_tracking=libsystemd-login -D tests=true @@ -68,7 +69,7 @@ package() { meson install -C build --destdir "$pkgdir" - rm -r "$pkgdir"/{etc,usr/{bin,include,lib,share}} + rm -r "$pkgdir"/{etc,usr/{include,lib,share}} } # vim:set sw=2 sts=-1 et: Modified: multilib.diff =================================================================== --- multilib.diff 2022-10-26 15:47:33 UTC (rev 1336363) +++ multilib.diff 2022-10-26 15:51:46 UTC (rev 1336364) @@ -1,31 +1,26 @@ -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 +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: - 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 -+++ w/src/meson.build -@@ -4,7 +4,6 @@ symbol_map = meson.current_source_dir() / 'symbol.map' - ldflags = cc.get_supported_link_arguments('-Wl,--version-script,@0@'.format(symbol_map)) + dst = os.path.join(bindir, 'pkexec') - subdir('polkit') --subdir('polkitbackend') - subdir('polkitagent') - subdir('programs') +-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') -diff --git i/test/meson.build w/test/meson.build -index 3f02d35..4fbb0ec 100644 ---- i/test/meson.build -+++ w/test/meson.build -@@ -23,4 +23,3 @@ test_env.set('MOCK_NETGROUP', test_etc_dir / 'netgroup') - test_env.set('POLKIT_TEST_DATA', test_data_dir) - - subdir('polkit') --subdir('polkitbackend') +-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:
