Control: tag -1 + patch Hi,
intrigeri wrote (16 Oct 2014 09:29:56 GMT) : > this seems to be https://bugzilla.gnome.org/show_bug.cgi?id=737275, > that was apparently fixed upstream in > https://git.gnome.org/browse/gobject-introspection/commit/?id=578eebd54bd9f2b1677922680701c454f489c895 > It's on their 3.14.1 whiteboard, but no release yet. I guess we should > cherry-pick this commit for Jessie. What do the maintainers think? The attached patch implements this proposed solution. I've confirmed that it indeed fixes the FTBFS of the new libgobject-introspection-perl upstream release, that I'd really like to upload in the next 3 days so that it has a chance to make it into Jessie. I intend to NMU tomorrow, unless the maintainers tell me they'll address this blocking RC bug themselves, at a pace that unblocks the situation soon enough for libgobject-introspection-perl. Comments are welcome :) Cheers! -- intrigeri
Index: debian/changelog =================================================================== --- debian/changelog (revision 43727) +++ debian/changelog (working copy) @@ -1,3 +1,11 @@ +gobject-introspection (1.42.0-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Dont_unconditionally_include_config.h_in_regress.c.patch: new patch, + cherry-picked from upstream (Closes: #764272) + + -- intrigeri <intrig...@debian.org> Tue, 21 Oct 2014 12:04:27 +0200 + gobject-introspection (1.42.0-2) unstable; urgency=medium * dh_girepository: Add a versioned dependency on libgirepository-1.0-1 Index: debian/patches/Dont_unconditionally_include_config.h_in_regress.c.patch =================================================================== --- debian/patches/Dont_unconditionally_include_config.h_in_regress.c.patch (revision 0) +++ debian/patches/Dont_unconditionally_include_config.h_in_regress.c.patch (working copy) @@ -0,0 +1,27 @@ +From 578eebd54bd9f2b1677922680701c454f489c895 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mcla...@redhat.com> +Date: Fri, 10 Oct 2014 11:36:23 -0400 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=737275 +Bug-Debian: https://bugs.debian.org/764272 +Origin: https://git.gnome.org/browse/gobject-introspection/commit/?id=578eebd54bd9f2b1677922680701c454f489c895 +Subject: Don't unconditionally include config.h in regress.c + +This is an installed file, so we can't assume that config.h +will be around. + +diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c +index 3d3cfdd..8a0652f 100644 +--- a/tests/scanner/regress.c ++++ b/tests/scanner/regress.c +@@ -1,5 +1,8 @@ + /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ ++/* This file gets installed, so we can't assume config.h is available */ ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + + #include <string.h> + #include <stdlib.h> +-- +cgit v0.10.1 + Index: debian/patches/series =================================================================== --- debian/patches/series (revision 43727) +++ debian/patches/series (working copy) @@ -1,2 +1,3 @@ #needed only until all packages are moved to mutliarch paths pre_multiarch_compat +Dont_unconditionally_include_config.h_in_regress.c.patch
