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