[oe-commits] org.oe.dev merge of 'a6eb93692ca38c674d1bc2d35444de89a6f5414f'

[cbrake commit]

merge of 'a6eb93692ca38c674d1bc2d35444de89a6f5414f'
     and 'ea03196e34e8a5d2435ae7d87522ec1acb271da9'

Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: 9d03a6523d65e2c27536cc9d6cd60b8b0838e177
ViewMTN: http://monotone.openembedded.org/revision/info/9d03a6523d65e2c27536cc9d6cd60b8b0838e177
Files:
1
packages/sylpheed/claws-mail.inc
packages/sylpheed/claws-mail_2.7.2.bb
packages/sylpheed/claws-mail_2.9.1.bb
packages/sylpheed/claws-mail_3.0.1.bb
packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.14.1.bb
packages/sylpheed/claws-plugin-maildir_0.24.4.bb
packages/sylpheed/claws-plugin-mailmbox_1.12.4.bb
packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb
packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.2.bb
packages/sylpheed/claws-plugin-mailmbox_1.13.bb
packages/sylpheed/claws-plugin-mailmbox_1.14.bb
packages/sylpheed/claws-plugin-rssyl_0.13.bb
packages/sylpheed/claws-plugin-rssyl_0.15.bb
packages/sylpheed/claws-mail_3.0.2.bb
packages/libtiff/tiff-3.7.2
packages/libtiff/tiff-3.7.2/configure.patch
packages/libtiff/tiff_3.7.2.bb
Diffs:

#
# mt diff -ra6eb93692ca38c674d1bc2d35444de89a6f5414f -r9d03a6523d65e2c27536cc9d6cd60b8b0838e177
#
# 
# 
# delete "packages/sylpheed/claws-mail.inc"
# 
# delete "packages/sylpheed/claws-mail_2.7.2.bb"
# 
# delete "packages/sylpheed/claws-mail_2.9.1.bb"
# 
# delete "packages/sylpheed/claws-mail_3.0.1.bb"
# 
# delete "packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.14.1.bb"
# 
# delete "packages/sylpheed/claws-plugin-maildir_0.24.4.bb"
# 
# delete "packages/sylpheed/claws-plugin-mailmbox_1.12.4.bb"
# 
# rename "packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb"
#     to "packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.2.bb"
# 
# rename "packages/sylpheed/claws-plugin-mailmbox_1.13.bb"
#     to "packages/sylpheed/claws-plugin-mailmbox_1.14.bb"
# 
# rename "packages/sylpheed/claws-plugin-rssyl_0.13.bb"
#     to "packages/sylpheed/claws-plugin-rssyl_0.15.bb"
# 
# add_file "packages/sylpheed/claws-mail_3.0.2.bb"
#  content [2b9c8d5e2a719ef32b55b66d6c5385b2108d35bb]
# 
============================================================
--- packages/sylpheed/claws-mail_3.0.2.bb	2b9c8d5e2a719ef32b55b66d6c5385b2108d35bb
+++ packages/sylpheed/claws-mail_3.0.2.bb	2b9c8d5e2a719ef32b55b66d6c5385b2108d35bb
@@ -0,0 +1,43 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ libetpan openssl aspell"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "\
+	${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2	\
+	file://desktop.patch;patch=1				\
+	"
+
+FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
+
+EXTRA_OECONF = "--disable-aspell-test 		\
+		--enable--aspell 		\
+		--disable-manual		\
+		--disable-crash-dialog		\
+		--disable-jpilot		\
+		--disable-trayicon-plugin	\
+		--disable-spamassassin-plugin	\
+		--disable-bogofilter-plugin	\
+		--disable-pgpcore-plugin	\
+		--disable-pgpmime-plugin	\
+		--disable-pgpinline-plugin	\
+  		--disable-dillo-viewer-plugin	\
+		--disable-clamav-plugin		\
+		--disable-gnomeprint		\
+		--disable-valgrind		\
+		"
+
+inherit autotools pkgconfig
+
+do_install_append() {
+	install -d ${D}${datadir}/applications
+	install -m 0644 claws-mail.desktop ${D}${datadir}/applications/
+	install -d ${D}${datadir}/pixmaps
+	install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
+}
+
+do_stage () {
+	autotools_stage_all
+}
+


#
# mt diff -rea03196e34e8a5d2435ae7d87522ec1acb271da9 -r9d03a6523d65e2c27536cc9d6cd60b8b0838e177
#
# 
# 
# add_dir "packages/libtiff/tiff-3.7.2"
# 
# add_file "packages/libtiff/tiff-3.7.2/configure.patch"
#  content [333c35f3da58ad6ad0feafe413c65a41a25ee7df]
# 
# patch "packages/libtiff/tiff_3.7.2.bb"
#  from [de037716db34eab6e8187cd73e55b8a4f145add7]
#    to [11812494c5ede2018d6bf81e95c44cde62630994]
# 
============================================================
--- packages/libtiff/tiff-3.7.2/configure.patch	333c35f3da58ad6ad0feafe413c65a41a25ee7df
+++ packages/libtiff/tiff-3.7.2/configure.patch	333c35f3da58ad6ad0feafe413c65a41a25ee7df
@@ -0,0 +1,20 @@
+Index: tiff-3.7.2/configure.ac
+===================================================================
+--- tiff-3.7.2.orig/configure.ac	2005-03-15 10:42:19.000000000 -0500
++++ tiff-3.7.2/configure.ac	2007-10-10 12:05:58.000000000 -0400
+@@ -32,7 +32,6 @@
+ AC_CANONICAL_TARGET
+ 
+ AM_INIT_AUTOMAKE
+-AM_PROG_CC_C_O
+ dnl Do not rebuild generated files every time
+ AM_MAINTAINER_MODE
+ 
+@@ -55,6 +54,7 @@
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ 
+ dnl We want warnings. As many warnings as possible.
+ #VL_PROG_CC_WARNINGS()
============================================================
--- packages/libtiff/tiff_3.7.2.bb	de037716db34eab6e8187cd73e55b8a4f145add7
+++ packages/libtiff/tiff_3.7.2.bb	11812494c5ede2018d6bf81e95c44cde62630994
@@ -1,10 +1,11 @@ DEPENDS = "zlib jpeg"
 DESCRIPTION = "This software provides support for the Tag Image File Format (TIFF)"
 LICENSE = ""
 HOMEPAGE = "http://www.remotesensing.org/libtiff/"
 DEPENDS = "zlib jpeg"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz"
+SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz \
+	  file://configure.patch;patch=1"
 
 inherit autotools