diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2016-02-18 21:04:28 +0100 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2016-02-18 21:05:35 +0100 |
| commit | ac1c61e66cfae101b753f0012ddd9aca0b792a67 (patch) | |
| tree | 6cab9f5dd5ef623cc513d26915c4d7f300fd1b98 /x11-misc | |
| parent | sec-policy/selinux-base: add arm/arm64/mips love (diff) | |
| download | gentoo-ac1c61e66cfae101b753f0012ddd9aca0b792a67.tar.gz gentoo-ac1c61e66cfae101b753f0012ddd9aca0b792a67.tar.bz2 gentoo-ac1c61e66cfae101b753f0012ddd9aca0b792a67.zip | |
x11-misc/gromit: Fix build issues (#369453 by kensington, #552574)
Package-Manager: portage-2.2.27
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/gromit/files/gromit-20041213-build.patch | 19 | ||||
| -rw-r--r-- | x11-misc/gromit/gromit-20041213-r1.ebuild | 23 |
2 files changed, 26 insertions, 16 deletions
diff --git a/x11-misc/gromit/files/gromit-20041213-build.patch b/x11-misc/gromit/files/gromit-20041213-build.patch new file mode 100644 index 000000000000..f61a13bcccd6 --- /dev/null +++ b/x11-misc/gromit/files/gromit-20041213-build.patch @@ -0,0 +1,19 @@ +Respect CC, CFLAGS, & LDFLAGS. +Drop DEPRECATED flags for bug #387833. +Fix underlinking for bug #369453. +--- a/Makefile ++++ b/Makefile +@@ -1,10 +1,10 @@ + all: gromit + + proptest: proptest.c +- gcc -o proptest proptest.c `gtk-config --libs --cflags` ++ $(CC) -o proptest proptest.c `gtk-config --libs --cflags` + + propertywatch: propertywatch.c +- gcc -o propertywatch propertywatch.c `gtk-config --libs --cflags` ++ $(CC) -o propertywatch propertywatch.c `gtk-config --libs --cflags` + + gromit: gromit.c Makefile +- 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` ++ $(CC) -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall $(CFLAGS) $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -lX11 -lm diff --git a/x11-misc/gromit/gromit-20041213-r1.ebuild b/x11-misc/gromit/gromit-20041213-r1.ebuild index aa995ee80f94..faa285f9292b 100644 --- a/x11-misc/gromit/gromit-20041213-r1.ebuild +++ b/x11-misc/gromit/gromit-20041213-r1.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="2" - -inherit toolchain-funcs +EAPI=6 +inherit autotools toolchain-funcs DESCRIPTION="GRaphics Over MIscellaneous Things, a presentation helper" HOMEPAGE="http://www.home.unix-ag.org/simon/gromit" @@ -17,25 +16,17 @@ IUSE="" RDEPEND="x11-libs/gtk+:2" DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - sed -i Makefile \ - -e 's:-Wall:-Wall $(CFLAGS) $(LDFLAGS):' \ - -e 's:gcc:$(CC):g' \ - || die "sed Makefile failed" + virtual/pkgconfig +" - # Drop DEPRECATED flags, bug #387833 - sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED ::g' \ - Makefile || die -} +PATCHES=( "${FILESDIR}"/${P}-build.patch ) src_compile() { - emake CC=$(tc-getCC) || die + emake CC=$(tc-getCC) } src_install() { dobin ${PN} newdoc ${PN}rc ${PN}rc.example - dodoc AUTHORS ChangeLog README + einstalldocs } |