gentoo auto-resync : 05:01:2023 - 18:09:32

4 files changed, 83 insertions, 2 deletions

diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 5e136f1608aa..a20057be310e 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,5 +1,8 @@
 AUX spectrwm-3.4.0-gentoo.patch 1134 BLAKE2B 01f472388c38b276fc91747cb1e06bf4709b1a53caacd1e16f3ef7d0817eb3d127aac76c665e92d05c41c9f01ce8b79525dd0bacbeecdd5d36c1d012bcdcb1c5 SHA512 9c8450fcdd198dd0ef88d13c38edb0cc48c7324cc8a3b3e2c331d9ca5608cfa9fa041b9cae466429e8b77fcb9eb28a29d484590106ea604f27163d07ee428508
 AUX spectrwm-3.4.1-musl.patch 259 BLAKE2B 61dde875af4c9fb8be72a098debe0ac00174ee4bf15c727778d37f80f844a60834959c8ab6f2f15200e4fb5968528f06c03a18fa4d89d074ffe1f32eb7fbfd8c SHA512 5780b9fa2504b3fe0d426bc373d9e43babc642af402035bcdf453b71766adac9d9e903226a63ccac1edc4f90d44c61723f80ceb2fb0c8743702cc1b14da0491b
+AUX spectrwm-3.4.1_p20221224-fix-cflags-ldflags.patch 1126 BLAKE2B 5be199ba5324db6d2420453c3e8f492933d11e07746e665d91c48db6fc32eadd0930935acb71ce41985159977afdcacaf5546f99de57d472ab4c493aaabec659 SHA512 37e39380d8b322c733ab8665a1f92526461ac29f78ce130d605792a0d0a7caf1bdffd174812d0eae4c694e338b1fb095c844630a2844e78efc77dfa7b06f624b
 DIST spectrwm-3.4.1.tar.gz 164507 BLAKE2B 8047e639be3d4a07616f7ef3911765c5d6dd7dbd56c684453db90283faee08aac2cb9e3e20ae42f839582b67b778a4490a04fa21fc90fe489f798c40c517351e SHA512 94d468833124b51fa12b29b173126f10f27dd551d599459e4bea589721b3df6f1f0af0ea67326ed3ad462e1203d3bbcb82032ff83abfa0943ec45afd29dedaa6
-EBUILD spectrwm-3.4.1.ebuild 1161 BLAKE2B 8e387535ed26df8d9dd8109b311f4a7f9816b9bdfc3c23e11e71612031e374c910f4f90f06248a221f1cbb8150ec8d28e0eb2862e79a8d749038e2485adbfb85 SHA512 1b7c1f46fd59bb451294906d49506202a838cfb452742bea4e8145d1da9b105bd7c330da1c367f84c3c17af0ff882978e0de8340547306a681c9a94fecbb2563
+DIST spectrwm-3.4.1_p20221224.tar.gz 166161 BLAKE2B 62dddfea9b80727d47bdfe61e4bf5ae5996e7bcdcaf76a37c29a3a448fcf4d19f6eeed75d7c13ca2c1e5c093c79503f00dfdde239d5022e700e27f75b7157e39 SHA512 424acf589ab137bdb8b7c010c757fde40a53b7bf70dc1c0ccf0df7e4a5ffce360cab02933f6eb7191e57ba594f4c8a6e732ac4bb8da0684d3889e9448e704edb
+EBUILD spectrwm-3.4.1.ebuild 1210 BLAKE2B 723ed509fea0b900873ef62ebc7ff82b02fb7ba780dc989c5cc39ed41687ba5564f6a83f25899f2797683689158062d4c0d65698777191f06f9185cdc9c6364f SHA512 f5c6644ff6f537371329044d9a73ff54e21f817f70acf3c01139e63e79bfada27d2577e10e34788fea8db06e1c3284f3f7bf7a541350aababa49bc18ca03b9ed
+EBUILD spectrwm-3.4.1_p20221224.ebuild 1209 BLAKE2B 049166a135c331d8a9d31fa4176428383f3394339147860cefb3921af768320750496854bf72db52a4ee41492c7fc14b0ca8418b74808ccb731ff3c7487fc905 SHA512 4bde9a5843c041168320a65a2a62b687ddec002ac6a6128ba79ce3462492ceca70ccdebd96eaae85e526016ea12cb03f08c62a6b069df2a81a788bec4721ac0d
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
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.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
index a0949ab30736..8628a4ce4ffe 100644
--- a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
+++ b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,8 @@ DEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXt
 	x11-libs/xcb-util
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0-gentoo.patch
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
+}