| author | Niveditha Rau <Niveditha.Rau@Oracle.COM> |
| Fri, 28 Oct 2016 14:57:43 -0700 | |
| changeset 7192 | bcbc95c2f212 |
| permissions | -rw-r--r-- |
|
7192
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
1 |
This is a hack for which I have found no alternative; it allows |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
2 |
gobject-introspection to find the nss/nspr libraries when it's scanning the |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
3 |
libraries. Since it isn't used by any binaries or libraries we deliver, it |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
4 |
should be ok, but I wish there was a better solution. |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
5 |
|
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
6 |
Not appropriate for upstream. |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
7 |
--- evolution-data-server-3.16.2/addressbook/libebook/Makefile.am 2015-03-22 23:41:04.000000000 -0700 |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
8 |
+++ evolution-data-server-3.16.2/addressbook/libebook/Makefile.am 2015-07-16 18:27:14.254242705 -0700 |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
9 |
@@ -133,6 +133,10 @@ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
10 |
$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
11 |
libebook-1.2.la $(top_builddir)/libedataserver/libedataserver-1.2.la \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
12 |
$(NULL) |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
13 |
+EBook_1_2_gir_LDFLAGS = \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
14 |
+ -L/usr/lib/mps/64 \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
15 |
+ -L/usr/lib/mps \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
16 |
+ $(NULL) |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
17 |
EBook_1_2_gir_FILES = \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
18 |
$(libebook_1_2_la_SOURCES) \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
19 |
$(libebookinclude_HEADERS) \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
20 |
--- evolution-data-server-3.16.2/addressbook/libebook-contacts/Makefile.am 2015-03-22 23:41:04.000000000 -0700 |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
21 |
+++ evolution-data-server-3.16.2/addressbook/libebook-contacts/Makefile.am 2015-07-16 18:27:21.249507947 -0700 |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
22 |
@@ -142,6 +142,10 @@ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
23 |
EBookContacts_1_2_gir_LIBS = \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
24 |
libebook-contacts-1.2.la $(top_builddir)/libedataserver/libedataserver-1.2.la \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
25 |
$(NULL) |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
26 |
+EBookContacts_1_2_gir_LDFLAGS = \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
27 |
+ -L/usr/lib/mps/64 \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
28 |
+ -L/usr/lib/mps \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
29 |
+ $(NULL) |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
30 |
EBookContacts_1_2_gir_FILES = \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
31 |
$(libebook_contacts_1_2_la_SOURCES) \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
32 |
$(libebookcontactsinclude_HEADERS) \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
33 |
--- evolution-data-server-3.16.2/libedataserver/Makefile.am 2015-03-22 23:41:04.000000000 -0700 |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
34 |
+++ evolution-data-server-3.16.2/libedataserver/Makefile.am 2015-07-16 18:27:44.552846725 -0700 |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
35 |
@@ -261,6 +261,10 @@ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
36 |
libedataserver-1.2.la \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
37 |
$(top_builddir)/camel/libcamel-1.2.la \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
38 |
$(NULL) |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
39 |
+EDataServer_1_2_gir_LDFLAGS = \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
40 |
+ -L/usr/lib/mps/64 \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
41 |
+ -L/usr/lib/mps \ |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
42 |
+ $(NULL) |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
43 |
EDataServer_1_2_gir_FILES = $(introspection_sources) |
|
bcbc95c2f212
23245290 Move evolution-data-server to Userland and update to 3.18.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
44 |
INTROSPECTION_GIRS += EDataServer-1.2.gir |