Control: tag -1 + patch
Hi Michael,
Michael Stapelberg wrote:
> I don’t have the means to test on non-linux.
Every DD has access to porterboxes... :-)
> Can you please verify that the following patch fixes the issue? (also
> attached for convenience)
Nope. Still FTBFS:
CC src/print_volume.c
cc -Wdate-time -D_FORTIFY_SOURCE=2 -DSYSCONFDIR=\"/etc\" -DVERSION=\""2.10
(2016-01-01)"\" -g -O2 -fdebug-prefix-map=/home/abe/debian/i3status=.
-fstack-protector-strong -Wformat -Werror=format-security -Wall -Wshadow
-Wpointer-arith -Wcast-qual -Wsign-compare -g -std=gnu99 -pedantic -Iinclude
-idirafter yajl-fallback -c -o src/print_wireless_info.o
src/print_wireless_info.c
src/print_wireless_info.c: In function ‘print_wireless_info’:
src/print_wireless_info.c:524:41: error: ‘wireless_info_t {aka struct
<anonymous>}’ has no member named ‘essid’
maybe_escape_markup(info.essid, &outwalk);
^
Makefile:79: recipe for target 'src/print_wireless_info.o' failed
The following patch works for me, but is probably quite ugly:
Index: i3status/src/print_wireless_info.c
===================================================================
--- i3status.orig/src/print_wireless_info.c 2016-08-20 01:46:12.460196000
+0200
+++ i3status/src/print_wireless_info.c 2016-08-20 01:53:50.946062000 +0200
@@ -64,7 +64,9 @@
typedef struct {
int flags;
+#ifdef IW_ESSID_MAX_SIZE
char essid[IW_ESSID_MAX_SIZE + 1];
+#endif
#ifdef LINUX
uint8_t bssid[ETH_ALEN];
#endif
@@ -518,9 +520,11 @@
}
if (BEGINS_WITH(walk + 1, "essid")) {
+#ifdef IW_ESSID_MAX_SIZE
if (info.flags & WIRELESS_INFO_FLAG_HAS_ESSID)
maybe_escape_markup(info.essid, &outwalk);
else
+#endif
*(outwalk++) = '?';
walk += strlen("essid");
}
Regards, Axel
--
,''`. | Axel Beckert <[email protected]>, http://people.debian.org/~abe/
: :' : | Debian Developer, ftp.ch.debian.org Admin
`. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5
`- | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
