[oe-commits] org.oe.dev merge of '52aa2df47cf7bc30b6972165f60dd26369dd337c'

pfalcon commit openembedded-commits at lists.openembedded.org
Fri Dec 14 16:05:31 UTC 2007 

merge of '52aa2df47cf7bc30b6972165f60dd26369dd337c'
     and '6a57ef3dc19b0640f6623b5aa686a5c2d3f81f32'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: dd2e25c6a29c15ebebb630124d0e86b9e4a00650
ViewMTN: http://monotone.openembedded.org/revision/info/dd2e25c6a29c15ebebb630124d0e86b9e4a00650
Files:
1
packages/uboot/files/glamo-ram-init.patch
packages/python/python-pyqt_4.3.1.bb
packages/python/python-pyqt_4.3.3.bb
packages/python/python-sip_4.7.1.bb
packages/python/python-sip_4.7.3.bb
packages/roadmap/zroadmap-1.0.12/zroadgps.png
packages/roadmap/files/zroadgps.png
packages/sip/sip-native_4.7.1.bb
packages/sip/sip-native_4.7.3.bb
packages/gnome/libart-lgpl/armeb
packages/mono/mono-1.2.6
packages/pointercal/files/e680
packages/roadmap/files/qt
packages/gnome/libart-lgpl/armeb/art_config.h
packages/gtk-webcore/midori_0.0.13.bb
packages/meta/meta-angstrom-2007.bb
packages/mono/files/mono-libgc-configure.patch
packages/mono/mono-1.2.6/configure.patch
packages/mono/mono-mcs-intermediate_1.2.6.bb
packages/mono/mono_1.2.6.bb
packages/mono/mono_1.2.6.inc
packages/pointercal/files/e680/pointercal
packages/roadmap/files/qt/qt2-fixes.patch
packages/roadmap/files/qt/qt_canvas.patch
packages/roadmap/files/qt/qt_main.patch
packages/roadmap/files/qt/roadmap.desktop.patch
packages/roadmap/files/qt/roadmap_main.patch
packages/roadmap/roadmap.inc
packages/roadmap/zroadmap.inc
packages/roadmap/zroadmap_1.1.0.bb
classes/scons.bbclass
classes/sip.bbclass
conf/checksums.ini
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
contrib/angstrom/build-release.sh
packages/enca/enca_1.9.bb
packages/fbreader/fbreader_0.7.3d.bb
packages/fbreader/fbreader_0.7.4q.bb
packages/fbreader/fbreader_0.8.2a.bb
packages/glibc/eglibc-package.bbclass
packages/glibc/eglibc_svn.bb
packages/gnome/gconf-dbus_svn.bb
packages/gpephone/gpe-applauncher_0.11.bb
packages/gpephone/gpe-applauncher_svn.bb
packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
packages/lua/lua-gtk2_0.3.bb
packages/matchbox-keyboard/files/fic-gta01-font-size.patch
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/opie-citytime/opie-citytime.inc
packages/pointercal/pointercal_0.0.bb
packages/roadmap/roadmap-gtk2_cvs.bb
packages/roadmap/zroadmap_1.0.12.bb
packages/roadmap/zroadmap_cvs.bb
packages/uboot/uboot-openmoko_svn.bb
packages/webkit/files/WebKit.pri
packages/webkit/files/WebKit.pro
packages/webkit/webkit-gtk_svn.bb
packages/webkit/webkit.inc
packages/initrdscripts/devimage_0.1.bb
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
Diffs:

#
# mt diff -r52aa2df47cf7bc30b6972165f60dd26369dd337c -rdd2e25c6a29c15ebebb630124d0e86b9e4a00650
#
# 
# 
# delete "packages/uboot/files/glamo-ram-init.patch"
# 
# rename "packages/python/python-pyqt_4.3.1.bb"
#     to "packages/python/python-pyqt_4.3.3.bb"
# 
# rename "packages/python/python-sip_4.7.1.bb"
#     to "packages/python/python-sip_4.7.3.bb"
# 
# rename "packages/roadmap/zroadmap-1.0.12/zroadgps.png"
#     to "packages/roadmap/files/zroadgps.png"
# 
# rename "packages/sip/sip-native_4.7.1.bb"
#     to "packages/sip/sip-native_4.7.3.bb"
# 
# add_dir "packages/gnome/libart-lgpl/armeb"
# 
# add_dir "packages/mono/mono-1.2.6"
# 
# add_dir "packages/pointercal/files/e680"
# 
# add_dir "packages/roadmap/files/qt"
# 
# add_file "packages/gnome/libart-lgpl/armeb/art_config.h"
#  content [d94c2cc1288fee878cb8c9791b3b847eaa6b93e7]
# 
# add_file "packages/gtk-webcore/midori_0.0.13.bb"
#  content [248eb3a40d4c7bdb50c581812cdbeaeb356a89fd]
# 
# add_file "packages/meta/meta-angstrom-2007.bb"
#  content [4bfd1a85218210707ef5559a74494f4a8159a2e6]
# 
# add_file "packages/mono/files/mono-libgc-configure.patch"
#  content [6d03f707ee635c13461bda9c2c2e9ed7c10e9638]
# 
# add_file "packages/mono/mono-1.2.6/configure.patch"
#  content [f237d79597fc99f43d5667bdd4037483059be4ce]
# 
# add_file "packages/mono/mono-mcs-intermediate_1.2.6.bb"
#  content [fdadd0de483cc47df3e9cae3991787e3ac405de4]
# 
# add_file "packages/mono/mono_1.2.6.bb"
#  content [642bc86c2b995b52f4648891b36cbb23eade40f3]
# 
# add_file "packages/mono/mono_1.2.6.inc"
#  content [d1f74194e2241a0bfaab079b1c043f92b0e31f12]
# 
# add_file "packages/pointercal/files/e680/pointercal"
#  content [746ced31da69780530c774d54918e4a349c92224]
# 
# add_file "packages/roadmap/files/qt/qt2-fixes.patch"
#  content [83ebf600b82912603be342974976e1632293f259]
# 
# add_file "packages/roadmap/files/qt/qt_canvas.patch"
#  content [74b0e83a35a344fd9bf34cacb8a7b4406d829290]
# 
# add_file "packages/roadmap/files/qt/qt_main.patch"
#  content [22e4ac263d7fc8c659d6c9ee48b94afb88c0bfb6]
# 
# add_file "packages/roadmap/files/qt/roadmap.desktop.patch"
#  content [42b9a60edcb76bd0609020c491eaa1d1fa6fb1b5]
# 
# add_file "packages/roadmap/files/qt/roadmap_main.patch"
#  content [4d19c6f3d39ebf81201b518228e4ae8376742647]
# 
# add_file "packages/roadmap/roadmap.inc"
#  content [18f16cbe822cba5f8dd391e023297f98a693d254]
# 
# add_file "packages/roadmap/zroadmap.inc"
#  content [6f4897b3cbc5a817995412a0c649a7fffc71554b]
# 
# add_file "packages/roadmap/zroadmap_1.1.0.bb"
#  content [47050a07f10a909f16525fb375ad0bff60a3822e]
# 
# patch "classes/scons.bbclass"
#  from [7daf072a8b69aecb7a353e129508b5e514b1b5f0]
#    to [c546b54256dc44ccc4500ce748fb77c6d7efdcbd]
# 
# patch "classes/sip.bbclass"
#  from [a9ed0b070fecb4888c0a73be816865c0285ba605]
#    to [19431964e31ac4c591edad007b98e47bc3efc3b7]
# 
# patch "conf/checksums.ini"
#  from [24dba11be6365114a3bc231951dfb98c4a566f08]
#    to [ce22da057e8b56ac8825b7a043b4fa7cc3f86027]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [666f9821fd13c25a57a85d18bede92a2a755d104]
#    to [f3d89d1d37708d933d79f1a37dbef5925a80cf82]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [bc08487711a74b011fdf760aa1a788af6b5c8a6a]
#    to [4134eefa163f900e3bbf5f1853477a6b6f109033]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [8cad7fba1595a9a46320eb14f7b63799769241ec]
#    to [9a85ba9d86a1ceae58415bb7a11eed3fb6d5f333]
# 
# patch "contrib/angstrom/build-release.sh"
#  from [0d3b7a36cc56801803e97fa8da4ec459e9a991cd]
#    to [063085f7fea8b84ad5d548c22c48e61a73e934d2]
# 
# patch "packages/enca/enca_1.9.bb"
#  from [7815a20c38ea4d3a4b163268f1afc426eb36fbbe]
#    to [12cf67dc83f652c02eab5abef8445e1d981b41ab]
# 
# patch "packages/fbreader/fbreader_0.7.3d.bb"
#  from [aab2e6e0b1fd44ae8961388d9eb632ca132d9d9c]
#    to [34b11aba6a01b2904f78acd8ce7ad7c3befa6385]
# 
# patch "packages/fbreader/fbreader_0.7.4q.bb"
#  from [3071750398f41c84ca376433b0dd88d50e80577c]
#    to [44451b9b9caf082b52726f201197b9f344126ada]
# 
# patch "packages/fbreader/fbreader_0.8.2a.bb"
#  from [d21eeca9a1bb496e84541d55957587838aaa33e9]
#    to [44fe07852ed8432ebe5f55988cb384231d8b214a]
# 
# patch "packages/glibc/eglibc-package.bbclass"
#  from [f2443f95a6774f6041c3f94cbf9583fb4644b260]
#    to [8f51cdb2c68ef10a8cc444bb9c80b76e1b529a8e]
# 
# patch "packages/glibc/eglibc_svn.bb"
#  from [f37cb5c2f3c0bbc766306cbd58bd7aaf336de265]
#    to [e0e53388d3e2f7fb82da6c0800429fb089aaa667]
# 
# patch "packages/gnome/gconf-dbus_svn.bb"
#  from [cfb0cd440b4736752691aef4cc9761eb15e6a9e4]
#    to [17c69da4bd130d92af8af24b002ef34409149a33]
# 
# patch "packages/gpephone/gpe-applauncher_0.11.bb"
#  from [4cd8ca9197d759daf399a1817a800a2ca56b18de]
#    to [b55f599b04b5149092913c0a2b83bc4350cdba59]
# 
# patch "packages/gpephone/gpe-applauncher_svn.bb"
#  from [3776f2b66b25e0d25b0d2f0c7e35bbfe9dd5d36a]
#    to [4d20c813ad46630580e0ffc689c3794f8154fff7]
# 
# patch "packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb"
#  from [9781b60290a0df053d4514a522caa2b65fba46e7]
#    to [837a617f042a71fda1b806d153ad3ddf07156a19]
# 
# patch "packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb"
#  from [a29d8bc3586b86df7583d9ab0091bfff380bd07d]
#    to [d18fee8247c479d929f51640542c12d4827b584c]
# 
# patch "packages/lua/lua-gtk2_0.3.bb"
#  from [c9dfa04bfadacb293d77536191d5d47951a938fa]
#    to [ce285cb56e4d70c5f08d7a58733d767cc735e58e]
# 
# patch "packages/matchbox-keyboard/files/fic-gta01-font-size.patch"
#  from [7faa8b53d7e6bc3188ea910931137b054c3e77f4]
#    to [ead2a2a2c08495a4ce1a5eb0ecef61e6db31cad0]
# 
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
#  from [0443c38b2e1463c513fd3a12fa5c0d213e337cec]
#    to [801c5d051ce467eb8964dc701bb8040c2d9315bf]
# 
# patch "packages/opie-citytime/opie-citytime.inc"
#  from [943b73ea320db703c06f6bb67b80e6cd8fad52af]
#    to [8578cf76f429b5b1670f8c1123ffe3ee90a8d660]
# 
# patch "packages/pointercal/pointercal_0.0.bb"
#  from [a8a3e606c0d9cb9d7156407a1729b9d398ff5545]
#    to [f1a528bf4eccc047ffabc03cb6b323cda0cfac7c]
# 
# patch "packages/python/python-pyqt_4.3.3.bb"
#  from [ba7b95e381ea4abf18b5fb46f9e7d39d05d8198d]
#    to [f4e8b4a75b9b494f6d70e74cc041955ee3af4996]
# 
# patch "packages/roadmap/roadmap-gtk2_cvs.bb"
#  from [910392dc4aba52e64d998814ab3c6309cde2d477]
#    to [3d494fe1e57842d791e68ad3ac1b63b1692305d6]
# 
# patch "packages/roadmap/zroadmap_1.0.12.bb"
#  from [f694a330e8568d7ed7fa8ef74193a3d34c3837c7]
#    to [defdf4312079c65d41c8d23a255e656af962c476]
# 
# patch "packages/roadmap/zroadmap_cvs.bb"
#  from [9482663decb86dcafc9a60c4a8270154a0fa35df]
#    to [a3e925537e5fc4d227e62224726e06d610c448b3]
# 
# patch "packages/uboot/uboot-openmoko_svn.bb"
#  from [c0a89cd0bab0ba4349b2bf440f42a1f17e7fa912]
#    to [f7e8df9fab2b480e384525d33ccc0b0221c3f575]
# 
# patch "packages/webkit/files/WebKit.pri"
#  from [076f1c82b227a8d1472f9fa12e2fee65bd0c833c]
#    to [0e5c15ab2a6b4b986f311f4e0c55573ebf80191e]
# 
# patch "packages/webkit/files/WebKit.pro"
#  from [dd444c86e92aeb8c404efbd945a61ec54293c346]
#    to [ecf886ef5178fc86bdf74101c5bb563cb326002b]
# 
# patch "packages/webkit/webkit-gtk_svn.bb"
#  from [cda8f2a66ffa21e54d42abd299bfb7e2162a58a5]
#    to [2b24d6f59232655003cc23519603a66cec5aca93]
# 
# patch "packages/webkit/webkit.inc"
#  from [a9b135977d33b8fecb08b3e6b9ca8bae313ed7e2]
#    to [1b435431285f60a2f3bb6f118ed12807b76bee80]
# 
============================================================
--- packages/gnome/libart-lgpl/armeb/art_config.h	d94c2cc1288fee878cb8c9791b3b847eaa6b93e7
+++ packages/gnome/libart-lgpl/armeb/art_config.h	d94c2cc1288fee878cb8c9791b3b847eaa6b93e7
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
============================================================
--- packages/gtk-webcore/midori_0.0.13.bb	248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
+++ packages/gtk-webcore/midori_0.0.13.bb	248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+          "
+
+
============================================================
--- packages/meta/meta-angstrom-2007.bb	4bfd1a85218210707ef5559a74494f4a8159a2e6
+++ packages/meta/meta-angstrom-2007.bb	4bfd1a85218210707ef5559a74494f4a8159a2e6
@@ -0,0 +1,32 @@
+# Meta file to inform the autobuilder which packages to build for the feeds
+# Any changes should be discussed first on the angstrom-distro-devel mailinglist
+
+# Try to keep it alphabetically sorted please
+ 
+inherit meta
+
+RDEPENDS = ""
+
+# Basic tools
+RDEPENDS += " \
+         task-proper-tools \
+	 screen \
+	 "
+
+# Browsers know to work on all archs
+RDEPENDS += " \
+         gpe-mini-browser \
+         midori \
+	 minimo \
+         openmoko-browser2 \
+	 webkit-gtklauncher \
+         "
+
+# Webservers
+RDEPENDS += " \
+        apache2 \
+        boa \
+	cherokee \
+	lighttpd \
+	thttpd \
+	"
============================================================
--- packages/mono/files/mono-libgc-configure.patch	6d03f707ee635c13461bda9c2c2e9ed7c10e9638
+++ packages/mono/files/mono-libgc-configure.patch	6d03f707ee635c13461bda9c2c2e9ed7c10e9638
@@ -0,0 +1,20 @@
+Index: mono-1.2.6/libgc/configure.in
+===================================================================
+--- mono-1.2.6.orig/libgc/configure.in	2007-12-12 15:02:31.000000000 -0500
++++ mono-1.2.6/libgc/configure.in	2007-12-12 15:05:10.000000000 -0500
+@@ -17,6 +17,15 @@
+ AC_PREREQ(2.53)
+ AC_INIT(libgc-mono, 6.6, Hans_Boehm at hp.com)
+ 
++# the following is a very strange bug.  CPPFLAGS does not get set correctly
++# if CPPFLAGS is set in the environment.  The top level configure script
++# appends to the CPPFLAGS variable, and then exports it.  This change should
++# be picked up by this configure script, but it is not.  The original 
++# env variable is still used for some reason.  If CPPFLAGS is not set in the
++# environment, everything works fine.
++# Someone more experienced with autoconf will have to come up with a better fix.
++CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP  -DUSE_COMPILER_TLS"
++echo "CPPFLAGS verify: start of libgc/configure.in, CPPFLAGS = $CPPFLAGS"
+ AM_INIT_AUTOMAKE(libgc-mono, 6.6, no-define)
+ 
+ AC_CONFIG_SRCDIR(gcj_mlc.c)
============================================================
--- packages/mono/mono-1.2.6/configure.patch	f237d79597fc99f43d5667bdd4037483059be4ce
+++ packages/mono/mono-1.2.6/configure.patch	f237d79597fc99f43d5667bdd4037483059be4ce
@@ -0,0 +1,23 @@
+Index: mono-1.2.6/configure.in
+===================================================================
+--- mono-1.2.6.orig/configure.in	2007-11-08 17:07:57.000000000 -0500
++++ mono-1.2.6/configure.in	2007-12-12 15:27:52.000000000 -0500
+@@ -1150,6 +1150,8 @@
+ 		], [
+ 				AC_MSG_RESULT(no)
+ 				with_tls=pthread
++		], [
++				AC_MSG_RESULT(yes)
+ 		])
+ 	fi
+ 
+@@ -1252,6 +1254,9 @@
+ 		], [
+ 				with_sigaltstack=no
+ 				AC_MSG_RESULT(no)
++		], [
++				AC_MSG_RESULT(yes)
++				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
+ 		])
+ 	fi
+ 
============================================================
--- packages/mono/mono-mcs-intermediate_1.2.6.bb	fdadd0de483cc47df3e9cae3991787e3ac405de4
+++ packages/mono/mono-mcs-intermediate_1.2.6.bb	fdadd0de483cc47df3e9cae3991787e3ac405de4
@@ -0,0 +1,10 @@
+# This is a straw-man recipe for step 1 in the two-step build of
+# mono. Because it's impossible to build the mcs directory
+# in cross-compile mode, this recipe will do a native build,
+# then tar the resulting install tree for usage by the mono
+# package in step 2.
+# See http://www.mono-project.com/Mono:ARM
+
+require mono_1.2.6.inc
+require mono-mcs-intermediate.inc
+
============================================================
--- packages/mono/mono_1.2.6.bb	642bc86c2b995b52f4648891b36cbb23eade40f3
+++ packages/mono/mono_1.2.6.bb	642bc86c2b995b52f4648891b36cbb23eade40f3
@@ -0,0 +1,78 @@
+require mono_1.2.6.inc
+
+DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
+
+PR = "r1"
+
+SRC_URI += "file://configure.patch;patch=1"
+
+# Per http://www.mono-project.com/Mono:ARM
+EXTRA_OECONF += " --disable-mcs-build "
+# Instead, get the mcs tree from a different build (see mono-mcs-intermediate)
+
+do_install_prepend() {
+	install -d ${D}
+	pushd ${D}
+	tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz
+	popd
+}
+
+do_install_append() {
+	# mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#),
+	# however, jay is not being cross-compiled and thus only
+	# available for the buildhost architecture, so remove it
+	# entirely
+	pushd ${D}
+	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
+	    ./usr/share/jay/README.jay \
+	    ./usr/bin/jay
+	popd
+
+	# Not packaged with the default rules and apparently
+	# not used for anything
+	rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml
+}
+
+inherit mono
+
+# Import file definitions from Debian
+require mono_1.2.5.1-files.inc
+
+# Add some packages
+PACKAGES_append = " mono-doc mono mono-runtime"
+
+FILES_mono-doc_append = " /usr/share/libgc-mono/ "
+
+FILES_mono = ""
+ALLOW_EMPTY_mono = "1"
+RDEPENDS_mono = "mono-common mono-jit"
+
+FILES_mono-runtime = ""
+ALLOW_EMPTY_mono-runtime = "1"
+RDEPENDS_mono-runtime = "mono-jit mono-gac"
+
+RDEPENDS_mono-jit = "mono-common"
+
+FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \
+	/usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la"
+FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \
+	/usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so"
+
+# Packages not included in Debian
+PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \
+	libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \
+	libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil"
+
+FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll"
+FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc"
+FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb"
+
+FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*"
+FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb"
+
+FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll"
+FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb"
+
+# Move .pc files
+FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc"
+PACKAGES =+ " libmono-cairo1.0-cil-dev "
============================================================
--- packages/mono/mono_1.2.6.inc	d1f74194e2241a0bfaab079b1c043f92b0e31f12
+++ packages/mono/mono_1.2.6.inc	d1f74194e2241a0bfaab079b1c043f92b0e31f12
@@ -0,0 +1,13 @@
+DESCRIPTION = "Mono Programming Language"
+SECTION = "devel/mono"
+LICENSE = "GPL LGPL X11"
+
+SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2 \
+	   file://mono-libgc-configure.patch;patch=1"
+
+S = "${WORKDIR}/mono-1.2.6"
+
+inherit autotools
+EXTRA_OECONF_arm = "--without-tls"
+EXTRA_OECONF_mipsel = "--without-tls"
+
============================================================
--- packages/pointercal/files/e680/pointercal	746ced31da69780530c774d54918e4a349c92224
+++ packages/pointercal/files/e680/pointercal	746ced31da69780530c774d54918e4a349c92224
@@ -0,0 +1 @@
+-19857 -412 18085522 189 -23922 22734294 65536
============================================================
--- packages/roadmap/files/qt/qt2-fixes.patch	83ebf600b82912603be342974976e1632293f259
+++ packages/roadmap/files/qt/qt2-fixes.patch	83ebf600b82912603be342974976e1632293f259
@@ -0,0 +1,10 @@
+--- src/qt/Makefile~qt2-fixes.patch
++++ src/qt/Makefile
+@@ -19,7 +19,7 @@
+ 
+ ifeq ($(DESKTOP),QPE)
+    CFLAGS += -I$(QTDIR)/include -DQWS
+-   LIBS += -lqte -lqpe
++   LIBS += -lqpe
+    INSTALLDIR=$(QTDIR)
+ endif
============================================================
--- packages/roadm%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r6a57ef3dc19b0640f6623b5aa686a5c2d3f81f32 -rdd2e25c6a29c15ebebb630124d0e86b9e4a00650
#
# 
# 
# patch "packages/initrdscripts/devimage_0.1.bb"
#  from [4d6613a7cf373cad5cd52603f3a02ad18595f16e]
#    to [927ed0e937df451327d36b29dac515ed51a08844]
# 
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
#  from [3be3bf803a686aab18297d3d48a928bc8c6d1084]
#    to [388ec458d592dce0a5a48e2ae5cc23b52f898460]
# 
============================================================
--- packages/initrdscripts/devimage_0.1.bb	4d6613a7cf373cad5cd52603f3a02ad18595f16e
+++ packages/initrdscripts/devimage_0.1.bb	927ed0e937df451327d36b29dac515ed51a08844
@@ -1,5 +1,6 @@
+DESCRIPTION = "Set of files to initialize bare system suitable for kernel, etc. testing."
 SRC_URI = "file://devimage.sh file://passwd file://dropbear_rsa_host_key"
-PR = "r1"
+PR = "r2"
 
 do_install() {
         install -m 0755 ${WORKDIR}/devimage.sh ${D}/init
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	3be3bf803a686aab18297d3d48a928bc8c6d1084
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	388ec458d592dce0a5a48e2ae5cc23b52f898460
@@ -1,7 +1,9 @@ SRC_URI = "file://30-bootmenu.sh"
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r3"
+PR = "r4"
+DESCRIPTION = "An initramfs module with UI for selection of boot device."
 RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop"
-DESCRIPTION = "An initramfs module with UI for selection of boot device."
+# For VFAT mounting.
+RRECOMMENDS = "kernel-module-nls-cp437 kernel-module-nls-iso8859-1"
 
 do_install() {
 	install -d ${D}/initrd.d

More information about the Openembedded-commits mailing list