diff options
| author |   Peter Weller <welp@gentoo.org> | 2007-01-06 10:50:49 +0000 |
|---|---|---|
| committer | Peter Weller <welp@gentoo.org> | 2007-01-06 10:50:49 +0000 |
| commit | b24fac4665fa1dc9d08b1f544762e2e1075bee6e (patch) | |
| tree | a72668e9e9838b9503c5f7d3d1cd7a676f783cfd /net-im/gajim/files | |
| parent | Add postinst message about integrated systray icon. (diff) | |
| download | historical-b24fac4665fa1dc9d08b1f544762e2e1075bee6e.tar.gz historical-b24fac4665fa1dc9d08b1f544762e2e1075bee6e.tar.bz2 historical-b24fac4665fa1dc9d08b1f544762e2e1075bee6e.zip | |
Added patch to fix bug #144968 for good...
Package-Manager: portage-2.1.1-r2
Diffstat (limited to 'net-im/gajim/files')
| -rw-r--r-- | net-im/gajim/files/gajim-10.1-FLAGS_noOverride.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/net-im/gajim/files/gajim-10.1-FLAGS_noOverride.patch b/net-im/gajim/files/gajim-10.1-FLAGS_noOverride.patch new file mode 100644 index 000000000000..c680fee26c9c --- /dev/null +++ b/net-im/gajim/files/gajim-10.1-FLAGS_noOverride.patch @@ -0,0 +1,63 @@ +Index: src/Makefile +=================================================================== +--- src/Makefile (revision 6612) ++++ src/Makefile (working copy) +@@ -1,21 +1,24 @@ + # Set the C flags to include the GTK+ and Python libraries + PYTHON ?= python + PYTHONVER = `$(PYTHON) -c 'import sys; print sys.version[:3]'` +-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. +-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -lpython$(PYTHONVER) ++gtk_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. ++gtk_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -lpython$(PYTHONVER) + + all: trayicon.so gtkspell.so + + # Build the shared objects + trayicon.so: trayicon.o eggtrayicon.o trayiconmodule.o +- $(CC) $(LDFLAGS) -shared $^ -o $@ ++ $(CC) -shared $^ -o $@ $(LDFLAGS) $(gtk_LDFLAGS) + + gtkspell.so: +- $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) `pkg-config --libs --cflags gtkspell-2.0` -shared gtkspellmodule.c $^ -o $@ ++ $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) $(gtk_CFLAGS) $(gtk_LDFLAGS) `pkg-config --libs --cflags gtkspell-2.0` -shared gtkspellmodule.c $^ -o $@ + + # The path to the GTK+ python types + DEFS=`pkg-config --variable=defsdir pygtk-2.0` + ++%.o: %.c ++ $(CC) -o $@ -c $< $(CFLAGS) $(gtk_CFLAGS) ++ + # Generate the C wrapper from the defs and our override file + trayicon.c: trayicon.defs trayicon.override + pygtk-codegen-2.0 --prefix trayicon \ +Index: src/common/Makefile +=================================================================== +--- src/common/Makefile (revision 6612) ++++ src/common/Makefile (working copy) +@@ -6,19 +6,19 @@ + + ifeq ($(HAVE_XSCRNSAVER),YES) + # We link with libXScrnsaver from modular X.Org X11 +-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I. +-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver` -lpython$(PYTHONVER) ++gtk_and_x_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I. ++gtk_and_x_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver` -lpython$(PYTHONVER) + else + # # We link with libXScrnsaver from monolithic X.Org X11 +-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I. +-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -L/usr/X11R6$(LIBDIR) -lX11 \ +- -lXss -lXext -lpython$(PYTHONVER) ++gtk_and_x_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I. ++gtk_and_x_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` \ ++ -L/usr/X11R6$(LIBDIR) -lX11 -lXss -lXext -lpython$(PYTHONVER) + endif + + all: idle.so + + idle.so: +- $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@ ++ $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) $(gtk_and_x_CFLAGS) $(gtk_and_x_LDFLAGS) -shared idle.c $^ -o $@ + + clean: + rm -f *.so |