[oe-commits] org.oe.dev merge of '07b7a00cd47af0555ac72032429c0ef42baad5ec'

[koen commit]

merge of '07b7a00cd47af0555ac72032429c0ef42baad5ec'
     and 'a9b77dce74783f5b5be87dcb91229c55762834fc'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 2df14f77bc0b8cf45fc50980504c05318fd972b9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2df14f77bc0b8cf45fc50980504c05318fd972b9
Files:
1
packages/abiword/abiword-embedded_2.5.2.bb
packages/abiword/abiword-plugins_2.5.2.bb
packages/abiword/abiword_2.5.2.bb
conf/distro/include/sane-srcdates.inc
Diffs:

#
# mt diff -r07b7a00cd47af0555ac72032429c0ef42baad5ec -r2df14f77bc0b8cf45fc50980504c05318fd972b9
#
# 
# 
# add_file "packages/abiword/abiword-embedded_2.5.2.bb"
#  content [f5eb7c78697311dd47c0487749b1225434ed84f9]
# 
# add_file "packages/abiword/abiword-plugins_2.5.2.bb"
#  content [380a4ea0f3f1f3606d2a65ae330bb4bc025f1452]
# 
# add_file "packages/abiword/abiword_2.5.2.bb"
#  content [c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1]
# 
============================================================
--- packages/abiword/abiword-embedded_2.5.2.bb	f5eb7c78697311dd47c0487749b1225434ed84f9
+++ packages/abiword/abiword-embedded_2.5.2.bb	f5eb7c78697311dd47c0487749b1225434ed84f9
@@ -0,0 +1,10 @@
+require abiword-2.5.inc
+
+EXTRA_OECONF += "--enable-embedded"
+
+S = "${WORKDIR}/abiword-${PV}"
+
+RCONFLICTS = "abiword"
+RPROVIDES += "abiword"
+
+
============================================================
--- packages/abiword/abiword-plugins_2.5.2.bb	380a4ea0f3f1f3606d2a65ae330bb4bc025f1452
+++ packages/abiword/abiword-plugins_2.5.2.bb	380a4ea0f3f1f3606d2a65ae330bb4bc025f1452
@@ -0,0 +1,39 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+	   "
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = " --without-libwmf \
+                 --without-inter7eps \
+		 --with-abiword=${WORKDIR}/abiword-${PV} \
+		 --with-boost=${STAGINC_INCDIR}/../ \ 
+		 "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.5/plugins', d)
+	do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+        do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='')
+}
+
+
+PACKAGES =+ "abiword-plugin-collab-glade"
+
+FILES_abiword-plugin-collab-glade += "${datadir}"
+RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
+
+FILES_${PN}-dbg += "${libdir}/abiword-2.5/plugins/.debug"
+
============================================================
--- packages/abiword/abiword_2.5.2.bb	c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1
+++ packages/abiword/abiword_2.5.2.bb	c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1
@@ -0,0 +1,7 @@
+require abiword-2.5.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "r0"
+
+RCONFLICTS = "abiword-embedded"


#
# mt diff -ra9b77dce74783f5b5be87dcb91229c55762834fc -r2df14f77bc0b8cf45fc50980504c05318fd972b9
#
# 
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [ccb3a58cdc94f8b3782b9c1addc3638f883f4b83]
#    to [f1ab446a8fd03f4c3c21fe929989805983c34b8d]
# 
============================================================
--- conf/distro/include/sane-srcdates.inc	ccb3a58cdc94f8b3782b9c1addc3638f883f4b83
+++ conf/distro/include/sane-srcdates.inc	f1ab446a8fd03f4c3c21fe929989805983c34b8d
@@ -40,6 +40,9 @@ SRCDATE_zaurusd ?= "20060628"
 SRCDATE_web ?= "20060613"
 SRCDATE_zaurusd ?= "20060628"
 
+# OpenMoko
+SRCDATE_uboot-openmoko = "20070820"
+
 # GPE
 SRCDATE_dasher-gpe  ?= "20060814"
 SRCDATE_rosetta ?= "20060804"