Date: Saturday, September 15, 2018 @ 06:21:48 Author: heftig Revision: 334610
1.58.0+2+g1f1dd7f4-1 Modified: gobject-introspection/trunk/PKGBUILD Deleted: gobject-introspection/trunk/warnlib.diff --------------+ PKGBUILD | 21 ++++++++++----------- warnlib.diff | 13 ------------- 2 files changed, 10 insertions(+), 24 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-15 06:21:25 UTC (rev 334609) +++ PKGBUILD 2018-09-15 06:21:48 UTC (rev 334610) @@ -3,8 +3,8 @@ pkgbase=gobject-introspection pkgname=(gobject-introspection gobject-introspection-runtime) -pkgver=1.58.0 -pkgrel=2 +pkgver=1.58.0+2+g1f1dd7f4 +pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/Projects/GObjectIntrospection"; arch=(x86_64) @@ -12,11 +12,9 @@ depends=(python python-mako) makedepends=(cairo git gtk-doc python-sphinx meson) options=(!emptydirs) -_commit=01bf21f398d5ece9ac2d78c00b4b362091f8e05c # tags/1.58.0^0 -source=("git+https://gitlab.gnome.org/GNOME/gobject-introspection.git#commit=$_commit"; - warnlib.diff) -sha512sums=('SKIP' - 'f9cf08b83a6f220923f7b5666638877a152ab90bebb6703e5026badc9852a69131b9c17e1d4dda89f9f5b6d8fb58a17780bd87d9c3bf66f5b8a9260f4f6debf4') +_commit=1f1dd7f4857c13db507ad663664a5e4b8d620ffc # gnome-3-30 +source=("git+https://gitlab.gnome.org/GNOME/gobject-introspection.git#commit=$_commit";) +sha512sums=('SKIP') pkgver() { cd $pkgbase @@ -25,8 +23,6 @@ prepare() { cd $pkgbase - # GJS needs warnlib to build - patch -Np1 -i ../warnlib.diff } build() { @@ -42,9 +38,12 @@ depends+=("gobject-introspection-runtime=$pkgver-$pkgrel") DESTDIR="$pkgdir" meson install -C build - python -m compileall "$pkgdir/usr/lib/gobject-introspection" - python -O -m compileall "$pkgdir/usr/lib/gobject-introspection" + pushd "$pkgdir" + python -m compileall -d / usr/lib/gobject-introspection + python -O -m compileall -d / usr/lib/gobject-introspection + popd + ### Split runtime mkdir -p "$srcdir/runtime/lib" mv "$pkgdir"/usr/lib/{lib*,girepository-*} "$srcdir/runtime/lib" Deleted: warnlib.diff =================================================================== --- warnlib.diff 2018-09-15 06:21:25 UTC (rev 334609) +++ warnlib.diff 2018-09-15 06:21:48 UTC (rev 334610) @@ -1,13 +0,0 @@ -diff --git i/tests/meson.build w/tests/meson.build -index 71cd97fe..18cc0807 100644 ---- i/tests/meson.build -+++ w/tests/meson.build -@@ -8,6 +8,8 @@ test_regress_incdirs = include_directories(['.', 'scanner']) - installed_sources = [ - 'scanner/regress.c', - 'scanner/regress.h', -+ 'scanner/warnlib.c', -+ 'scanner/warnlib.h', - 'gimarshallingtests.c', - 'gimarshallingtests.h', - 'gitestmacros.h',
