gentoo resync : 05.02.2020

5 files changed, 136 insertions, 11 deletions

diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index ff1322b77f98..bd0c9d7db9c0 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -1,7 +1,10 @@
 AUX wmfs-201003-desktop.patch 167 BLAKE2B 4150ba608826e4defb56161db0044f13402d08ab2d3243ded7b3520b8c68453fe40b8265d841fbeeb27e8f8bebd4d03a426471174626166d3254f81ee162d1a0 SHA512 20d885f3496d039794f5f94df73936aeafd93e658fff8843af63b433773ec05dde369bdfae43329302614233f1e6a6b453929bcca2660c451d4b33b3a8451717
 AUX wmfs-201003-pthread.patch 191 BLAKE2B 4a317083425e5dc6ae58529a6ebba7185a12a0adbdf5e428a1fa935718d18abe5c6c11470d32e2bedfeba1c777e47b2a76b3c269cf0e50d2ed4d6078cc9f71af SHA512 871a6558fc3201c2652e1a84d221d7d2bd90150f4e1afb8b4a7e6862797e47d012f832ecf0b1c205ad07942aa9b0cd3807a9c839cc6304ce3fae3746065493fc
+AUX wmfs-99999999-Debian.patch 310 BLAKE2B 92f207cad5e54b6a83c08e4248c81a2dd0d61e715f395440c8b0f19b6069411f3f4267b16331214831228b52823c8d2d75bc960188f9574b522bec6eeb6a869c SHA512 25ad3ada9d2376f80d7e17fa483798f2e252e68e388dc63737d3f705b44b0c1c6b524715988ba3516a0de926c8ec479fb3e63d57d5b571f74342674b617625b8
 AUX wmfs-99999999-desktop.patch 153 BLAKE2B e9a3f1039bddd76ddc05955e843e89c1ab81d486b79e870466fc4ac94ec07e72cb1bd0e5d45752543b104386d852f619d749f42e6561ea6767cd797a46e0c434 SHA512 5463fe8bbf312a003e48276fd15e6ad04075d28835f18e61260038278e31f4de4a2a7e38ad7358a12d669af973e2297d121adc0f5a2f07077874327e20362711
+AUX wmfs-99999999-fno-common.patch 1986 BLAKE2B 096becca88a23b15e3fee115640b50baca0f1f3ba58c15903a74fd4da75bc2e1662d672982940ac55c506f79f3820ffa9e851981008f82d9163eaf291e4339cf SHA512 b7593e0c0c0e3e73421a1636cdc2b3cebd6c51896e404bad9bec378e733b54cb0168a53dea40466128210f47459a2bb5e04074d588d33b07908efd1581472eaf
+AUX wmfs-99999999-strncat.patch 598 BLAKE2B e80fd233e895162e24f7264cf152c9a570665d5f6ff48ea1ec9212963c2b786b5707c8052d33a1a354b283042af0c2b7d5ac45f34e8dc57a68abd517d7e410aa SHA512 9141bd044a122fbe0aa10189f38d02e127c453665ae7d926dee852bb16ec7812450357e86ab6dfc8f48a41ce16891759a8229bb4a67f1bb5a970c7e6452298fd
 DIST wmfs-201003.tar.gz 59593 BLAKE2B b2e1f2cf73ca3d8881fa8de7b52fb6cae947a6006549f05dd06179b8b44b10fd1157a8e180b2b3177177fe0edf4c39b9a3fbf36ebb2b6470f1ed802a641a4c89 SHA512 117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90
 EBUILD wmfs-201003.ebuild 789 BLAKE2B 76630661f09f93d2beb7a043c0923ea64e0b37bf6920e65dbfa985a702cb9511cd90f6d718b7a89d3d37656642f93f92da005be41bc54d696641ae12c8f22a95 SHA512 a6f4958fd22028021da5c1589dfd548b3be6d1991e69bfcafb42d41aa33cb36b5d4c401f29e32ea0d3ee8d36b92e026281c306a43675229e7364834d8cbaa0ff
-EBUILD wmfs-99999999.ebuild 1062 BLAKE2B ee93fc556d94b3c89c4a95b3faf434291c20331834bd1b2aba8f62f02f92f11bd604c0f9bc875a084ea8642734ff12010e40cc61ae55cd1fd773312c252a2c65 SHA512 ed2e9dd39507c9a130f4edd4f663424c96fcdf45c886923955f32f555b6e7625534927853255a9a9c1f97d785261bf2068b3832edf5e5089e1135ddd97cfa895
+EBUILD wmfs-99999999.ebuild 1097 BLAKE2B 1f3d48ce2f4b5477872bd4e307ed35daac2e4163406481b55c7a169c681505bfdcc6e859925977d6f141ba29e066b41c4fd65c23464ed34ff950f03501d24e83 SHA512 7fe78bc7ab800d3a4a6f6411a7f0155d83a75aa528a8511ca7539b4744ebf892e63304305df6fbad87360f26332b339112ed34e8032ceda041a94d114b522a96
 MISC metadata.xml 380 BLAKE2B 318de05f3f531b8c35e71a0563525f7c8a1397e0ba4adbd086b768c93d792d8c336da47bc7582dfc7b0f4ce2917dcccb21191f46c064b02317477ef3a568ee17 SHA512 644e88ac0ca2d999cd273f807d45400a8438a9800b3b744f764c914fa41d819efd55ecaa27de6cbcf4403491f2986299fc1c032afd26fee67822cfc2c6368359
diff --git a/x11-wm/wmfs/files/wmfs-99999999-Debian.patch b/x11-wm/wmfs/files/wmfs-99999999-Debian.patch
new file mode 100644
index 000000000000..dde3497e640d
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs-99999999-Debian.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -81,7 +81,7 @@ fi
+ [ -n "$USE_XFT" ] && CFLAGS="$CFLAGS -DHAVE_XFT"
+ 
+ # Debian hardening options http://wiki.debian.org/Hardening
+-which dpkg-buildflags > /dev/null 2>&1
++false
+ if [ $? -eq 0 ];
+ then
+     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 `dpkg-buildflags --get CFLAGS`"
diff --git a/x11-wm/wmfs/files/wmfs-99999999-fno-common.patch b/x11-wm/wmfs/files/wmfs-99999999-fno-common.patch
new file mode 100644
index 000000000000..0ff0ce0ebc9e
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs-99999999-fno-common.patch
@@ -0,0 +1,92 @@
+--- a/src/client.c
++++ b/src/client.c
+@@ -12,6 +12,7 @@
+ #include "draw.h"
+ #include "screen.h"
+ #include "mouse.h"
++#include "wmfs.h"
+ 
+ #define CLIENT_RESIZE_DIR(D)                                    \
+      void uicb_client_resize_##D(Uicb cmd)                      \
+--- a/src/event.c
++++ b/src/event.c
+@@ -21,6 +21,9 @@
+           if(!m->use_area || (m->use_area && INAREA(ev->x, ev->y, m->area))) \
+                if(m->func)                                                   \
+                     m->func(m->cmd);
++
++void (*event_handle[MAX_EV])(XEvent*);
++
+ static void
+ event_buttonpress(XEvent *e)
+ {
+--- a/src/event.h
++++ b/src/event.h
+@@ -17,6 +17,6 @@
+ 
+ void event_init(void);
+ 
+-void (*event_handle[MAX_EV])(XEvent*);
++extern void (*event_handle[MAX_EV])(XEvent*);
+ 
+ #endif /* EVENT_H */
+--- a/src/ewmh.c
++++ b/src/ewmh.c
+@@ -7,6 +7,7 @@
+ #include "util.h"
+ #include "screen.h"
+ #include "client.h"
++#include "wmfs.h"
+ 
+ /* Taken From standards.freedesktop.org */
+ #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */
+--- a/src/mouse.c
++++ b/src/mouse.c
+@@ -9,6 +9,7 @@
+ #include "client.h"
+ #include "layout.h"
+ #include "draw.h"
++#include "wmfs.h"
+ 
+ #define _REV_SBORDER(c) draw_reversed_rect(W->root, c, false);
+ 
+--- a/src/status.c
++++ b/src/status.c
+@@ -9,6 +9,7 @@
+ #include "infobar.h"
+ #include "util.h"
+ #include "draw.h"
++#include "wmfs.h"
+ 
+ #include <string.h>
+ 
+--- a/src/wmfs.c
++++ b/src/wmfs.c
+@@ -25,6 +25,8 @@
+ #include "layout.h"
+ #include "systray.h"
+ 
++struct wmfs *W;
++
+ int
+ wmfs_error_handler(Display *d, XErrorEvent *event)
+ {
+@@ -617,8 +619,6 @@ main(int argc, char **argv)
+           }
+      }
+ 
+-     W = (struct wmfs*)xcalloc(1, sizeof(struct wmfs));
+-
+      /* Default path ~/.config/wmfs/wmfsrc */
+      W->confpath = path;
+ 
+--- a/src/wmfs.h
++++ b/src/wmfs.h
+@@ -444,6 +444,6 @@ void uicb_reload(Uicb cmd);
+ void uicb_quit(Uicb cmd);
+ 
+ /* Single global variable */
+-struct wmfs *W;
++extern struct wmfs *W;
+ 
+ #endif /* WMFS_H */
diff --git a/x11-wm/wmfs/files/wmfs-99999999-strncat.patch b/x11-wm/wmfs/files/wmfs-99999999-strncat.patch
new file mode 100644
index 000000000000..e55cd00121ba
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs-99999999-strncat.patch
@@ -0,0 +1,20 @@
+--- a/src/launcher.c
++++ b/src/launcher.c
+@@ -366,7 +366,7 @@
+                if(pos && (end = complete(&cache, tmpbuf)))
+                {
+                     strncpy(buf, tmpbuf, sizeof(buf));
+-                    strncat(buf, end, sizeof(buf));
++                    strncat(buf, end, sizeof(buf) - 1);
+                     found = true;
+                }
+ 
+@@ -387,7 +387,7 @@
+ 
+           default:
+                lastwastab = false;
+-               strncat(buf, tmp, sizeof(tmp));
++               strncat(buf, tmp, sizeof(buf) - 1);
+                ++pos;
+                break;
+           }
diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
index f152990663f4..a2a1959136ed 100644
--- a/x11-wm/wmfs/wmfs-99999999.ebuild
+++ b/x11-wm/wmfs/wmfs-99999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils git-r3
+EAPI=7
+inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
 HOMEPAGE="https://github.com/xorg62/wmfs"
@@ -26,15 +26,14 @@ DEPEND="
 	virtual/pkgconfig
 	x11-base/xorg-proto
 "
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-99999999-desktop.patch
-
-	sed -i -e '/^which dpkg/s|.*|false|g' configure || die
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999999-Debian.patch
+	"${FILESDIR}"/${PN}-99999999-desktop.patch
+	"${FILESDIR}"/${PN}-99999999-fno-common.patch
+)
 
 src_configure() {
+	tc-export CC
 	# not autotools based
 	local ECHO
 	for ECHO in echo ''; do