[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#816352: qjackctl: FTBFS[!linux]: gethostname undeclared



Package: qjackctl
Version: 0.4.1-1
Severity: important
Tags: patch

Hi,

qjackctl stopped building on kfreebsd and hurd with upstream version
0.4.1.  I've attached a patch which also explains the regression:

    Upstream commit 5e9eb4e32a1233ca92ec3684c357cec33a38d18b
    removed #include <unistd.h>, but this source file uses
    gethostname() if CONFIG_X11 and CONFIG_XUNIQUE are defined.
    
    On Linux the ALSA headers include unistd.h anyway, but this
    broke the build on Debian GNU/kFreeBSD and Hurd.
    
    So, add this back in, guarded by those macros just in case
    some platforms don't have or need it.

Thanks!

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: kfreebsd-amd64 (x86_64)

Kernel: kFreeBSD 10.1-0-amd64
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From 3a14ba3f60579d87ebf5ff3d1e8d6954baa1df05 Mon Sep 17 00:00:00 2001
From: Steven Chamberlain <steven@pyro.eu.org>
Date: Tue, 1 Mar 2016 03:46:44 +0000
Subject: [PATCH] include <unistd.h> again

Upstream commit 5e9eb4e32a1233ca92ec3684c357cec33a38d18b
removed #include <unistd.h>, but this source file uses
gethostname() if CONFIG_X11 and CONFIG_XUNIQUE are defined.

On Linux the ALSA headers include unistd.h anyway, but this
broke the build on Debian GNU/kFreeBSD and Hurd.

So, add this back in, guarded by those macros just in case
some platforms don't have or need it.
---
 src/qjackctl.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/qjackctl.cpp b/src/qjackctl.cpp
index db37ed6..342d7e3 100644
--- a/src/qjackctl.cpp
+++ b/src/qjackctl.cpp
@@ -65,6 +65,8 @@ const WindowFlags WindowCloseButtonHint = WindowFlags(0x08000000);
 #ifdef CONFIG_X11
 #ifdef CONFIG_XUNIQUE
 
+#include <unistd.h> /* for gethostname() */
+
 #include <QX11Info>
 
 #include <X11/Xatom.h>
-- 
1.8.4.rc3


Reply to: