org.openembedded.dev: 660d6e1643f1da92bdf8e0ea043685cffa810f9d

[oe at monotone.openmoko.org]

revision:            660d6e1643f1da92bdf8e0ea043685cffa810f9d
date:                2008-05-04T12:36:21
author:              oe at openembedded.org
branch:              org.openembedded.dev
changelog:
merge of '72b5caa4d0825327887c110ab10309e54e23b537'
     and 'a858865489e9e014f299d9caaa2c9ce237ec87ac'

manifest:
format_version "1"

new_manifest [2dba538f1dbf814d9d2281498c1a8109d26fcb0a]

old_revision [72b5caa4d0825327887c110ab10309e54e23b537]

rename "packages/xapian/xapian-quickstartindex_1.0.bb"
    to "packages/xapian/xapian-quickstart.inc"

add_file "packages/xapian/xapian-core-native_1.0.5.bb"
 content [f53f0f3d23a4986dd1f3b808b4b7a7a4acea202c]

add_file "packages/xapian/xapian-quickstartindex-native_1.0.bb"
 content [d07b07ae26ee893e4a8fbc8401c86a23920792a3]

add_file "packages/xapian/xapian-quickstartindex_1.0.bb"
 content [503ae28911dc24fe53a2bcf189638f089205b4c9]

add_file "packages/xapian/xapian-quickstartsearch_1.0.bb"
 content [c1a70c8535df3383bcc91c64ecfbe94ef458d3fd]

patch "packages/xapian/xapian-quickstart.inc"
 from [1c7028dd7343e73e3fcc0fe3750699b578adb9d9]
   to [3ada22f1aec5b46950e441445b902e7e7fc06a12]

old_revision [a858865489e9e014f299d9caaa2c9ce237ec87ac]

add_file "packages/gnome/epiphany_2.22.1.bb"
 content [e11dacf27365b72ec178166a6d92a04de4366667]
-------------- next part --------------
#
#
# rename "packages/xapian/xapian-quickstartindex_1.0.bb"
#     to "packages/xapian/xapian-quickstart.inc"
# 
# add_file "packages/xapian/xapian-core-native_1.0.5.bb"
#  content [f53f0f3d23a4986dd1f3b808b4b7a7a4acea202c]
# 
# add_file "packages/xapian/xapian-quickstartindex-native_1.0.bb"
#  content [d07b07ae26ee893e4a8fbc8401c86a23920792a3]
# 
# add_file "packages/xapian/xapian-quickstartindex_1.0.bb"
#  content [503ae28911dc24fe53a2bcf189638f089205b4c9]
# 
# add_file "packages/xapian/xapian-quickstartsearch_1.0.bb"
#  content [c1a70c8535df3383bcc91c64ecfbe94ef458d3fd]
# 
# patch "packages/xapian/xapian-quickstart.inc"
#  from [1c7028dd7343e73e3fcc0fe3750699b578adb9d9]
#    to [3ada22f1aec5b46950e441445b902e7e7fc06a12]
#
============================================================
--- packages/xapian/xapian-core-native_1.0.5.bb	f53f0f3d23a4986dd1f3b808b4b7a7a4acea202c
+++ packages/xapian/xapian-core-native_1.0.5.bb	f53f0f3d23a4986dd1f3b808b4b7a7a4acea202c
@@ -0,0 +1,5 @@
+require xapian-core_${PV}.bb
+
+inherit native
+
+S = "${WORKDIR}/xapian-core-${PV}"
============================================================
--- packages/xapian/xapian-quickstartindex-native_1.0.bb	d07b07ae26ee893e4a8fbc8401c86a23920792a3
+++ packages/xapian/xapian-quickstartindex-native_1.0.bb	d07b07ae26ee893e4a8fbc8401c86a23920792a3
@@ -0,0 +1,9 @@
+require xapian-quickstartindex_${PV}.bb
+
+DEPENDS = "xapian-core-native"
+
+inherit native
+
+do_stage() {
+        install -m 0744 ${WORKDIR}/${BINARY_NAME} ${STAGING_BINDIR}
+}
============================================================
--- packages/xapian/xapian-quickstartindex_1.0.bb	503ae28911dc24fe53a2bcf189638f089205b4c9
+++ packages/xapian/xapian-quickstartindex_1.0.bb	503ae28911dc24fe53a2bcf189638f089205b4c9
@@ -0,0 +1,4 @@
+require xapian-quickstart.inc
+
+DESCRIPTION += "This package provides the tool for creating the index."
+PR = "r1"
============================================================
--- packages/xapian/xapian-quickstartsearch_1.0.bb	c1a70c8535df3383bcc91c64ecfbe94ef458d3fd
+++ packages/xapian/xapian-quickstartsearch_1.0.bb	c1a70c8535df3383bcc91c64ecfbe94ef458d3fd
@@ -0,0 +1,4 @@
+require xapian-quickstart.inc
+
+DESCRIPTION += "This package provides the tool for searching the index."
+PR = "r1"
============================================================
--- packages/xapian/xapian-quickstartindex_1.0.bb	1c7028dd7343e73e3fcc0fe3750699b578adb9d9
+++ packages/xapian/xapian-quickstart.inc	3ada22f1aec5b46950e441445b902e7e7fc06a12
@@ -1,18 +1,20 @@
-DESCRIPTION = "Simplest possible indexer (from older release of xapian)"
+DESCRIPTION = "Simplest possible indexer (from an older release of xapian)."
 HOMEPAGE = "http://users.softlab.ece.ntua.gr/~ttsiod/buildWikipediaOffline.html"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "xapian-core"
-PR = "r0"
 
-SRC_URI = "http://users.softlab.ece.ntua.gr/~ttsiod/quickstartindex.cc"
+BINARY_NAME = ${@bb.data.getVar("PN",d,1).replace("xapian-","").replace("-native","")}
 S = "${WORKDIR}"
 
+SRC_URI = "http://users.softlab.ece.ntua.gr/~ttsiod/${BINARY_NAME}.cc"
+
 do_compile() {
-        ${CXX} ${CXXLAGS} ${LDFLAGS} -lxapian -o quickstartindex quickstartindex.cc
+        ${CXX} ${CXXLAGS} ${LDFLAGS} -I${STAGING_INCDIR_NATIVE} -lxapian -o ${BINARY_NAME} ${BINARY_NAME}.cc
 }
 
 do_install() {
+        install -d ${D}$
         install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/quickstartindex ${D}${bindir}/
+        install -m 0755 ${WORKDIR}/${BINARY_NAME} ${D}${bindir}/
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080506/58b19216/attachment.htm 
-------------- next part --------------
#
#
# add_file "packages/gnome/epiphany_2.22.1.bb"
#  content [e11dacf27365b72ec178166a6d92a04de4366667]
#
============================================================
--- packages/gnome/epiphany_2.22.1.bb	e11dacf27365b72ec178166a6d92a04de4366667
+++ packages/gnome/epiphany_2.22.1.bb	e11dacf27365b72ec178166a6d92a04de4366667
@@ -0,0 +1,17 @@
+DESCRIPTION = "GNOME default webbrowser"
+DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
+RDEPENDS = "gnome-vfs-plugin-http"
+
+inherit gnome
+
+
+EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
+
+do_configure_prepend() {
+        touch ${S}/gnome-doc-utils.make
+        sed -i -e s:help::g Makefile.am
+}
+
+FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
+
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080506/58b19216/attachment-0001.htm