[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: 7eca9fda6f7b3df54cb1d3772a6141dffdb49d58 Author: Sam James gentoo org> AuthorDate: Wed Jun 15 19:11:53 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 15 19:36:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eca9fda x11-wm/windowlab: fix build with lld Closes: https://bugs.gentoo.org/732470 Signed-off-by: Sam James gentoo.org> x11-wm/windowlab/files/windowlab-1.40-libdir.patch | 20 x11-wm/windowlab/windowlab-1.40-r2.ebuild | 53 ++ 2 files changed, 73 insertions(+) diff --git a/x11-wm/windowlab/files/windowlab-1.40-libdir.patch b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch new file mode 100644 index ..65c2b662dc62 --- /dev/null +++ b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch @@ -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 $@ diff --git a/x11-wm/windowlab/windowlab-1.40-r2.ebuild b/x11-wm/windowlab/windowlab-1.40-r2.ebuild new file mode 100644 index ..521a807b40c7 --- /dev/null +++ b/x11-wm/windowlab/windowlab-1.40-r2.ebuild @@ -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" +}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: ac4a9a3fb2bd1d8632f1507e76203ca252e43be7 Author: Amy Liffey gentoo org> AuthorDate: Tue Aug 15 11:03:07 2017 + Commit: Amy Liffey gentoo org> CommitDate: Tue Aug 15 11:06:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4a9a3f x11-wm/windowlab: EAPI 6 bump Package-Manager: Portage-2.3.6, Repoman-2.3.1 x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch | 4 ++-- x11-wm/windowlab/files/windowlab-1.40-gentoo.diff | 4 ++-- ...{windowlab-1.40.ebuild => windowlab-1.40-r1.ebuild} | 18 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch index 0dd095ce073..ed85936bbcd 100644 --- a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch +++ b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch @@ -1,5 +1,5 @@ windowlab.h.orig2006-09-01 23:47:36.0 +0200 -+++ windowlab.h 2006-09-01 23:47:49.0 +0200 +--- a/windowlab.h2006-09-01 23:47:36.0 +0200 b/windowlab.h 2006-09-01 23:47:49.0 +0200 @@ -49,7 +49,7 @@ #ifdef XFT #define DEF_FONT "-bitstream-bitstream vera sans-medium-r-*-*-*-100-*-*-*-*-*-*" diff --git a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff index 121526ceac8..b0a9b490eb0 100644 --- a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff +++ b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff @@ -1,5 +1,5 @@ Makefile.orig 2009-11-05 21:04:45.0 + -+++ Makefile 2010-05-30 15:31:04.047559352 + +--- a/Makefile 2009-11-05 21:04:45.0 + b/Makefile 2010-05-30 15:31:04.047559352 + @@ -5,18 +5,18 @@ EXTRA_LIBS += -lXext diff --git a/x11-wm/windowlab/windowlab-1.40.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild similarity index 77% rename from x11-wm/windowlab/windowlab-1.40.ebuild rename to x11-wm/windowlab/windowlab-1.40-r1.ebuild index 2085afa8ffc..28f22b9e18a 100644 --- a/x11-wm/windowlab/windowlab-1.40.ebuild +++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="small and simple window manager of novel design" HOMEPAGE="http://www.nickgravgaard.com/windowlab/"; @@ -20,6 +20,9 @@ DEPEND="${RDEPEND} x11-proto/xextproto virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch" + "${FILESDIR}/${P}-gentoo.diff" ) + pkg_setup() { if use truetype ; then export DEFINES=-DXFT @@ -29,14 +32,9 @@ pkg_setup() { tc-export CC } -src_prepare() { - epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch" \ - "${FILESDIR}"/${P}-gentoo.diff -} - src_install() { - emake DESTDIR="${D}" install || die - dodoc CHANGELOG README TODO || die + emake DESTDIR="${D}" install + dodoc CHANGELOG README TODO exeinto /etc/X11/Sessions cat <<- EOF > "${T}"/${PN}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: ac4a9a3fb2bd1d8632f1507e76203ca252e43be7 Author: Amy Liffey gentoo org> AuthorDate: Tue Aug 15 11:03:07 2017 + Commit: Amy Liffey gentoo org> CommitDate: Tue Aug 15 11:06:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4a9a3f x11-wm/windowlab: EAPI 6 bump Package-Manager: Portage-2.3.6, Repoman-2.3.1 x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch | 4 ++-- x11-wm/windowlab/files/windowlab-1.40-gentoo.diff | 4 ++-- ...{windowlab-1.40.ebuild => windowlab-1.40-r1.ebuild} | 18 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch index 0dd095ce073..ed85936bbcd 100644 --- a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch +++ b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch @@ -1,5 +1,5 @@ windowlab.h.orig2006-09-01 23:47:36.0 +0200 -+++ windowlab.h 2006-09-01 23:47:49.0 +0200 +--- a/windowlab.h2006-09-01 23:47:36.0 +0200 b/windowlab.h 2006-09-01 23:47:49.0 +0200 @@ -49,7 +49,7 @@ #ifdef XFT #define DEF_FONT "-bitstream-bitstream vera sans-medium-r-*-*-*-100-*-*-*-*-*-*" diff --git a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff index 121526ceac8..b0a9b490eb0 100644 --- a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff +++ b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff @@ -1,5 +1,5 @@ Makefile.orig 2009-11-05 21:04:45.0 + -+++ Makefile 2010-05-30 15:31:04.047559352 + +--- a/Makefile 2009-11-05 21:04:45.0 + b/Makefile 2010-05-30 15:31:04.047559352 + @@ -5,18 +5,18 @@ EXTRA_LIBS += -lXext diff --git a/x11-wm/windowlab/windowlab-1.40.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild similarity index 77% rename from x11-wm/windowlab/windowlab-1.40.ebuild rename to x11-wm/windowlab/windowlab-1.40-r1.ebuild index 2085afa8ffc..28f22b9e18a 100644 --- a/x11-wm/windowlab/windowlab-1.40.ebuild +++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="small and simple window manager of novel design" HOMEPAGE="http://www.nickgravgaard.com/windowlab/"; @@ -20,6 +20,9 @@ DEPEND="${RDEPEND} x11-proto/xextproto virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch" + "${FILESDIR}/${P}-gentoo.diff" ) + pkg_setup() { if use truetype ; then export DEFINES=-DXFT @@ -29,14 +32,9 @@ pkg_setup() { tc-export CC } -src_prepare() { - epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch" \ - "${FILESDIR}"/${P}-gentoo.diff -} - src_install() { - emake DESTDIR="${D}" install || die - dodoc CHANGELOG README TODO || die + emake DESTDIR="${D}" install + dodoc CHANGELOG README TODO exeinto /etc/X11/Sessions cat <<- EOF > "${T}"/${PN}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: 7eca9fda6f7b3df54cb1d3772a6141dffdb49d58 Author: Sam James gentoo org> AuthorDate: Wed Jun 15 19:11:53 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 15 19:36:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eca9fda x11-wm/windowlab: fix build with lld Closes: https://bugs.gentoo.org/732470 Signed-off-by: Sam James gentoo.org> x11-wm/windowlab/files/windowlab-1.40-libdir.patch | 20 x11-wm/windowlab/windowlab-1.40-r2.ebuild | 53 ++ 2 files changed, 73 insertions(+) diff --git a/x11-wm/windowlab/files/windowlab-1.40-libdir.patch b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch new file mode 100644 index ..65c2b662dc62 --- /dev/null +++ b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch @@ -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 $@ diff --git a/x11-wm/windowlab/windowlab-1.40-r2.ebuild b/x11-wm/windowlab/windowlab-1.40-r2.ebuild new file mode 100644 index ..521a807b40c7 --- /dev/null +++ b/x11-wm/windowlab/windowlab-1.40-r2.ebuild @@ -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" +}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: 7eca9fda6f7b3df54cb1d3772a6141dffdb49d58 Author: Sam James gentoo org> AuthorDate: Wed Jun 15 19:11:53 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 15 19:36:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eca9fda x11-wm/windowlab: fix build with lld Closes: https://bugs.gentoo.org/732470 Signed-off-by: Sam James gentoo.org> x11-wm/windowlab/files/windowlab-1.40-libdir.patch | 20 x11-wm/windowlab/windowlab-1.40-r2.ebuild | 53 ++ 2 files changed, 73 insertions(+) diff --git a/x11-wm/windowlab/files/windowlab-1.40-libdir.patch b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch new file mode 100644 index ..65c2b662dc62 --- /dev/null +++ b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch @@ -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 $@ diff --git a/x11-wm/windowlab/windowlab-1.40-r2.ebuild b/x11-wm/windowlab/windowlab-1.40-r2.ebuild new file mode 100644 index ..521a807b40c7 --- /dev/null +++ b/x11-wm/windowlab/windowlab-1.40-r2.ebuild @@ -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" +}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: ac4a9a3fb2bd1d8632f1507e76203ca252e43be7 Author: Amy Liffey gentoo org> AuthorDate: Tue Aug 15 11:03:07 2017 + Commit: Amy Liffey gentoo org> CommitDate: Tue Aug 15 11:06:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4a9a3f x11-wm/windowlab: EAPI 6 bump Package-Manager: Portage-2.3.6, Repoman-2.3.1 x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch | 4 ++-- x11-wm/windowlab/files/windowlab-1.40-gentoo.diff | 4 ++-- ...{windowlab-1.40.ebuild => windowlab-1.40-r1.ebuild} | 18 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch index 0dd095ce073..ed85936bbcd 100644 --- a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch +++ b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch @@ -1,5 +1,5 @@ windowlab.h.orig2006-09-01 23:47:36.0 +0200 -+++ windowlab.h 2006-09-01 23:47:49.0 +0200 +--- a/windowlab.h2006-09-01 23:47:36.0 +0200 b/windowlab.h 2006-09-01 23:47:49.0 +0200 @@ -49,7 +49,7 @@ #ifdef XFT #define DEF_FONT "-bitstream-bitstream vera sans-medium-r-*-*-*-100-*-*-*-*-*-*" diff --git a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff index 121526ceac8..b0a9b490eb0 100644 --- a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff +++ b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff @@ -1,5 +1,5 @@ Makefile.orig 2009-11-05 21:04:45.0 + -+++ Makefile 2010-05-30 15:31:04.047559352 + +--- a/Makefile 2009-11-05 21:04:45.0 + b/Makefile 2010-05-30 15:31:04.047559352 + @@ -5,18 +5,18 @@ EXTRA_LIBS += -lXext diff --git a/x11-wm/windowlab/windowlab-1.40.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild similarity index 77% rename from x11-wm/windowlab/windowlab-1.40.ebuild rename to x11-wm/windowlab/windowlab-1.40-r1.ebuild index 2085afa8ffc..28f22b9e18a 100644 --- a/x11-wm/windowlab/windowlab-1.40.ebuild +++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="small and simple window manager of novel design" HOMEPAGE="http://www.nickgravgaard.com/windowlab/"; @@ -20,6 +20,9 @@ DEPEND="${RDEPEND} x11-proto/xextproto virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch" + "${FILESDIR}/${P}-gentoo.diff" ) + pkg_setup() { if use truetype ; then export DEFINES=-DXFT @@ -29,14 +32,9 @@ pkg_setup() { tc-export CC } -src_prepare() { - epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch" \ - "${FILESDIR}"/${P}-gentoo.diff -} - src_install() { - emake DESTDIR="${D}" install || die - dodoc CHANGELOG README TODO || die + emake DESTDIR="${D}" install + dodoc CHANGELOG README TODO exeinto /etc/X11/Sessions cat <<- EOF > "${T}"/${PN}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: ac4a9a3fb2bd1d8632f1507e76203ca252e43be7 Author: Amy Liffey gentoo org> AuthorDate: Tue Aug 15 11:03:07 2017 + Commit: Amy Liffey gentoo org> CommitDate: Tue Aug 15 11:06:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4a9a3f x11-wm/windowlab: EAPI 6 bump Package-Manager: Portage-2.3.6, Repoman-2.3.1 x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch | 4 ++-- x11-wm/windowlab/files/windowlab-1.40-gentoo.diff | 4 ++-- ...{windowlab-1.40.ebuild => windowlab-1.40-r1.ebuild} | 18 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch index 0dd095ce073..ed85936bbcd 100644 --- a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch +++ b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch @@ -1,5 +1,5 @@ windowlab.h.orig2006-09-01 23:47:36.0 +0200 -+++ windowlab.h 2006-09-01 23:47:49.0 +0200 +--- a/windowlab.h2006-09-01 23:47:36.0 +0200 b/windowlab.h 2006-09-01 23:47:49.0 +0200 @@ -49,7 +49,7 @@ #ifdef XFT #define DEF_FONT "-bitstream-bitstream vera sans-medium-r-*-*-*-100-*-*-*-*-*-*" diff --git a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff index 121526ceac8..b0a9b490eb0 100644 --- a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff +++ b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff @@ -1,5 +1,5 @@ Makefile.orig 2009-11-05 21:04:45.0 + -+++ Makefile 2010-05-30 15:31:04.047559352 + +--- a/Makefile 2009-11-05 21:04:45.0 + b/Makefile 2010-05-30 15:31:04.047559352 + @@ -5,18 +5,18 @@ EXTRA_LIBS += -lXext diff --git a/x11-wm/windowlab/windowlab-1.40.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild similarity index 77% rename from x11-wm/windowlab/windowlab-1.40.ebuild rename to x11-wm/windowlab/windowlab-1.40-r1.ebuild index 2085afa8ffc..28f22b9e18a 100644 --- a/x11-wm/windowlab/windowlab-1.40.ebuild +++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="small and simple window manager of novel design" HOMEPAGE="http://www.nickgravgaard.com/windowlab/"; @@ -20,6 +20,9 @@ DEPEND="${RDEPEND} x11-proto/xextproto virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch" + "${FILESDIR}/${P}-gentoo.diff" ) + pkg_setup() { if use truetype ; then export DEFINES=-DXFT @@ -29,14 +32,9 @@ pkg_setup() { tc-export CC } -src_prepare() { - epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch" \ - "${FILESDIR}"/${P}-gentoo.diff -} - src_install() { - emake DESTDIR="${D}" install || die - dodoc CHANGELOG README TODO || die + emake DESTDIR="${D}" install + dodoc CHANGELOG README TODO exeinto /etc/X11/Sessions cat <<- EOF > "${T}"/${PN}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: ac4a9a3fb2bd1d8632f1507e76203ca252e43be7 Author: Amy Liffey gentoo org> AuthorDate: Tue Aug 15 11:03:07 2017 + Commit: Amy Liffey gentoo org> CommitDate: Tue Aug 15 11:06:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4a9a3f x11-wm/windowlab: EAPI 6 bump Package-Manager: Portage-2.3.6, Repoman-2.3.1 x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch | 4 ++-- x11-wm/windowlab/files/windowlab-1.40-gentoo.diff | 4 ++-- ...{windowlab-1.40.ebuild => windowlab-1.40-r1.ebuild} | 18 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch index 0dd095ce073..ed85936bbcd 100644 --- a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch +++ b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch @@ -1,5 +1,5 @@ windowlab.h.orig2006-09-01 23:47:36.0 +0200 -+++ windowlab.h 2006-09-01 23:47:49.0 +0200 +--- a/windowlab.h2006-09-01 23:47:36.0 +0200 b/windowlab.h 2006-09-01 23:47:49.0 +0200 @@ -49,7 +49,7 @@ #ifdef XFT #define DEF_FONT "-bitstream-bitstream vera sans-medium-r-*-*-*-100-*-*-*-*-*-*" diff --git a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff index 121526ceac8..b0a9b490eb0 100644 --- a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff +++ b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff @@ -1,5 +1,5 @@ Makefile.orig 2009-11-05 21:04:45.0 + -+++ Makefile 2010-05-30 15:31:04.047559352 + +--- a/Makefile 2009-11-05 21:04:45.0 + b/Makefile 2010-05-30 15:31:04.047559352 + @@ -5,18 +5,18 @@ EXTRA_LIBS += -lXext diff --git a/x11-wm/windowlab/windowlab-1.40.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild similarity index 77% rename from x11-wm/windowlab/windowlab-1.40.ebuild rename to x11-wm/windowlab/windowlab-1.40-r1.ebuild index 2085afa8ffc..28f22b9e18a 100644 --- a/x11-wm/windowlab/windowlab-1.40.ebuild +++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="small and simple window manager of novel design" HOMEPAGE="http://www.nickgravgaard.com/windowlab/"; @@ -20,6 +20,9 @@ DEPEND="${RDEPEND} x11-proto/xextproto virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch" + "${FILESDIR}/${P}-gentoo.diff" ) + pkg_setup() { if use truetype ; then export DEFINES=-DXFT @@ -29,14 +32,9 @@ pkg_setup() { tc-export CC } -src_prepare() { - epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch" \ - "${FILESDIR}"/${P}-gentoo.diff -} - src_install() { - emake DESTDIR="${D}" install || die - dodoc CHANGELOG README TODO || die + emake DESTDIR="${D}" install + dodoc CHANGELOG README TODO exeinto /etc/X11/Sessions cat <<- EOF > "${T}"/${PN}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: 7eca9fda6f7b3df54cb1d3772a6141dffdb49d58 Author: Sam James gentoo org> AuthorDate: Wed Jun 15 19:11:53 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 15 19:36:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eca9fda x11-wm/windowlab: fix build with lld Closes: https://bugs.gentoo.org/732470 Signed-off-by: Sam James gentoo.org> x11-wm/windowlab/files/windowlab-1.40-libdir.patch | 20 x11-wm/windowlab/windowlab-1.40-r2.ebuild | 53 ++ 2 files changed, 73 insertions(+) diff --git a/x11-wm/windowlab/files/windowlab-1.40-libdir.patch b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch new file mode 100644 index ..65c2b662dc62 --- /dev/null +++ b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch @@ -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 $@ diff --git a/x11-wm/windowlab/windowlab-1.40-r2.ebuild b/x11-wm/windowlab/windowlab-1.40-r2.ebuild new file mode 100644 index ..521a807b40c7 --- /dev/null +++ b/x11-wm/windowlab/windowlab-1.40-r2.ebuild @@ -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" +}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: 7eca9fda6f7b3df54cb1d3772a6141dffdb49d58 Author: Sam James gentoo org> AuthorDate: Wed Jun 15 19:11:53 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 15 19:36:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eca9fda x11-wm/windowlab: fix build with lld Closes: https://bugs.gentoo.org/732470 Signed-off-by: Sam James gentoo.org> x11-wm/windowlab/files/windowlab-1.40-libdir.patch | 20 x11-wm/windowlab/windowlab-1.40-r2.ebuild | 53 ++ 2 files changed, 73 insertions(+) diff --git a/x11-wm/windowlab/files/windowlab-1.40-libdir.patch b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch new file mode 100644 index ..65c2b662dc62 --- /dev/null +++ b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch @@ -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 $@ diff --git a/x11-wm/windowlab/windowlab-1.40-r2.ebuild b/x11-wm/windowlab/windowlab-1.40-r2.ebuild new file mode 100644 index ..521a807b40c7 --- /dev/null +++ b/x11-wm/windowlab/windowlab-1.40-r2.ebuild @@ -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" +}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: 7eca9fda6f7b3df54cb1d3772a6141dffdb49d58 Author: Sam James gentoo org> AuthorDate: Wed Jun 15 19:11:53 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 15 19:36:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eca9fda x11-wm/windowlab: fix build with lld Closes: https://bugs.gentoo.org/732470 Signed-off-by: Sam James gentoo.org> x11-wm/windowlab/files/windowlab-1.40-libdir.patch | 20 x11-wm/windowlab/windowlab-1.40-r2.ebuild | 53 ++ 2 files changed, 73 insertions(+) diff --git a/x11-wm/windowlab/files/windowlab-1.40-libdir.patch b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch new file mode 100644 index ..65c2b662dc62 --- /dev/null +++ b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch @@ -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 $@ diff --git a/x11-wm/windowlab/windowlab-1.40-r2.ebuild b/x11-wm/windowlab/windowlab-1.40-r2.ebuild new file mode 100644 index ..521a807b40c7 --- /dev/null +++ b/x11-wm/windowlab/windowlab-1.40-r2.ebuild @@ -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" +}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: ac4a9a3fb2bd1d8632f1507e76203ca252e43be7 Author: Amy Liffey gentoo org> AuthorDate: Tue Aug 15 11:03:07 2017 + Commit: Amy Liffey gentoo org> CommitDate: Tue Aug 15 11:06:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4a9a3f x11-wm/windowlab: EAPI 6 bump Package-Manager: Portage-2.3.6, Repoman-2.3.1 x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch | 4 ++-- x11-wm/windowlab/files/windowlab-1.40-gentoo.diff | 4 ++-- ...{windowlab-1.40.ebuild => windowlab-1.40-r1.ebuild} | 18 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch index 0dd095ce073..ed85936bbcd 100644 --- a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch +++ b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch @@ -1,5 +1,5 @@ windowlab.h.orig2006-09-01 23:47:36.0 +0200 -+++ windowlab.h 2006-09-01 23:47:49.0 +0200 +--- a/windowlab.h2006-09-01 23:47:36.0 +0200 b/windowlab.h 2006-09-01 23:47:49.0 +0200 @@ -49,7 +49,7 @@ #ifdef XFT #define DEF_FONT "-bitstream-bitstream vera sans-medium-r-*-*-*-100-*-*-*-*-*-*" diff --git a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff index 121526ceac8..b0a9b490eb0 100644 --- a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff +++ b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff @@ -1,5 +1,5 @@ Makefile.orig 2009-11-05 21:04:45.0 + -+++ Makefile 2010-05-30 15:31:04.047559352 + +--- a/Makefile 2009-11-05 21:04:45.0 + b/Makefile 2010-05-30 15:31:04.047559352 + @@ -5,18 +5,18 @@ EXTRA_LIBS += -lXext diff --git a/x11-wm/windowlab/windowlab-1.40.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild similarity index 77% rename from x11-wm/windowlab/windowlab-1.40.ebuild rename to x11-wm/windowlab/windowlab-1.40-r1.ebuild index 2085afa8ffc..28f22b9e18a 100644 --- a/x11-wm/windowlab/windowlab-1.40.ebuild +++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="small and simple window manager of novel design" HOMEPAGE="http://www.nickgravgaard.com/windowlab/"; @@ -20,6 +20,9 @@ DEPEND="${RDEPEND} x11-proto/xextproto virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch" + "${FILESDIR}/${P}-gentoo.diff" ) + pkg_setup() { if use truetype ; then export DEFINES=-DXFT @@ -29,14 +32,9 @@ pkg_setup() { tc-export CC } -src_prepare() { - epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch" \ - "${FILESDIR}"/${P}-gentoo.diff -} - src_install() { - emake DESTDIR="${D}" install || die - dodoc CHANGELOG README TODO || die + emake DESTDIR="${D}" install + dodoc CHANGELOG README TODO exeinto /etc/X11/Sessions cat <<- EOF > "${T}"/${PN}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: 7eca9fda6f7b3df54cb1d3772a6141dffdb49d58 Author: Sam James gentoo org> AuthorDate: Wed Jun 15 19:11:53 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 15 19:36:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eca9fda x11-wm/windowlab: fix build with lld Closes: https://bugs.gentoo.org/732470 Signed-off-by: Sam James gentoo.org> x11-wm/windowlab/files/windowlab-1.40-libdir.patch | 20 x11-wm/windowlab/windowlab-1.40-r2.ebuild | 53 ++ 2 files changed, 73 insertions(+) diff --git a/x11-wm/windowlab/files/windowlab-1.40-libdir.patch b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch new file mode 100644 index ..65c2b662dc62 --- /dev/null +++ b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch @@ -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 $@ diff --git a/x11-wm/windowlab/windowlab-1.40-r2.ebuild b/x11-wm/windowlab/windowlab-1.40-r2.ebuild new file mode 100644 index ..521a807b40c7 --- /dev/null +++ b/x11-wm/windowlab/windowlab-1.40-r2.ebuild @@ -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" +}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: ac4a9a3fb2bd1d8632f1507e76203ca252e43be7 Author: Amy Liffey gentoo org> AuthorDate: Tue Aug 15 11:03:07 2017 + Commit: Amy Liffey gentoo org> CommitDate: Tue Aug 15 11:06:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4a9a3f x11-wm/windowlab: EAPI 6 bump Package-Manager: Portage-2.3.6, Repoman-2.3.1 x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch | 4 ++-- x11-wm/windowlab/files/windowlab-1.40-gentoo.diff | 4 ++-- ...{windowlab-1.40.ebuild => windowlab-1.40-r1.ebuild} | 18 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch index 0dd095ce073..ed85936bbcd 100644 --- a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch +++ b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch @@ -1,5 +1,5 @@ windowlab.h.orig2006-09-01 23:47:36.0 +0200 -+++ windowlab.h 2006-09-01 23:47:49.0 +0200 +--- a/windowlab.h2006-09-01 23:47:36.0 +0200 b/windowlab.h 2006-09-01 23:47:49.0 +0200 @@ -49,7 +49,7 @@ #ifdef XFT #define DEF_FONT "-bitstream-bitstream vera sans-medium-r-*-*-*-100-*-*-*-*-*-*" diff --git a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff index 121526ceac8..b0a9b490eb0 100644 --- a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff +++ b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff @@ -1,5 +1,5 @@ Makefile.orig 2009-11-05 21:04:45.0 + -+++ Makefile 2010-05-30 15:31:04.047559352 + +--- a/Makefile 2009-11-05 21:04:45.0 + b/Makefile 2010-05-30 15:31:04.047559352 + @@ -5,18 +5,18 @@ EXTRA_LIBS += -lXext diff --git a/x11-wm/windowlab/windowlab-1.40.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild similarity index 77% rename from x11-wm/windowlab/windowlab-1.40.ebuild rename to x11-wm/windowlab/windowlab-1.40-r1.ebuild index 2085afa8ffc..28f22b9e18a 100644 --- a/x11-wm/windowlab/windowlab-1.40.ebuild +++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="small and simple window manager of novel design" HOMEPAGE="http://www.nickgravgaard.com/windowlab/"; @@ -20,6 +20,9 @@ DEPEND="${RDEPEND} x11-proto/xextproto virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch" + "${FILESDIR}/${P}-gentoo.diff" ) + pkg_setup() { if use truetype ; then export DEFINES=-DXFT @@ -29,14 +32,9 @@ pkg_setup() { tc-export CC } -src_prepare() { - epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch" \ - "${FILESDIR}"/${P}-gentoo.diff -} - src_install() { - emake DESTDIR="${D}" install || die - dodoc CHANGELOG README TODO || die + emake DESTDIR="${D}" install + dodoc CHANGELOG README TODO exeinto /etc/X11/Sessions cat <<- EOF > "${T}"/${PN}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: ac4a9a3fb2bd1d8632f1507e76203ca252e43be7 Author: Amy Liffey gentoo org> AuthorDate: Tue Aug 15 11:03:07 2017 + Commit: Amy Liffey gentoo org> CommitDate: Tue Aug 15 11:06:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4a9a3f x11-wm/windowlab: EAPI 6 bump Package-Manager: Portage-2.3.6, Repoman-2.3.1 x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch | 4 ++-- x11-wm/windowlab/files/windowlab-1.40-gentoo.diff | 4 ++-- ...{windowlab-1.40.ebuild => windowlab-1.40-r1.ebuild} | 18 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch index 0dd095ce073..ed85936bbcd 100644 --- a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch +++ b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch @@ -1,5 +1,5 @@ windowlab.h.orig2006-09-01 23:47:36.0 +0200 -+++ windowlab.h 2006-09-01 23:47:49.0 +0200 +--- a/windowlab.h2006-09-01 23:47:36.0 +0200 b/windowlab.h 2006-09-01 23:47:49.0 +0200 @@ -49,7 +49,7 @@ #ifdef XFT #define DEF_FONT "-bitstream-bitstream vera sans-medium-r-*-*-*-100-*-*-*-*-*-*" diff --git a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff index 121526ceac8..b0a9b490eb0 100644 --- a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff +++ b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff @@ -1,5 +1,5 @@ Makefile.orig 2009-11-05 21:04:45.0 + -+++ Makefile 2010-05-30 15:31:04.047559352 + +--- a/Makefile 2009-11-05 21:04:45.0 + b/Makefile 2010-05-30 15:31:04.047559352 + @@ -5,18 +5,18 @@ EXTRA_LIBS += -lXext diff --git a/x11-wm/windowlab/windowlab-1.40.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild similarity index 77% rename from x11-wm/windowlab/windowlab-1.40.ebuild rename to x11-wm/windowlab/windowlab-1.40-r1.ebuild index 2085afa8ffc..28f22b9e18a 100644 --- a/x11-wm/windowlab/windowlab-1.40.ebuild +++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="small and simple window manager of novel design" HOMEPAGE="http://www.nickgravgaard.com/windowlab/"; @@ -20,6 +20,9 @@ DEPEND="${RDEPEND} x11-proto/xextproto virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch" + "${FILESDIR}/${P}-gentoo.diff" ) + pkg_setup() { if use truetype ; then export DEFINES=-DXFT @@ -29,14 +32,9 @@ pkg_setup() { tc-export CC } -src_prepare() { - epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch" \ - "${FILESDIR}"/${P}-gentoo.diff -} - src_install() { - emake DESTDIR="${D}" install || die - dodoc CHANGELOG README TODO || die + emake DESTDIR="${D}" install + dodoc CHANGELOG README TODO exeinto /etc/X11/Sessions cat <<- EOF > "${T}"/${PN}
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowlab/files/, x11-wm/windowlab/
commit: 7eca9fda6f7b3df54cb1d3772a6141dffdb49d58 Author: Sam James gentoo org> AuthorDate: Wed Jun 15 19:11:53 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 15 19:36:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eca9fda x11-wm/windowlab: fix build with lld Closes: https://bugs.gentoo.org/732470 Signed-off-by: Sam James gentoo.org> x11-wm/windowlab/files/windowlab-1.40-libdir.patch | 20 x11-wm/windowlab/windowlab-1.40-r2.ebuild | 53 ++ 2 files changed, 73 insertions(+) diff --git a/x11-wm/windowlab/files/windowlab-1.40-libdir.patch b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch new file mode 100644 index ..65c2b662dc62 --- /dev/null +++ b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch @@ -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 $@ diff --git a/x11-wm/windowlab/windowlab-1.40-r2.ebuild b/x11-wm/windowlab/windowlab-1.40-r2.ebuild new file mode 100644 index ..521a807b40c7 --- /dev/null +++ b/x11-wm/windowlab/windowlab-1.40-r2.ebuild @@ -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" +}