public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-laptop/pommed/files: pommed-1.31.patch
@ 2010-02-28 16:33 Cedric Krier (cedk)
  0 siblings, 0 replies; 2+ messages in thread
From: Cedric Krier (cedk) @ 2010-02-28 16:33 UTC (permalink / raw
  To: gentoo-commits

cedk        10/02/28 16:33:10

  Added:                pommed-1.31.patch
  Log:
  Version bump
  (Portage version: 2.1.7.16/cvs/Linux i686)

Revision  Changes    Path
1.1                  app-laptop/pommed/files/pommed-1.31.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-laptop/pommed/files/pommed-1.31.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-laptop/pommed/files/pommed-1.31.patch?rev=1.1&content-type=text/plain

Index: pommed-1.31.patch
===================================================================
diff -ru pommed-1.31~/gpomme/Makefile pommed-1.31/gpomme/Makefile
--- pommed-1.31~/gpomme/Makefile	2010-02-28 17:24:31.000000000 +0100
+++ pommed-1.31/gpomme/Makefile	2010-02-28 17:25:31.000000000 +0100
@@ -17,8 +17,8 @@
 
 INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
-LDFLAGS = -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
+LDFLAGS += -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
 
 SOURCES = gpomme.c theme.c conffile.c \
 		../client-common/dbus-client.c \
@@ -33,6 +33,7 @@
 mo: $(MOFILES)
 
 gpomme: $(OBJS) $(LIBS)
+	${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
 
 gpomme.o: gpomme.c gpomme.h theme.h ../client-common/dbus-client.h ../client-common/video-client.h
 
diff -ru pommed-1.31~/pommed/Makefile pommed-1.31/pommed/Makefile
--- pommed-1.31~/pommed/Makefile	2010-02-28 17:24:31.000000000 +0100
+++ pommed-1.31/pommed/Makefile	2010-02-28 17:26:20.000000000 +0100
@@ -18,9 +18,9 @@
 
 TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
 
-LDFLAGS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
+LDFLAGS += -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
 
 ifneq (, $(findstring ppc, $(ARCH)))
 OFLIB ?=
@@ -52,6 +52,7 @@
 
 	CFLAGS += $(LIBPCI_CFLAGS)
 	LDFLAGS += $(LIBPCI_LIBS)
+	LIBS = $(LIBPCI_LIBS)
 else
 	LIBS = /usr/lib/libpci.a
 	LDFLAGS += -lz	
@@ -69,6 +70,7 @@
 
 
 pommed: $(OBJS) $(LIBS)
+	${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
 
 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
 
diff -ru pommed-1.31~/wmpomme/Makefile pommed-1.31/wmpomme/Makefile
--- pommed-1.31~/wmpomme/Makefile	2010-02-28 17:24:31.000000000 +0100
+++ pommed-1.31/wmpomme/Makefile	2010-02-28 17:26:42.000000000 +0100
@@ -5,8 +5,8 @@
 
 TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
-LDFLAGS = -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
+LDFLAGS += -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
 
 SOURCES = wmgeneral.c wmpomme.c \
 	../client-common/dbus-client.c \
@@ -15,6 +15,7 @@
 OBJS = $(SOURCES:%.c=%.o)
 
 wmpomme: $(OBJS)
+	${CC} -o $@ ${OBJS} ${LDFLAGS}
 
 wmpomme.o: wmpomme.c wmgeneral.h wmpomme-master.xpm ../client-common/dbus-client.h
 






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-laptop/pommed/files: pommed-1.31.patch
@ 2011-11-24  4:45 Naohiro Aota (naota)
  0 siblings, 0 replies; 2+ messages in thread
From: Naohiro Aota (naota) @ 2011-11-24  4:45 UTC (permalink / raw
  To: gentoo-commits

naota       11/11/24 04:45:16

  Modified:             pommed-1.31.patch
  Log:
  Drop -g from CFLAGS. Bug #389661
  
  (Portage version: 2.2.0_alpha75/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-laptop/pommed/files/pommed-1.31.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/pommed/files/pommed-1.31.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/pommed/files/pommed-1.31.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/pommed/files/pommed-1.31.patch?r1=1.1&r2=1.2

Index: pommed-1.31.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-laptop/pommed/files/pommed-1.31.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pommed-1.31.patch	28 Feb 2010 16:33:10 -0000	1.1
+++ pommed-1.31.patch	24 Nov 2011 04:45:16 -0000	1.2
@@ -7,7 +7,7 @@
  
 -CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
 -LDFLAGS = -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
-+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
++CFLAGS += -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
 +LDFLAGS += -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
  
  SOURCES = gpomme.c theme.c conffile.c \
@@ -28,7 +28,7 @@
  TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
  
 -CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
-+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
++CFLAGS += -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
  
 -LDFLAGS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
 +LDFLAGS += -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
@@ -60,7 +60,7 @@
  
 -CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
 -LDFLAGS = -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
-+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
++CFLAGS += -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
 +LDFLAGS += -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
  
  SOURCES = wmgeneral.c wmpomme.c \






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-11-24  4:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-24  4:45 [gentoo-commits] gentoo-x86 commit in app-laptop/pommed/files: pommed-1.31.patch Naohiro Aota (naota)
  -- strict thread matches above, loose matches on Subject: below --
2010-02-28 16:33 Cedric Krier (cedk)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox