mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
x11-wm/windowlab: fix build with lld
Closes: https://bugs.gentoo.org/732470 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
20
x11-wm/windowlab/files/windowlab-1.40-libdir.patch
Normal file
20
x11-wm/windowlab/files/windowlab-1.40-libdir.patch
Normal file
@@ -0,0 +1,20 @@
|
||||
https://bugs.gentoo.org/732470
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -51,7 +51,6 @@ BINDIR = $(DESTDIR)$(PREFIX)/bin
|
||||
MANDIR = $(DESTDIR)$(PREFIX)$(MANBASE)/man1
|
||||
CFGDIR = $(DESTDIR)$(SYSCONFDIR)
|
||||
INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
|
||||
-LDPATH = -L$(XROOT)/lib
|
||||
LIBS = -lX11 $(EXTRA_LIBS)
|
||||
|
||||
PROG = windowlab
|
||||
@@ -62,7 +61,7 @@ HEADERS = windowlab.h
|
||||
all: $(PROG)
|
||||
|
||||
$(PROG): $(OBJS)
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
|
||||
|
||||
$(OBJS): %.o: %.c $(HEADERS)
|
||||
$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
|
||||
53
x11-wm/windowlab/windowlab-1.40-r2.ebuild
Normal file
53
x11-wm/windowlab/windowlab-1.40-r2.ebuild
Normal file
@@ -0,0 +1,53 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="small and simple window manager of novel design"
|
||||
HOMEPAGE="http://www.nickgravgaard.com/windowlab/"
|
||||
SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~mips ~ppc ~x86"
|
||||
IUSE="truetype"
|
||||
|
||||
RDEPEND="truetype? ( x11-libs/libXft )
|
||||
x11-libs/libXext"
|
||||
DEPEND="${RDEPEND}
|
||||
x11-base/xorg-proto"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.34-fixed-font.patch"
|
||||
"${FILESDIR}/${P}-gentoo.diff"
|
||||
"${FILESDIR}/${PN}-1.40-libdir.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
if use truetype ; then
|
||||
export DEFINES=-DXFT
|
||||
export EXTRA_INC=$($(tc-getPKG_CONFIG) --cflags xft)
|
||||
export EXTRA_LIBS=$($(tc-getPKG_CONFIG) --libs xft)
|
||||
fi
|
||||
|
||||
tc-export CC
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
exeinto /etc/X11/Sessions
|
||||
cat <<- EOF > "${T}"/${PN}
|
||||
#!/bin/sh
|
||||
exec /usr/bin/${PN}
|
||||
EOF
|
||||
doexe "${T}"/${PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "${PN}'s menu config file has been changed from"
|
||||
elog "${EROOT}/etc/X11/${PN}/menurc to ${EROOT}/etc/X11/${PN}/${PN}.menurc"
|
||||
}
|
||||
Reference in New Issue
Block a user