summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-03-19 14:59:49 +0000
committerJoshua Lock <josh@linux.intel.com>2010-03-19 14:59:49 +0000
commitd296df43975bb99586a023dceb064a867ce304b1 (patch)
tree1b2d52ff025b59674db420f144c352f4a93aed62 /meta
parent34e1b3ef1ce646420c228734d43eca5d71f5ccf8 (diff)
downloadpoky-d296df43975bb99586a023dceb064a867ce304b1.tar.gz
claws-mail: Fix building with new automake
Having the same file listed multiple times in Makefile.am breaks with new Autotools Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/claws-mail/claws-mail.inc6
-rw-r--r--meta/packages/claws-mail/files/fix-build.patch24
2 files changed, 28 insertions, 2 deletions
diff --git a/meta/packages/claws-mail/claws-mail.inc b/meta/packages/claws-mail/claws-mail.inc
index f3208a169c..04401df2f5 100644
--- a/meta/packages/claws-mail/claws-mail.inc
+++ b/meta/packages/claws-mail/claws-mail.inc
@@ -3,13 +3,14 @@ DESCRIPTION = "Mail user agent"
3#DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell openssl" 3#DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell openssl"
4DEPENDS = "gtk+ libetpan openssl libowl" 4DEPENDS = "gtk+ libetpan openssl libowl"
5LICENSE = "GPL" 5LICENSE = "GPL"
6PR = "r5" 6PR = "r6"
7 7
8SRC_URI = "\ 8SRC_URI = "\
9 ${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \ 9 ${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \
10 file://desktop.patch;patch=1 \ 10 file://desktop.patch;patch=1 \
11 file://streamline-ui.patch;patch=1 \ 11 file://streamline-ui.patch;patch=1 \
12 file://owl-window-menu.patch;patch=1 \ 12 file://owl-window-menu.patch;patch=1 \
13 file://fix-build.patch;patch=1 \
13 " 14 "
14 15
15FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" 16FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
@@ -35,11 +36,12 @@ EXTRA_OECONF = "--disable-aspell-test \
35# --disable-libetpan \ 36# --disable-libetpan \
36 --disable-gnomeprint \ 37 --disable-gnomeprint \
37 --disable-valgrind \ 38 --disable-valgrind \
39 --disable-static \
38 " 40 "
39 41
40CFLAGS += "-D_GNU_SOURCE" 42CFLAGS += "-D_GNU_SOURCE"
41 43
42inherit autotools_stage pkgconfig gettext 44inherit autotools pkgconfig gettext
43 45
44do_install_append() { 46do_install_append() {
45 install -d ${D}${datadir}/applications 47 install -d ${D}${datadir}/applications
diff --git a/meta/packages/claws-mail/files/fix-build.patch b/meta/packages/claws-mail/files/fix-build.patch
new file mode 100644
index 0000000000..2f30899fe1
--- /dev/null
+++ b/meta/packages/claws-mail/files/fix-build.patch
@@ -0,0 +1,24 @@
1Remove duplicate file entries as this breaks install with new Automake
2
3JL 19/03/10
4
5Index: claws-mail-2.9.1/src/gtk/Makefile.am
6===================================================================
7--- claws-mail-2.9.1.orig/src/gtk/Makefile.am 2007-03-22 07:52:47.000000000 +0000
8+++ claws-mail-2.9.1/src/gtk/Makefile.am 2010-03-19 14:54:06.565828281 +0000
9@@ -44,7 +44,6 @@
10 filesel.h \
11 foldersort.h \
12 gtkaspell.h \
13- gtksctree.h \
14 gtkshruler.h \
15 gtksctree.h \
16 gtksourceprintjob.h \
17@@ -57,7 +56,6 @@
18 menu.h \
19 pluginwindow.h \
20 prefswindow.h \
21- gtkvscrollbutton.h \
22 progressdialog.h \
23 quicksearch.h \
24 sslcertwindow.h \