callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgimp*: make more libgimp* libraries introspected.

Browse Source 
Only libgimpwidgets is not introspected yet as it didn't work from
scratch and I don't have the time right now to look into it. Anyway with
all the others, we already have so many warnings during the GObject
Introspection step now that we have a lot of work to do already!
This commit is contained in:
Jehan
2019-07-27 20:25:20 +02:00
parent 3597e92a20
commit fb4c86a660
11 changed files with 168 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Makefile.am
View File

@ -173,36 +173,67 @@ git-version.h: update-git-version-header
-include $(INTROSPECTION_MAKEFILE) -include $(INTROSPECTION_MAKEFILE)
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
include $(top_srcdir)/libgimpbase/Makefile.gi
include $(top_srcdir)/libgimp/Makefile.gi include $(top_srcdir)/libgimp/Makefile.gi
include $(top_srcdir)/libgimpbase/Makefile.gi
include $(top_srcdir)/libgimpcolor/Makefile.gi
include $(top_srcdir)/libgimpconfig/Makefile.gi
include $(top_srcdir)/libgimpmath/Makefile.gi
include $(top_srcdir)/libgimpmodule/Makefile.gi
include $(top_srcdir)/libgimpthumb/Makefile.gi
INTROSPECTION_GIRS = INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path="$(srcdir)" --add-include-path="$(shell $(PKG_CONFIG) --define-variable=datadir="$(datadir)" --variable=girdir gobject-introspection-1.0)" INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path="$(srcdir)" --add-include-path="$(shell $(PKG_CONFIG) --define-variable=datadir="$(datadir)" --variable=girdir gobject-introspection-1.0)"
INTROSPECTION_COMPILER_ARGS = --includedir="$(srcdir)" --includedir="$(shell $(PKG_CONFIG) --define-variable=datadir="$(datadir)" --variable=girdir gobject-introspection-1.0)" INTROSPECTION_COMPILER_ARGS = --includedir="$(srcdir)" --includedir="$(shell $(PKG_CONFIG) --define-variable=datadir="$(datadir)" --variable=girdir gobject-introspection-1.0)"
INTROSPECTION_SCANNER_ENV = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" INTROSPECTION_SCANNER_ENV = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)"
Gimp-@GIMP_API_VERSION@.gir: libgimpbase/libgimpbase-@GIMP_API_VERSION@.la libgimp/libgimp-@GIMP_API_VERSION@.la libgimp/libgimpui-@GIMP_API_VERSION@.la Makefile Gimp-@GIMP_API_VERSION@.gir: \
libgimp/libgimp-@GIMP_API_VERSION@.la \
libgimp/libgimpui-@GIMP_API_VERSION@.la \
libgimpbase/libgimpbase-@GIMP_API_VERSION@.la \
libgimpcolor/libgimpcolor-@GIMP_API_VERSION@.la \
libgimpconfig/libgimpconfig-@GIMP_API_VERSION@.la \
libgimpmath/libgimpmath-@GIMP_API_VERSION@.la \
libgimpmodule/libgimpmodule-@GIMP_API_VERSION@.la \
libgimpthumb/libgimpthumb-@GIMP_API_VERSION@.la \
Makefile
Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0 Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0
Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_CFLAGS = \ Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_CFLAGS = \
-DGIMP_BASE_COMPILATION \
-DGIMP_COMPILATION \ -DGIMP_COMPILATION \
-DGIMP_BASE_COMPILATION \
-DGIMP_COLOR_COMPILATION \
-DGIMP_CONFIG_COMPILATION \
-DGIMP_MATH_COMPILATION \
-DGIMP_MODULE_COMPILATION \
-DGIMP_THUMB_COMPILATION \
$(AM_CFLAGS) \ $(AM_CFLAGS) \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(CAIRO_CFLAGS) \ $(CAIRO_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \ $(GDK_PIXBUF_CFLAGS) \
$(BABL_CFLAGS) \
$(GEGL_CFLAGS) \ $(GEGL_CFLAGS) \
$(GTK_CFLAGS) $(GTK_CFLAGS)
Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_LIBS = \ Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_LIBS = \
libgimpbase/libgimpbase-@GIMP_API_VERSION@.la \
libgimp/libgimp-@GIMP_API_VERSION@.la \ libgimp/libgimp-@GIMP_API_VERSION@.la \
libgimp/libgimpui-@GIMP_API_VERSION@.la libgimp/libgimpui-@GIMP_API_VERSION@.la \
libgimpbase/libgimpbase-@GIMP_API_VERSION@.la \
libgimpcolor/libgimpcolor-@GIMP_API_VERSION@.la \
libgimpconfig/libgimpconfig-@GIMP_API_VERSION@.la \
libgimpmath/libgimpmath-@GIMP_API_VERSION@.la \
libgimpmodule/libgimpmodule-@GIMP_API_VERSION@.la \
libgimpthumb/libgimpthumb-@GIMP_API_VERSION@.la
Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_FILES = \ Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_FILES = \
$(libgimp_introspectable) \
$(libgimpbase_introspectable) \ $(libgimpbase_introspectable) \
$(libgimp_introspectable) $(libgimpcolor_introspectable) \
$(libgimpconfig_introspectable) \
$(libgimpmath_introspectable) \
$(libgimpmodule_introspectable) \
$(libgimpthumb_introspectable)
INTROSPECTION_GIRS += Gimp-@GIMP_API_VERSION@.gir INTROSPECTION_GIRS += Gimp-@GIMP_API_VERSION@.gir

44
libgimpcolor/Makefile.am
View File

@ -61,50 +61,16 @@ EXTRA_DIST = \
lib_LTLIBRARIES = libgimpcolor-@GIMP_API_VERSION@.la lib_LTLIBRARIES = libgimpcolor-@GIMP_API_VERSION@.la
AUTOMAKE_OPTIONS = subdir-objects
include $(top_srcdir)/libgimpcolor/Makefile.gi
libgimpcolor_@GIMP_API_VERSION@_la_SOURCES = \ libgimpcolor_@GIMP_API_VERSION@_la_SOURCES = \
gimpcolor.h \ gimpcolor.h \
gimpcolortypes.h \ $(libgimpcolor_introspectable)
gimpadaptivesupersample.c \
gimpadaptivesupersample.h \
gimpbilinear.c \
gimpbilinear.h \
gimpcairo.c \
gimpcairo.h \
gimpcmyk.c \
gimpcmyk.h \
gimpcolormanaged.c \
gimpcolormanaged.h \
gimpcolorprofile.c \
gimpcolorprofile.h \
gimpcolorspace.c \
gimpcolorspace.h \
gimpcolortransform.c \
gimpcolortransform.h \
gimphsl.c \
gimphsl.h \
gimphsv.c \
gimphsv.h \
gimppixbuf.c \
gimppixbuf.h \
gimprgb.c \
gimprgb.h \
gimprgb-parse.c
libgimpcolorinclude_HEADERS = \ libgimpcolorinclude_HEADERS = \
gimpcolor.h \ gimpcolor.h \
gimpcolortypes.h \ $(libgimpcolor_introspectable_headers)
gimpadaptivesupersample.h \
gimpbilinear.h \
gimpcairo.h \
gimpcmyk.h \
gimpcolormanaged.h \
gimpcolorprofile.h \
gimpcolorspace.h \
gimpcolortransform.h \
gimphsl.h \
gimphsv.h \
gimppixbuf.h \
gimprgb.h
libgimpcolor_@GIMP_API_VERSION@_la_LDFLAGS = \ libgimpcolor_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \

32
libgimpcolor/Makefile.gi Normal file
View File

@ -0,0 +1,32 @@
# Introspectable sources for libgimpcolor
libgimpcolor_introspectable_headers = \
$(top_srcdir)/libgimpcolor/gimpcolortypes.h \
$(top_srcdir)/libgimpcolor/gimpadaptivesupersample.h \
$(top_srcdir)/libgimpcolor/gimpbilinear.h \
$(top_srcdir)/libgimpcolor/gimpcairo.h \
$(top_srcdir)/libgimpcolor/gimpcmyk.h \
$(top_srcdir)/libgimpcolor/gimpcolormanaged.h \
$(top_srcdir)/libgimpcolor/gimpcolorprofile.h \
$(top_srcdir)/libgimpcolor/gimpcolorspace.h \
$(top_srcdir)/libgimpcolor/gimpcolortransform.h \
$(top_srcdir)/libgimpcolor/gimphsl.h \
$(top_srcdir)/libgimpcolor/gimphsv.h \
$(top_srcdir)/libgimpcolor/gimppixbuf.h \
$(top_srcdir)/libgimpcolor/gimprgb.h
libgimpcolor_introspectable = \
$(top_srcdir)/libgimpcolor/gimpadaptivesupersample.c \
$(top_srcdir)/libgimpcolor/gimpbilinear.c \
$(top_srcdir)/libgimpcolor/gimpcairo.c \
$(top_srcdir)/libgimpcolor/gimpcmyk.c \
$(top_srcdir)/libgimpcolor/gimpcolormanaged.c \
$(top_srcdir)/libgimpcolor/gimpcolorprofile.c \
$(top_srcdir)/libgimpcolor/gimpcolorspace.c \
$(top_srcdir)/libgimpcolor/gimpcolortransform.c \
$(top_srcdir)/libgimpcolor/gimphsl.c \
$(top_srcdir)/libgimpcolor/gimphsv.c \
$(top_srcdir)/libgimpcolor/gimppixbuf.c \
$(top_srcdir)/libgimpcolor/gimprgb.c \
$(top_srcdir)/libgimpcolor/gimprgb-parse.c \
$(libgimpcolor_introspectable_headers)

41
libgimpconfig/Makefile.am
View File

@ -59,30 +59,12 @@ EXTRA_DIST = \
lib_LTLIBRARIES = libgimpconfig-@GIMP_API_VERSION@.la lib_LTLIBRARIES = libgimpconfig-@GIMP_API_VERSION@.la
AUTOMAKE_OPTIONS = subdir-objects
include $(top_srcdir)/libgimpconfig/Makefile.gi
libgimpconfig_sources = \ libgimpconfig_sources = \
gimpconfig.h \ gimpconfig.h \
gimpconfigenums.h \ $(libgimpconfig_introspectable)
gimpconfigtypes.h \
\
gimpconfig-iface.c \
gimpconfig-iface.h \
gimpconfig-deserialize.c \
gimpconfig-deserialize.h \
gimpconfig-error.c \
gimpconfig-error.h \
gimpconfig-params.h \
gimpconfig-path.c \
gimpconfig-path.h \
gimpconfig-serialize.c \
gimpconfig-serialize.h \
gimpconfig-utils.c \
gimpconfig-utils.h \
gimpconfigwriter.c \
gimpconfigwriter.h \
gimpscanner.c \
gimpscanner.h \
gimpcolorconfig.c \
gimpcolorconfig.h
libgimpconfig_built_sources = \ libgimpconfig_built_sources = \
gimpconfigenums.c gimpconfigenums.c
@ -91,22 +73,9 @@ libgimpconfig_@GIMP_API_VERSION@_la_SOURCES = \
$(libgimpconfig_sources) \ $(libgimpconfig_sources) \
$(libgimpconfig_built_sources) $(libgimpconfig_built_sources)
libgimpconfiginclude_HEADERS = \ libgimpconfiginclude_HEADERS = \
gimpconfig.h \ gimpconfig.h \
gimpconfigenums.h \ $(libgimpconfig_introspectable_headers)
gimpconfigtypes.h \
gimpconfig-iface.h \
gimpconfig-deserialize.h \
gimpconfig-error.h \
gimpconfig-params.h \
gimpconfig-path.h \
gimpconfig-serialize.h \
gimpconfig-utils.h \
gimpconfigwriter.h \
gimpscanner.h \
gimpcolorconfig.h
libgimpconfig_@GIMP_API_VERSION@_la_LDFLAGS = \ libgimpconfig_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \

27
libgimpconfig/Makefile.gi Normal file
View File

@ -0,0 +1,27 @@
# Introspectable sources for libgimpconfig
libgimpconfig_introspectable_headers = \
$(top_srcdir)/libgimpconfig/gimpconfigenums.h \
$(top_srcdir)/libgimpconfig/gimpconfigtypes.h \
$(top_srcdir)/libgimpconfig/gimpconfig-iface.h \
$(top_srcdir)/libgimpconfig/gimpconfig-deserialize.h \
$(top_srcdir)/libgimpconfig/gimpconfig-error.h \
$(top_srcdir)/libgimpconfig/gimpconfig-params.h \
$(top_srcdir)/libgimpconfig/gimpconfig-path.h \
$(top_srcdir)/libgimpconfig/gimpconfig-serialize.h \
$(top_srcdir)/libgimpconfig/gimpconfig-utils.h \
$(top_srcdir)/libgimpconfig/gimpconfigwriter.h \
$(top_srcdir)/libgimpconfig/gimpscanner.h \
$(top_srcdir)/libgimpconfig/gimpcolorconfig.h
libgimpconfig_introspectable = \
$(top_srcdir)/libgimpconfig/gimpconfig-iface.c \
$(top_srcdir)/libgimpconfig/gimpconfig-deserialize.c \
$(top_srcdir)/libgimpconfig/gimpconfig-error.c \
$(top_srcdir)/libgimpconfig/gimpconfig-path.c \
$(top_srcdir)/libgimpconfig/gimpconfig-serialize.c \
$(top_srcdir)/libgimpconfig/gimpconfig-utils.c \
$(top_srcdir)/libgimpconfig/gimpconfigwriter.c \
$(top_srcdir)/libgimpconfig/gimpscanner.c \
$(top_srcdir)/libgimpconfig/gimpcolorconfig.c \
$(libgimpconfig_introspectable_headers)

15
libgimpmath/Makefile.am
View File

@ -58,19 +58,14 @@ EXTRA_DIST = \
lib_LTLIBRARIES = libgimpmath-@GIMP_API_VERSION@.la lib_LTLIBRARIES = libgimpmath-@GIMP_API_VERSION@.la
AUTOMAKE_OPTIONS = subdir-objects
include $(top_srcdir)/libgimpmath/Makefile.gi
libgimpmath_@GIMP_API_VERSION@_la_SOURCES = \ libgimpmath_@GIMP_API_VERSION@_la_SOURCES = \
gimpmath.h \ $(libgimpmath_introspectable)
gimpmathtypes.h \
gimpmatrix.c \
gimpmatrix.h \
gimpvector.c \
gimpvector.h
libgimpmathinclude_HEADERS = \ libgimpmathinclude_HEADERS = \
gimpmath.h \ $(libgimpmath_introspectable_headers)
gimpmathtypes.h \
gimpmatrix.h \
gimpvector.h
libgimpmath_@GIMP_API_VERSION@_la_LDFLAGS = \ libgimpmath_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \

12
libgimpmath/Makefile.gi Normal file
View File

@ -0,0 +1,12 @@
# Introspectable sources for libgimpmath
#
libgimpmath_introspectable_headers = \
$(top_srcdir)/libgimpmath/gimpmath.h \
$(top_srcdir)/libgimpmath/gimpmathtypes.h \
$(top_srcdir)/libgimpmath/gimpmatrix.h \
$(top_srcdir)/libgimpmath/gimpvector.h
libgimpmath_introspectable = \
$(top_srcdir)/libgimpmath/gimpmatrix.c \
$(top_srcdir)/libgimpmath/gimpvector.c \
$(libgimpmath_introspectable_headers)

13
libgimpmodule/Makefile.am
View File

@ -56,17 +56,14 @@ EXTRA_DIST = \
lib_LTLIBRARIES = libgimpmodule-@GIMP_API_VERSION@.la lib_LTLIBRARIES = libgimpmodule-@GIMP_API_VERSION@.la
AUTOMAKE_OPTIONS = subdir-objects
include $(top_srcdir)/libgimpmodule/Makefile.gi
libgimpmodule_@GIMP_API_VERSION@_la_SOURCES = \ libgimpmodule_@GIMP_API_VERSION@_la_SOURCES = \
gimpmoduletypes.h \ $(libgimpmodule_introspectable)
gimpmodule.c \
gimpmodule.h \
gimpmoduledb.c \
gimpmoduledb.h
libgimpmoduleinclude_HEADERS = \ libgimpmoduleinclude_HEADERS = \
gimpmoduletypes.h \ $(libgimpmodule_introspectable_headers)
gimpmodule.h \
gimpmoduledb.h
libgimpmodule_@GIMP_API_VERSION@_la_LDFLAGS = \ libgimpmodule_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \

11
libgimpmodule/Makefile.gi Normal file
View File

@ -0,0 +1,11 @@
# Introspectable sources for libgimpmodule
libgimpmodule_introspectable_headers = \
$(top_srcdir)/libgimpmodule/gimpmoduletypes.h \
$(top_srcdir)/libgimpmodule/gimpmodule.h \
$(top_srcdir)/libgimpmodule/gimpmoduledb.h
libgimpmodule_introspectable = \
$(top_srcdir)/libgimpmodule/gimpmodule.c \
$(top_srcdir)/libgimpmodule/gimpmoduledb.c \
$(libgimpmodule_introspectable_headers)

19
libgimpthumb/Makefile.am
View File

@ -70,25 +70,16 @@ EXTRA_DIST = \
lib_LTLIBRARIES = libgimpthumb-@GIMP_API_VERSION@.la lib_LTLIBRARIES = libgimpthumb-@GIMP_API_VERSION@.la
AUTOMAKE_OPTIONS = subdir-objects
include $(top_srcdir)/libgimpthumb/Makefile.gi
libgimpthumb_@GIMP_API_VERSION@_la_SOURCES = \ libgimpthumb_@GIMP_API_VERSION@_la_SOURCES = \
gimpthumb.h \ gimpthumb.h \
gimpthumb-enums.c \ $(libgimpthumb_introspectable_headers)
gimpthumb-enums.h \
gimpthumb-error.c \
gimpthumb-error.h \
gimpthumb-types.h \
gimpthumb-utils.c \
gimpthumb-utils.h \
gimpthumbnail.c \
gimpthumbnail.h
libgimpthumbinclude_HEADERS = \ libgimpthumbinclude_HEADERS = \
gimpthumb.h \ gimpthumb.h \
gimpthumb-enums.h \ $(libgimpthumb_introspectable_headers)
gimpthumb-error.h \
gimpthumb-types.h \
gimpthumb-utils.h \
gimpthumbnail.h
libgimpthumb_@GIMP_API_VERSION@_la_LDFLAGS = \ libgimpthumb_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \

15
libgimpthumb/Makefile.gi Normal file
View File

@ -0,0 +1,15 @@
# Introspectable sources for libgimpthumb
libgimpthumb_introspectable_headers = \
$(top_srcdir)/libgimpthumb/gimpthumb-enums.h \
$(top_srcdir)/libgimpthumb/gimpthumb-error.h \
$(top_srcdir)/libgimpthumb/gimpthumb-types.h \
$(top_srcdir)/libgimpthumb/gimpthumb-utils.h \
$(top_srcdir)/libgimpthumb/gimpthumbnail.h
libgimpthumb_introspectable = \
$(top_builddir)/libgimpthumb/gimpthumb-enums.c \
$(top_srcdir)/libgimpthumb/gimpthumb-error.c \
$(top_srcdir)/libgimpthumb/gimpthumb-utils.c \
$(top_srcdir)/libgimpthumb/gimpthumbnail.c \
$(libgimpthumb_introspectable_headers)