| blob | acb10001d3149f47da163ddd2057edcba71af856 |
1 --- w3mimg/x11/x11_w3mimg.c 2004-11-08 18:14:06.000000000 +0100
2 +++ w3mimg/x11/x11_w3mimg.c 2012-05-19 06:31:08.908783927 +0200
3 @@ -14,7 +14,7 @@
4 #elif defined(USE_GDKPIXBUF)
5 #if defined(USE_GTK2)
6 #include <glib-object.h>
7 -#include <gdk/gdk.h>
8 +#include <gdk-pixbuf/gdk-pixbuf.h>
9 #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
10 #else
11 #include <gdk-pixbuf/gdk-pixbuf-xlib.h>
12 --- w3mimg/fb/fb_gdkpixbuf.c 2004-11-08 18:14:06.000000000 +0100
13 +++ w3mimg/fb/fb_gdkpixbuf.c 2012-05-20 05:06:07.744816661 +0200
14 @@ -6,7 +6,7 @@
15 #include "config.h"
16 #if defined(USE_GTK2)
17 #include <glib-object.h>
18 -#include <gdk/gdk.h>
19 +#include <gdk-pixbuf/gdk-pixbuf.h>
20 #endif
21 #include <gdk-pixbuf/gdk-pixbuf.h>
22 #include "fb.h"
23 --- acinclude.m4 2011-01-04 10:22:18.000000000 +0100
24 +++ acinclude.m4 2012-05-20 05:15:36.158981506 +0200
25 @@ -705,8 +705,8 @@ AC_DEFUN([AC_W3M_IMAGE],
26 IMGTARGETS="x11"
27 AC_DEFINE(USE_GDKPIXBUF)
28 AC_DEFINE(USE_GTK2)
29 - IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
30 - IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
31 + IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`"
32 + IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`"
33 elif test x"$have_gdkpixbuf" = xyes; then
34 AC_DEFINE(USE_W3MIMG_X11)
35 IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
36 @@ -740,8 +740,8 @@ AC_DEFUN([AC_W3M_IMAGE],
37 IMGTARGETS="${IMGTARGETS} fb"
38 AC_DEFINE(USE_GDKPIXBUF)
39 AC_DEFINE(USE_GTK2)
40 - IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gtk+-2.0`"
41 - IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gtk+-2.0`"
42 + IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0`"
43 + IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0`"
44 elif test x"$have_gdkpixbuf" = xyes; then
45 AC_DEFINE(USE_W3MIMG_FB)
46 IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"