diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2015-01-24 14:36:40 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2015-01-24 14:37:05 +0000 |
| commit | 8595cb4102d547388d0d9e699d10a14f8f7aa71c (patch) | |
| tree | cd27e4b710769000b651b9af4db2704a1cd328dd /debian/patches/040_link-gtk2.patch | |
| parent | Update Vcs-Browser (diff) | |
| download | w3m-8595cb4102d547388d0d9e699d10a14f8f7aa71c.tar.gz w3m-8595cb4102d547388d0d9e699d10a14f8f7aa71c.zip | |
Integrate Debian changes into 020_debian.patch (closes: #776112)
(debian/patches/*.patch except 010_upstream.patch are merged)
Diffstat (limited to 'debian/patches/040_link-gtk2.patch')
| -rw-r--r-- | debian/patches/040_link-gtk2.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/debian/patches/040_link-gtk2.patch b/debian/patches/040_link-gtk2.patch deleted file mode 100644 index 4bbc486..0000000 --- a/debian/patches/040_link-gtk2.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 - |