From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- ...ce4-wavelan-plugin-0.6.2-close-definition.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.6.2-close-definition.patch (limited to 'xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.6.2-close-definition.patch') diff --git a/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.6.2-close-definition.patch b/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.6.2-close-definition.patch new file mode 100644 index 000000000000..bc27e2c12afc --- /dev/null +++ b/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.6.2-close-definition.patch @@ -0,0 +1,55 @@ +https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/merge_requests/4 +https://bugs.gentoo.org/799827 + +From: Olaf Hering +Date: Fri, 25 Jun 2021 19:37:09 +0200 +Subject: [PATCH] remove bogus close function + +Just close the file descriptor, instead of doing shutdown. + +Not doing so was already wrong in 2006. + +wi_linux.c:83:1: error: conflicting types for 'close' + close(int fd) + ^~~~~ +In file included from /usr/include/glib-2.0/gio/gcredentials.h:32:0, + from /usr/include/glib-2.0/gio/gio.h:46, + from /usr/include/xfce4/libxfce4util/xfce-gio-extensions.h:28, + from /usr/include/xfce4/libxfce4util/libxfce4util.h:40, + from wi_linux.c:32: +/usr/include/unistd.h:353:12: note: previous declaration of 'close' was here + extern int close (int __fd); + ^~~~~ +make[2]: *** [Makefile:525: libwavelan_la-wi_linux.lo] Error 1 +make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/xfce4-wavelan-plugin-20210505T194034.7ba466b/panel-plugin' + +Signed-off-by: Olaf Hering +--- a/panel-plugin/wi_linux.c ++++ b/panel-plugin/wi_linux.c +@@ -31,6 +31,7 @@ + + #include + ++#include + #include + #include + #include +@@ -79,17 +80,9 @@ wi_open(const char *interface) + return(device); + } + +-static void +-close(int fd) +-{ +- shutdown(fd, SHUT_RDWR); +-} +- + void + wi_close(struct wi_device *device) + { +- g_return_if_fail(device != NULL); +- + close(device->socket); + g_free(device); + } +GitLab -- cgit v1.2.3