| 1 |
ssuominen 10/08/21 02:19:36 |
| 2 |
|
| 3 |
Modified: aylet-0.5-gtk.patch |
| 4 |
Log: |
| 5 |
Respect LDFLAGS wrt #333729 by Diego E. Pettenò. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 media-sound/aylet/files/aylet-0.5-gtk.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/aylet/files/aylet-0.5-gtk.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/aylet/files/aylet-0.5-gtk.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/aylet/files/aylet-0.5-gtk.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: aylet-0.5-gtk.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/aylet/files/aylet-0.5-gtk.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- aylet-0.5-gtk.patch 25 Jul 2007 14:27:42 -0000 1.1 |
| 22 |
+++ aylet-0.5-gtk.patch 21 Aug 2010 02:19:36 -0000 1.2 |
| 23 |
@@ -1,6 +1,20 @@ |
| 24 |
-diff -ur aylet-0.5.orig/Makefile aylet-0.5/Makefile |
| 25 |
---- aylet-0.5.orig/Makefile 2005-12-18 05:05:08.000000000 +0200 |
| 26 |
-+++ aylet-0.5/Makefile 2007-07-25 17:14:19.000000000 +0300 |
| 27 |
+--- Makefile |
| 28 |
++++ Makefile |
| 29 |
+@@ -2,12 +2,12 @@ |
| 30 |
+ |
| 31 |
+ # You need an ANSI C compiler. gcc is probably best. |
| 32 |
+ # |
| 33 |
+-CC=gcc |
| 34 |
++CC?=gcc |
| 35 |
+ |
| 36 |
+ # Compiler options (and sound driver) to use. This one is for Linux, |
| 37 |
+ # and other OSS-using systems. |
| 38 |
+ # |
| 39 |
+-CFLAGS=-O -Wall -DDRIVER_OSS |
| 40 |
++CFLAGS+=-Wall -DDRIVER_OSS |
| 41 |
+ |
| 42 |
+ # for OpenBSD, uncomment this: |
| 43 |
+ #CFLAGS=-O -Wall -DDRIVER_OPENBSD |
| 44 |
@@ -39,14 +39,29 @@ |
| 45 |
|
| 46 |
all: aylet xaylet |
| 47 |
@@ -21,11 +35,12 @@ |
| 48 |
+gtk2: all |
| 49 |
+ |
| 50 |
aylet: $(OBJS) |
| 51 |
- $(CC) -o aylet $(OBJS) $(CURSES_LIB) |
| 52 |
+- $(CC) -o aylet $(OBJS) $(CURSES_LIB) |
| 53 |
++ $(CC) $(LDFLAGS) $(CFLAGS) -o aylet $(OBJS) $(CURSES_LIB) |
| 54 |
|
| 55 |
xaylet: $(XOBJS) |
| 56 |
- $(CC) -o xaylet $(XOBJS) `gtk-config --libs` |
| 57 |
-+ $(CC) -o xaylet $(XOBJS) `$(GTKCONFIG) --libs` |
| 58 |
++ $(CC) $(LDFLAGS) $(CFLAGS) -o xaylet $(XOBJS) `$(GTKCONFIG) --libs` |
| 59 |
|
| 60 |
uigtk.o: uigtk.c |
| 61 |
- $(CC) $(CFLAGS) `gtk-config --cflags` -c uigtk.c -o uigtk.o |
| 62 |
@@ -33,9 +48,8 @@ |
| 63 |
|
| 64 |
installdirs: |
| 65 |
/bin/sh ./mkinstalldirs $(BINDIR) $(XBINDIR) $(MANDIR) |
| 66 |
-diff -ur aylet-0.5.orig/ui.c aylet-0.5/ui.c |
| 67 |
---- aylet-0.5.orig/ui.c 2003-11-27 21:42:47.000000000 +0200 |
| 68 |
-+++ aylet-0.5/ui.c 2007-07-25 17:14:53.000000000 +0300 |
| 69 |
+--- ui.c |
| 70 |
++++ ui.c |
| 71 |
@@ -5,7 +5,9 @@ |
| 72 |
*/ |
| 73 |
|
| 74 |
@@ -57,10 +71,8 @@ |
| 75 |
} |
| 76 |
|
| 77 |
/* update time display */ |
| 78 |
-Only in aylet-0.5: ui.c.orig |
| 79 |
-diff -ur aylet-0.5.orig/uigtk.c aylet-0.5/uigtk.c |
| 80 |
---- aylet-0.5.orig/uigtk.c 2002-09-14 18:45:45.000000000 +0300 |
| 81 |
-+++ aylet-0.5/uigtk.c 2007-07-25 17:14:22.000000000 +0300 |
| 82 |
+--- uigtk.c |
| 83 |
++++ uigtk.c |
| 84 |
@@ -14,11 +14,13 @@ |
| 85 |
#include "ui.h" |
Archives