Commit 8cf4b7a4 authored by Jehan's avatar Jehan

libgimp: reduce GObject Introspection warnings.

Thanks to Massimo for helping:

> To reduce the number of warnings down to 2, it is necessary to list
> gimptypes.h and gimpenums.h right after gimp.h and gimpui.h
> gimpuitypes.h at the start of libgimpui_headers_introspectable like
> they are in the corresponding list in Makefile.gi.
>
> Their order evidently matters

See #4018.
Some stuff are still wrong, but this is a first step in the right
direction.
parent 9326f4a7
Pipeline #122271 failed with stages
in 10 minutes and 34 seconds
...@@ -182,12 +182,16 @@ libgimp_sources = [ ...@@ -182,12 +182,16 @@ libgimp_sources = [
] ]
libgimp_headers_introspectable = [ libgimp_headers_introspectable = [
# Order matters. Leave these headers at the top.
'gimp.h', 'gimp.h',
'gimptypes.h',
'gimpenums.h',
# Other headers
'gimpbrushselect.h', 'gimpbrushselect.h',
'gimpchannel.h', 'gimpchannel.h',
'gimpdisplay.h', 'gimpdisplay.h',
'gimpdrawable.h', 'gimpdrawable.h',
'gimpenums.h',
'gimpfileprocedure.h', 'gimpfileprocedure.h',
'gimpfontselect.h', 'gimpfontselect.h',
'gimpgimprc.h', 'gimpgimprc.h',
...@@ -209,7 +213,6 @@ libgimp_headers_introspectable = [ ...@@ -209,7 +213,6 @@ libgimp_headers_introspectable = [
'gimpsaveprocedure.h', 'gimpsaveprocedure.h',
'gimpselection.h', 'gimpselection.h',
'gimpthumbnailprocedure.h', 'gimpthumbnailprocedure.h',
'gimptypes.h',
'gimpvectors.h', 'gimpvectors.h',
pdb_wrappers_headers, pdb_wrappers_headers,
] ]
...@@ -247,6 +250,11 @@ libgimpui_sources = [ ...@@ -247,6 +250,11 @@ libgimpui_sources = [
] ]
libgimpui_headers_introspectable = [ libgimpui_headers_introspectable = [
# Order matters. Leave these headers at the top.
'gimpui.h',
'gimpuitypes.h',
# Other headers
'gimpaspectpreview.h', 'gimpaspectpreview.h',
'gimpbrushselectbutton.h', 'gimpbrushselectbutton.h',
'gimpdrawablepreview.h', 'gimpdrawablepreview.h',
...@@ -263,8 +271,6 @@ libgimpui_headers_introspectable = [ ...@@ -263,8 +271,6 @@ libgimpui_headers_introspectable = [
'gimpprocview.h', 'gimpprocview.h',
'gimpprogressbar.h', 'gimpprogressbar.h',
'gimpselectbutton.h', 'gimpselectbutton.h',
'gimpui.h',
'gimpuitypes.h',
'gimpzoompreview.h', 'gimpzoompreview.h',
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment