gnome-nettool: update to 42.0

This commit is contained in:
oreo639 2022-04-21 23:32:55 -07:00 committed by Michal Vasilek
parent 41db689df6
commit d6ac9f00e1
2 changed files with 41 additions and 9 deletions

View File

@ -0,0 +1,36 @@
From 1124c3e1fdb8472d30b7636500229aa16cdc1244 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jeremy.bicha@canonical.com>
Date: Wed, 6 Apr 2022 13:05:25 -0400
Subject: [PATCH] meson: drop unused positional arguments
This fixes a build error with newer meson
---
data/meson.build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 585e6d3..ed1e8bb 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -20,16 +20,14 @@ 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,
--
GitLab

View File

@ -1,9 +1,9 @@
# Template file for 'gnome-nettool' # Template file for 'gnome-nettool'
pkgname=gnome-nettool pkgname=gnome-nettool
version=3.8.1 version=42.0
revision=6 revision=1
build_style=gnu-configure build_style=meson
hostmakedepends="glib-devel intltool itstool pkg-config" hostmakedepends="pkg-config gettext itstool glib-devel"
makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute" gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
@ -13,8 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="http://www.gnome.org" homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1 checksum=a54f29eef2038aee69551c8b19ca4f758e5eb9e2090a4bc6b5633dff0188751f
post_patch() {
vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}