caribou 0.4.21
[git/cygwin-packages/caribou.git] / 0.4.1-no-undefined.patch
1 --- origsrc/caribou-0.4.19/configure.ac 2015-06-08 07:22:38.000000000 -0500
2 +++ src/caribou-0.4.19/configure.ac 2015-11-13 00:48:56.362601000 -0600
3 @@ -95,6 +95,7 @@ AM_CONDITIONAL([ENABLE_GTK3_MODULES], [t
4 if test x"$enable_gtk3_module" = x"yes"; then
5 PKG_CHECK_MODULES(GTK3, [
6 gtk+-3.0
7 + gmodule-2.0
8 ])
9
10 GTK3_MODULES_DIR="$libdir"/gtk-3.0/modules
11 @@ -112,6 +113,7 @@ AM_CONDITIONAL([ENABLE_GTK2_MODULES], [t
12 if test x"$enable_gtk2_module" = x"yes"; then
13 PKG_CHECK_MODULES(GTK2, [
14 gtk+-2.0
15 + gmodule-2.0
16 ])
17
18 GTK2_MODULES_DIR="$libdir"/gtk-2.0/modules
19 --- origsrc/caribou-0.4.1/libcaribou/Makefile.am 2011-10-09 15:38:14.000000000 -0500
20 +++ src/caribou-0.4.1/libcaribou/Makefile.am 2011-11-18 10:59:05.255984600 -0600
21 @@ -26,6 +26,8 @@ caribou_headers = \
22 libcaribouinclude_HEADERS = \
23 $(caribou_headers)
24
25 +libcaribou_la_LDFLAGS = -no-undefined
26 +
27 libcaribou_la_LIBADD = \
28 $(LIBCARIBOU_LIBS)
29
30 @@ -62,8 +64,13 @@ typelib_DATA = Caribou-1.0.typelib
31 Caribou-1.0.gir: _Caribou-1.0.gir
32 $(top_srcdir)/tools/fix_gir.py $< > $@
33
34 -Caribou-1.0.typelib: Caribou-1.0.gir
35 - @INTROSPECTION_COMPILER@ --shared-library=libcaribou.so.0 -o $@ $^
36 +# We have to extract our own dlname from libfolks.la; see bgo#658002.
37 +# This is what g-ir-scanner does.
38 +libcaribou_dlname = \
39 + `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libcaribou.la`
40 +
41 +Caribou-1.0.typelib: Caribou-1.0.gir libcaribou.la
42 + @INTROSPECTION_COMPILER@ --shared-library=$(libcaribou_dlname) -o $@ $^
43
44 Caribou-1.0.gir caribou-internals-1.0.vapi caribou-1.0.vapi: libcaribou.la
45
46 --- origsrc/caribou-0.4.1/modules/gtk2/Makefile.am 2011-10-09 15:38:14.000000000 -0500
47 +++ src/caribou-0.4.1/modules/gtk2/Makefile.am 2011-11-18 10:28:52.844320600 -0600
48 @@ -27,6 +27,7 @@ libcaribou_gtk_module_la_LIBADD = \
49 libcaribou_gtk_module_la_LDFLAGS = \
50 -avoid-version \
51 -module \
52 + -no-undefined \
53 $(NULL)
54
55 EXTRA_DIST = \
56 --- origsrc/caribou-0.4.1/modules/gtk3/Makefile.am 2011-10-09 15:38:14.000000000 -0500
57 +++ src/caribou-0.4.1/modules/gtk3/Makefile.am 2011-11-18 10:28:57.068562200 -0600
58 @@ -26,6 +26,7 @@ libcaribou_gtk_module_la_LIBADD = \
59 libcaribou_gtk_module_la_LDFLAGS = \
60 -avoid-version \
61 -module \
62 + -no-undefined \
63 $(NULL)
64
65 EXTRA_DIST = \
This page took 0.034856 seconds and 5 git commands to generate.