Package: w3m
Version: 0.5.2-10
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch natty

Hello,

w3m currently fails to build with gcc 4.5 due to its stricter linking
behaviour. 

gcc -I. -I. -g -O2 -I./libwc -I/usr/include/gc -I/usr/include/gc 
-DHAVE_CONFIG_H -DAUXBIN_DIR=\"/usr/lib/w3m\" 
-DCGIBIN_DIR=\"/usr/lib/w3m/cgi-bin\" -DHELP_DIR=\"/usr/share/w3m\" 
-DETC_DIR=\"/etc\" -DCONF_DIR=\"/etc/w3m\" -DRC_DIR=\"~/.w3m\" 
-DLOCALEDIR=\"/usr/share/locale\" -o w3mimgdisplay w3mimgdisplay.o 
w3mimg/w3mimg.a -Wl,-Bsymbolic-functions -lm -lbsd -lnsl -ldl -pthread 
-lgdk_pixbuf_xlib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 
-lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lm -lcairo -lpng12 
-lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 
-lrt -lglib-2.0 -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 
-lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lm -lcairo -lpng12 
-lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 
-lrt -lglib-2.0
/usr/bin/ld.bfd.real: w3mimg/w3mimg.a(x11_w3mimg.o): undefined reference to 
symbol 'XGetWindowAttributes'
/usr/bin/ld.bfd.real: note: 'XGetWindowAttributes' is defined in DSO 
/usr/lib64/libX11.so.6 so try adding it to the linker command line
/usr/lib64/libX11.so.6: could not read symbols: Invalid operation


Attached patch fixes this.

I also posted this to upstream:
https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441

Thanks for considering,

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
diff -Nru w3m-0.5.2/debian/changelog w3m-0.5.2/debian/changelog
--- w3m-0.5.2/debian/changelog  2010-10-15 17:59:38.000000000 +0200
+++ w3m-0.5.2/debian/changelog  2010-12-03 09:45:06.000000000 +0100
@@ -1,3 +1,11 @@
+w3m (0.5.2-10ubuntu1) natty; urgency=low
+
+  * Add 040_link_gcc45.patch: Explicitly link w3mimgdisplay with -lX11 to
+    build with gcc 4.5. Forwarded to
+    
https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441
+
+ -- Martin Pitt <martin.p...@ubuntu.com>  Fri, 03 Dec 2010 09:44:07 +0100
+
 w3m (0.5.2-10) unstable; urgency=low
 
   * debian/patches/010_upstream.patch: Sync with the upstream development
diff -Nru w3m-0.5.2/debian/control w3m-0.5.2/debian/control
diff -Nru w3m-0.5.2/debian/patches/040_link_gcc45.patch 
w3m-0.5.2/debian/patches/040_link_gcc45.patch
--- w3m-0.5.2/debian/patches/040_link_gcc45.patch       1970-01-01 
01:00:00.000000000 +0100
+++ w3m-0.5.2/debian/patches/040_link_gcc45.patch       2010-12-03 
09:41:35.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5
+Author: Martin Pitt <martin.p...@ubuntu.com>
+Bug: 
https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441
+
+Index: w3m-0.5.2/Makefile.in
+===================================================================
+--- w3m-0.5.2.orig/Makefile.in 2010-12-03 09:38:54.699796002 +0100
++++ w3m-0.5.2/Makefile.in      2010-12-03 09:40:39.739796001 +0100
+@@ -193,7 +193,7 @@
+       $(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
+ 
+ $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
+-      $(CC) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a 
$(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
++      $(CC) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a 
$(LDFLAGS) $(LIBS) -lX11 $(IMGLDFLAGS)
+ 
+ w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
+       $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
diff -Nru w3m-0.5.2/debian/patches/series w3m-0.5.2/debian/patches/series
--- w3m-0.5.2/debian/patches/series     2010-08-21 18:26:24.000000000 +0200
+++ w3m-0.5.2/debian/patches/series     2010-12-03 09:38:50.000000000 +0100
@@ -1,3 +1,4 @@
 010_upstream.patch
 020_button.patch
 030_pager-s-option.patch
+040_link_gcc45.patch

Attachment: signature.asc
Description: Digital signature

Reply via email to