Control: tags -1 + patch On 2015-05-25 22:12:07, Sebastian Ramacher wrote: > Source: netsurf > Version: 3.2+dfsg-2 > Severity: serious > Justification: fails to build from source (but built successfully in the past) > Tags: stretch sid > > netsurf FTBFS if built against libgdk-píxbuf2.0-dev 2.31.4-1 which is > currently > in unstable: > | COMPILE: gtk/window.c > | gtk/window.c:55:14: error: unknown type name 'GdkPixdata' > | extern const GdkPixdata menu_cursor_pixdata; > | ^ > | gtk/window.c: In function 'nsgtk_create_menu_cursor': > | gtk/window.c:1057:2: warning: implicit declaration of function > 'gdk_pixbuf_from_pixdata' [-Wimplicit-function-declaration] > | pixbuf = gdk_pixbuf_from_pixdata(&menu_cursor_pixdata, FALSE, NULL); > | ^ > | gtk/window.c:1057:2: warning: nested extern declaration of > 'gdk_pixbuf_from_pixdata' [-Wnested-externs] > | gtk/window.c:1057:9: warning: assignment makes pointer from integer without > a cast > | pixbuf = gdk_pixbuf_from_pixdata(&menu_cursor_pixdata, FALSE, NULL); > | ^
This issue is almost fixed upstream in [1]. In addition to this change, the generated file also needs another include. A debdiff fixing this bug is attached. Cheers [1] http://source.netsurf-browser.org/netsurf.git/commit/?id=a29e9589f6bd54e258805bef367528a18d7b0c2b -- Sebastian Ramacher
diff -Nru netsurf-3.2+dfsg/debian/changelog netsurf-3.2+dfsg/debian/changelog --- netsurf-3.2+dfsg/debian/changelog 2014-08-29 23:59:03.000000000 +0200 +++ netsurf-3.2+dfsg/debian/changelog 2015-05-25 22:52:12.000000000 +0200 @@ -1,3 +1,11 @@ +netsurf (3.2+dfsg-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * debian/patches/change-how-gdk-image.patch: Fix build against + libgdk-pixbuf2.0-dev 2.31.4. (Closes: #786819) + + -- Sebastian Ramacher <sramac...@debian.org> Mon, 25 May 2015 22:25:10 +0200 + netsurf (3.2+dfsg-2) unstable; urgency=medium * Do not build with javascript support on s390x diff -Nru netsurf-3.2+dfsg/debian/patches/change-how-gdk-image.patch netsurf-3.2+dfsg/debian/patches/change-how-gdk-image.patch --- netsurf-3.2+dfsg/debian/patches/change-how-gdk-image.patch 1970-01-01 01:00:00.000000000 +0100 +++ netsurf-3.2+dfsg/debian/patches/change-how-gdk-image.patch 2015-05-25 22:54:14.000000000 +0200 @@ -0,0 +1,49 @@ +Description: Change how GDK image resources are compiled in + The compiled in image resources were being created as a structure in a + generated c source file. The generation of this file caused constness + warning as a guint8 * was initialised from a const char array. + . + This changes the generation and use of these compiled in resources to + use the raw inline form as suggested by the documentation removing the + const warning. + . + In addition to the changes from a29e9589f6bd54e258805bef367528a18d7b0c2b, the + include in the generated file is changed to glib.h. +Origin: upstream, + http://source.netsurf-browser.org/netsurf.git/commit/?id=a29e9589f6bd54e258805bef367528a18d7b0c2b +Bug-Debian: https://bugs.debian.org/786819 +Last-Update: 2015-05-25 + +--- a/netsurf/gtk/Makefile.target ++++ b/netsurf/gtk/Makefile.target +@@ -90,8 +90,8 @@ + S_PIXBUF += $(2) + + $(2): $(1) +- $(Q)echo "#include <gdk-pixbuf/gdk-pixdata.h>" > $(2) +- $(Q)gdk-pixbuf-csource --extern --struct --name=$(3) $(1) >> $(2) || \ ++ $(Q)echo "#include <glib.h>" > $(2) ++ $(Q)gdk-pixbuf-csource --extern --raw --name=$(3) $(1) >> $(2) || \ + ( rm -f $(2) && false ) + + endef +--- a/netsurf/gtk/window.c ++++ b/netsurf/gtk/window.c +@@ -52,7 +52,7 @@ + #define CONNECT(obj, sig, callback, ptr) \ + g_signal_connect(G_OBJECT(obj), (sig), G_CALLBACK(callback), (ptr)) + +-extern const GdkPixdata menu_cursor_pixdata; ++extern const guint8 *menu_cursor_pixdata; + + struct gui_window { + /** The gtk scaffold object containing menu, buttons, url bar, [tabs], +@@ -1054,7 +1054,7 @@ + { + GdkCursor *cursor = NULL; + GdkPixbuf *pixbuf; +- pixbuf = gdk_pixbuf_from_pixdata(&menu_cursor_pixdata, FALSE, NULL); ++ pixbuf = gdk_pixbuf_new_from_inline(-1, menu_cursor_pixdata, FALSE, NULL); + cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), pixbuf, 0, 3); + g_object_unref (pixbuf); + diff -Nru netsurf-3.2+dfsg/debian/patches/series netsurf-3.2+dfsg/debian/patches/series --- netsurf-3.2+dfsg/debian/patches/series 2014-08-20 10:59:40.000000000 +0200 +++ netsurf-3.2+dfsg/debian/patches/series 2015-05-25 22:33:13.000000000 +0200 @@ -1,2 +1,3 @@ set-netsurf-config.patch change-install-binary-targets +change-how-gdk-image.patch
signature.asc
Description: Digital signature
