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.

101 lines
3.6 KiB

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