Date: Monday, October 30, 2017 @ 22:37:10 Author: heftig Revision: 308719
2.26.1-1 Modified: at-spi2-atk/trunk/PKGBUILD Deleted: at-spi2-atk/trunk/0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch -----------------------------------------------------------+ 0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch | 28 ------------ PKGBUILD | 16 ++---- 2 files changed, 6 insertions(+), 38 deletions(-) Deleted: 0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch =================================================================== --- 0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch 2017-10-30 22:32:30 UTC (rev 308718) +++ 0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch 2017-10-30 22:37:10 UTC (rev 308719) @@ -1,28 +0,0 @@ -From 9c6451833b7550b594c4a3f8082275dfcc81e5ae Mon Sep 17 00:00:00 2001 -Message-Id: <9c6451833b7550b594c4a3f8082275dfcc81e5ae.1505468187.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Fri, 15 Sep 2017 07:36:15 +0200 -Subject: [PATCH] meson: Ensure paths written to .pc are absolute - ---- - meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index a357a9798f89da3c..38d37019908376fa 100644 ---- a/meson.build -+++ b/meson.build -@@ -53,8 +53,8 @@ import('gnome') - pkg_conf = configuration_data() - pkg_conf.set('prefix', get_option('prefix')) - pkg_conf.set('exec_prefix', get_option('prefix')) --pkg_conf.set('libdir', get_option('libdir')) --pkg_conf.set('includedir', get_option('includedir')) -+pkg_conf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkg_conf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkg_conf.set('VERSION', meson.project_version()) - - configure_file(input: 'atk-bridge-2.0.pc.in', --- -2.14.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-10-30 22:32:30 UTC (rev 308718) +++ PKGBUILD 2017-10-30 22:37:10 UTC (rev 308719) @@ -2,8 +2,8 @@ # Contributor: Ionut Biru <ib...@archlinux.org> pkgname=at-spi2-atk -pkgver=2.26.0 -pkgrel=2 +pkgver=2.26.1 +pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" url="https://wiki.gnome.org/Accessibility" arch=(i686 x86_64) @@ -10,11 +10,9 @@ license=(GPL2) depends=(at-spi2-core libx11 libxml2 atk) makedepends=(git meson) -_commit=6c1c9f343fda51780fc12ed1a1746832f070db85 # tags/AT_SPI2_ATK_2_26_0^0 -source=("git+https://git.gnome.org/browse/at-spi2-atk#commit=$_commit" - 0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch) -sha256sums=('SKIP' - 'a7aea6262a4159e5b50134171e52115688e4e2c90ff712f86031d9f9dab348be') +_commit=3ea01613fb9f10d67f45e931fa5664a68ac49a29 # tags/AT_SPI2_ATK_2_26_1^0 +source=("git+https://git.gnome.org/browse/at-spi2-atk#commit=$_commit") +sha256sums=('SKIP') pkgver() { cd $pkgname @@ -24,13 +22,11 @@ prepare() { mkdir build cd $pkgname - patch -Np1 -i ../0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch } build() { cd build - meson setup --prefix=/usr --buildtype=release ../$pkgname \ - --sysconfdir=/etc + arch-meson ../$pkgname ninja }