From 88da3a653bd30879e8a11d0c86aa1f7a4dd1e9f4 Mon Sep 17 00:00:00 2001
From: Tatsuya Kinoshita <tats@debian.org>
Date: Tue, 15 Oct 2013 20:56:03 +0900
Subject: Update 040_link_gcc45.patch to 040_link-gtk2.patch

---
 debian/patches/040_link-gtk2.patch  | 31 +++++++++++++++++++++++++++++++
 debian/patches/040_link_gcc45.patch | 15 ---------------
 debian/patches/series               |  2 +-
 3 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 debian/patches/040_link-gtk2.patch
 delete mode 100644 debian/patches/040_link_gcc45.patch

(limited to 'debian')

diff --git a/debian/patches/040_link-gtk2.patch b/debian/patches/040_link-gtk2.patch
new file mode 100644
index 0000000..4bbc486
--- /dev/null
+++ b/debian/patches/040_link-gtk2.patch
@@ -0,0 +1,31 @@
+Subject: Explicitly add -lX11 to IMGX11LDFLAGS only when gtk2
+From: Tatsuya Kinoshita <tats@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605761
+Bug: https://sourceforge.net/p/w3m/patches/57/
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index e4ccc3d..3b180dd 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -706,7 +706,7 @@ AC_DEFUN([AC_W3M_IMAGE],
+      AC_DEFINE(USE_GDKPIXBUF)
+      AC_DEFINE(USE_GTK2)
+      IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
+-     IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
++     IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
+    elif test x"$have_gdkpixbuf" = xyes; then
+      AC_DEFINE(USE_W3MIMG_X11)
+      IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
+diff --git a/configure b/configure
+index 4c1bc06..30edf21 100755
+--- a/configure
++++ b/configure
+@@ -6927,7 +6927,7 @@ $as_echo "$as_me: WARNING: Imlib2 is not installed.  Install Imlib2 (version >=
+      $as_echo "#define USE_GTK2 1" >>confdefs.h
+ 
+      IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
+-     IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
++     IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
+    elif test x"$have_gdkpixbuf" = xyes; then
+      $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h
+ 
diff --git a/debian/patches/040_link_gcc45.patch b/debian/patches/040_link_gcc45.patch
deleted file mode 100644
index 1b034b4..0000000
--- a/debian/patches/040_link_gcc45.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5
-Author: Martin Pitt <martin.pitt@ubuntu.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441
-
---- w3m-0.5.3.orig/Makefile.in	2011-01-04 18:22:18.000000000 +0900
-+++ w3m-0.5.3/Makefile.in	2011-02-06 12:05:40.000000000 +0900
-@@ -199,7 +199,7 @@
- 	$(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
- 
- $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
--	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
-+	$(IMGLINK) $(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 --git a/debian/patches/series b/debian/patches/series
index a423976..6003d51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
 015_debian-version.patch
 020_button.patch
 030_pager-s-option.patch
-040_link_gcc45.patch
+040_link-gtk2.patch
 050_autotools-config.patch
 060_format-security.patch
 070_glibc2.14.patch
-- 
cgit v1.2.3