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.

102 lines
3.7 KiB

  1. diff -u --recursive libgee-0.20.0-vanilla/configure.ac libgee-0.20.0/configure.ac
  2. --- libgee-0.20.0-vanilla/configure.ac 2018-01-07 20:42:52.827537620 -0500
  3. +++ libgee-0.20.0/configure.ac 2018-01-07 20:43:25.128645499 -0500
  4. @@ -65,11 +65,6 @@
  5. enable_consistency_check=$enableval, enable_consistency_check=no)
  6. AS_IF([test "x$enable_consistency_check" != xno], [VALA_ADD_VALAFLAGS(-D CONSISTENCY_CHECKS)])
  7. -AX_REQUIRE_DEFINED([GOBJECT_INTROSPECTION_CHECK])
  8. -GOBJECT_INTROSPECTION_CHECK([0.9.0])
  9. -
  10. -VALA_CHECK([0.25.1])
  11. -
  12. AC_OUTPUT([Makefile
  13. gee-0.8.pc
  14. benchmark/Makefile
  15. diff -u --recursive libgee-0.20.0-vanilla/gee/Makefile.am libgee-0.20.0/gee/Makefile.am
  16. --- libgee-0.20.0-vanilla/gee/Makefile.am 2018-01-07 20:42:52.829537627 -0500
  17. +++ libgee-0.20.0/gee/Makefile.am 2018-01-07 20:43:48.332722990 -0500
  18. @@ -146,29 +146,6 @@
  19. gee-0.8.vapi \
  20. $(NULL)
  21. -if HAVE_INTROSPECTION
  22. -girdir = @INTROSPECTION_GIRDIR@
  23. -
  24. -dist_gir_DATA = \
  25. - Gee-0.8.gir \
  26. - $(NULL)
  27. -
  28. -typelibdir = @INTROSPECTION_TYPELIBDIR@
  29. -typelib_DATA = \
  30. - Gee-0.8.typelib \
  31. - $(NULL)
  32. -
  33. -# Extract dlname from libfolks.la; see bug #658002.
  34. -# This is what g-ir-scanner does.
  35. -libgee_dlname = \
  36. - `$(SED) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgee-0.8.la`
  37. -INTROSPECTION_COMPILER_ARGS= \
  38. - -l $(libgee_dlname)
  39. -Gee-0.8.gir: libgee_0_8_la_vala.stamp
  40. -Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la
  41. - @INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^
  42. -endif
  43. -
  44. MOSTLYCLEANFILES = \
  45. $(libgee_0_8_la_VALASOURCES:.vala=.c) \
  46. libgee_0_8_la_vala.stamp \
  47. diff -u --recursive libgee-0.20.0-vanilla/gee/Makefile.in libgee-0.20.0/gee/Makefile.in
  48. --- libgee-0.20.0-vanilla/gee/Makefile.in 2018-01-07 20:42:52.830537630 -0500
  49. +++ libgee-0.20.0/gee/Makefile.in 2018-01-07 20:44:18.433823516 -0500
  50. @@ -297,14 +297,6 @@
  51. INSTALL_PROGRAM = @INSTALL_PROGRAM@
  52. INSTALL_SCRIPT = @INSTALL_SCRIPT@
  53. INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  54. -INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
  55. -INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
  56. -INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
  57. -INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
  58. -INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
  59. -INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
  60. -INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
  61. -INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
  62. LCOV = @LCOV@
  63. LD = @LD@
  64. LDFLAGS = @LDFLAGS@
  65. @@ -544,25 +536,6 @@
  66. gee-0.8.vapi \
  67. $(NULL)
  68. -@HAVE_INTROSPECTION_TRUE@girdir = @INTROSPECTION_GIRDIR@
  69. -@HAVE_INTROSPECTION_TRUE@dist_gir_DATA = \
  70. -@HAVE_INTROSPECTION_TRUE@ Gee-0.8.gir \
  71. -@HAVE_INTROSPECTION_TRUE@ $(NULL)
  72. -
  73. -@HAVE_INTROSPECTION_TRUE@typelibdir = @INTROSPECTION_TYPELIBDIR@
  74. -@HAVE_INTROSPECTION_TRUE@typelib_DATA = \
  75. -@HAVE_INTROSPECTION_TRUE@ Gee-0.8.typelib \
  76. -@HAVE_INTROSPECTION_TRUE@ $(NULL)
  77. -
  78. -
  79. -# Extract dlname from libfolks.la; see bug #658002.
  80. -# This is what g-ir-scanner does.
  81. -@HAVE_INTROSPECTION_TRUE@libgee_dlname = \
  82. -@HAVE_INTROSPECTION_TRUE@ `$(SED) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgee-0.8.la`
  83. -
  84. -@HAVE_INTROSPECTION_TRUE@INTROSPECTION_COMPILER_ARGS = \
  85. -@HAVE_INTROSPECTION_TRUE@ -l $(libgee_dlname)
  86. -
  87. MOSTLYCLEANFILES = \
  88. $(libgee_0_8_la_VALASOURCES:.vala=.c) \
  89. libgee_0_8_la_vala.stamp \
  90. @@ -1621,9 +1594,6 @@
  91. $(libgee_0_8_la_VALASOURCES:.vala=.c): libgee_0_8_la_vala.stamp
  92. gee-0.8.vapi gee-internals-0.8.vapi gee.h gee-internals.h: libgee_0_8_la_vala.stamp
  93. -@HAVE_INTROSPECTION_TRUE@Gee-0.8.gir: libgee_0_8_la_vala.stamp
  94. -@HAVE_INTROSPECTION_TRUE@Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la
  95. -@HAVE_INTROSPECTION_TRUE@ @INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^
  96. # Tell versions [3.59,3.63) of GNU make to not export all variables.
  97. # Otherwise a system limit (for SysV at least) may be exceeded.