r52562 - in /desktop/unstable/gnome-dictionary/debian: changelog patches/Include_the_right_header_in_GdictClientContext.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Mon Jul  3 08:14:15 2017
New Revision: 52562

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52562
Log:
* Add patch from upstream to fix FTBFS:
  - debian/patches/Include_the_right_header_in_GdictClientContext.patch
  (Closes: #865806, thanks to Jason Crain for investigating this)

Added:
    desktop/unstable/gnome-dictionary/debian/patches/Include_the_right_header_in_GdictClientContext.patch
Modified:
    desktop/unstable/gnome-dictionary/debian/changelog
    desktop/unstable/gnome-dictionary/debian/patches/series

Modified: desktop/unstable/gnome-dictionary/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/changelog?rev=52562&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/changelog	[utf-8] Mon Jul  3 08:14:15 2017
@@ -1,3 +1,11 @@
+gnome-dictionary (3.20.0-4) unstable; urgency=medium
+
+  * Add patch from upstream to fix FTBFS:
+    - debian/patches/Include_the_right_header_in_GdictClientContext.patch
+    (Closes: #865806, thanks to Jason Crain for investigating this)
+
+ -- Andreas Henriksson <andreas at fatal.se>  Mon, 03 Jul 2017 10:11:49 +0200
+
 gnome-dictionary (3.20.0-3) unstable; urgency=medium
 
   * Convert from cdbs to dh.

Added: desktop/unstable/gnome-dictionary/debian/patches/Include_the_right_header_in_GdictClientContext.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/patches/Include_the_right_header_in_GdictClientContext.patch?rev=52562&op=file
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/patches/Include_the_right_header_in_GdictClientContext.patch	(added)
+++ desktop/unstable/gnome-dictionary/debian/patches/Include_the_right_header_in_GdictClientContext.patch	[utf-8] Mon Jul  3 08:14:15 2017
@@ -0,0 +1,28 @@
+From d529e2dd056f05cb1115c2f68bb6f773b4b14948 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi at gnome.org>
+Date: Sun, 5 Mar 2017 14:38:07 +0000
+Subject: Include the right header in GdictClientContext
+
+GdictClientContext implements GdictContext, and since the header for the
+former references the latter, we need to include the correct header
+instead of a generic 'glib-object.h' one.
+---
+ libgdict/gdict-client-context.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgdict/gdict-client-context.h b/libgdict/gdict-client-context.h
+index 9952434..d68b729 100644
+--- a/libgdict/gdict-client-context.h
++++ b/libgdict/gdict-client-context.h
+@@ -19,7 +19,7 @@
+ #ifndef __GDICT_CLIENT_CONTEXT_H__
+ #define __GDICT_CLIENT_CONTEXT_H__
+ 
+-#include <glib-object.h>
++#include "gdict-context.h"
+ 
+ #define GDICT_TYPE_CLIENT_CONTEXT		(gdict_client_context_get_type ())
+ #define GDICT_CLIENT_CONTEXT(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GDICT_TYPE_CLIENT_CONTEXT, GdictClientContext))
+-- 
+cgit v0.12
+

Modified: desktop/unstable/gnome-dictionary/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/patches/series?rev=52562&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/patches/series	[utf-8] Mon Jul  3 08:14:15 2017
@@ -0,0 +1 @@
+Include_the_right_header_in_GdictClientContext.patch