← Back to branch summary

~ubuntu-branches/ubuntu/natty/evolution-data-server/natty

« back to all changes in this revision

Viewing changes to debian/patches/01_various_linking_issues.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2011-02-07 14:11:56 UTC
  • mfrom: (1.1.84 upstream)
  • Revision ID: james.westby@ubuntu.com-20110207141156-jakojbbkzee62447
Tags: 2.32.2-0ubuntu1
* New upstream release
* debian/patches/01_various_linking_issues.patch:
* debian/patches/02_fix_sources_migration.patch:
* debian/patches/199-git-backport-2.32.1-b08a6a1_to_2d0f4a3.patch:
* debian/patches/199-git-backport-2.32.1-to-b08a6a1.patch:
* debian/patches/199-git-skip-empty-cache-files-ee21a86.patch:
  - Fixed upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_various_linking_issues.patch
1
 
commit 15c7d8948cd0f628097976b7c054c79a6627841c
2
 
Author: Diego Escalante Urrelo <descalante@igalia.com>
3
 
Date:   Mon Nov 22 20:02:16 2010 -0500
4
 
 
5
 
    Bug 635572 - Various linking failures
6
 
    
7
 
    On Debian sid, using binutils-gold, a couple missing links are discovered.
8
 
 
9
 
diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
10
 
index 12db8f8..997c727 100644
11
 
--- a/addressbook/libedata-book/Makefile.am
12
 
+++ b/addressbook/libedata-book/Makefile.am
13
 
@@ -82,6 +82,7 @@ e_addressbook_factory_SOURCES = \
14
 
 
15
 
 e_addressbook_factory_LDADD =                                  \
16
 
        libedata-book-1.2.la                                    \
17
 
+       $(EVOLUTION_ADDRESSBOOK_LIBS)                           \
18
 
        $(top_builddir)/libedataserver/libedataserver-1.2.la    \
19
 
        $(top_builddir)/libebackend/libebackend-1.2.la
20
 
 
21
 
diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
22
 
index 82dd911..cb9ad96 100644
23
 
--- a/calendar/libedata-cal/Makefile.am
24
 
+++ b/calendar/libedata-cal/Makefile.am
25
 
@@ -111,6 +111,7 @@ e_calendar_factory_CPPFLAGS = \
26
 
        $(EVOLUTION_CALENDAR_CFLAGS)
27
 
 
28
 
 e_calendar_factory_LDADD =                                             \
29
 
+       $(top_builddir)/calendar/libecal/libecal-1.2.la                 \
30
 
        $(top_builddir)/calendar/libegdbus/libegdbus-cal.la             \
31
 
        libedata-cal-1.2.la                                             \
32
 
        $(top_builddir)/libedataserver/libedataserver-1.2.la            \
33
 
@@ -128,9 +129,10 @@ test_e_sexp_CPPFLAGS = \
34
 
        -DTESTER=1
35
 
 
36
 
 test_e_sexp_LDADD = \
37
 
-       libedata-cal-1.2.la                                                     \
38
 
-       $(top_builddir)/calendar/libecal/libecal-1.2.la                         \
39
 
-       $(top_builddir)/libedataserver/libedataserver-1.2.la                    \
40
 
+       libedata-cal-1.2.la                                     \
41
 
+       $(top_builddir)/calendar/libecal/libecal-1.2.la         \
42
 
+       $(top_builddir)/libedataserver/libedataserver-1.2.la    \
43
 
+       $(EVOLUTION_CALENDAR_LIBS)                              \
44
 
        $(E_DATA_SERVER_LIBS)
45
 
 
46
 
 test_intervaltree_SOURCES = test-intervaltree.c e-cal-backend-intervaltree.c
47
 
diff --git a/camel/providers/imapx/Makefile.am b/camel/providers/imapx/Makefile.am
48
 
index 1e7a0a3..a8ae7be 100644
49
 
--- a/camel/providers/imapx/Makefile.am
50
 
+++ b/camel/providers/imapx/Makefile.am
51
 
@@ -54,6 +54,7 @@ test_imapx_CPPFLAGS = \
52
 
        -DG_LOG_DOMAIN=\"camel-imapx\"
53
 
 test_imapx_SOURCES = test-imapx.c
54
 
 test_imapx_LDADD =                                                     \
55
 
+       $(CAMEL_LIBS)                                                   \
56
 
        $(top_builddir)/camel/libcamel-1.2.la                           \
57
 
        $(top_builddir)/camel/libcamel-provider-1.2.la
58
 
 
59
 
diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am
60
 
index 0337fae..f746165 100644
61
 
--- a/libedataserverui/Makefile.am
62
 
+++ b/libedataserverui/Makefile.am
63
 
@@ -98,11 +98,15 @@ TEST_EDATASERVERUI_CPPFLAGS= \
64
 
 if ENABLE_GTK3
65
 
 TEST_EDATASERVERUI_LDFLAGS = \
66
 
        libedataserverui-3.0.la                                 \
67
 
+       $(top_builddir)/camel/libcamel-1.2.la                   \
68
 
+       $(top_builddir)/addressbook/libebook/libebook-1.2.la    \
69
 
        $(top_builddir)/libedataserver/libedataserver-1.2.la    \
70
 
        $(E_DATA_SERVER_UI_LIBS)
71
 
 else
72
 
 TEST_EDATASERVERUI_LDFLAGS = \
73
 
        libedataserverui-1.2.la                                 \
74
 
+       $(top_builddir)/camel/libcamel-1.2.la                   \
75
 
+       $(top_builddir)/addressbook/libebook/libebook-1.2.la    \
76
 
        $(top_builddir)/libedataserver/libedataserver-1.2.la    \
77
 
        $(E_DATA_SERVER_UI_LIBS)
78
 
 endif