Date: Wednesday, April 6, 2022 @ 23:01:11 Author: heftig Revision: 441691
42.0-1 Added: gnome-nettool/trunk/fix-build.diff Modified: gnome-nettool/trunk/PKGBUILD ----------------+ PKGBUILD | 34 ++++++++++++++++++++-------------- fix-build.diff | 29 +++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-06 22:59:58 UTC (rev 441690) +++ PKGBUILD 2022-04-06 23:01:11 UTC (rev 441691) @@ -1,42 +1,48 @@ -# Maintainer: Jan Alexander Steffens (heftig) <[email protected]> +# Maintainer: Jan Alexander Steffens (heftig) <[email protected]> # Contributor: Jan de Groot <[email protected]> # Contributor: Kritoke <[email protected]> pkgname=gnome-nettool -pkgver=3.8.1+205+g8550eef -pkgrel=3 +pkgver=42.0 +pkgrel=1 pkgdesc="Graphical interface for various networking tools" -url="https://git.gnome.org/browse/gnome-nettool"; +url="https://gitlab.gnome.org/GNOME/gnome-nettool"; arch=(x86_64) license=(GPL) -depends=(gtk3 libgtop ldns iputils dconf whois) -makedepends=(nmap net-tools git meson itstool) +depends=(gtk3 libgtop iputils whois) +makedepends=(nmap bind net-tools git meson yelp-tools) optdepends=('nmap: Port scanning' + 'bind: DNS lookup' 'net-tools: Network statistics') groups=(gnome-extra) -_commit=8550eef45eb228fb4a4c816bde33ec24da0aa06e # master -source=("git+https://git.gnome.org/browse/gnome-nettool#commit=$_commit";) -sha256sums=('SKIP') +options=(debug) +_commit=5748c0fa632c9caad9e46377ca1aa330dec4b757 # tags/gnome-nettool-42-0^0 +source=("git+https://gitlab.gnome.org/GNOME/gnome-nettool.git#commit=$_commit"; + fix-build.diff) +sha256sums=('SKIP' + '95437116039a453c7c15eb25b90e3818338d6b6a87437f384b3d6aded4a845d7') pkgver() { cd $pkgname - git describe --tags | sed 's/^gnome-nettool-//;s/-/./;s/-/./;s/-/+/g' + git describe --tags | sed 's/^gnome-nettool-//;s/-/./;s/[^-]*-g/r&/;s/-/+/g' } prepare() { cd $pkgname + + # Fix build with recent Meson + git apply -3 ../fix-build.diff } build() { arch-meson $pkgname build - ninja -C build + meson compile -C build } check() { - cd build - meson test + meson test -C build --print-errorlogs } package() { - DESTDIR="$pkgdir" ninja -C build install + meson install -C build --destdir "$pkgdir" } Added: fix-build.diff =================================================================== --- fix-build.diff (rev 0) +++ fix-build.diff 2022-04-06 23:01:11 UTC (rev 441691) @@ -0,0 +1,29 @@ +diff --git i/data/meson.build w/data/meson.build +index 585e6d3..c4b35cc 100644 +--- i/data/meson.build ++++ w/data/meson.build +@@ -20,21 +20,18 @@ desktop_in = configure_file(input: 'gnome-nettool.desktop.in.in', + output: 'gnome-nettool.desktop.in', + configuration: desktop_conf) + +-i18n.merge_file('desktop', +- type: 'desktop', ++i18n.merge_file(type: 'desktop', + input: desktop_in, + output: 'gnome-nettool.desktop', + po_dir: po_dir, + install: true, + install_dir: join_paths(prefix, datadir, 'applications')) + +-i18n.merge_file('appdata', +- type: 'xml', ++i18n.merge_file(type: 'xml', + input: 'gnome-nettool.appdata.xml.in', + output: 'gnome-nettool.appdata.xml', + po_dir: po_dir, + install: true, +- install_dir: join_paths(prefix, datadir, 'metainfo'), +-) ++ install_dir: join_paths(prefix, datadir, 'metainfo')) + + install_data('org.gnome.gnome-nettool.gschema.xml', install_dir: schemas_dir)
