[arch-commits] Commit in valabind/trunk (PKGBUILD fix-build.diff)

[Jan Steffens]

    Date: Thursday, March 17, 2022 @ 20:43:04
  Author: heftig
Revision: 1157033

1.8.0-3: vala 0.56

Added:
  valabind/trunk/fix-build.diff
Modified:
  valabind/trunk/PKGBUILD

----------------+
 PKGBUILD       |   28 ++++++++++++++++++----------
 fix-build.diff |   17 +++++++++++++++++
 2 files changed, 35 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-17 20:42:30 UTC (rev 1157032)
+++ PKGBUILD	2022-03-17 20:43:04 UTC (rev 1157033)
@@ -2,26 +2,34 @@
 
 pkgname=valabind
 pkgver=1.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Tool to parse vala or vapi files to transform them into swig interface files, C++, NodeJS-ffi or GIR'
 url='https://github.com/radare/valabind'
 arch=('x86_64')
 license=('GPL3')
-depends=('sh' 'glibc' 'glib2' 'vala' 'swig' 'libvala-0.54.so')
+depends=('sh' 'glibc' 'glib2' 'vala' 'swig' 'libvala-0.56.so')
 makedepends=('meson')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/radare/${pkgname}/archive/${pkgver}.tar.gz)
-sha256sums=('3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd')
-sha512sums=('50a32b080e1f55b88ce65facd8df948e77938a74b800658cadd9874ff4f78fa3d11cee97b5fe19d69c0fc664af8ab1750bbc2a4163c89546ee2cc4e82034f7e4')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/radare/${pkgname}/archive/${pkgver}.tar.gz
+        fix-build.diff)
+sha256sums=('3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd'
+            '760cbcc4cdd3da1d64973bcbd78c8b72479c89fcdf83f8748cacce6976cb2acf')
+sha512sums=('50a32b080e1f55b88ce65facd8df948e77938a74b800658cadd9874ff4f78fa3d11cee97b5fe19d69c0fc664af8ab1750bbc2a4163c89546ee2cc4e82034f7e4'
+            '5673af12844b4ab81a6dbb4c921e0e16593bc50280202b04f8fa9d71c5a2ecda93b617e50a48643a3054fb8bc72104254326a93ee839319d2c2f731edd7a12d9')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # Fix build outside source dir
+  patch -Np1 -i ../fix-build.diff
+}
+
 build() {
-  cd ${pkgname}-${pkgver}
-  arch-meson . build
+  arch-meson ${pkgname}-${pkgver} build
   meson compile -C build
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-  DESTDIR="${pkgdir}" meson install -C build
+  meson install -C build --destdir "${pkgdir}"
 }
 
-# vim: ts=2 sw=2 et:
+# vim:set ts=2 sw=2 et:

Added: fix-build.diff
===================================================================
--- fix-build.diff	                        (rev 0)
+++ fix-build.diff	2022-03-17 20:43:04 UTC (rev 1157033)
@@ -0,0 +1,17 @@
+diff --git i/meson.build w/meson.build
+index b816dd7..af0c6a9 100644
+--- i/meson.build
++++ w/meson.build
+@@ -34,9 +34,9 @@ executable(
+   'valabind',
+   files,
+   dependencies: [glib_dep, gobject_dep, libvala_dep, valaccodegen_dep],
+-  vala_args: ['--pkg', 'posix', '--includedir', '../private',
+-    '--vapidir', '../private', '--pkg', 'codegen'],
+-  include_directories: include_directories('../private'),
++  vala_args: ['--pkg', 'posix', '--pkg', 'codegen',
++    '--vapidir', meson.current_source_dir() / 'private'],
++  include_directories: include_directories('private'),
+   install: true,
+   install_rpath: libvala_dep.get_pkgconfig_variable('pkglibdir')
+ )