gentoo auto-resync : 18:07:2024 - 12:29:01

4 files changed, 84 insertions, 1 deletions

diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index df633011531e..1cf61948f26d 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,4 +1,7 @@
 AUX spectrwm-3.5.0-fix-cflags-ldflags.patch 1149 BLAKE2B bedac9647ffca75f79d6ddfc66b13b3f6ddf0545df669cf79c8e1f5f18a2b3f9e5ac90abf69652c2954b3433e5071c6e627305bd8f06fa56bf2d99c315419d51 SHA512 915210bc84a4f563c6ddc5b05b3cf1dc5758d9060b2fb132dc25c41f08723b2e06c8baf443e23c27ced36ffbdf6e6ed28b7ffb5d83ce615e4ad2df33c633bbe2
+AUX spectrwm-3.6.0-fix-cflags-ldflags.patch 1177 BLAKE2B 4ce9f4d94734e64c6bc92d4cc6c59a55cb048072000943f70d158df46f323cc20bf8dd73c5e9919f90ba1558c7ce04b83e60b9358d33e89cfe47698a5d67c65b SHA512 88a2d148f349e349abe6357c9a01e8ce1c06b0e5133377f0c599cd1bf166acc41eb494660e53137f060cdf4f33889128abcb80890838fb62637c4b583f444bd4
 DIST spectrwm-3.5.1.tar.gz 196431 BLAKE2B 4de0240353dd0b0066e68148b02aed68b037fda5b5d5fa2a979621ba6b3f029d3c341768929cd8cc7d7aebd1e44594bfb31617078cf83c0179c395a7212d50eb SHA512 9a5b9bee6debd395b6b5f706d12dbb80a848e4f5f02405a54cf9a47b2bcceb407bf14fce64a9cc4ff9205ed7e688adeefb0280289b73a0cf9927b44cfaec02fa
-EBUILD spectrwm-3.5.1.ebuild 1228 BLAKE2B 0d4e6ccd72a37c285f27008170c4713ea01634311f14f604ba75efed502489bba18f50c3094d32bc4c34755410bb0a411746819eafa94af72ffda781a3cbf85f SHA512 ad558d5dea1dc1842584815a7e9eb0864b66ef5f740057d905fb5bc79a3007537845b96aff03ab89cfc8f104995b3e9251db6dc2c1a75b6e9930bc4459b64b07
+DIST spectrwm-3.6.0.tar.gz 205957 BLAKE2B b6fb72031a4ee7110465b5f55773d623210b4f8f74113381d061c593c9d7ef408e651061601402be82ff774355611a1f939af5edc251e361dc75a70ffc715c5e SHA512 70ae19d792ae8b9fcbaaf15d9e1a13b83e992c06ac77333712eca4178270b431adb13125ed316c129aadb2d8243abd9f5b1b6a91505f1b7a04feaf78c6f3d85d
+EBUILD spectrwm-3.5.1.ebuild 1244 BLAKE2B 916a4a2f24f0d3a6f143e3c03f9ab93ace7656069952c5bde9c77300f725f10ff3197f0f7cf252ed3c9950949b85982b126c2eeb0370ca56732fe080dd78fe0e SHA512 c26146aae0a497bdf99d78098f83bbe12c455c4a3596e86bff9c2d7d34a8c4b3edb729c3deff143608da00f18ce9dacfc63587b00cb13fbd1fe91e33d3709682
+EBUILD spectrwm-3.6.0.ebuild 1263 BLAKE2B df17a35970d6d6a7c44f64c33947f371e84856eaa6976e88b89bf5116df554efbc298a1d18b49b8780a89f8faccf344781cb5d1c0a0a2f356b2c82bd36ba22e8 SHA512 f3f3cdca512df88af1077b4bd7eb3b9026f40ff4f5dd64d668005536bbd3ae8abd7a9294a945e638ace10800845f7206dd5702545a73ed69fd1006f06b66b565
 MISC metadata.xml 328 BLAKE2B 4f82bd35cf47d6791ea543bec20f7e510abba33f9de8bc8e0fe8176b0d3e908c30581a6083e90e6f0a2947ad3ffb6ff93d0e11030e68b8056451a017debfb377 SHA512 97e6057c3043db295d56ffd208c189cb5b575cf48f1cc9b78475f8055e59801fa8f7c8c1b8c9c090beb85e00365438c33831c87d9499e95495ee6287ecf7e4c4
diff --git a/x11-wm/spectrwm/files/spectrwm-3.6.0-fix-cflags-ldflags.patch b/x11-wm/spectrwm/files/spectrwm-3.6.0-fix-cflags-ldflags.patch
new file mode 100644
index 000000000000..53f05c4199bc
--- /dev/null
+++ b/x11-wm/spectrwm/files/spectrwm-3.6.0-fix-cflags-ldflags.patch
@@ -0,0 +1,24 @@
+diff '--color=auto' -ur a/linux/Makefile b/linux/Makefile
+--- a/linux/Makefile	2024-07-10 06:19:42.000000000 -0500
++++ b/linux/Makefile	2024-07-17 08:16:22.559326147 -0500
+@@ -12,16 +12,16 @@
+ 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 libbsd-overlay x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor fontconfig xft)
+ BIN_LDLIBS   := $(shell $(PKG_CONFIG) --libs   libbsd-overlay x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor fontconfig xft)
+ LIB_CFLAGS   := -fPIC
diff --git a/x11-wm/spectrwm/spectrwm-3.5.1.ebuild b/x11-wm/spectrwm/spectrwm-3.5.1.ebuild
index 8e29591ba462..9bc5bf3223c5 100644
--- a/x11-wm/spectrwm/spectrwm-3.5.1.ebuild
+++ b/x11-wm/spectrwm/spectrwm-3.5.1.ebuild
@@ -20,6 +20,7 @@ DEPEND="
 	x11-libs/libXcursor
 	x11-libs/libXft
 	x11-libs/libXrandr
+	x11-libs/libXt
 	x11-libs/xcb-util
 	x11-libs/xcb-util-keysyms
 	x11-libs/xcb-util-wm
diff --git a/x11-wm/spectrwm/spectrwm-3.6.0.ebuild b/x11-wm/spectrwm/spectrwm-3.6.0.ebuild
new file mode 100644
index 000000000000..40dd1a4780be
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-3.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PN^^}_${PV//./_}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	elibc_musl? ( sys-libs/queue-standalone )
+	dev-libs/libbsd
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXft
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/xcb-util
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+"
+RDEPEND="
+	${DEPEND}
+	x11-misc/dmenu
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/spectrwm-3.6.0-fix-cflags-ldflags.patch
+)
+
+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
+}