Control: tags -1 + patch upstream fixed-upstream

On Sun, Jun 25, 2017 at 01:09:28AM +0300, Adrian Bunk wrote:
> ...
> libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -I../libgdict -I../libgdict 
> -DG_LOG_DOMAIN=\"Gdict\" -DDATADIR=\"/usr/share\" 
> -DLIBDIR=\"/usr/lib/i386-linux-gnu\" -DSYSCONFDIR=\"/etc\" -DPREFIX=\"/usr\" 
> -DGNOMELOCALEDIR=\"/usr/share/locale\" 
> -DGDICTSOURCESDIR=\"/usr/share/gdict-1.0/sources\" -DGDICT_ENABLE_INTERNALS=1 
> -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -UGTK_DISABLE_DEPRECATED 
> -DPANGO_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES 
> -DGTK_DISABLE_SINGLE_INCLUDES -Wdate-time -D_FORTIFY_SOURCE=2 -pthread 
> -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 
> -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 
> -I/usr/lib/i386-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 
> -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 
> -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 
> -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 
> -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 
> -I/usr/include
>  /glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -DG_DISABLE_CAST_CHECKS 
> -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c 
> gdict-enum-types.c  -fPIC -DPIC -o .libs/libgdict_1_0_la-gdict-enum-types.o
> libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -I../libgdict -I../libgdict 
> -DG_LOG_DOMAIN=\"Gdict\" -DDATADIR=\"/usr/share\" 
> -DLIBDIR=\"/usr/lib/i386-linux-gnu\" -DSYSCONFDIR=\"/etc\" -DPREFIX=\"/usr\" 
> -DGNOMELOCALEDIR=\"/usr/share/locale\" 
> -DGDICTSOURCESDIR=\"/usr/share/gdict-1.0/sources\" -DGDICT_ENABLE_INTERNALS=1 
> -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -UGTK_DISABLE_DEPRECATED 
> -DPANGO_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES 
> -DGTK_DISABLE_SINGLE_INCLUDES -Wdate-time -D_FORTIFY_SOURCE=2 -pthread 
> -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 
> -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 
> -I/usr/lib/i386-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 
> -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 
> -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 
> -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 
> -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 
> -I/usr/include
>  /glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -DG_DISABLE_CAST_CHECKS 
> -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c 
> gdict-utils.c  -fPIC -DPIC -o .libs/libgdict_1_0_la-gdict-utils.o
> In file included from gdict-enum-types.c:6:0:
> ./gdict-client-context.h:84:1: error: unknown type name 'GdictContext'
>  GdictContext *        gdict_client_context_new          (const gchar        
> *hostname,
>  ^~~~~~~~~~~~

libgdict/gdict-enum-types.c has been rearranged so maybe this is caused
by glib-mkenums generating this file in a different order.

This is fixed in version 3.24.0 with commit
https://git.gnome.org/browse/gnome-dictionary/commit/?id=d529e2dd056f05cb1115c2f68bb6f773b4b14948

commit d529e2dd056f05cb1115c2f68bb6f773b4b14948 
Author: Emmanuele Bassi <eba...@gnome.org>      
Date:   Sun Mar 5 14:38:07 2017 +0000           

    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.   

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))                         
                                      

Reply via email to