Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellshoot/, x11-plugins/gkrellshoot/files/
Date: Sat, 01 Jan 2022 15:49:03
Message-Id: 1641052130.fdd5a72b90396ae4a152df30a9f67437def59a74.flow@gentoo
1 commit: fdd5a72b90396ae4a152df30a9f67437def59a74
2 Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 1 15:47:55 2022 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 1 15:48:50 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd5a72b
7
8 x11-plugins/gkrellshoot: respect LDFLAGS
9
10 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
11 Closes: https://bugs.gentoo.org/338867
12
13 .../gkrellshoot/files/makefile-respect-flags.patch | 26 ++++++++++++++++++++++
14 ...0.4.4-r2.ebuild => gkrellshoot-0.4.4-r3.ebuild} | 6 ++++-
15 2 files changed, 31 insertions(+), 1 deletion(-)
16
17 diff --git a/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
18 new file mode 100644
19 index 000000000000..8de89009dbbc
20 --- /dev/null
21 +++ b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
22 @@ -0,0 +1,26 @@
23 +--- a/Makefile 2006-12-09 04:24:36.000000000 +0100
24 ++++ b/Makefile 2013-03-16 13:50:00.147834790 +0100
25 +@@ -1,16 +1,20 @@
26 + GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
27 + GTK_LIB = `pkg-config gtk+-2.0 --libs`
28 +
29 +-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
30 ++FLAGS = -fPIC $(GTK_INCLUDE)
31 + LIBS = $(GTK_LIB)
32 + LFLAGS = -shared
33 +
34 +-CC = gcc $(CFLAGS) $(FLAGS)
35 +
36 + OBJS = gkrellshoot.o
37 +
38 ++all: gkrellshoot.so
39 ++
40 ++%.o: %.c
41 ++ $(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) -c -o $@ $<
42 ++
43 + gkrellshoot.so: $(OBJS)
44 +- $(CC) $(OBJS) -o gkrellshoot.so $(LFLAGS) $(LIBS)
45 ++ $(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) $(OBJS) -o gkrellshoot.so $(LFLAGS) $(LIBS)
46 +
47 + clean:
48 + rm -f *.o core *.so* *.bak *~
49
50 diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild
51 similarity index 82%
52 rename from x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild
53 rename to x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild
54 index ad424be2249b..028ef92f7eb6 100644
55 --- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild
56 +++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild
57 @@ -1,4 +1,4 @@
58 -# Copyright 1999-2020 Gentoo Authors
59 +# Copyright 1999-2022 Gentoo Authors
60 # Distributed under the terms of the GNU General Public License v2
61
62 EAPI=6
63 @@ -20,3 +20,7 @@ RDEPEND="
64 virtual/imagemagick-tools"
65
66 S=${WORKDIR}/${P/s/S}
67 +
68 +PATCHES=(
69 + "${FILESDIR}"/makefile-respect-flags.patch
70 +)