[arch-commits] Commit in lib32-polkit/repos/multilib-x86_64 (3 files)

Jan Steffens heftig at gemini.archlinux.org
Wed Dec 15 18:49:31 UTC 2021


    Date: Wednesday, December 15, 2021 @ 18:49:30
  Author: heftig
Revision: 1073425

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-polkit/repos/multilib-x86_64/PKGBUILD
    (from rev 1073424, lib32-polkit/trunk/PKGBUILD)
  lib32-polkit/repos/multilib-x86_64/multilib.diff
    (from rev 1073424, lib32-polkit/trunk/multilib.diff)
Deleted:
  lib32-polkit/repos/multilib-x86_64/PKGBUILD

---------------+
 PKGBUILD      |  126 ++++++++++++++++++++++++++++++--------------------------
 multilib.diff |   33 ++++++++++++++
 2 files changed, 101 insertions(+), 58 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-15 18:45:36 UTC (rev 1073424)
+++ PKGBUILD	2021-12-15 18:49:30 UTC (rev 1073425)
@@ -1,58 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd 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=1
-pkgdesc='Application development toolkit for controlling system-wide privileges'
-arch=(x86_64)
-license=(LGPL)
-url=https://www.freedesktop.org/wiki/Software/polkit/
-depends=(
-  lib32-expat
-  lib32-glib2
-  lib32-pam
-  lib32-systemd
-  polkit
-)
-makedepends=(
-  meson
-  git
-)
-_tag=92b910ce2273daf6a76038f6bd764fa6958d4e8e
-source=(git+https://gitlab.freedesktop.org/polkit/polkit/#tag=${_tag})
-sha256sums=(SKIP)
-
-pkgver() {
-  cd polkit
-
-  git describe --tags
-}
-
-prepare() {
-  sed -e '/polkitbackend/d' -i polkit/src/meson.build -i polkit/test/meson.build
-}
-
-build() {
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-
-  meson build polkit \
-    --prefix=/usr \
-    --libdir=/usr/lib32 \
-    -D session_tracking=libsystemd-login \
-    -D os_type=redhat \
-    -D tests=true \
-    -D introspection=false
-  meson compile -C build
-}
-
-package() {
-  meson install -C build --destdir "${pkgdir}"
-  rm -r "$pkgdir"/{etc,usr/{bin,include,lib,share}}
-}
-
-# vim: ts=2 sw=2 et:

Copied: lib32-polkit/repos/multilib-x86_64/PKGBUILD (from rev 1073424, lib32-polkit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-12-15 18:49:30 UTC (rev 1073425)
@@ -0,0 +1,68 @@
+# Maintainer: Maxime Gauduin <alucryd 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=3
+pkgdesc='Application development toolkit for controlling system-wide privileges'
+arch=(x86_64)
+license=(LGPL)
+url=https://www.freedesktop.org/wiki/Software/polkit/
+depends=(
+  lib32-expat
+  lib32-glib2
+  lib32-pam
+  lib32-systemd
+  polkit
+)
+makedepends=(
+  meson
+  git
+)
+_tag=92b910ce2273daf6a76038f6bd764fa6958d4e8e
+source=(
+  git+https://gitlab.freedesktop.org/polkit/polkit.git#tag=${_tag}
+  multilib.diff
+)
+sha256sums=('SKIP'
+            '7271f97282d22b58b74cf9089fa3a83c799cde184eb6e06a83164692362e50fe')
+
+pkgver() {
+  cd polkit
+
+  git describe --tags
+}
+
+prepare() {
+  cd polkit
+
+  # Don't build the backend
+  git apply -3 ../multilib.diff
+}
+
+build() {
+  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
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs -t 3
+}
+
+package() {
+  meson install -C build --destdir "${pkgdir}"
+  rm -r "$pkgdir"/{etc,usr/{bin,include,lib,share}}
+}
+
+# vim: ts=2 sw=2 et:

Copied: lib32-polkit/repos/multilib-x86_64/multilib.diff (from rev 1073424, lib32-polkit/trunk/multilib.diff)
===================================================================
--- multilib.diff	                        (rev 0)
+++ multilib.diff	2021-12-15 18:49:30 UTC (rev 1073425)
@@ -0,0 +1,33 @@
+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.')
+ 
+-mozjs_dep = dependency('mozjs-78')
+ 
+ dbus_dep = dependency('dbus-1', required: false)
+ dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d'
+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, at 0@'.format(symbol_map))
+ 
+ subdir('polkit')
+-subdir('polkitbackend')
+ subdir('polkitagent')
+ subdir('programs')
+ 
+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')



More information about the arch-commits mailing list