Date: Wednesday, August 10, 2022 @ 20:47:04 Author: heftig Revision: 452532
3.40.0-1 Modified: glade/trunk/PKGBUILD Deleted: glade/trunk/python-dep.diff -----------------+ PKGBUILD | 38 ++++++++++++++------------------------ python-dep.diff | 13 ------------- 2 files changed, 14 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-10 20:00:47 UTC (rev 452531) +++ PKGBUILD 2022-08-10 20:47:04 UTC (rev 452532) @@ -2,8 +2,8 @@ # Contributor: Douglas Soares de Andrade <[email protected]> pkgname=glade -pkgver=3.38.2 -pkgrel=3 +pkgver=3.40.0 +pkgrel=1 pkgdesc="User Interface Builder for GTK+ applications" url="https://glade.gnome.org/"; arch=(x86_64) @@ -13,42 +13,32 @@ git webkit2gtk meson gjs) checkdepends=(xorg-server-xvfb) optdepends=('devhelp: development help') +provides=(libgladeui-2.so) groups=(gnome-extra) -provides=(libgladeui-2.so) -_commit=152031927c60c167ae7b035a78fca4d70678775c # glade-3-38 -source=("git+https://gitlab.gnome.org/GNOME/glade.git#commit=$_commit"; - python-dep.diff) -sha256sums=('SKIP' - 'dc1ed48403d473fcacef37fc6dd693e0442e7fed31bb852b20957c71595e2124') +options=(debug) +_commit=b3823efd0acea2b0a5629b261cf56b1d3f2664aa # tags/GLADE_3_40_0^0 +source=("git+https://gitlab.gnome.org/GNOME/glade.git#commit=$_commit";) +sha256sums=('SKIP') pkgver() { - cd $pkgname - git describe --tags | sed 's/^GLADE_//;s/_/./g;s/-/+/g' + cd glade + git describe --tags | sed 's/^GLADE_//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g' } prepare() { - cd $pkgname - - # Add missing tag - git tag -f GLADE_3_38_2 152031927c60c167ae7b035a78fca4d70678775c - - # Fix build with Python 3.9 - git apply -3 ../python-dep.diff + cd glade } build() { - arch-meson $pkgname build -D gtk_doc=true + arch-meson glade build -D gtk_doc=true meson compile -C build } check() { - # Requires Glade to be installed to pass - # GladeUI-FATAL-CRITICAL: Unable to load image (Failed to open file "/usr/share/glade/pixmaps/plus.png": No such file or directory) - dbus-run-session xvfb-run \ - -s '-screen 0 1920x1080x24 -nolisten local' \ - meson test -C build --print-errorlogs || : + dbus-run-session xvfb-run -s '-nolisten local' \ + meson test -C build --print-errorlogs } package() { - DESTDIR="$pkgdir" meson install -C build + meson install -C build --destdir "$pkgdir" } Deleted: python-dep.diff =================================================================== --- python-dep.diff 2022-08-10 20:00:47 UTC (rev 452531) +++ python-dep.diff 2022-08-10 20:47:04 UTC (rev 452532) @@ -1,13 +0,0 @@ -diff --git i/meson.build w/meson.build -index fc4c4492..0c4b412f 100644 ---- i/meson.build -+++ w/meson.build -@@ -153,7 +153,7 @@ pygobject_version = '3.8.0' - pygobject_dep = dependency('pygobject-3.0', version: '>= ' + pygobject_version, required: get_option('python')) - have_python = pygobject_dep.found() - if have_python -- python_dep = dependency('python-3.8-embed', version: '>= 3.8') -+ python_dep = import('python').find_installation().dependency(embed: true) - - version_array = pygobject_version.split('.') - config_h.set('PYGOBJECT_REQUIRED_MAJOR', version_array[0].to_int())
