You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

73 lines
2.2 KiB

  1. diff -u --recursive vips-8.6.1-vanilla/configure.ac vips-8.6.1/configure.ac
  2. --- vips-8.6.1-vanilla/configure.ac 2018-01-13 17:27:19.375813474 -0500
  3. +++ vips-8.6.1/configure.ac 2018-01-13 17:27:38.486871756 -0500
  4. @@ -53,9 +53,6 @@
  5. AC_SUBST(LIBRARY_REVISION)
  6. AC_SUBST(LIBRARY_AGE)
  7. -# init introspection support
  8. -GOBJECT_INTROSPECTION_CHECK([1.30.0])
  9. -
  10. # gir needs a list of source files to scan for introspection
  11. #
  12. # build with a glob and a list of files to exclude from scanning
  13. diff -u --recursive vips-8.6.1-vanilla/libvips/Makefile.am vips-8.6.1/libvips/Makefile.am
  14. --- vips-8.6.1-vanilla/libvips/Makefile.am 2018-01-13 17:27:19.366813446 -0500
  15. +++ vips-8.6.1/libvips/Makefile.am 2018-01-13 17:27:57.256929001 -0500
  16. @@ -70,56 +70,3 @@
  17. echo "#define VIPS_SONAME \"$$dlname\"" >> soname.h && \
  18. cp soname.h $(DESTDIR)$(pkgincludedir) && \
  19. rm soname.h
  20. -
  21. --include $(INTROSPECTION_MAKEFILE)
  22. -INTROSPECTION_GIRS =
  23. -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
  24. -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
  25. -
  26. -if HAVE_INTROSPECTION
  27. -
  28. -AM_CPPFLAGS = \
  29. - -I${top_srcdir}/libvips/include \
  30. - @VIPS_CFLAGS@ \
  31. - @VIPS_INCLUDES@ \
  32. - @INTROSPECTION_CFLAGS@
  33. -AM_LDFLAGS = \
  34. - @INTROSPECTION_LIBS@ \
  35. - @LDFLAGS@
  36. -LDADD = @INTROSPECTION_LIBS@ @VIPS_CFLAGS@ libvips.la @VIPS_LIBS@
  37. -
  38. -noinst_PROGRAMS = \
  39. - introspect
  40. -introspect_SOURCES = \
  41. - introspect.c
  42. -
  43. -# we can't get the _SOURCES lists from the subdirs directly, we get passed it
  44. -# by configure instead
  45. -introspection_sources = @vips_introspection_sources@
  46. -
  47. -# we make the vips8 API
  48. -Vips-8.0.gir: introspect
  49. -Vips_8_0_gir_INCLUDES = GObject-2.0
  50. -Vips_8_0_gir_CFLAGS = $(INCLUDES) -I${top_srcdir}/libvips/include
  51. -Vips_8_0_gir_LIBS = libvips.la
  52. -Vips_8_0_gir_FILES = $(introspection_sources)
  53. -INTROSPECTION_GIRS += Vips-8.0.gir
  54. -
  55. -# don't use
  56. -# --warn-all --verbose
  57. -# too annoying
  58. -Vips_8_0_gir_SCANNERFLAGS = \
  59. - --program=./introspect$(EXEEXT) \
  60. - --identifier-prefix=Vips \
  61. - --identifier-prefix=vips \
  62. - --symbol-prefix=vips \
  63. - --c-include=vips/vips.h
  64. -
  65. -girdir = $(datadir)/gir-1.0
  66. -gir_DATA = $(INTROSPECTION_GIRS)
  67. -
  68. -typelibdir = $(libdir)/girepository-1.0
  69. -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
  70. -
  71. -CLEANFILES += $(gir_DATA) $(typelib_DATA)
  72. -endif