[oe-commits] org.oe.dev merge of '1372c5a3008f1e559f32d05877593e8fa87e3e51'

pfalcon commit oe at amethyst.openembedded.net
Mon Mar 17 08:54:39 UTC 2008


merge of '1372c5a3008f1e559f32d05877593e8fa87e3e51'
     and '38f9432c595bce2786e31909b48e40b52b697bb0'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 7ecf249aa01227cf559b984727eddf32c13c84a5
ViewMTN: http://monotone.openembedded.org/revision/info/7ecf249aa01227cf559b984727eddf32c13c84a5
Files:
1
packages/linux/linux-handhelds-2.6.inc
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/openmoko-projects
packages/packagekit
packages/packagekit/files
packages/gypsy/files/docs-reference-am.patch
packages/intltool/files/intltool-0.35.5-polkit.patch
packages/mono/mono-1.2.5.1/disable-monoburg.patch
packages/openmoko-projects/assassin_svn.bb
packages/openmoko-projects/diversity-daemon_svn.bb
packages/openmoko-projects/diversity-nav_svn.bb
packages/packagekit/files/disable-docbook2man.patch
packages/packagekit/packagekit_git.bb
classes/package_deb.bbclass
conf/distro/include/moko-autorev.inc
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc
packages/e17/e-wm_cvs.bb
packages/gnash/gnash.inc
packages/gypsy/gypsy_svn.bb
packages/intltool/intltool_0.35.5.bb
packages/mono/mono-native_1.2.5.1.bb
packages/mono/mono_1.2.5.1.bb
packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
Diffs:

#
# mt diff -r1372c5a3008f1e559f32d05877593e8fa87e3e51 -r7ecf249aa01227cf559b984727eddf32c13c84a5
#
#
#
# patch "packages/linux/linux-handhelds-2.6.inc"
#  from [70d018f15aa5f5a88cbad6314c69d71719eb911f]
#    to [98a6f0f9f040fedbfaf3ba13c0c39685da9f4c34]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
#  from [1fe13d52ca457feb5a103d0b1ccbce114ec04797]
#    to [77d66be7e651da29ca286c2f28474b976270f746]
#
============================================================
--- packages/linux/linux-handhelds-2.6.inc	70d018f15aa5f5a88cbad6314c69d71719eb911f
+++ packages/linux/linux-handhelds-2.6.inc	98a6f0f9f040fedbfaf3ba13c0c39685da9f4c34
@@ -37,6 +37,11 @@ do_configure() {
 		die "No default configuration for ${MACHINE} available."
 	fi
 
+	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then
+		# Kernel expects non-compressed cpio
+		gzip -d -c ${KERNEL_INITRAMFS_PATH} >${WORKDIR}/initramfs.cpio
+		echo "CONFIG_INITRAMFS_SOURCE=\"${WORKDIR}/initramfs.cpio\"" >> ${S}/.config
+	fi
 
 	if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
@@ -48,26 +53,13 @@ do_configure() {
 
 	sed 	-e '/CONFIG_AEABI/d' \
 		-e '/CONFIG_OABI_COMPAT=/d' \
+		-e '/CONFIG_INITRAMFS_SOURCE=/d' \
 		'${WORKDIR}/defconfig' >>'${S}/.config'
 
 	yes '' | oe_runmake oldconfig
 
 }
 
-do_compile_prepend() {
-	# Clean up any stale initramfs archive
-	rm -f usr/initramfs_data.cpio.gz
-	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then
-	    if [ ! -f ${KERNEL_INITRAMFS_PATH} ]; then
-		echo "${KERNEL_INITRAMFS_PATH} does not exist, you may need to bitbake it separately"
-		exit 1
-	    fi
-	    cp ${KERNEL_INITRAMFS_PATH} usr/initramfs_data.cpio.gz
-	    # touch is for broken Koen's cp
-	    touch usr/initramfs_data.cpio.gz
-	fi
-}
-
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME}
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb	1fe13d52ca457feb5a103d0b1ccbce114ec04797
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb	77d66be7e651da29ca286c2f28474b976270f746
@@ -1,7 +1,7 @@ LICENSE = "GPL"
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-PR = "r18"
+PR = "r19"
 
 DEFAULT_PREFERENCE = "-1"
 


#
# mt diff -r38f9432c595bce2786e31909b48e40b52b697bb0 -r7ecf249aa01227cf559b984727eddf32c13c84a5
#
#
#
# add_dir "packages/openmoko-projects"
# 
# add_dir "packages/packagekit"
# 
# add_dir "packages/packagekit/files"
# 
# add_file "packages/gypsy/files/docs-reference-am.patch"
#  content [de4e6ccfad1cfbd1d60a310a472e9210ef5c84b3]
# 
# add_file "packages/intltool/files/intltool-0.35.5-polkit.patch"
#  content [72d062a3f136a1d3ad5d1db1d7af59a3be4b5e0d]
# 
# add_file "packages/mono/mono-1.2.5.1/disable-monoburg.patch"
#  content [dfe52ba84c77f75205b8b02c6140c27ef67a7709]
# 
# add_file "packages/openmoko-projects/assassin_svn.bb"
#  content [138a3c3ebad00edd5369a922d879c6435db33028]
# 
# add_file "packages/openmoko-projects/diversity-daemon_svn.bb"
#  content [999b1e20ed0a67ee79e83a1483e4de1d18c21e1f]
# 
# add_file "packages/openmoko-projects/diversity-nav_svn.bb"
#  content [735e09ebf7933d1a68caa20982cd25a68e8dae54]
# 
# add_file "packages/packagekit/files/disable-docbook2man.patch"
#  content [bf9e1424e2ef4fc6731a7fdd94075945bf6cee63]
# 
# add_file "packages/packagekit/packagekit_git.bb"
#  content [8fe65fd15a32dc4664adf3b54c04374d3aff362c]
# 
# patch "classes/package_deb.bbclass"
#  from [29ec1e6d134d74483c5c26043872a32cdc95bdc9]
#    to [a780e6f7dff8c1d720645d2b4f66b6f8e05d576d]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [8693d3caf1c49ddccfce7c158c5cec881d623a58]
#    to [9a1c96718efce77233cdcd54100dcf160e30b2c4]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [ec064cf6915151b8ae2e72c80c9b0b938053ada1]
#    to [e862f6042ce71dd536cb1abf60132cdda2d229ea]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [c7d0ad4faccc7664f24cec0e8e6628005208830a]
#    to [7807b46edf3ad60c42d97c25c0059e4324ce7a1c]
# 
# patch "packages/e17/e-wm_cvs.bb"
#  from [a08de1bb584a6652174d86c1429131d56738c3e9]
#    to [2257fc48c13eef3f9a2d015680eee7ed70c6b167]
# 
# patch "packages/gnash/gnash.inc"
#  from [bc7ce0bb9d022a74c35eff388b180d174a1a2eef]
#    to [66c805eb5cfd0e18a89770e022d4420ee9013566]
# 
# patch "packages/gypsy/gypsy_svn.bb"
#  from [7c8bebbab2c817b985ad6679a088c571ea02dbb1]
#    to [2c21466c36d291378e0b1969c53da221456a3d20]
# 
# patch "packages/intltool/intltool_0.35.5.bb"
#  from [3988342f58d7e4721fe3ce448611d40b792d577c]
#    to [10a0f98d1497cd9141a619a9e75f44c063075ce0]
# 
# patch "packages/mono/mono-native_1.2.5.1.bb"
#  from [e463e56ce2e9dae0cd9780d8e21578fbe2c87ead]
#    to [8b7896804cad7ef3c1b4c10dbf0223ae1d8f67f0]
# 
# patch "packages/mono/mono_1.2.5.1.bb"
#  from [02c534f859b7637ca5aca1d0d851f0622b8e0ab2]
#    to [41d36ce7224102d48d7757b26c0ad42be6468b8b]
# 
# patch "packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch"
#  from [575298514df1fc14f35e686d68f10eb0e1584978]
#    to [2bc3dcecb39e5c4fcd3b9c7b27cd5efde31380e3]
# 
# patch "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
#  from [db78f04c96cb5d27ad12ca8a87b74256bfcbe02d]
#    to [9bb8f7f724382e4eefd1ee89dda392bc20c877d0]
#
============================================================
--- packages/gypsy/files/docs-reference-am.patch	de4e6ccfad1cfbd1d60a310a472e9210ef5c84b3
+++ packages/gypsy/files/docs-reference-am.patch	de4e6ccfad1cfbd1d60a310a472e9210ef5c84b3
@@ -0,0 +1,17 @@
+Index: gypsy/docs/reference/Makefile.am
+===================================================================
+--- gypsy.orig/docs/reference/Makefile.am	2008-03-10 13:15:06.000000000 +0800
++++ gypsy/docs/reference/Makefile.am	2008-03-10 13:15:24.000000000 +0800
+@@ -88,10 +88,10 @@
+ 
+ # Other files to distribute
+ # e.g. EXTRA_DIST += version.xml.in
+-EXTRA_DIST += version.xml.in \
++EXTRA_DIST = version.xml.in \
+ 	gypsy-design.png
+ 
+-CLEANFILES += $(dbus_docs)
++CLEANFILES = $(dbus_docs)
+ 
+ ref-%.xml: $(top_srcdir)/interfaces/%-full.xml
+ 	$(XSLT) -o $@ $(top_srcdir)/docs/tools/spec-to-docbook.xsl $<
============================================================
--- packages/intltool/files/intltool-0.35.5-polkit.patch	72d062a3f136a1d3ad5d1db1d7af59a3be4b5e0d
+++ packages/intltool/files/intltool-0.35.5-polkit.patch	72d062a3f136a1d3ad5d1db1d7af59a3be4b5e0d
@@ -0,0 +1,32 @@
+diff -up intltool-0.35.5/intltool.m4.polkit intltool-0.35.5/intltool.m4
+--- intltool-0.35.5/intltool.m4.polkit	2007-07-31 17:23:52.000000000 -0400
++++ intltool-0.35.5/intltool.m4	2007-07-31 17:24:20.000000000 -0400
+@@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+   INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ 
+ AC_SUBST(INTLTOOL_DESKTOP_RULE)
+ AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+@@ -84,6 +85,7 @@ AC_SUBST(INTLTOOL_CAVES_RULE)
+ AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+ AC_SUBST(INTLTOOL_THEME_RULE)
+ AC_SUBST(INTLTOOL_SERVICE_RULE)
++AC_SUBST(INTLTOOL_POLICY_RULE)
+ 
+ # Use the tools built into the package, not the ones that are installed.
+ AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+diff -up intltool-0.35.5/intltool-update.in.in.polkit intltool-0.35.5/intltool-update.in.in
+--- intltool-0.35.5/intltool-update.in.in.polkit	2007-07-31 17:10:52.000000000 -0400
++++ intltool-0.35.5/intltool-update.in.in	2007-07-31 17:21:45.000000000 -0400
+@@ -71,7 +71,8 @@ my $xml_support =
+ "sheet(?:\\.in)+|".	# ?
+ "schemas(?:\\.in)+|".	# GConf specific
+ "pong(?:\\.in)+|".	# DEPRECATED: PONG is not used [by GNOME] any longer.
+-"kbd(?:\\.in)+";	# GOK specific. 
++"kbd(?:\\.in)+|".	# GOK specific. 
++"policy(?:\\.in)+";	# PolicyKit files
+ 
+ my $ini_support =
+ "icon(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
============================================================
--- packages/mono/mono-1.2.5.1/disable-monoburg.patch	dfe52ba84c77f75205b8b02c6140c27ef67a7709
+++ packages/mono/mono-1.2.5.1/disable-monoburg.patch	dfe52ba84c77f75205b8b02c6140c27ef67a7709
@@ -0,0 +1,22 @@
+Index: mono-1.2.5.1/mono/Makefile.am
+===================================================================
+--- mono-1.2.5.1.orig/mono/Makefile.am	2008-03-05 15:52:06.000000000 +0800
++++ mono-1.2.5.1/mono/Makefile.am	2008-03-05 15:52:23.000000000 +0800
+@@ -1,3 +1,3 @@
+ 
+-SUBDIRS = utils io-layer monoburg os cil metadata \
++SUBDIRS = utils io-layer os cil metadata \
+       arch interpreter mini dis monograph tests benchmark profiler
+Index: mono-1.2.5.1/mono/mini/Makefile.am
+===================================================================
+--- mono-1.2.5.1.orig/mono/mini/Makefile.am	2008-03-05 16:02:51.000000000 +0800
++++ mono-1.2.5.1/mono/mini/Makefile.am	2008-03-05 16:02:57.000000000 +0800
+@@ -436,7 +436,7 @@
+ 	$(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc
+ 
+ inssel.c inssel.h: $(BURGSRC)
+-	$(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
++	monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
+ 
+ testi: mono test.exe
+ 	$(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe
============================================================
--- packages/openmoko-projects/assassin_svn.bb	138a3c3ebad00edd5369a922d879c6435db33028
+++ packages/openmoko-projects/assassin_svn.bb	138a3c3ebad00edd5369a922d879c6435db33028
@@ -0,0 +1,16 @@
+DESCRIPTION = "Action GUI for Installer"
+HOMEPAGE = "http://assassin.projects.openmoko.org/"
+LICENSE = "GPL"
+DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit"
+PV = "0.2+svn${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
+
+S = "${WORKDIR}/assassin"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = ""
+
+FILES_${PN} += "${prefix}/share/*"
============================================================
--- packages/openmoko-projects/diversity-daemon_svn.bb	999b1e20ed0a67ee79e83a1483e4de1d18c21e1f
+++ packages/openmoko-projects/diversity-daemon_svn.bb	999b1e20ed0a67ee79e83a1483e4de1d18c21e1f
@@ -0,0 +1,19 @@
+DESCRIPTION = "Diveristy Daemon"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "net/misc"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus gypsy libjana curl"
+RDEPENDS = "eds-dbus gypsy openmoko-dialer2"
+PV = "0.0+svnr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
+
+S = "${WORKDIR}/diversity-daemon"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-nm --disable-geoclue --disable-xmpp --enable-session-bus"
+
+FILES_${PN} += "${datadir}/dbus-1/"
+FILES_${PN} += "${sysconfdir}/dbus-1/"
============================================================
--- packages/openmoko-projects/diversity-nav_svn.bb	735e09ebf7933d1a68caa20982cd25a68e8dae54
+++ packages/openmoko-projects/diversity-nav_svn.bb	735e09ebf7933d1a68caa20982cd25a68e8dae54
@@ -0,0 +1,16 @@
+DESCRIPTION = "Diversity_nav - a GPS location based communicative application"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "openmoko/applications"
+LICENSE = "GPL"
+DEPENDS = "evas edje ecore edbus"
+RDEPENDS = "libevas-engine-buffer libevas-engine-software-16 libevas-engine-software-16-x11 libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-eet libevas-loader-jpeg libevas-loader-png"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
+
+S = "${WORKDIR}/diversity-nav"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
============================================================
--- packages/packagekit/files/disable-docbook2man.patch	bf9e1424e2ef4fc6731a7fdd94075945bf6cee63
+++ packages/packagekit/files/disable-docbook2man.patch	bf9e1424e2ef4fc6731a7fdd94075945bf6cee63
@@ -0,0 +1,12 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac	2008-02-20 17:57:44.000000000 +0800
++++ git/configure.ac	2008-02-20 17:58:30.000000000 +0800
+@@ -115,6 +115,7 @@
+ if test "$DOCBOOK2MAN" = "no" ; then
+ 	AC_MSG_WARN([docbook2man not found, will not be able to build man documentation])
+ 	fi
++DOCBOOK2MAN="no"
+ AM_CONDITIONAL(HAVE_DOCBOOK2MAN, [test "$DOCBOOK2MAN" != "no"])
+ 
+ dnl ---------------------------------------------------------------------------
============================================================
--- packages/packagekit/packagekit_git.bb	8fe65fd15a32dc4664adf3b54c04374d3aff362c
+++ packages/packagekit/packagekit_git.bb	8fe65fd15a32dc4664adf3b54c04374d3aff362c
@@ -0,0 +1,27 @@
+DESCRIPTION = "PackageKit package management abstraction"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool"
+RDEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 opkg"
+PV = "0.1+git${SRCREV}"
+PR = "r7"
+
+SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
+           file://disable-docbook2man.patch;patch=1"
+
+SRCREV = "${AUTOREV}"
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-security-framework=dummy --with-default-backend=opkg --enable-opkg"
+
+do_configure_prepend() {
+        echo "EXTRA_DIST=" > gtk-doc.make
+}
+do_stage () {
+        autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/packagekit-backend/*.so ${datadir}/dbus-1/system-services/"
============================================================
--- classes/package_deb.bbclass	29ec1e6d134d74483c5c26043872a32cdc95bdc9
+++ classes/package_deb.bbclass	a780e6f7dff8c1d720645d2b4f66b6f8e05d576d
@@ -94,10 +94,6 @@ python do_package_deb () {
     if os.access(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
         os.unlink(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"))
 
-    if packages == []:
-        bb.debug(1, "No packages; nothing to do")
-        return
-
     packages = bb.data.getVar('PACKAGES', d, 1)
     for pkg in packages.split():
         localdata = bb.data.createCopy(d)
============================================================
--- conf/distro/include/moko-autorev.inc	8693d3caf1c49ddccfce7c158c5cec881d623a58
+++ conf/distro/include/moko-autorev.inc	9a1c96718efce77233cdcd54100dcf160e30b2c4
@@ -7,6 +7,9 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUT
 SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 
+SRCREV_pn-assassin ?= "${AUTOREV}"
+SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
+SRCREV_pn-diversity-nav ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 SRCREV_pn-opkg ?= "${AUTOREV}"
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	ec064cf6915151b8ae2e72c80c9b0b938053ada1
+++ conf/distro/include/preferred-om-2008-versions.inc	e862f6042ce71dd536cb1abf60132cdda2d229ea
@@ -5,7 +5,10 @@ PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_gnash = "0.8.1"
 PREFERRED_VERSION_gpsdrive = "2.10pre4"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_intltool = "0.35.5"
+PREFERRED_VERSION_intltool-native = "0.35.5"
 PREFERRED_VERSION_libtool = "1.5.24"
+PREFERRED_VERSION_midori = "0.0.17"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.9"
============================================================
--- conf/distro/include/sane-srcrevs.inc	c7d0ad4faccc7664f24cec0e8e6628005208830a
+++ conf/distro/include/sane-srcrevs.inc	7807b46edf3ad60c42d97c25c0059e4324ce7a1c
@@ -12,12 +12,15 @@ SRCREV_pn-aircrack-ng ?= "802"
 # you know what that means? like... a, b, c, d, e, f, g...
 
 SRCREV_pn-aircrack-ng ?= "802"
+SRCREV_pn-assassin ?= "2"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-contact ?= "1410"
 SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dfu-util ?= "2866"
 SRCREV_pn-dfu-util-native ?= "2866"
+SRCREV_pn-diversity-daemon ?= "127"
+SRCREV_pn-diversity-nav ?= "238"
 SRCREV_pn-eds-dbus ?= "659"
 SRCREV_pn-eglibc ?= "4355"
 SRCREV_pn-eglibc-initial ?= "4355"
@@ -148,7 +151,7 @@ SRCREV_pn-tmut ?= "60"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-u-boot-openmoko ?= "4100"
+SRCREV_pn-u-boot-openmoko ?= "4138"
 SRCREV_pn-usbpath ?= "3108"
 SRCREV_pn-usbpath-native ?= "3108"
 SRCREV_pn-webkit-gtk ?= "30762"
============================================================
--- packages/e17/e-wm_cvs.bb	a08de1bb584a6652174d86c1429131d56738c3e9
+++ packages/e17/e-wm_cvs.bb	2257fc48c13eef3f9a2d015680eee7ed70c6b167
@@ -9,7 +9,6 @@ SRC_URI = "${E_CVS};module=e17/apps/e \
 SRC_URI = "${E_CVS};module=e17/apps/e \
            file://Xsession.d/98enlightenment \
            file://applications.menu \
-           file://Makefile.in.in \
 "
 S = "${WORKDIR}/e"
 
============================================================
--- packages/gnash/gnash.inc	bc7ce0bb9d022a74c35eff388b180d174a1a2eef
+++ packages/gnash/gnash.inc	66c805eb5cfd0e18a89770e022d4420ee9013566
@@ -1,68 +1,30 @@ DESCRIPTION = "Gnash is a GNU Flash movi
 DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
-
+HOMEPAGE = "http://www.gnu.org/software/gnash"
 LICENSE = "GPL-2"
-HOMEPAGE = "http://www.gnu.org/software/gnash"
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+PR = "r1"
 
-DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl"
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
+          "
 
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
+inherit autotools pkgconfig
 
-
 EXTRA_OECONF = "--enable-gui=gtk \
                 --enable-renderer=cairo \
-		--enable-media=none \
+                --enable-media=none \
                 --disable-klash \
-		--enable-z \
-		--enable-jpe%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list