upgrade PKGBUILD

3 files changed, 86 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93fb92e9abb1..8747bd0d962a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
 pkgbase = d-feet-git
 	pkgdesc = D-Bus debugger for GNOME
-	pkgver = 0.3.16.r1.g7874512
+	pkgver = 0.3.16.r15.g4f00ee6
 	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/d-feet
 	arch = any
 	license = GPL2
 	checkdepends = xorg-server-xvfb
-	makedepends = meson
 	makedepends = gobject-introspection
+	makedepends = meson
+	makedepends = python-pycodestyle
+	makedepends = yelp-tools
 	depends = gtk3
-	depends = glib2
 	depends = python-gobject
-	depends = python>=2.7
 	provides = d-feet
 	conflicts = d-feet
 	source = git+https://gitlab.gnome.org/GNOME/d-feet.git
-	sha256sums = SKIP
+	source = meson-drop-unused-argument.patch
+	sha512sums = SKIP
+	sha512sums = 019dbeff67c22eccab4e34ed3c3aa292a86c6113f0f9575ecbec948aa5e2fc06f0f862d8e07d8ce566045e6aeb985cebddbc3c70ce6cffc8a074c1e08c80e27c
 
 pkgname = d-feet-git
diff --git a/PKGBUILD b/PKGBUILD
index ec5b207a1fb2..d81e05d37307 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,62 @@
+# Maintainer: Pellegrino Prevete (tallero) <pellegrinoprevete@gmail.com>
 # Maintainer: Igor Dyatlov <dyatlov.igor@protonmail.com>
 
-pkgname=d-feet-git
-pkgver=0.3.16.r1.g7874512
+_pkgname=d-feet
+pkgname="${_pkgname}-git"
+pkgver=0.3.16.r15.g4f00ee6
 pkgrel=1
 pkgdesc="D-Bus debugger for GNOME"
 arch=('any')
-url="https://gitlab.gnome.org/GNOME/d-feet"
+url="https://gitlab.gnome.org/GNOME/${_pkgname}"
 license=('GPL2')
-depends=('gtk3' 'glib2' 'python-gobject' 'python>=2.7')
-makedepends=('meson' 'gobject-introspection')
+depends=(
+  gtk3
+  python-gobject
+)
+makedepends=(
+  gobject-introspection
+  meson
+  python-pycodestyle
+  yelp-tools
+)
 checkdepends=('xorg-server-xvfb')
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
-source=(git+$url.git)
-sha256sums=('SKIP')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
+source=(
+  "git+${url}.git"
+  meson-drop-unused-argument.patch
+)
+sha512sums=(
+  'SKIP'
+  '019dbeff67c22eccab4e34ed3c3aa292a86c6113f0f9575ecbec948aa5e2fc06f0f862d8e07d8ce566045e6aeb985cebddbc3c70ce6cffc8a074c1e08c80e27c'
+)
 
 pkgver() {
-  cd "${pkgname%-git}"
+  cd "${_pkgname}"
   ( set -o pipefail
-    git describe --long 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    git describe --long 2>/dev/null \
+    | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+      printf "r%s.%s" "$(git rev-list --count HEAD)" \
+                      "$(git rev-parse --short HEAD)"
   )
 }
 
+prepare() {
+  cd "${_pkgname}"
+  patch -Np1 -i ${srcdir}/meson-drop-unused-argument.patch
+}
+
 build() {
-    arch-meson "${pkgname%-git}" build
+    arch-meson "${_pkgname}" build
     meson compile -C build
 }
 
+check() {
+  xvfb-run meson test -C build --print-errorlogs
+}
+
 package() {
-  DESTDIR="$pkgdir" meson install -C build
-  python -m compileall -d /usr/lib "$pkgdir/usr/lib"
-  python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
+  meson install -C build --destdir "${pkgdir}"
+  python -m compileall -d /usr/lib "${pkgdir}/usr/lib"
+  python -O -m compileall -d /usr/lib "${pkgdir}/usr/lib"
 }
diff --git a/meson-drop-unused-argument.patch b/meson-drop-unused-argument.patch
new file mode 100644
index 000000000000..5d728d7d60a7
--- /dev/null
+++ b/meson-drop-unused-argument.patch
@@ -0,0 +1,36 @@
+From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:11:57 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:27:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 026bd80..3b03b94 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+@@ -25,7 +24,6 @@ i18n.merge_file(
+ appdata = df_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+GitLab
+