Date: Tuesday, December 27, 2022 @ 14:25:52 Author: heftig Revision: 465031
3.40.0+r14+g1fbca367-1: FS#76937 add optdeps Added: glade/trunk/fix-build.diff Modified: glade/trunk/PKGBUILD ----------------+ PKGBUILD | 24 +++++++++++++++++------- fix-build.diff | 26 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-12-27 14:10:07 UTC (rev 465030) +++ PKGBUILD 2022-12-27 14:25:52 UTC (rev 465031) @@ -2,7 +2,7 @@ # Contributor: Douglas Soares de Andrade <[email protected]> pkgname=glade -pkgver=3.40.0 +pkgver=3.40.0+r14+g1fbca367 pkgrel=1 pkgdesc="User Interface Builder for GTK+ applications" url="https://glade.gnome.org/"; @@ -9,16 +9,21 @@ arch=(x86_64) license=(GPL LGPL) depends=(gtk3 libxml2) -makedepends=(gtk-doc gobject-introspection python-gobject itstool docbook-xsl - git webkit2gtk meson gjs) +makedepends=(gtk-doc gobject-introspection itstool docbook-xsl git meson gjs + python-gobject webkit2gtk) checkdepends=(xorg-server-xvfb) -optdepends=('devhelp: development help') +optdepends=('devhelp: development help' + 'gjs: gjs module' + 'python-gobject: python module' + 'webkit2gtk: webkit2gtk module') provides=(libgladeui-2.so) groups=(gnome-extra) options=(debug) -_commit=b3823efd0acea2b0a5629b261cf56b1d3f2664aa # tags/GLADE_3_40_0^0 -source=("git+https://gitlab.gnome.org/GNOME/glade.git#commit=$_commit";) -sha256sums=('SKIP') +_commit=1fbca367cf33991f1d8d20a256ca704eb778fca9 # master +source=("git+https://gitlab.gnome.org/GNOME/glade.git#commit=$_commit"; + fix-build.diff) +sha256sums=('SKIP' + '0dd99583c4b7b6327e84a909614f46ec0062dbc9f67be733ea97dc294e40317b') pkgver() { cd glade @@ -27,6 +32,9 @@ prepare() { cd glade + + # Fix missing dependency on vcs_tag + git apply -3 ../fix-build.diff } build() { @@ -42,3 +50,5 @@ package() { meson install -C build --destdir "$pkgdir" } + +# vim:set sw=2 sts=-1 et: Added: fix-build.diff =================================================================== --- fix-build.diff (rev 0) +++ fix-build.diff 2022-12-27 14:25:52 UTC (rev 465031) @@ -0,0 +1,26 @@ +diff --git i/src/meson.build w/src/meson.build +index 40c730a0..56f4e47d 100644 +--- i/src/meson.build ++++ w/src/meson.build +@@ -1,18 +1,18 @@ + fs = import('fs') + + if fs.exists('../.git') +- vcs_tag(input: 'version.h.in', output: 'version.h') ++ version_h = vcs_tag(input: 'version.h.in', output: 'version.h')[0] + else + config = configuration_data() + config.set ('VCS_TAG', glade_version) +- configure_file( ++ version_h = configure_file( + input: 'version.h.in', + output: 'version.h', + configuration: config + ) + endif + +-sources = files( ++sources = [version_h] + files( + 'glade-intro.c', + 'glade-preferences.c', + 'glade-settings.c',
