gentoo resync : 22.12.2021

3 files changed, 88 insertions, 0 deletions

diff --git a/xfce-extra/xfce4-wavelan-plugin/Manifest b/xfce-extra/xfce4-wavelan-plugin/Manifest
index 5d1e9b9bf239..a61525bb6b93 100644
--- a/xfce-extra/xfce4-wavelan-plugin/Manifest
+++ b/xfce-extra/xfce4-wavelan-plugin/Manifest
@@ -1,3 +1,5 @@
+AUX xfce4-wavelan-plugin-0.6.2-close-definition.patch 1551 BLAKE2B d4d13dc82bcc990562b2fd40207e0ecf39b51fbc157eff92ce726e34708691531da3fa35d9c3245f00a1ae5b738ee35d12019c9adb24b455c15b256bbceacf5d SHA512 ad15a7fcae2a3254d59c5a856d6e3e4a523748ad58edae3aeec1bb7044dd025c0d7dab83f756715813a64f32ddd94ba73deddef5f846198fd8c35c36ca3a01f9
 DIST xfce4-wavelan-plugin-0.6.2.tar.bz2 356954 BLAKE2B 982ffbc5f72d5771650b4e8d6c64f468bf927febca8c65d8a20258043e1c9433ee9c4631eb501e620f6a1037852494e3f66fe2700e08063ee770cedcad857475 SHA512 90e0d5f2e9add1f177f0f69e537ccdeeaf518a122feb776cb8bce139b9af6ea7d248e758ae381b69041bbdefe2d38f2162d08b25fd246d98c3a028d743892123
+EBUILD xfce4-wavelan-plugin-0.6.2-r1.ebuild 770 BLAKE2B e86b511684118cceb4dc7f70d5add5ef17af4bce03fa6037cc76eb52f30b642b7ac3fa5bdb2cf57202021527355c88a6fb5bdf0e702ddb1c5fbc7fe6c2ea72e2 SHA512 7622bbc0ec3c23032aecada9821e38a10533fecf60405c9d3212e8fa248f13b95d4b02209c37a4f3a3ee58b03711d84db71cd7df3e9286ca6ce0f3f5916fed79
 EBUILD xfce4-wavelan-plugin-0.6.2.ebuild 711 BLAKE2B f02f7d93320e32544c60d990dcc39c636adebe6d480072aae8ee5fdc6ef19e87887a35e626510818737d4ccd42a49c4bc457baa662f052781d8324e937699633 SHA512 8cbbb5087fd27f374747f0a77d7f88c476d6d2f9f267acbb4c0b7aa16497457cc2a553855e570d84de4e2b0045bc868d376df84aa43a4783eb52a29a0ccd8a6d
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
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 <olaf@aepfle.de>
+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 <olaf@aepfle.de>
+--- a/panel-plugin/wi_linux.c
++++ b/panel-plugin/wi_linux.c
+@@ -31,6 +31,7 @@
+ 
+ #include <libxfce4util/libxfce4util.h>
+ 
++#include <unistd.h>
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -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
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.2-r1.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..d68780f3c4e9
--- /dev/null
+++ b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A panel plug-in to display wireless interface statistics"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="kernel_linux"
+
+DEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/xfce4-panel-4.12:="
+RDEPEND="${DEPEND}
+	kernel_linux? ( sys-apps/net-tools )"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-close-definition.patch
+)
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}