[gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in x11-plugins/wmfishtime/files: wmfishtime-1.24-gtk.patch

2014-06-22 Thread Samuli Suominen 

On 22/06/14 19:25, Bernard Cafarelli (voyageur) wrote:
 voyageur14/06/22 16:25:10

   Modified: wmfishtime-1.24-gtk.patch
   Log:
   Link with libm, spotted by patrick in bug #513908
   
   (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
 C74525F2)

 Revision  ChangesPath
 1.3  x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch

 file : 
 http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch?rev=1.3view=markup
 plain: 
 http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch?rev=1.3content-type=text/plain
 diff : 
 http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch?r1=1.2r2=1.3

 Index: wmfishtime-1.24-gtk.patch
 ===
 RCS file: 
 /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch,v
 retrieving revision 1.2
 retrieving revision 1.3
 diff -u -r1.2 -r1.3
 --- wmfishtime-1.24-gtk.patch 6 Jun 2011 20:04:49 -   1.2
 +++ wmfishtime-1.24-gtk.patch 22 Jun 2014 16:25:10 -  1.3
 @@ -48,7 +48,7 @@
   SHELL = sh
   OBJS = fishmon.o
  -LIBS = `gtk-config --libs | sed s/-lgtk//g`
 -+LIBS = `pkg-config gtk+-2.0 --libs` -lX11
 ++LIBS = `pkg-config gtk+-2.0 --libs` -lm -lX11
   INSTALL = -m 755
   
   all: wmfishtime




 gtk+-2.0 --libs` -lm -lX11

This is wrong, it should be:

PKG_CONFIG ?= pkg-config
LIBS = `$(PKG_CONFIG) gtk+-2.0 --libs` -lm -X11

And ebuild should have `export PKG_CONFIG=$(tc-getPKG_CONFIG)`

As in, PKG_CONFIG needs to be respected from the environment, it's
almost never O.K. to
hardcode pkg-config

I realize you didn't touch that part of the patch right now, but imho,
these should get fixed
whereever spotted.

Thanks,
Samuli

Re: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in x11-plugins/wmfishtime/files: wmfishtime-1.24-gtk.patch

2014-06-22 Thread Jeroen Roovers 
On Sun, 22 Jun 2014 20:08:41 +0300
Samuli Suominen ssuomi...@gentoo.org wrote:

 LIBS = `$(PKG_CONFIG) gtk+-2.0 --libs` -lm -X11

No, it should be

LIBS = $(shell $(PKG_CONFIG) ...)

or PKG_CONFIG will be called every time LIBS is evaluated.

And while you're at it, why not call PKG_CONFIG on x11, too?

LIBS = $(shell $(PKG_CONFIG) --libs gtk+-2.0 x11) -lm


 jer

Re: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in x11-plugins/wmfishtime/files: wmfishtime-1.24-gtk.patch

2014-06-22 Thread Samuli Suominen 

On 23/06/14 05:01, Jeroen Roovers wrote:
 On Sun, 22 Jun 2014 20:08:41 +0300
 Samuli Suominen ssuomi...@gentoo.org wrote:

 LIBS = `$(PKG_CONFIG) gtk+-2.0 --libs` -lm -X11
 No, it should be

 LIBS = $(shell $(PKG_CONFIG) ...)

 or PKG_CONFIG will be called every time LIBS is evaluated.

 And while you're at it, why not call PKG_CONFIG on x11, too?

 LIBS = $(shell $(PKG_CONFIG) --libs gtk+-2.0 x11) -lm


  jer


Oops. You are right. Thanks.