Date: Sunday, September 25, 2022 @ 18:33:23 Author: heftig Revision: 1309710
2.46.0-2 Modified: lib32-at-spi2-core/trunk/PKGBUILD ----------+ PKGBUILD | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-25 18:33:06 UTC (rev 1309709) +++ PKGBUILD 2022-09-25 18:33:23 UTC (rev 1309710) @@ -6,7 +6,7 @@ pkgbase=lib32-at-spi2-core pkgname=(lib32-at-spi2-core) pkgver=2.46.0 -pkgrel=1 +pkgrel=2 pkgdesc="Protocol definitions and daemon for D-Bus at-spi (32-bit)" url="https://gitlab.gnome.org/GNOME/at-spi2-core"; arch=(x86_64) @@ -39,14 +39,18 @@ } build() { - export CC='gcc -m32' - export PKG_CONFIG=i686-pc-linux-gnu-pkg-config + local meson_options=( + --libdir=/usr/lib32 + -D introspection=no + -D default_bus=dbus-broker + -D docs=false + ) - arch-meson at-spi2-core build \ - --libdir=/usr/lib32 \ - -D introspection=no \ - -D default_bus=dbus-broker \ - -D docs=false + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG="i686-pc-linux-gnu-pkg-config" + + arch-meson at-spi2-core build "${meson_options[@]}" meson compile -C build } @@ -58,15 +62,19 @@ package_lib32-at-spi2-core() { provides=( - lib32-at-spi2-atk - lib32-atk + "lib32-at-spi2-atk=$pkgver-$pkgrel" + "lib32-atk=$pkgver-$pkgrel" libatk-1.0.so libatk-bridge-2.0.so libatspi.so ) + conflicts=( + 'lib32-at-spi2-atk<=2.38.0-2' + 'lib32-atk<=2.38.0-2' + ) replaces=( 'lib32-at-spi2-atk<=2.38.0-2' - 'lib32-atk<=2.38.0-1' + 'lib32-atk<=2.38.0-2' ) meson install -C build --destdir "$pkgdir"
