Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/aylet/files: aylet-0.5-gtk.patch
Date: Fri, 31 Oct 2014 11:37:23
Message-Id: 20141031113720.651A49232@oystercatcher.gentoo.org
1 jer 14/10/31 11:37:20
2
3 Modified: aylet-0.5-gtk.patch
4 Log:
5 Fix building against sys-libs/ncurses[tinfo] (bug #526498).
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.3 media-sound/aylet/files/aylet-0.5-gtk.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/aylet/files/aylet-0.5-gtk.patch?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/aylet/files/aylet-0.5-gtk.patch?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/aylet/files/aylet-0.5-gtk.patch?r1=1.2&r2=1.3
15
16 Index: aylet-0.5-gtk.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-sound/aylet/files/aylet-0.5-gtk.patch,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- aylet-0.5-gtk.patch 21 Aug 2010 02:19:36 -0000 1.2
23 +++ aylet-0.5-gtk.patch 31 Oct 2014 11:37:20 -0000 1.3
24 @@ -1,5 +1,5 @@
25 ---- Makefile
26 -+++ Makefile
27 +--- a/Makefile
28 ++++ b/Makefile
29 @@ -2,12 +2,12 @@
30
31 # You need an ANSI C compiler. gcc is probably best.
32 @@ -26,7 +26,7 @@
33 +gtk1: all
34 +
35 +# GTK+2 stuff: "make gtk2"
36 -+gtk2: GTKCONFIG:=pkg-config gtk+-2.0
37 ++gtk2: GTKCONFIG:=$(PKG_CONFIG) gtk+-2.0
38 +gtk2: GTKFLAGS:=-DGTK2 $(shell \
39 + $(GTKCONFIG) --modversion | \
40 + awk 'BEGIN { FS="." } \
41 @@ -40,16 +40,16 @@
42
43 xaylet: $(XOBJS)
44 - $(CC) -o xaylet $(XOBJS) `gtk-config --libs`
45 -+ $(CC) $(LDFLAGS) $(CFLAGS) -o xaylet $(XOBJS) `$(GTKCONFIG) --libs`
46 ++ $(CC) $(LDFLAGS) $(CFLAGS) -o xaylet $(XOBJS) $(shell $(GTKCONFIG) --libs)
47
48 uigtk.o: uigtk.c
49 - $(CC) $(CFLAGS) `gtk-config --cflags` -c uigtk.c -o uigtk.o
50 -+ $(CC) $(CFLAGS) $(GTKFLAGS) `$(GTKCONFIG) --cflags` -c uigtk.c -o uigtk.o
51 ++ $(CC) $(CFLAGS) $(GTKFLAGS) $(shell $(GTKCONFIG) --cflags) -c uigtk.c -o uigtk.o
52
53 installdirs:
54 /bin/sh ./mkinstalldirs $(BINDIR) $(XBINDIR) $(MANDIR)
55 ---- ui.c
56 -+++ ui.c
57 +--- a/ui.c
58 ++++ b/ui.c
59 @@ -5,7 +5,9 @@
60 */
61
62 @@ -71,8 +71,8 @@
63 }
64
65 /* update time display */
66 ---- uigtk.c
67 -+++ uigtk.c
68 +--- a/uigtk.c
69 ++++ b/uigtk.c
70 @@ -14,11 +14,13 @@
71 #include "ui.h"