From: | "Gilles Dartiguelongue (eva)" <eva@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in mail-client/evolution/files: evolution-2.30.3-fix-linking-issues-in-libeshell.patch |
Date: | Wed, 08 Sep 2010 18:57:59 |
Message-Id: | 20100908185754.E45DE20054@flycatcher.gentoo.org |
1 | eva 10/09/08 18:57:54 |
2 | |
3 | Added: |
4 | evolution-2.30.3-fix-linking-issues-in-libeshell.patch |
5 | Log: |
6 | Version bump. Loads of fixes and translation updates. |
7 | |
8 | (Portage version: 2.2_rc74/cvs/Linux x86_64) |
9 | |
10 | Revision Changes Path |
11 | 1.1 mail-client/evolution/files/evolution-2.30.3-fix-linking-issues-in-libeshell.patch |
12 | |
13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/files/evolution-2.30.3-fix-linking-issues-in-libeshell.patch?rev=1.1&view=markup |
14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/files/evolution-2.30.3-fix-linking-issues-in-libeshell.patch?rev=1.1&content-type=text/plain |
15 | |
16 | Index: evolution-2.30.3-fix-linking-issues-in-libeshell.patch |
17 | =================================================================== |
18 | From 7ae36c45c81c8f1f4e837b564ea73c035c34a395 Mon Sep 17 00:00:00 2001 |
19 | From: Gilles Dartiguelongue <eva@g.o> |
20 | Date: Wed, 8 Sep 2010 18:39:35 +0200 |
21 | Subject: [PATCH] Fix linking issues in libeshell |
22 | |
23 | --- |
24 | shell/Makefile.am | 9 ++++++++- |
25 | 1 files changed, 8 insertions(+), 1 deletions(-) |
26 | |
27 | diff --git a/shell/Makefile.am b/shell/Makefile.am |
28 | index 7b742de..64ced47 100644 |
29 | --- a/shell/Makefile.am |
30 | +++ b/shell/Makefile.am |
31 | @@ -2,6 +2,12 @@ if ENABLE_TEST_COMPONENT |
32 | SUBDIRS = . test |
33 | endif |
34 | |
35 | +if OS_WIN32 |
36 | +eggsm_libs = |
37 | +else |
38 | +eggsm_libs = -lSM -lICE |
39 | +endif |
40 | + |
41 | # Executable |
42 | bin_PROGRAMS = evolution |
43 | |
44 | @@ -82,7 +88,8 @@ libeshell_la_LIBADD = \ |
45 | $(top_builddir)/widgets/misc/libemiscwidgets.la \ |
46 | $(top_builddir)/widgets/menus/libmenus.la \ |
47 | $(GNOME_PLATFORM_LIBS) \ |
48 | - $(SHELL_LIBS) |
49 | + $(SHELL_LIBS) \ |
50 | + $(eggsm_libs) |
51 | |
52 | # Evolution executable |
53 | |
54 | -- |
55 | 1.7.2.2 |