Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
Date: Sat, 30 May 2020 14:49:43
Message-Id: 1590850173.922539a7c779164aba0bc14f6ef7a1eff057def4.jer@gentoo
1 commit: 922539a7c779164aba0bc14f6ef7a1eff057def4
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 30 14:49:13 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sat May 30 14:49:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=922539a7
7
8 x11-misc/xlockmore: Inject LDFLAGS
9
10 Package-Manager: Portage-2.3.100, Repoman-2.3.22
11 Closes: https://bugs.gentoo.org/726280
12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14 .../files/xlockmore-5.64_alpha0-LDFLAGS.patch | 33 ++++++++++++++++++++++
15 x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild | 1 +
16 2 files changed, 34 insertions(+)
17
18 diff --git a/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch b/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch
19 new file mode 100644
20 index 00000000000..f36e3ab0b7a
21 --- /dev/null
22 +++ b/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch
23 @@ -0,0 +1,33 @@
24 +--- a/modes/Makefile.in
25 ++++ b/modes/Makefile.in
26 +@@ -344,7 +344,7 @@
27 + CXXFLAGS = @CXXFLAGS@
28 + #CFLAGS = -O
29 + #CFLAGS = -g
30 +-XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
31 ++XLOCKLDFLAGS = $(LDFLAGS) @XLOCKLDFLAGS@ $(CHECKLDFLAG)
32 + XLIBS = @XLIBS@
33 + XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@
34 +
35 +--- a/xmlock/Makefile.in
36 ++++ b/xmlock/Makefile.in
37 +@@ -94,7 +94,7 @@
38 + CFLAGS = @CFLAGS@
39 + #CFLAGS = -O
40 + #CFLAGS = -g
41 +-XMLOCKLDFLAGS = @XMLOCKLDFLAGS@
42 ++XMLOCKLDFLAGS = $(LDFLAGS) @XMLOCKLDFLAGS@
43 + XLIBS = @XLIBS@
44 + XMLOCKLIBS = @XMLOCKLIBS@
45 + #If you have purify, and want to use it, uncomment this definition or
46 +--- a/xglock/Makefile.in
47 ++++ b/xglock/Makefile.in
48 +@@ -92,7 +92,7 @@
49 + CFLAGS = @GTK_CFLAGS@ @CFLAGS@
50 + #CFLAGS = -O
51 + #CFLAGS = -g
52 +-XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
53 ++XGLOCKLDFLAGS = $(LDFLAGS) @XGLOCKLDFLAGS@
54 + XLIBS = @XLIBS@
55 + XGLOCKLIBS = @XGLOCKLIBS@
56 + #If you have purify, and want to use it, uncomment this definition or
57
58 diff --git a/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild b/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
59 index 2071d070081..26cf0a2b072 100644
60 --- a/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
61 +++ b/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
62 @@ -50,6 +50,7 @@ PATCHES=(
63 "${FILESDIR}"/${PN}-5.46-freetype261.patch
64 "${FILESDIR}"/${PN}-5.47-CXX.patch
65 "${FILESDIR}"/${PN}-5.47-strip.patch
66 + "${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
67 )
68 S=${WORKDIR}/${P/_alpha/ALPHA}