diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-19 08:09:18 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-19 20:10:36 +0100 |
| commit | d4262a934b4dc08862c295f1e5e25b846a322258 (patch) | |
| tree | 888d49bfb7fb703e0366d724be353a0df25c0550 | |
| parent | x11-plugins/wmclockmon: respect PKG_CONFIG, add pkgconfig BDEPEND (diff) | |
| download | gentoo-d4262a934b4dc08862c295f1e5e25b846a322258.tar.gz gentoo-d4262a934b4dc08862c295f1e5e25b846a322258.tar.bz2 gentoo-d4262a934b4dc08862c295f1e5e25b846a322258.zip | |
x11-plugins/wmfishtime: respect PKG_CONFIG
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch | 14 | ||||
| -rw-r--r-- | x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch b/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch index 68d4c057c44e..91fb45ae8746 100644 --- a/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch +++ b/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch @@ -1,6 +1,5 @@ -diff -ur wmfishtime-1.24.orig/fishmon.c wmfishtime-1.24/fishmon.c ---- wmfishtime-1.24.orig/fishmon.c 2004-05-13 02:55:59.000000000 +0300 -+++ wmfishtime-1.24/fishmon.c 2008-01-12 16:19:34.000000000 +0200 +--- a/fishmon.c ++++ b/fishmon.c @@ -648,6 +648,7 @@ /* make a copy for the iconwin - parameters are the same */ @@ -26,9 +25,8 @@ diff -ur wmfishtime-1.24.orig/fishmon.c wmfishtime-1.24/fishmon.c #undef MASK } /* make_new_fishmon_dockapp */ -diff -ur wmfishtime-1.24.orig/Makefile wmfishtime-1.24/Makefile ---- wmfishtime-1.24.orig/Makefile 2001-05-26 23:49:41.000000000 +0300 -+++ wmfishtime-1.24/Makefile 2008-01-12 16:22:30.000000000 +0200 +--- a/Makefile ++++ b/Makefile @@ -2,11 +2,11 @@ DESTDIR = @@ -39,7 +37,7 @@ diff -ur wmfishtime-1.24.orig/Makefile wmfishtime-1.24/Makefile # no user serviceable parts below this line # optimization cflags -CFLAGS = -O3 -Wall `gtk-config --cflags` ${EXTRA} -+CFLAGS += -Wall `pkg-config gtk+-2.0 --cflags` ${EXTRA} ++CFLAGS += -Wall `${PKG_CONFIG} gtk+-2.0 --cflags` ${EXTRA} # profiling cflags # CFLAGS=-ansi -pedantic -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO # test coverage cflags @@ -48,7 +46,7 @@ diff -ur wmfishtime-1.24.orig/Makefile wmfishtime-1.24/Makefile SHELL = sh OBJS = fishmon.o -LIBS = `gtk-config --libs | sed "s/-lgtk//g"` -+LIBS = `pkg-config gtk+-2.0 --libs` -lm -lX11 ++LIBS = `${PKG_CONFIG} gtk+-2.0 --libs` -lm -lX11 INSTALL = -m 755 all: wmfishtime diff --git a/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild index d031d7285b63..3b20412197ae 100644 --- a/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild +++ b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,6 +28,7 @@ src_prepare() { } src_compile() { + tc-export PKG_CONFIG emake CC="$(tc-getCC)" } |