app-laptop/pommed/files/pommed-1.31.patch

   1 diff -ru pommed-1.31~/gpomme/Makefile pommed-1.31/gpomme/Makefile
   2 --- pommed-1.31~/gpomme/Makefile        2010-02-28 17:24:31.000000000 +0100
   3 +++ pommed-1.31/gpomme/Makefile 2010-02-28 17:25:31.000000000 +0100
   4 @@ -17,8 +17,8 @@
   5
   6  INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
   7
   8 -CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
   9 -LDFLAGS = -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
  10 +CFLAGS += -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
  11 +LDFLAGS += -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
  12
  13  SOURCES = gpomme.c theme.c conffile.c \
  14                 ../client-common/dbus-client.c \
  15 @@ -33,6 +33,7 @@
  16  mo: $(MOFILES)
  17
  18  gpomme: $(OBJS) $(LIBS)
  19 +       ${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
  20
  21  gpomme.o: gpomme.c gpomme.h theme.h ../client-common/dbus-client.h ../client-common/video-client.h
  22
  23 diff -ru pommed-1.31~/pommed/Makefile pommed-1.31/pommed/Makefile
  24 --- pommed-1.31~/pommed/Makefile        2010-02-28 17:24:31.000000000 +0100
  25 +++ pommed-1.31/pommed/Makefile 2010-02-28 17:26:20.000000000 +0100
  26 @@ -18,9 +18,9 @@
  27
  28  TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
  29
  30 -CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
  31 +CFLAGS += -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
  32
  33 -LDFLAGS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
  34 +LDFLAGS += -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
  35
  36  ifneq (, $(findstring ppc, $(ARCH)))
  37  OFLIB ?=
  38 @@ -52,6 +52,7 @@
  39
  40         CFLAGS += $(LIBPCI_CFLAGS)
  41         LDFLAGS += $(LIBPCI_LIBS)
  42 +       LIBS = $(LIBPCI_LIBS)
  43  else
  44         LIBS = /usr/lib/libpci.a
  45         LDFLAGS += -lz
  46 @@ -69,6 +70,7 @@
  47
  48
  49  pommed: $(OBJS) $(LIBS)
  50 +       ${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
  51
  52  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
  53
  54 diff -ru pommed-1.31~/wmpomme/Makefile pommed-1.31/wmpomme/Makefile
  55 --- pommed-1.31~/wmpomme/Makefile       2010-02-28 17:24:31.000000000 +0100
  56 +++ pommed-1.31/wmpomme/Makefile        2010-02-28 17:26:42.000000000 +0100
  57 @@ -5,8 +5,8 @@
  58
  59  TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
  60
  61 -CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
  62 -LDFLAGS = -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
  63 +CFLAGS += -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
  64 +LDFLAGS += -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
  65
  66  SOURCES = wmgeneral.c wmpomme.c \
  67         ../client-common/dbus-client.c \
  68 @@ -15,6 +15,7 @@
  69  OBJS = $(SOURCES:%.c=%.o)
  70
  71  wmpomme: $(OBJS)
  72 +       ${CC} -o $@ ${OBJS} ${LDFLAGS}
  73
  74  wmpomme.o: wmpomme.c wmgeneral.h wmpomme-master.xpm ../client-common/dbus-client.h
  75