Bjørn Lie
2d72c795f9
- Reinstate avahi-0.6.31-systemd-order.patch (boo#1194561). This can probably go away if/when gh#lathiat/avahi#118 is fixed. - Drop avahi-0.6.32-suppress-resolv-conf-warning.patch: we should no longer need this given the above patch. - Add several patches from git: 0001-man-fix-reference-to-avahi-autoipd.action-8-in-avahi.patch 0005-avahi-dnsconfd.service-Drop-Also-avahi-daemon.socket.patch 0006-man-add-missing-bshell.1-symlink.patch 0007-Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK.patch 0009-fix-bytestring-decoding-for-proper-display.patch 0010-avahi_dns_packet_consume_uint32-fix-potential-undefi.patch - Build manpages with xmltoman. Currently needed for bssh. - Minor spec file clean-up. - Require python-rpm-macros for all builds (boo#1194744 boo#1194745). OBS-URL: https://build.opensuse.org/request/show/947263 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=195
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
From a94f72081dd1d546a1d95d860311a1242315bb28 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
|
|
Date: Sat, 29 Feb 2020 19:14:04 -0500
|
|
Subject: [PATCH 09/10] fix bytestring decoding for proper display
|
|
|
|
---
|
|
avahi-python/avahi-discover/avahi-discover.py | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py
|
|
index 0db705d..4a2b575 100755
|
|
--- a/avahi-python/avahi-discover/avahi-discover.py
|
|
+++ b/avahi-python/avahi-discover/avahi-discover.py
|
|
@@ -238,12 +238,15 @@ class Main_window:
|
|
txts+="<b>" + _("TXT") + " <i>%s</i></b> = %s\n" % (k,v)
|
|
else:
|
|
txts = "<b>" + _("TXT Data:") + "</b> <i>" + _("empty") + "</i>"
|
|
+
|
|
+ txts = txts.decode("utf-8")
|
|
|
|
infos = "<b>" + _("Service Type:") + "</b> %s\n"
|
|
infos += "<b>" + _("Service Name:") + "</b> %s\n"
|
|
infos += "<b>" + _("Domain Name:") + "</b> %s\n"
|
|
infos += "<b>" + _("Interface:") + "</b> %s %s\n"
|
|
infos += "<b>" + _("Address:") + "</b> %s/%s:%i\n%s"
|
|
+ infos = infos.decode("utf-8")
|
|
infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip())
|
|
self.info_label.set_markup(infos)
|
|
|
|
--
|
|
2.34.1
|
|
|