[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/
commit: b9f6fce172a4b6f826eafd6c86d9c63c71f0c580
Author: Sam James gentoo org>
AuthorDate: Sun Feb 20 01:31:38 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 20 01:31:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f6fce1
x11-wm/wmfs: fix build on musl
Closes: https://bugs.gentoo.org/833323
Signed-off-by: Sam James gentoo.org>
x11-wm/wmfs/wmfs-20180520.ebuild | 6 --
x11-wm/wmfs/wmfs-.ebuild | 6 --
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/x11-wm/wmfs/wmfs-20180520.ebuild b/x11-wm/wmfs/wmfs-20180520.ebuild
index b0225851e54d..a9f99e8c0db5 100644
--- a/x11-wm/wmfs/wmfs-20180520.ebuild
+++ b/x11-wm/wmfs/wmfs-20180520.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,9 +23,11 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- virtual/pkgconfig
x11-base/xorg-proto
+ elibc_musl? ( sys-libs/queue-standalone )
"
+BDEPEND="virtual/pkgconfig"
+
PATCHES=(
"${FILESDIR}"/${PN}--Debian.patch
"${FILESDIR}"/${PN}--desktop.patch
diff --git a/x11-wm/wmfs/wmfs-.ebuild b/x11-wm/wmfs/wmfs-.ebuild
index 286281b6f1f6..4d856eab612c 100644
--- a/x11-wm/wmfs/wmfs-.ebuild
+++ b/x11-wm/wmfs/wmfs-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,9 +23,11 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- virtual/pkgconfig
x11-base/xorg-proto
+ elibc_musl? ( sys-libs/queue-standalone )
"
+BDEPEND="virtual/pkgconfig"
+
PATCHES=(
"${FILESDIR}"/${PN}--Debian.patch
"${FILESDIR}"/${PN}--desktop.patch
[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/
commit: 1d0a30da5540eadf3a699e3685e9a0d45aee6f0a
Author: Jakov Smolić gentoo org>
AuthorDate: Tue Oct 19 19:07:12 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Tue Oct 19 19:09:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d0a30da
x11-wm/wmfs: Update SRC_URI
jer@ is retired and I've archived the distfiles in my devspace
Signed-off-by: Jakov Smolić gentoo.org>
x11-wm/wmfs/wmfs-20180520.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-wm/wmfs/wmfs-20180520.ebuild b/x11-wm/wmfs/wmfs-20180520.ebuild
index f01f6ce2129..b0225851e54 100644
--- a/x11-wm/wmfs/wmfs-20180520.ebuild
+++ b/x11-wm/wmfs/wmfs-20180520.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ inherit toolchain-funcs
DESCRIPTION="Window Manager From Scratch, A tiling window manager highly
configurable"
HOMEPAGE="https://github.com/xorg62/wmfs;
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz;
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz;
LICENSE="BSD"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/files/
commit: 568796a044655b86753265de8a6216cadefad93c
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Mon Jan 25 09:24:54 2021 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Jan 25 15:01:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568796a0
x11-wm/wmfs: remove unused patches
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19208
Signed-off-by: Aaron Bauman gentoo.org>
x11-wm/wmfs/files/wmfs-201003-desktop.patch | 9 -
x11-wm/wmfs/files/wmfs-201003-pthread.patch | 12
2 files changed, 21 deletions(-)
diff --git a/x11-wm/wmfs/files/wmfs-201003-desktop.patch
b/x11-wm/wmfs/files/wmfs-201003-desktop.patch
deleted file mode 100644
index 91edac6d88b..000
--- a/x11-wm/wmfs/files/wmfs-201003-desktop.patch
+++ /dev/null
@@ -1,9 +0,0 @@
a/wmfs.desktop
-+++ b/wmfs.desktop
-@@ -1,5 +1,4 @@
--[Desktop Entry]
--Encoding=UTF-8
-+[Desktop Entry]
- Name=wmfs
- Comment=Window manager from scratch
- TryExec=wmfs
diff --git a/x11-wm/wmfs/files/wmfs-201003-pthread.patch
b/x11-wm/wmfs/files/wmfs-201003-pthread.patch
deleted file mode 100644
index cbbf6343bdf..000
--- a/x11-wm/wmfs/files/wmfs-201003-pthread.patch
+++ /dev/null
@@ -1,12 +0,0 @@
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -94,7 +92,8 @@
- set(LIBRARIES_TO_LINK
- ${FREETYPE_LIBRARIES}
- ${X11_LIBRARIES}
-- Xft)
-+ Xft
-+ pthread)
-
- # Includes
- include(FindDoxygen)
[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/
commit: 38b96f6904f8b471cfe671022bc209ec765ca17e
Author: Andreas K. Huettel gentoo org>
AuthorDate: Sun Jan 3 00:59:08 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Jan 3 00:59:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b96f69
x11-wm/wmfs: Remove old
Bug: https://bugs.gentoo.org/706654
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas K. Huettel gentoo.org>
x11-wm/wmfs/Manifest | 1 -
x11-wm/wmfs/wmfs-201003.ebuild | 47 --
2 files changed, 48 deletions(-)
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index b1ff0c4736f..d6f6bb805fd 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -1,2 +1 @@
-DIST wmfs-201003.tar.gz 59593 BLAKE2B
b2e1f2cf73ca3d8881fa8de7b52fb6cae947a6006549f05dd06179b8b44b10fd1157a8e180b2b3177177fe0edf4c39b9a3fbf36ebb2b6470f1ed802a641a4c89
SHA512
117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90
DIST wmfs-20180520.tar.xz 56364 BLAKE2B
23530193ba2c37ae4129fd23dda2ff8cd301b0bd92d32e06b264efd990b7957b38170de31f04afca6fd9875d2e0450c8bede416e5f49d6e19962718fe2e240a3
SHA512
bcff251397d8483db49c037c51eef7b3dcc87a6d94650ae9e9cabc7104177216e0efa7e67bfb34978bae67dc4853884673ce288bb8087e95cb2993d519ab4f2f
diff --git a/x11-wm/wmfs/wmfs-201003.ebuild b/x11-wm/wmfs/wmfs-201003.ebuild
deleted file mode 100644
index 27bdfa3ef56..000
--- a/x11-wm/wmfs/wmfs-201003.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake
-
-DESCRIPTION="Window Manager From Scratch, A tiling window manager highly
configurable"
-HOMEPAGE="https://github.com/xorg62/wmfs;
-SRC_URI="https://github.com/xorg62/wmfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- media-libs/freetype
- media-libs/imlib2[X]
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXinerama
- x11-libs/libXrandr
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-201003-desktop.patch
- "${FILESDIR}"/${PN}-201003-pthread.patch
-)
-
-src_prepare() {
- cmake_src_prepare
- sed -i \
- -e '/set(CFLAGS/d' \
- -e '/set(LDFLAGS/s#)#
[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/
commit: 7c78867fc1aaae480ff575bf54a00dfb4d28a3ba
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Sep 26 10:30:51 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Sep 26 10:31:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c78867f
x11-wm/wmfs: Update live ebuild
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers gentoo.org>
x11-wm/wmfs/wmfs-.ebuild | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/x11-wm/wmfs/wmfs-.ebuild b/x11-wm/wmfs/wmfs-.ebuild
index 416f8f678db..286281b6f1f 100644
--- a/x11-wm/wmfs/wmfs-.ebuild
+++ b/x11-wm/wmfs/wmfs-.ebuild
@@ -32,6 +32,11 @@ PATCHES=(
"${FILESDIR}"/${PN}--fno-common.patch
"${FILESDIR}"/${PN}--strncat.patch
)
+DOCS=(
+ README
+ scripts/keybind_help.sh
+ scripts/status.sh
+)
src_configure() {
tc-export CC
@@ -47,9 +52,3 @@ src_configure() {
|| die
done
}
-
-src_install() {
- default
- rm -r "${D}"/usr/share/${PN}
- dodoc README
-}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/
commit: 7ff257a29dbd0576d2ed4b5230499b21b85381ef
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Sep 26 10:28:57 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Sep 26 10:31:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff257a2
x11-wm/wmfs: Version 20180520
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers gentoo.org>
x11-wm/wmfs/Manifest | 1 +
x11-wm/wmfs/wmfs-20180520.ebuild | 54
2 files changed, 55 insertions(+)
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index 6697cf6fb52..b1ff0c4736f 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -1 +1,2 @@
DIST wmfs-201003.tar.gz 59593 BLAKE2B
b2e1f2cf73ca3d8881fa8de7b52fb6cae947a6006549f05dd06179b8b44b10fd1157a8e180b2b3177177fe0edf4c39b9a3fbf36ebb2b6470f1ed802a641a4c89
SHA512
117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90
+DIST wmfs-20180520.tar.xz 56364 BLAKE2B
23530193ba2c37ae4129fd23dda2ff8cd301b0bd92d32e06b264efd990b7957b38170de31f04afca6fd9875d2e0450c8bede416e5f49d6e19962718fe2e240a3
SHA512
bcff251397d8483db49c037c51eef7b3dcc87a6d94650ae9e9cabc7104177216e0efa7e67bfb34978bae67dc4853884673ce288bb8087e95cb2993d519ab4f2f
diff --git a/x11-wm/wmfs/wmfs-20180520.ebuild b/x11-wm/wmfs/wmfs-20180520.ebuild
new file mode 100644
index 000..f01f6ce2129
--- /dev/null
+++ b/x11-wm/wmfs/wmfs-20180520.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Window Manager From Scratch, A tiling window manager highly
configurable"
+HOMEPAGE="https://github.com/xorg62/wmfs;
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+imlib2 +xinerama"
+
+RDEPEND="
+ media-libs/freetype
+ media-libs/imlib2[X]
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}--Debian.patch
+ "${FILESDIR}"/${PN}--desktop.patch
+ "${FILESDIR}"/${PN}--fno-common.patch
+ "${FILESDIR}"/${PN}--strncat.patch
+)
+DOCS=(
+ README
+ scripts/keybind_help.sh
+ scripts/status.sh
+)
+
+src_configure() {
+ tc-export CC
+ # not autotools based
+ local ECHO
+ for ECHO in echo ''; do
+ ${ECHO} sh configure \
+ $(usex xinerama '' --without-xinerama) \
+ $(usex imlib2 '' --without-imlib2) \
+ --prefix /usr \
+ --man-prefix /usr/share/man \
+ --xdg-config-dir /etc/xdg \
+ || die
+ done
+}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/, x11-wm/wmfs/files/
commit: 4d2516ef563fdf2a533b427a139f7552da97dfd7
Author: Jeroen Roovers gentoo org>
AuthorDate: Wed Jun 24 06:20:46 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Wed Jun 24 06:21:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2516ef
x11-wm/wmfs: Actually apply dropped patch instead
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jeroen Roovers gentoo.org>
x11-wm/wmfs/files/wmfs--strncat.patch | 20
x11-wm/wmfs/wmfs-.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/x11-wm/wmfs/files/wmfs--strncat.patch
b/x11-wm/wmfs/files/wmfs--strncat.patch
new file mode 100644
index 000..e55cd00121b
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs--strncat.patch
@@ -0,0 +1,20 @@
+--- a/src/launcher.c
b/src/launcher.c
+@@ -366,7 +366,7 @@
+if(pos && (end = complete(, 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-.ebuild b/x11-wm/wmfs/wmfs-.ebuild
index a2a1959136e..416f8f678db 100644
--- a/x11-wm/wmfs/wmfs-.ebuild
+++ b/x11-wm/wmfs/wmfs-.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${PN}--Debian.patch
"${FILESDIR}"/${PN}--desktop.patch
"${FILESDIR}"/${PN}--fno-common.patch
+ "${FILESDIR}"/${PN}--strncat.patch
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/files/
commit: 0b2b3498ba93f257a8889f82abf89a0fb554a5ca
Author: Jeroen Roovers gentoo org>
AuthorDate: Wed Jun 24 05:32:47 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Wed Jun 24 05:46:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b2b3498
x11-wm/wmfs: Drop obsolete patch
Package-Manager: Portage-2.3.102, Repoman-2.3.23
Signed-off-by: Jeroen Roovers gentoo.org>
x11-wm/wmfs/files/wmfs--strncat.patch | 20
1 file changed, 20 deletions(-)
diff --git a/x11-wm/wmfs/files/wmfs--strncat.patch
b/x11-wm/wmfs/files/wmfs--strncat.patch
deleted file mode 100644
index e55cd00121b..000
--- a/x11-wm/wmfs/files/wmfs--strncat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
a/src/launcher.c
-+++ b/src/launcher.c
-@@ -366,7 +366,7 @@
-if(pos && (end = complete(, 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;
- }
[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/
commit: 49b49044d1390ca4f3bdf1558917aa775a12581b
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun May 17 13:38:49 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun May 17 13:41:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b49044
x11-wm/wmfs: Respect CFLAGS/LDFLAGS, fix man page
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Bug: https://bugs.gentoo.org/706654
Signed-off-by: Jeroen Roovers gentoo.org>
x11-wm/wmfs/wmfs-201003.ebuild | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/x11-wm/wmfs/wmfs-201003.ebuild b/x11-wm/wmfs/wmfs-201003.ebuild
index 14da5d0b915..27bdfa3ef56 100644
--- a/x11-wm/wmfs/wmfs-201003.ebuild
+++ b/x11-wm/wmfs/wmfs-201003.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit cmake-utils eutils
+EAPI=7
+inherit cmake
DESCRIPTION="Window Manager From Scratch, A tiling window manager highly
configurable"
HOMEPAGE="https://github.com/xorg62/wmfs;
@@ -31,8 +31,17 @@ PATCHES=(
"${FILESDIR}"/${PN}-201003-pthread.patch
)
+src_prepare() {
+ cmake_src_prepare
+ sed -i \
+ -e '/set(CFLAGS/d' \
+ -e '/set(LDFLAGS/s#)#
[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/, x11-wm/wmfs/files/
commit: 76fd4de2a8574b255cb8c84fd769a2eabc8b3aca
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Jan 27 18:02:11 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Jan 27 18:40:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76fd4de2
x11-wm/wmfs: Fix CFLAGS=-fno-common
- EAPI=7
- Convert sed script to patch
- Fix W and event_handle for CFLAGS=-fno-common
- Respect CC
- Apply one lingering upstream patch
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=706654
Signed-off-by: Jeroen Roovers gentoo.org>
x11-wm/wmfs/files/wmfs--Debian.patch | 11 +++
x11-wm/wmfs/files/wmfs--fno-common.patch | 92
x11-wm/wmfs/files/wmfs--strncat.patch| 20 ++
x11-wm/wmfs/wmfs-.ebuild | 19 +++--
4 files changed, 132 insertions(+), 10 deletions(-)
diff --git a/x11-wm/wmfs/files/wmfs--Debian.patch
b/x11-wm/wmfs/files/wmfs--Debian.patch
new file mode 100644
index 000..dde3497e640
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs--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--fno-common.patch
b/x11-wm/wmfs/files/wmfs--fno-common.patch
new file mode 100644
index 000..0ff0ce0ebc9
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs--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
+
+--- 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--strncat.patch
b/x11-wm/wmfs/files/wmfs--strncat.patch
new file mode 100644
index 000..e55cd00121b
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs--strncat.patch
@@ -0,0 +1,20 @@
+--- a/src/launcher.c
b/src/launcher.c
+@@ -366,7 +366,7 @@
+if(pos && (end = complete(, 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-.ebuild b/x11-wm/wmfs/wmfs-.ebuild
index f152990663f..a2a1959136e 100644
--- a/x11-wm/wmfs/wmfs-.ebuild
+++ b/x11-wm/wmfs/wmfs-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of
[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/
commit: a854bd644a06103d05130d025bd758d6612d011e
Author: David Seifert gentoo org>
AuthorDate: Mon Jan 13 10:07:30 2020 +
Commit: David Seifert gentoo org>
CommitDate: Mon Jan 13 10:07:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a854bd64
x11-wm/wmfs: [QA] Fix HomepageInSrcUri
Signed-off-by: David Seifert gentoo.org>
x11-wm/wmfs/wmfs-201003.ebuild | 2 +-
x11-wm/wmfs/wmfs-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-wm/wmfs/wmfs-201003.ebuild b/x11-wm/wmfs/wmfs-201003.ebuild
index ffa5e17c56f..1fe2b2cdf6d 100644
--- a/x11-wm/wmfs/wmfs-201003.ebuild
+++ b/x11-wm/wmfs/wmfs-201003.ebuild
@@ -6,7 +6,7 @@ inherit cmake-utils eutils
DESCRIPTION="Window Manager From Scratch, A tiling window manager highly
configurable"
HOMEPAGE="https://github.com/xorg62/wmfs;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/xorg62/wmfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/x11-wm/wmfs/wmfs-.ebuild b/x11-wm/wmfs/wmfs-.ebuild
index cbcb210e099..f152990663f 100644
--- a/x11-wm/wmfs/wmfs-.ebuild
+++ b/x11-wm/wmfs/wmfs-.ebuild
@@ -6,7 +6,7 @@ inherit eutils git-r3
DESCRIPTION="Window Manager From Scratch, A tiling window manager highly
configurable"
HOMEPAGE="https://github.com/xorg62/wmfs;
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/xorg62/wmfs;
LICENSE="BSD"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/
commit: 651d6109b8de619b5e8a30f8e4a8e1b79a4092d2
Author: David Seifert gentoo org>
AuthorDate: Mon Oct 16 03:34:24 2017 +
Commit: David Seifert gentoo org>
CommitDate: Mon Oct 16 03:34:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=651d6109
x11-wm/wmfs: [QA] Add cmake-utils_src_prepare
Package-Manager: Portage-2.3.11, Repoman-2.3.3
x11-wm/wmfs/wmfs-201003.ebuild | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/x11-wm/wmfs/wmfs-201003.ebuild b/x11-wm/wmfs/wmfs-201003.ebuild
index a61c8a35568..1c7709cb6fc 100644
--- a/x11-wm/wmfs/wmfs-201003.ebuild
+++ b/x11-wm/wmfs/wmfs-201003.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -28,11 +28,10 @@ DEPEND="
x11-proto/xproto
"
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-201003-desktop.patch \
- "${FILESDIR}"/${PN}-201003-pthread.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-201003-desktop.patch
+ "${FILESDIR}"/${PN}-201003-pthread.patch
+)
src_install() {
cmake-utils_src_install
