Control: tags 910342 + patch
Control: tags 910342 + pending
I've prepared an NMU for playerctl (versioned as 0.6.1-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should cancel it or delay it longer.
Individual git commits and a consolidated nmudiff are
attached, but I imagine you'd probably prefer to merge
https://salsa.debian.org/nickm-guest/playerctl/merge_requests/1 instead.
Thanks,
smcv
diffstat for playerctl-0.6.1 playerctl-0.6.1
changelog| 13 +++
patches/build-Use-PKG_CHECK_VAR-to-check-for-gdbus-codegen.patch | 39 ++
patches/series |1
3 files changed, 53 insertions(+)
diff -Nru playerctl-0.6.1/debian/changelog playerctl-0.6.1/debian/changelog
--- playerctl-0.6.1/debian/changelog 2018-08-22 23:24:26.0 +0100
+++ playerctl-0.6.1/debian/changelog 2018-10-10 09:09:00.0 +0100
@@ -1,3 +1,16 @@
+playerctl (0.6.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * d/p/build-Use-PKG_CHECK_VAR-to-check-for-gdbus-codegen.patch:
+Use PKG_CHECK_VAR to check for gdbus-codegen.
+This is the upstream-recommended pattern for detecting gdbus-codegen
+in an Autotools build system, and it fixes failure to build from source
+with recent versions of GLib, in which
+`$PKG_CONFIG --variable=gdbus_codegen gio-2.0` returns an absolute
+path that is not a valid input to AC_PATH_PROG. (Closes: #910342)
+
+ -- Simon McVittie Wed, 10 Oct 2018 09:09:00 +0100
+
playerctl (0.6.1-1) unstable; urgency=medium
* New upstream version 0.6.1
diff -Nru playerctl-0.6.1/debian/patches/build-Use-PKG_CHECK_VAR-to-check-for-gdbus-codegen.patch playerctl-0.6.1/debian/patches/build-Use-PKG_CHECK_VAR-to-check-for-gdbus-codegen.patch
--- playerctl-0.6.1/debian/patches/build-Use-PKG_CHECK_VAR-to-check-for-gdbus-codegen.patch 1970-01-01 01:00:00.0 +0100
+++ playerctl-0.6.1/debian/patches/build-Use-PKG_CHECK_VAR-to-check-for-gdbus-codegen.patch 2018-10-10 09:09:00.0 +0100
@@ -0,0 +1,39 @@
+From: Simon McVittie
+Date: Thu, 4 Oct 2018 21:08:27 +0100
+Subject: build: Use PKG_CHECK_VAR to check for gdbus-codegen
+
+Recent versions of GLib define $gdbus_codegen to the absolute path to
+gdbus-codegen, but AC_PATH_PROG doesn't work for an absolute path as
+its second argument, causing configure to fail.
+
+There's actually no need to use AC_PATH_PROG here, because
+we don't need an absolute path to gdbus-codegen: if it's just a
+basename that AC_PATH_PROG could find in the PATH, then the Makefile
+can also find it in the PATH.
+
+Using PKG_CHECK_VAR (from pkg-config 0.28+) preserves the ability for
+a user to specify the path to a gdbus-codegen tool as a configure
+argument, defaulting to the value of $gdbus_codegen from gio-2.0.pc.
+
+Forwarded: no, Autotools build system has been removed upstream
+---
+ configure.ac | 6 ++
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 21679fa..9a137c9 100644
+--- a/configure.ac
b/configure.ac
+@@ -21,10 +21,8 @@ AC_PROG_INSTALL
+ PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.38])
+ PKG_CHECK_MODULES([GIO], [gio-unix-2.0])
+
+-AC_PATH_PROG([GDBUS_CODEGEN], [`$PKG_CONFIG --variable=gdbus_codegen gio-2.0`])
+-if test -z "$GDBUS_CODEGEN"; then
+-AC_MSG_ERROR([*** gdbus-codegen is required to build playerctl])
+-fi
++PKG_CHECK_VAR([GDBUS_CODEGEN], [gio-2.0], [gdbus_codegen], [],
++ [AC_MSG_ERROR([*** gdbus-codegen is required to build playerctl])])
+
+ # Checks for typedefs, structures, and compiler characteristics
+ AC_PROG_CC_STDC
diff -Nru playerctl-0.6.1/debian/patches/series playerctl-0.6.1/debian/patches/series
--- playerctl-0.6.1/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ playerctl-0.6.1/debian/patches/series 2018-10-10 09:09:00.0 +0100
@@ -0,0 +1 @@
+build-Use-PKG_CHECK_VAR-to-check-for-gdbus-codegen.patch
>From d9fd141b2d1c257460069d59b332a9b1db974328 Mon Sep 17 00:00:00 2001
From: Simon McVittie
Date: Thu, 4 Oct 2018 21:08:47 +0100
Subject: [PATCH 1/2] Use PKG_CHECK_VAR to check for gdbus-codegen
This is the upstream-recommended pattern for detecting gdbus-codegen
in an Autotools build system, and it fixes failure to build from source
with recent versions of GLib, in which
`$PKG_CONFIG --variable=gdbus_codegen gio-2.0` returns an absolute
path that is not a valid input to AC_PATH_PROG.
Closes: #910342
---
...CHECK_VAR-to-check-for-gdbus-codegen.patch | 39 +++
debian/patches/series | 1 +
2 files changed, 40 insertions(+)
create mode 100644 debian/patches/build-Use-PKG_CHECK_VAR-to-check-for-gdbus-codegen.patch
create mode 100644 debian/patches/series
diff --git a/debian/patches/build-Use-PKG_CHECK_VAR-to-check-for-gdbus-codegen.patch b/debian/patches/build-Use-PKG_CHECK_VAR-to-check-for-gdbus-codegen.patch
new file mode 100644
