1 |
commit: ac1c61e66cfae101b753f0012ddd9aca0b792a67 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 18 20:04:28 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 18 20:05:35 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1c61e6 |
7 |
|
8 |
x11-misc/gromit: Fix build issues (#369453 by kensington, #552574) |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
x11-misc/gromit/files/gromit-20041213-build.patch | 19 +++++++++++++++++++ |
13 |
x11-misc/gromit/gromit-20041213-r1.ebuild | 23 +++++++---------------- |
14 |
2 files changed, 26 insertions(+), 16 deletions(-) |
15 |
|
16 |
diff --git a/x11-misc/gromit/files/gromit-20041213-build.patch b/x11-misc/gromit/files/gromit-20041213-build.patch |
17 |
new file mode 100644 |
18 |
index 0000000..f61a13b |
19 |
--- /dev/null |
20 |
+++ b/x11-misc/gromit/files/gromit-20041213-build.patch |
21 |
@@ -0,0 +1,19 @@ |
22 |
+Respect CC, CFLAGS, & LDFLAGS. |
23 |
+Drop DEPRECATED flags for bug #387833. |
24 |
+Fix underlinking for bug #369453. |
25 |
+--- a/Makefile |
26 |
++++ b/Makefile |
27 |
+@@ -1,10 +1,10 @@ |
28 |
+ all: gromit |
29 |
+ |
30 |
+ proptest: proptest.c |
31 |
+- gcc -o proptest proptest.c `gtk-config --libs --cflags` |
32 |
++ $(CC) -o proptest proptest.c `gtk-config --libs --cflags` |
33 |
+ |
34 |
+ propertywatch: propertywatch.c |
35 |
+- gcc -o propertywatch propertywatch.c `gtk-config --libs --cflags` |
36 |
++ $(CC) -o propertywatch propertywatch.c `gtk-config --libs --cflags` |
37 |
+ |
38 |
+ gromit: gromit.c Makefile |
39 |
+- gcc -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall `pkg-config --libs --cflags gtk+-2.0` |
40 |
++ $(CC) -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall $(CFLAGS) $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -lX11 -lm |
41 |
|
42 |
diff --git a/x11-misc/gromit/gromit-20041213-r1.ebuild b/x11-misc/gromit/gromit-20041213-r1.ebuild |
43 |
index aa995ee..faa285f 100644 |
44 |
--- a/x11-misc/gromit/gromit-20041213-r1.ebuild |
45 |
+++ b/x11-misc/gromit/gromit-20041213-r1.ebuild |
46 |
@@ -2,9 +2,8 @@ |
47 |
# Distributed under the terms of the GNU General Public License v2 |
48 |
# $Id$ |
49 |
|
50 |
-EAPI="2" |
51 |
- |
52 |
-inherit toolchain-funcs |
53 |
+EAPI=6 |
54 |
+inherit autotools toolchain-funcs |
55 |
|
56 |
DESCRIPTION="GRaphics Over MIscellaneous Things, a presentation helper" |
57 |
HOMEPAGE="http://www.home.unix-ag.org/simon/gromit" |
58 |
@@ -17,25 +16,17 @@ IUSE="" |
59 |
|
60 |
RDEPEND="x11-libs/gtk+:2" |
61 |
DEPEND="${RDEPEND} |
62 |
- virtual/pkgconfig" |
63 |
- |
64 |
-src_prepare() { |
65 |
- sed -i Makefile \ |
66 |
- -e 's:-Wall:-Wall $(CFLAGS) $(LDFLAGS):' \ |
67 |
- -e 's:gcc:$(CC):g' \ |
68 |
- || die "sed Makefile failed" |
69 |
+ virtual/pkgconfig |
70 |
+" |
71 |
|
72 |
- # Drop DEPRECATED flags, bug #387833 |
73 |
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED ::g' \ |
74 |
- Makefile || die |
75 |
-} |
76 |
+PATCHES=( "${FILESDIR}"/${P}-build.patch ) |
77 |
|
78 |
src_compile() { |
79 |
- emake CC=$(tc-getCC) || die |
80 |
+ emake CC=$(tc-getCC) |
81 |
} |
82 |
|
83 |
src_install() { |
84 |
dobin ${PN} |
85 |
newdoc ${PN}rc ${PN}rc.example |
86 |
- dodoc AUTHORS ChangeLog README |
87 |
+ einstalldocs |
88 |
} |