From: | Sam James <sam@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] repo/gentoo:master commit in: x11-misc/xssstate/files/, x11-misc/xssstate/ |
Date: | Sun, 25 Sep 2022 01:27:57 |
Message-Id: | 1664069239.85a1ad79647a6e5592c5c59172ceed1a91ef1ea8.sam@gentoo |
1 | commit: 85a1ad79647a6e5592c5c59172ceed1a91ef1ea8 |
2 | Author: orbea <orbea <AT> riseup <DOT> net> |
3 | AuthorDate: Sat Sep 24 04:41:22 2022 +0000 |
4 | Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 | CommitDate: Sun Sep 25 01:27:19 2022 +0000 |
6 | URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85a1ad79 |
7 | |
8 | x11-misc/xssstate: Don't hardcode /usr/lib |
9 | |
10 | Bug: https://bugs.gentoo.org/732450 |
11 | Closes: https://bugs.gentoo.org/732450 |
12 | Upstream-Commit: https://git.suckless.org/xssstate/commit/5d8e9b49ce2970f786f1e5aa12bbaae83900453f.html |
13 | Signed-off-by: orbea <orbea <AT> riseup.net> |
14 | Closes: https://github.com/gentoo/gentoo/pull/27419 |
15 | Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 | |
17 | x11-misc/xssstate/files/xssstate-1.1-libdir.patch | 23 +++++++++++++ |
18 | x11-misc/xssstate/xssstate-1.1-r1.ebuild | 42 +++++++++++++++++++++++ |
19 | 2 files changed, 65 insertions(+) |
20 | |
21 | diff --git a/x11-misc/xssstate/files/xssstate-1.1-libdir.patch b/x11-misc/xssstate/files/xssstate-1.1-libdir.patch |
22 | new file mode 100644 |
23 | index 000000000000..cedde569f12b |
24 | --- /dev/null |
25 | +++ b/x11-misc/xssstate/files/xssstate-1.1-libdir.patch |
26 | @@ -0,0 +1,23 @@ |
27 | +Bug: https://bugs.gentoo.org/732450 |
28 | +Upstream-Commit: https://git.suckless.org/xssstate/commit/5d8e9b49ce2970f786f1e5aa12bbaae83900453f.html |
29 | + |
30 | +From: orbea <orbea@××××××.net> |
31 | +Date: Fri, 23 Sep 2022 21:17:01 -0700 |
32 | +Subject: [PATCH] config.mk: Add LIBDIR |
33 | + |
34 | +--- a/config.mk |
35 | ++++ b/config.mk |
36 | +@@ -5,11 +5,12 @@ VERSION = 1.1 |
37 | + |
38 | + # paths |
39 | + PREFIX = /usr/local |
40 | ++LIBDIR = ${PREFIX}/lib |
41 | + MANPREFIX = ${PREFIX}/share/man |
42 | + |
43 | + # includes and libs |
44 | + INCS = -I. -I/usr/include |
45 | +-LIBS = -L/usr/lib -lc -lX11 -lXss |
46 | ++LIBS = -L${LIBDIR} -lc -lX11 -lXss |
47 | + |
48 | + # flags |
49 | + CPPFLAGS = -DVERSION=\"${VERSION}\" |
50 | |
51 | diff --git a/x11-misc/xssstate/xssstate-1.1-r1.ebuild b/x11-misc/xssstate/xssstate-1.1-r1.ebuild |
52 | new file mode 100644 |
53 | index 000000000000..a28494199a22 |
54 | --- /dev/null |
55 | +++ b/x11-misc/xssstate/xssstate-1.1-r1.ebuild |
56 | @@ -0,0 +1,42 @@ |
57 | +# Copyright 1999-2022 Gentoo Authors |
58 | +# Distributed under the terms of the GNU General Public License v2 |
59 | + |
60 | +EAPI=8 |
61 | + |
62 | +inherit toolchain-funcs |
63 | + |
64 | +DESCRIPTION="A simple tool to retrieve the X screensaver state" |
65 | +HOMEPAGE="https://tools.suckless.org/x/xssstate" |
66 | +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" |
67 | + |
68 | +LICENSE="MIT" |
69 | +SLOT="0" |
70 | +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
71 | + |
72 | +RDEPEND=" |
73 | + x11-libs/libX11 |
74 | + x11-libs/libXScrnSaver |
75 | +" |
76 | +DEPEND=" |
77 | + ${RDEPEND} |
78 | + x11-base/xorg-proto |
79 | +" |
80 | + |
81 | +PATCHES=( |
82 | + "${FILESDIR}"/${PN}-1.0.20130103-gentoo.patch |
83 | + "${FILESDIR}"/${PN}-1.1-libdir.patch #732450 |
84 | +) |
85 | + |
86 | +src_compile() { |
87 | + emake CC="$(tc-getCC)" LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
88 | +} |
89 | + |
90 | +src_install() { |
91 | + emake install \ |
92 | + DESTDIR="${D}" \ |
93 | + PREFIX="${EPREFIX}"/usr \ |
94 | + LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
95 | + |
96 | + dodoc README xsidle.sh |
97 | + doman ${PN}.1 |
98 | +} |