x11-wm/spectrwm: add 3.4.1_p20221224 with musl & clang-16 fixes

Signed-off-by: Ben Kohler <bkohler@gentoo.org>

3 files changed, 77 insertions, 0 deletions

diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index c07c07df991f..e6975168f9e4 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1 +1,2 @@
 DIST spectrwm-3.4.1.tar.gz 164507 BLAKE2B 8047e639be3d4a07616f7ef3911765c5d6dd7dbd56c684453db90283faee08aac2cb9e3e20ae42f839582b67b778a4490a04fa21fc90fe489f798c40c517351e SHA512 94d468833124b51fa12b29b173126f10f27dd551d599459e4bea589721b3df6f1f0af0ea67326ed3ad462e1203d3bbcb82032ff83abfa0943ec45afd29dedaa6
+DIST spectrwm-3.4.1_p20221224.tar.gz 166161 BLAKE2B 62dddfea9b80727d47bdfe61e4bf5ae5996e7bcdcaf76a37c29a3a448fcf4d19f6eeed75d7c13ca2c1e5c093c79503f00dfdde239d5022e700e27f75b7157e39 SHA512 424acf589ab137bdb8b7c010c757fde40a53b7bf70dc1c0ccf0df7e4a5ffce360cab02933f6eb7191e57ba594f4c8a6e732ac4bb8da0684d3889e9448e704edb
diff --git a/x11-wm/spectrwm/files/spectrwm-3.4.1_p20221224-fix-cflags-ldflags.patch b/x11-wm/spectrwm/files/spectrwm-3.4.1_p20221224-fix-cflags-ldflags.patch
new file mode 100644
index 000000000000..5b880b772440
--- /dev/null
+++ b/x11-wm/spectrwm/files/spectrwm-3.4.1_p20221224-fix-cflags-ldflags.patch
@@ -0,0 +1,25 @@
+diff --git a/linux/Makefile b/linux/Makefile
+index 8466651..a7a5ebd 100644
+--- a/linux/Makefile
++++ b/linux/Makefile
+@@ -12,16 +12,16 @@ BUILDVERSION    := $(shell sh $(CURDIR)/../buildver.sh)
+ LIBVERSION      := $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major.$$minor)
+ LIBMAJORVERSION := $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major)
+ 
+-MAINT_CFLAGS   := -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -g
+-MAINT_LDFLAGS  := -Wl,--as-needed
++MAINT_CFLAGS   := -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow
++MAINT_LDFLAGS  :=
+ MAINT_CPPFLAGS := -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
+ 
+ ifneq ("${BUILDVERSION}", "")
+ MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
+ endif
+ 
+-BIN_CFLAGS   := -fPIE
+-BIN_LDFLAGS  := -fPIE -pie
++BIN_CFLAGS   :=
++BIN_LDFLAGS  :=
+ BIN_CPPFLAGS := $(shell $(PKG_CONFIG) --cflags x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor xft)
+ BIN_LDLIBS   := $(shell $(PKG_CONFIG) --libs   x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor xft)
+ LIB_CFLAGS   := -fPIC
diff --git a/x11-wm/spectrwm/spectrwm-3.4.1_p20221224.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1_p20221224.ebuild
new file mode 100644
index 000000000000..6e95a33426af
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-3.4.1_p20221224.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+COMMIT=67e16a136e505832bcd6322c02de28a8adc0af93
+inherit toolchain-funcs
+
+DESCRIPTION="Small dynamic tiling window manager for X11"
+HOMEPAGE="https://github.com/conformal/spectrwm"
+SRC_URI="https://github.com/conformal/spectrwm/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-misc/dmenu
+"
+DEPEND="
+	elibc_musl? ( sys-libs/queue-standalone )
+	virtual/pkgconfig
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/xcb-util
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-cflags-ldflags.patch
+)
+S=${WORKDIR}/${PN}-${COMMIT}
+
+src_prepare() {
+	sed -i -e '/LICENSE.md/d' linux/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		SYSCONFDIR="${EPREFIX}/etc" DOCDIR="${EPREFIX}/usr/share/doc/${P}" \
+		DESTDIR="${D}" install
+
+	dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh
+}