[arch-commits] Commit in at-spi2-atk/trunk (2 files)

[Jan Steffens]

    Date: Friday, September 15, 2017 @ 09:40:05
  Author: heftig
Revision: 305582

2.26.0-2

Added:
  at-spi2-atk/trunk/0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch
Modified:
  at-spi2-atk/trunk/PKGBUILD

-----------------------------------------------------------+
 0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch |   28 ++++++++++++
 PKGBUILD                                                  |    9 ++-
 2 files changed, 34 insertions(+), 3 deletions(-)

Added: 0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch
===================================================================
--- 0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch	                        (rev 0)
+++ 0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch	2017-09-15 09:40:05 UTC (rev 305582)
@@ -0,0 +1,28 @@
+From 9c6451833b7550b594c4a3f8082275dfcc81e5ae Mon Sep 17 00:00:00 2001
+Message-Id: <9c6451833b7550b594c4a3f8082275dfcc81e5ae.1505468187.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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-09-15 08:34:51 UTC (rev 305581)
+++ PKGBUILD	2017-09-15 09:40:05 UTC (rev 305582)
@@ -3,7 +3,7 @@
 
 pkgname=at-spi2-atk
 pkgver=2.26.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
 url="https://wiki.gnome.org/Accessibility"
 arch=(i686 x86_64)
@@ -11,8 +11,10 @@
 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")
-sha256sums=('SKIP')
+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')
 
 pkgver() {
   cd $pkgname
@@ -22,6 +24,7 @@
 prepare() {
   mkdir build
   cd $pkgname
+  patch -Np1 -i ../0001-meson-Ensure-paths-written-to-.pc-are-absolute.patch
 }
 
 build() {