~ubuntu-branches/ubuntu/natty/eggcups/natty

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
## Description: Fix FTBFS binutils-gold with ld --no-add-needed by adding X11 library in Makefile.*
## Author: Mahyuddin Susanto <udienz@ubuntu.com>
## Bug-Ubuntu: https://launchpad.net/bugs/715625

diff -Nur -x '*.orig' -x '*~' eggcups-0.20/Makefile.am eggcups-0.20.new/Makefile.am
--- eggcups-0.20/Makefile.am	2005-08-27 02:19:48.000000000 +0700
+++ eggcups-0.20.new/Makefile.am	2011-02-09 14:21:54.196047094 +0700
@@ -49,7 +49,7 @@
 ec-marshal.h: ec-marshal.list
 	@GLIB_GENMARSHAL@ --prefix=ec_marshal $(srcdir)/ec-marshal.list --header > ec-marshal.h
 
-eggcups_LDADD = @EGGCUPS_LIBS@ -L/usr/X11R6/lib -lXss -lcups
+eggcups_LDADD = @EGGCUPS_LIBS@ -L/usr/X11R6/lib -lXss -lcups -lX11
 eggcups_CFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE
 
 gnome_default_printer_LDADD = @EGGCUPS_LIBS@
diff -Nur -x '*.orig' -x '*~' eggcups-0.20/Makefile.in eggcups-0.20.new/Makefile.in
--- eggcups-0.20/Makefile.in	2006-12-19 02:05:39.000000000 +0700
+++ eggcups-0.20.new/Makefile.in	2011-02-09 14:22:09.095971741 +0700
@@ -320,7 +320,7 @@
 DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install
 BUILT_SOURCES = ec-marshal.c ec-marshal.h
 CLEAN_FILES = $(BUILT_SOURCES)
-eggcups_LDADD = @EGGCUPS_LIBS@ -L/usr/X11R6/lib -lXss -lcups
+eggcups_LDADD = @EGGCUPS_LIBS@ -L/usr/X11R6/lib -lXss -lcups -lX11
 eggcups_CFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE
 gnome_default_printer_LDADD = @EGGCUPS_LIBS@
 imagedir = $(datadir)/eggcups