| 1 |
cedk 10/02/28 16:33:10 |
| 2 |
|
| 3 |
Added: pommed-1.31.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
(Portage version: 2.1.7.16/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-laptop/pommed/files/pommed-1.31.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-laptop/pommed/files/pommed-1.31.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-laptop/pommed/files/pommed-1.31.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: pommed-1.31.patch |
| 15 |
=================================================================== |
| 16 |
diff -ru pommed-1.31~/gpomme/Makefile pommed-1.31/gpomme/Makefile |
| 17 |
--- pommed-1.31~/gpomme/Makefile 2010-02-28 17:24:31.000000000 +0100 |
| 18 |
+++ pommed-1.31/gpomme/Makefile 2010-02-28 17:25:31.000000000 +0100 |
| 19 |
@@ -17,8 +17,8 @@ |
| 20 |
|
| 21 |
INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H) |
| 22 |
|
| 23 |
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS) |
| 24 |
-LDFLAGS = -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS) |
| 25 |
+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS) |
| 26 |
+LDFLAGS += -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS) |
| 27 |
|
| 28 |
SOURCES = gpomme.c theme.c conffile.c \ |
| 29 |
../client-common/dbus-client.c \ |
| 30 |
@@ -33,6 +33,7 @@ |
| 31 |
mo: $(MOFILES) |
| 32 |
|
| 33 |
gpomme: $(OBJS) $(LIBS) |
| 34 |
+ ${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS} |
| 35 |
|
| 36 |
gpomme.o: gpomme.c gpomme.h theme.h ../client-common/dbus-client.h ../client-common/video-client.h |
| 37 |
|
| 38 |
diff -ru pommed-1.31~/pommed/Makefile pommed-1.31/pommed/Makefile |
| 39 |
--- pommed-1.31~/pommed/Makefile 2010-02-28 17:24:31.000000000 +0100 |
| 40 |
+++ pommed-1.31/pommed/Makefile 2010-02-28 17:26:20.000000000 +0100 |
| 41 |
@@ -18,9 +18,9 @@ |
| 42 |
|
| 43 |
TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H) |
| 44 |
|
| 45 |
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS) |
| 46 |
+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS) |
| 47 |
|
| 48 |
-LDFLAGS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS) |
| 49 |
+LDFLAGS += -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS) |
| 50 |
|
| 51 |
ifneq (, $(findstring ppc, $(ARCH))) |
| 52 |
OFLIB ?= |
| 53 |
@@ -52,6 +52,7 @@ |
| 54 |
|
| 55 |
CFLAGS += $(LIBPCI_CFLAGS) |
| 56 |
LDFLAGS += $(LIBPCI_LIBS) |
| 57 |
+ LIBS = $(LIBPCI_LIBS) |
| 58 |
else |
| 59 |
LIBS = /usr/lib/libpci.a |
| 60 |
LDFLAGS += -lz |
| 61 |
@@ -69,6 +70,7 @@ |
| 62 |
|
| 63 |
|
| 64 |
pommed: $(OBJS) $(LIBS) |
| 65 |
+ ${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS} |
| 66 |
|
| 67 |
pommed.o: pommed.c pommed.h evloop.h kbd_backlight.h lcd_backlight.h cd_eject.h evdev.h conffile.h audio.h dbus.h beep.h |
| 68 |
|
| 69 |
diff -ru pommed-1.31~/wmpomme/Makefile pommed-1.31/wmpomme/Makefile |
| 70 |
--- pommed-1.31~/wmpomme/Makefile 2010-02-28 17:24:31.000000000 +0100 |
| 71 |
+++ pommed-1.31/wmpomme/Makefile 2010-02-28 17:26:42.000000000 +0100 |
| 72 |
@@ -5,8 +5,8 @@ |
| 73 |
|
| 74 |
TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H) |
| 75 |
|
| 76 |
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS) |
| 77 |
-LDFLAGS = -lrt -lXpm -lXext -lX11 $(DBUS_LIBS) |
| 78 |
+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS) |
| 79 |
+LDFLAGS += -lrt -lXpm -lXext -lX11 $(DBUS_LIBS) |
| 80 |
|
| 81 |
SOURCES = wmgeneral.c wmpomme.c \ |
| 82 |
../client-common/dbus-client.c \ |
| 83 |
@@ -15,6 +15,7 @@ |
| 84 |
OBJS = $(SOURCES:%.c=%.o) |
| 85 |
|
| 86 |
wmpomme: $(OBJS) |
| 87 |
+ ${CC} -o $@ ${OBJS} ${LDFLAGS} |
| 88 |
|
| 89 |
wmpomme.o: wmpomme.c wmgeneral.h wmpomme-master.xpm ../client-common/dbus-client.h |
Archives