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

mickeyl commit openembedded-commits at lists.openembedded.org
Sat Mar 1 00:50:43 UTC 2008 

merge of 'b805c5a50c8090844ec5ef1b84d102464acb782d'
     and 'b875e862e2ccb0103de09d87184dc882abb4a8ad'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9a7a593052e32d18735eafed580653d108e0dfcb
ViewMTN: http://monotone.openembedded.org/revision/info/9a7a593052e32d18735eafed580653d108e0dfcb
Files:
1
packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/busybox/busybox-1.9.1/openmoko
packages/busybox/busybox-1.9.1/openmoko/defconfig
packages/libmatchbox/libmatchbox_1.2.bb
packages/libmatchbox/libmatchbox_1.3.bb
packages/libmatchbox/libmatchbox_1.4.bb
packages/libmatchbox/libmatchbox_1.5.bb
packages/libmatchbox/libmatchbox_1.6.bb
packages/matchbox-wm/matchbox-wm_0.8.3.bb
packages/matchbox-wm/matchbox-wm_0.8.4.bb
packages/matchbox-wm/matchbox-wm_0.9.2.bb
packages/matchbox-wm/matchbox-wm_0.9.3.bb
packages/matchbox-wm/matchbox-wm_0.9.4.bb
packages/matchbox-wm/matchbox-wm_0.9.bb
packages/pango/pango-1.13.3
packages/pango/pango-1.13.3/opentype-makefile.patch
packages/pango/pango-1.16.0
packages/pango/pango-1.16.0/no-tests.patch
packages/pango/pango-1.16.2
packages/pango/pango-1.16.2/no-tests.patch
packages/pango/pango-1.18.1
packages/pango/pango-1.18.1/no-tests.patch
packages/pango/pango_1.13.3.bb
packages/pango/pango_1.14.0.bb
packages/pango/pango_1.15.1.bb
packages/pango/pango_1.15.2.bb
packages/pango/pango_1.16.0.bb
packages/pango/pango_1.16.2.bb
packages/pango/pango_1.18.1.bb
packages/pango/pango_1.9.1.bb
packages/curl/files
packages/dtnrg/files
packages/gtk-webcore/osb-nrcit
packages/linux/linux-2.6.24/cm-x270
packages/curl/files/pkgconfig_fix.patch
packages/dtnrg/files/configure_fix.patch
packages/gtk-webcore/files/path_fixes.patch
packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch
packages/libmatchbox/files/configure_fixes.patch
packages/linux/linux-2.6.24/cm-x270/0001-cm-x270-match-type.patch
packages/linux/linux-2.6.24/cm-x270/0002-ramdisk_load.patch
packages/linux/linux-2.6.24/cm-x270/0003-mmcsd_large_cards-r0.patch
packages/linux/linux-2.6.24/cm-x270/0004-cm-x270-nand-simplify-name.patch
packages/linux/linux-2.6.24/cm-x270/0005-add-display-set-default-16bpp.patch
packages/linux/linux-2.6.24/cm-x270/0006-updated-defconfig.patch
packages/linux/linux-2.6.24/cm-x270/defconfig
packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch
packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch
packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch
packages/matchbox-wm/matchbox-wm/configure_fix.patch
packages/pango/pango-1.18.3/pkgconfig_fixes.patch
packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
conf/distro/include/sane-srcrevs.inc
conf/machine/cm-x270.conf
packages/busybox/busybox-1.9.1/defconfig
packages/busybox/busybox_1.9.1.bb
packages/curl/curl_7.16.4.bb
packages/gnutls/gnutls-1.6.3/configure_madness.patch
packages/gnutls/gnutls_1.6.3.bb
packages/gtk-webcore/osb-nrcit_svn.bb
packages/gtk-webcore/osb-nrcore.inc
packages/gtk-webcore/osb-nrcore_svn.bb
packages/libmatchbox/libmatchbox_1.9.bb
packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux-rt_2.6.24.bb
packages/linux/linux_2.6.23.bb
packages/linux/linux_2.6.24.bb
packages/madwifi/madwifi-ng_r.inc
packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
packages/matchbox-wm/matchbox-wm_1.2.bb
packages/pango/pango_1.16.4.bb
packages/pango/pango_1.18.3.bb
packages/xorg-xserver/xserver-kdrive_1.4.bb
Diffs:

#
# mt diff -rb805c5a50c8090844ec5ef1b84d102464acb782d -r9a7a593052e32d18735eafed580653d108e0dfcb
#
# 
# 
# patch "packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch"
#  from [63296cccc2b32cab961fcf4965eb86bd960f0213]
#    to [9bdb7df2ad99ce5d483801d3b1869c601b18fc60]
# 
# patch "packages/glibc/glibc_2.5.bb"
#  from [53e27da951911e905482cc1827cbd661372ca6bd]
#    to [4448b5d00d178de9e03d1a43d7c5803abbb93d2c]
# 
# patch "packages/glibc/glibc_2.6.1.bb"
#  from [a3edca56fd29b409cf9c2080cd7c5d19362a434c]
#    to [5ed9c93ca660afcc61380030ee1d8c4340997ae3]
# 
============================================================
--- packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch	63296cccc2b32cab961fcf4965eb86bd960f0213
+++ packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch	9bdb7df2ad99ce5d483801d3b1869c601b18fc60
@@ -1,44 +1,41 @@
---- glibc-2.5.orig/debian/patches/any/local-dynamic-resolvconf.diff
-+++ glibc-2.5/debian/patches/any/local-dynamic-resolvconf.diff
-@@ -0,0 +1,41 @@
-+# All lines beginning with `# DP:' are a description of the patch.
-+# DP: Description: allow dynamic long-running processes to
-+# DP: re-read a dynamically updated resolv.conf on the fly
-+# DP: Dpatch author: Adam Conrad <adconrad at ubuntu.com>
-+# DP: Patch author: Thorsten Kukuk <kukuk at suse.de>
-+# DP: Upstream status: Ubuntu-Specific
-+# DP: Date: 2006-01-13 08:14:21 UTC
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: allow dynamic long-running processes to
+# DP: re-read a dynamically updated resolv.conf on the fly
+# DP: Dpatch author: Adam Conrad <adconrad at ubuntu.com>
+# DP: Patch author: Thorsten Kukuk <kukuk at suse.de>
+# DP: Upstream status: Ubuntu-Specific
+# DP: Date: 2006-01-13 08:14:21 UTC
+
+Index: resolv/res_libc.c
+===================================================================
+--- resolv/res_libc.c.orig
++++ resolv/res_libc.c
+@@ -22,7 +22,7 @@
+ #include <arpa/nameser.h>
+ #include <resolv.h>
+ #include <bits/libc-lock.h>
+-
++#include <sys/stat.h>
+ 
+ /* The following bit is copied from res_data.c (where it is #ifdef'ed
+    out) since res_init() should go into libc.so but the rest of that
+@@ -94,8 +94,17 @@
+ int
+ __res_maybe_init (res_state resp, int preinit)
+ {
+-	if (resp->options & RES_INIT) {
+-		if (__res_initstamp != resp->_u._ext.initstamp) {
++  static time_t last_mtime;
++  struct stat statbuf;
++  int ret;
 +
++		
++  if (resp->options & RES_INIT) {
++	ret = stat (_PATH_RESCONF, &statbuf);
++		if (__res_initstamp != resp->_u._ext.initstamp
++		  || (ret == 0) && (last_mtime != statbuf.st_mtime))
++		  {
++		        last_mtime = statbuf.st_mtime;
+ 			if (resp->nscount > 0) {
+ 				__res_iclose (resp, true);
+ 				return __res_vinit (resp, 1);
-+Index: resolv/res_libc.c
-+===================================================================
-+--- resolv/res_libc.c.orig
-++++ resolv/res_libc.c
-+@@ -22,7 +22,7 @@
-+ #include <arpa/nameser.h>
-+ #include <resolv.h>
-+ #include <bits/libc-lock.h>
-+-
-++#include <sys/stat.h>
-+ 
-+ /* The following bit is copied from res_data.c (where it is #ifdef'ed
-+    out) since res_init() should go into libc.so but the rest of that
-+@@ -94,8 +94,17 @@
-+ int
-+ __res_maybe_init (res_state resp, int preinit)
-+ {
-+-	if (resp->options & RES_INIT) {
-+-		if (__res_initstamp != resp->_u._ext.initstamp) {
-++  static time_t last_mtime;
-++  struct stat statbuf;
-++  int ret;
-++
-++		
-++  if (resp->options & RES_INIT) {
-++	ret = stat (_PATH_RESCONF, &statbuf);
-++		if (__res_initstamp != resp->_u._ext.initstamp
-++		  || (ret == 0) && (last_mtime != statbuf.st_mtime))
-++		  {
-++		        last_mtime = statbuf.st_mtime;
-+ 			if (resp->nscount > 0) {
-+ 				__res_iclose (resp, true);
-+ 				return __res_vinit (resp, 1);
============================================================
--- packages/glibc/glibc_2.5.bb	53e27da951911e905482cc1827cbd661372ca6bd
+++ packages/glibc/glibc_2.5.bb	4448b5d00d178de9e03d1a43d7c5803abbb93d2c
@@ -1,5 +1,5 @@ require glibc.inc
 require glibc.inc
-PR = "r9"
+PR = "r10"
 
 ARM_INSTRUCTION_SET = "arm"
 
@@ -44,7 +44,7 @@ SRC_URI = "\
   file://dl-cache-libcmp.patch;patch=1 \
   file://ldsocache-varrun.patch;patch=1 \
   file://nptl-crosscompile.patch;patch=1 \
-  file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1 \
+  file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \
   file://glibc-check_pf.patch;patch=1;pnum=0 \
   file://zecke-sane-readelf.patch;patch=1 \
   file://ldd-unbash.patch;patch=1 \
============================================================
--- packages/glibc/glibc_2.6.1.bb	a3edca56fd29b409cf9c2080cd7c5d19362a434c
+++ packages/glibc/glibc_2.6.1.bb	5ed9c93ca660afcc61380030ee1d8c4340997ae3
@@ -1,5 +1,5 @@ require glibc.inc
 require glibc.inc
-PR = "r2"
+PR = "r3"
 
 ARM_INSTRUCTION_SET = "arm"
 
@@ -45,7 +45,7 @@ SRC_URI = "\
   file://dl-cache-libcmp.patch;patch=1 \
   file://ldsocache-varrun.patch;patch=1 \
   file://nptl-crosscompile.patch;patch=1 \
-  file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1 \
+  file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \
   file://glibc-check_pf.patch;patch=1;pnum=0 \
   file://zecke-sane-readelf.patch;patch=1 \
   file://ldd-unbash.patch;patch=1 \


#
# mt diff -rb875e862e2ccb0103de09d87184dc882abb4a8ad -r9a7a593052e32d18735eafed580653d108e0dfcb
#
# 
# 
# delete "packages/busybox/busybox-1.9.1/openmoko"
# 
# delete "packages/busybox/busybox-1.9.1/openmoko/defconfig"
# 
# delete "packages/libmatchbox/libmatchbox_1.2.bb"
# 
# delete "packages/libmatchbox/libmatchbox_1.3.bb"
# 
# delete "packages/libmatchbox/libmatchbox_1.4.bb"
# 
# delete "packages/libmatchbox/libmatchbox_1.5.bb"
# 
# delete "packages/libmatchbox/libmatchbox_1.6.bb"
# 
# delete "packages/matchbox-wm/matchbox-wm_0.8.3.bb"
# 
# delete "packages/matchbox-wm/matchbox-wm_0.8.4.bb"
# 
# delete "packages/matchbox-wm/matchbox-wm_0.9.2.bb"
# 
# delete "packages/matchbox-wm/matchbox-wm_0.9.3.bb"
# 
# delete "packages/matchbox-wm/matchbox-wm_0.9.4.bb"
# 
# delete "packages/matchbox-wm/matchbox-wm_0.9.bb"
# 
# delete "packages/pango/pango-1.13.3"
# 
# delete "packages/pango/pango-1.13.3/opentype-makefile.patch"
# 
# delete "packages/pango/pango-1.16.0"
# 
# delete "packages/pango/pango-1.16.0/no-tests.patch"
# 
# delete "packages/pango/pango-1.16.2"
# 
# delete "packages/pango/pango-1.16.2/no-tests.patch"
# 
# delete "packages/pango/pango-1.18.1"
# 
# delete "packages/pango/pango-1.18.1/no-tests.patch"
# 
# delete "packages/pango/pango_1.13.3.bb"
# 
# delete "packages/pango/pango_1.14.0.bb"
# 
# delete "packages/pango/pango_1.15.1.bb"
# 
# delete "packages/pango/pango_1.15.2.bb"
# 
# delete "packages/pango/pango_1.16.0.bb"
# 
# delete "packages/pango/pango_1.16.2.bb"
# 
# delete "packages/pango/pango_1.18.1.bb"
# 
# delete "packages/pango/pango_1.9.1.bb"
# 
# add_dir "packages/curl/files"
# 
# add_dir "packages/dtnrg/files"
# 
# add_dir "packages/gtk-webcore/osb-nrcit"
# 
# add_dir "packages/linux/linux-2.6.24/cm-x270"
# 
# add_file "packages/curl/files/pkgconfig_fix.patch"
#  content [d105999ef214e4616999e1d0accd284640974dc7]
# 
# add_file "packages/dtnrg/files/configure_fix.patch"
#  content [a89048eadd0ea582a6513bcb61d08df848026021]
# 
# add_file "packages/gtk-webcore/files/path_fixes.patch"
#  content [716a0950c604514677a0eae118da7da04d070344]
# 
# add_file "packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch"
#  content [0edb164c34530db60d690707bef73b3594b510aa]
# 
# add_file "packages/libmatchbox/files/configure_fixes.patch"
#  content [4de1e878c64796aab614df79cf5ee0753caa5fec]
# 
# add_file "packages/linux/linux-2.6.24/cm-x270/0001-cm-x270-match-type.patch"
#  content [ce421f7708d6cf607dac08b8b4d125819b4cf2c3]
# 
# add_file "packages/linux/linux-2.6.24/cm-x270/0002-ramdisk_load.patch"
#  content [596b212fef6751dfd8b8aeaa142c6bea4a4f9019]
# 
# add_file "packages/linux/linux-2.6.24/cm-x270/0003-mmcsd_large_cards-r0.patch"
#  content [d58e03a7c3887c838bf2aaada4caa2737df21d27]
# 
# add_file "packages/linux/linux-2.6.24/cm-x270/0004-cm-x270-nand-simplify-name.patch"
#  content [f66cdf667785145ab1bbf4d78b4777223a6174a9]
# 
# add_file "packages/linux/linux-2.6.24/cm-x270/0005-add-display-set-default-16bpp.patch"
#  content [f59150eeed8a7bd698bba59ac238a2d34ef3f8e6]
# 
# add_file "packages/linux/linux-2.6.24/cm-x270/0006-updated-defconfig.patch"
#  content [c8772dd094db3fe615d92b8b0893422c079a5f05]
# 
# add_file "packages/linux/linux-2.6.24/cm-x270/defconfig"
#  content [c155ca1a3bfc3d4352fc0219d180b888af20f71f]
# 
# add_file "packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch"
#  content [fd7e70b17a09e17b40a8f4ae230b0e9a2b13f83f]
# 
# add_file "packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch"
#  content [38deec6ca144203d2bec5f6271900e91c6c2dbaa]
# 
# add_file "packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch"
#  content [d199870bd1e6ba594504a9c421480b264394799b]
# 
# add_file "packages/matchbox-wm/matchbox-wm/configure_fix.patch"
#  content [bae834deeca2d5f8f79cc2ac7ad96dac873df15a]
# 
# add_file "packages/pango/pango-1.18.3/pkgconfig_fixes.patch"
#  content [a74df0506a1afcf11eea21107f6caa8e7b5bc8da]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch"
#  content [c63f18a7b52ed2a806647ca314ea5f8e3bcf08f2]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [ab67ae7855b44ff82646cc1c031cb6cafafea1f9]
#    to [1819e55c2030088e515aae4ce84d2cc2e97b12f2]
# 
# patch "conf/machine/cm-x270.conf"
#  from [2a8d6b9ac864b5f94ce6689ef7814ec193676166]
#    to [263d992b212de2d80b20d1541d198511ceaf4c60]
# 
# patch "packages/busybox/busybox-1.9.1/defconfig"
#  from [ff25ec81c1351231f97bffc1ee90939e562137a4]
#    to [183a1034704ae8119a3b8348768ba35a162e96b8]
# 
# patch "packages/busybox/busybox_1.9.1.bb"
#  from [611d61a446d2bd0678cce14f4d7f8a7e916ebf9d]
#    to [4ce3286b8b9f17817880e467425ec28de58ea3f4]
# 
# patch "packages/curl/curl_7.16.4.bb"
#  from [e059af19afea35121903c9bfbda21700cbf38c07]
#    to [75efc99de6c7cc702a277bad7d10afc175e42621]
# 
# patch "packages/gnutls/gnutls-1.6.3/configure_madness.patch"
#  from [2998e7642de3c93def273f07b105f57b61a9f9c9]
#    to [87f410ef8fb3b49faf09767ddad9b5adfeb02b69]
# 
# patch "packages/gnutls/gnutls_1.6.3.bb"
#  from [00f6ee42f807520ea4255904e757ed8cd210a4da]
#    to [d9680357a147ffbb532b44d35e0ba188e067e902]
# 
# patch "packages/gtk-webcore/osb-nrcit_svn.bb"
#  from [d70113c981456053b3eb81fb001830ff3a66089b]
#    to [f392ca94c652f0b2e0199720b3ca1891caa1e84d]
# 
# patch "packages/gtk-webcore/osb-nrcore.inc"
#  from [a81dab6970cf3f620379e415339da87027c19963]
#    to [a2d1b24a35197d99ed9f2238f7e7694386f7ba8e]
# 
# patch "packages/gtk-webcore/osb-nrcore_svn.bb"
#  from [ab839622392a9399df985a1c3d43b212da7e0e56]
#    to [6b4a5f5331023113b0b94f5a20f172c0144f3b20]
# 
# patch "packages/libmatchbox/libmatchbox_1.9.bb"
#  from [365c3dda341f2c4325bd84ab2891014107edcd0a]
#    to [a9b28c50f482c7cd7c7ca85bc68e492f6fad9611]
# 
# patch "packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig"
#  from [c20dde87e637984705b242283cff68d2e21b1512]
#    to [563f526c657d4db018fbb58a6373134adb43a7b1]
# 
# patch "packages/linux/linux-rt_2.6.24.bb"
#  from [f3cbc9b9bcdc504fa80a491cd5743b5ed799891f]
#    to [29d97acddf75b09d01099358d07240db5d4e2353]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [a9d28d2fb58ab00bc0024eb2dc819228bbe6d7ea]
#    to [2440043a73616ef8837486eec4d51aa891d62868]
# 
# patch "packages/linux/linux_2.6.24.bb"
#  from [90c088b9a606dde51c1eb8148602236bd47b8e9f]
#    to [02d0aff47a49583d0545d170cb8642f122e48c0c]
# 
# patch "packages/madwifi/madwifi-ng_r.inc"
#  from [94e56e839e15990576355deb1799b0c3dbb2615e]
#    to [7aa1e42dc113764feb73fa14b6553a8b16aac0c1]
# 
# patch "packages/matchbox-desktop/matchbox-desktop_0.9.1.bb"
#  from [bf560c49408f0a25330af4a37ec9f44da53a7cdc]
#    to [a4667d6f77aa846c3dce0a8ed91e57d6acd68929]
# 
# patch "packages/matchbox-wm/matchbox-wm_1.2.bb"
#  from [98095f550f8c77883c44c40c96ff2b2161a07c87]
#    to [12502c8a947c859da87bc31d714b44edeec78784]
# 
# patch "packages/pango/pango_1.16.4.bb"
#  from [fc1e699045d805d135ea55ae7c9d5addc3069c16]
#    to [924dd3f68c9ba35e01042e9e8bb7b14d86ae1591]
# 
# patch "packages/pango/pango_1.18.3.bb"
#  from [24af597bfe27e33d9b2bb47c39d625d95e8eecc2]
#    to [cb8809c85a8afc05d221451e591e5b5421dedb24]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
#  from [e924574025f2310b2e6051f3aeef14fd3082d730]
#    to [809878de21fa1d0beaae670608e46b5918205067]
# 
============================================================
--- packages/curl/files/pkgconfig_fix.patch	d105999ef214e4616999e1d0accd284640974dc7
+++ packages/curl/files/pkgconfig_fix.patch	d105999ef214e4616999e1d0accd284640974dc7
@@ -0,0 +1,14 @@
+Index: curl-7.16.4/libcurl.pc.in
+===================================================================
+--- curl-7.16.4.orig/libcurl.pc.in	2007-02-18 09:41:27.000000000 +0000
++++ curl-7.16.4/libcurl.pc.in	2008-02-29 12:19:32.000000000 +0000
+@@ -33,6 +33,7 @@
+ URL: http://curl.haxx.se/
+ Description: Library to transfer files with ftp, http, etc.
+ Version: @VERSION@
+-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+-Libs.private: @LIBCURL_LIBS@ @LIBS@
++Requires.private: gnutls
++Libs: -L${libdir} -lcurl
++Libs.private: -ldl -lz
+ Cflags: -I${includedir}
============================================================
--- packages/dtnrg/files/configure_fix.patch	a89048eadd0ea582a6513bcb61d08df848026021
+++ packages/dtnrg/files/configure_fix.patch	a89048eadd0ea582a6513bcb61d08df848026021
@@ -0,0 +1,22 @@
+head no longer supports "-1" syntax
+
+Index: dtn-2.5.0/oasys/aclocal/gcc.ac
+===================================================================
+--- dtn-2.5.0.orig/oasys/aclocal/gcc.ac	2008-02-27 22:38:22.000000000 +0000
++++ dtn-2.5.0/oasys/aclocal/gcc.ac	2008-02-27 22:39:05.000000000 +0000
+@@ -83,13 +83,13 @@
+     dnl Figure out the version and set version-specific options
+     dnl
+     AC_CACHE_CHECK(for the version of the GNU C compiler, oasys_cv_prog_gccver, [
+-      oasys_cv_prog_gccver=`$CC --version | head -1`
++      oasys_cv_prog_gccver=`$CC --version | head -n 1`
+       oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/.*gcc.*(GCC) //'`
+       oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/ .*//'`
+     ])      
+ 
+     AC_CACHE_CHECK(for the version of the GNU C++ compiler, oasys_cv_prog_gxxver, [
+-      oasys_cv_prog_gxxver=`$CXX --version | head -1`
++      oasys_cv_prog_gxxver=`$CXX --version | head -n 1`
+       oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/.*g++.*(GCC) //'`
+       oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/ .*//'`
+     ])
============================================================
--- packages/gtk-webcore/files/path_fixes.patch	716a0950c604514677a0eae118da7da04d070344
+++ packages/gtk-webcore/files/path_fixes.patch	716a0950c604514677a0eae118da7da04d070344
@@ -0,0 +1,15 @@
+Index: NRCore/configure.in
+===================================================================
+--- NRCore.orig/configure.in	2008-02-29 11:01:14.000000000 +0000
++++ NRCore/configure.in	2008-02-29 12:45:18.000000000 +0000
+@@ -67,8 +67,8 @@
+       AC_MSG_RESULT([found. Using prefix $jscore_prefix])
+       JSCORE_ENABLE=yes
+       AC_SUBST(JSCORE_ENABLE)
+-      JSCORE_LIBS="-L$jscore_prefix/lib -ljscore"
+-      JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore-jscore/"
++      JSCORE_LIBS="-L$jscore_prefix/lib -lgtk_webcore_jscore"
++      JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore/"
+       jscore_pkgdatadir="$jscore_prefix/share/gtk-webcore-jscore"
+    else
+      AC_MSG_ERROR([JavaScriptCore not found. Use --with-javascriptcore-prefix=PREFIX])
============================================================
--- packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch	0edb164c34530db60d690707bef73b3594b510aa
+++ packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch	0edb164c34530db60d690707bef73b3594b510aa
@@ -0,0 +1,13 @@
+Index: NRCit/gtk-webcore-nrcit.pc.in
+===================================================================
+--- NRCit.orig/gtk-webcore-nrcit.pc.in	2008-02-29 13:46:41.000000000 +0000
++++ NRCit/gtk-webcore-nrcit.pc.in	2008-02-29 13:46:51.000000000 +0000
+@@ -6,6 +6,6 @@
+ Name: gtk-webcore-nrcit
+ Description: Gtk+-WebCore HTML rendering engine, browser interface
+ Version: @VERSION@
+-Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0
+-Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0 @LIBCURL_LIBS@
++Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0 libcurl
++Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0
+ Cflags: -I${includedir}/gtk-webcore/webi -I${includedir}/gtk-webcore
============================================================
--- packages/libmatchbox/files/configure_fixes.patch	4de1e878c64796aab614df79cf5ee0753caa5fec
+++ packages/libmatchbox/files/configure_fixes.patch	4de1e878c64796aab614df79cf5ee0753caa5fec
@@ -0,0 +1,79 @@
+---
+ configure.ac |   15 +++++++--------
+ libmb.pc.in  |    2 +-
+ 2 files changed, 8 insertions(+), 9 deletions(-)
+
+Index: libmatchbox-1.9/configure.ac
+===================================================================
+--- libmatchbox-1.9.orig/configure.ac	2007-11-11 22:26:43.000000000 +0000
++++ libmatchbox-1.9/configure.ac	2007-11-11 22:52:09.000000000 +0000
+@@ -84,6 +84,7 @@ if test $have_libx11pc = yes; then
+       xft_pkg=xft
+       SUPPORTS_XFT=1
+       AC_DEFINE(USE_XFT, [1], [Use Xft])	
++      XFT_REQUIRED="xft"
+    fi
+ # XXX : xau is missing from x11.pc - workaround is too add here 
+    PKG_CHECK_MODULES(XLIBS, x11 xext  $xft_pkg)
+@@ -108,6 +109,7 @@ if test x$enable_xft != xno; then
+     AC_DEFINE(USE_XFT, [1], [Use Xft])
+     SUPPORTS_XFT=1
+     AC_MSG_RESULT(yes)
++    XFT_REQUIRED="xft"
+   else
+ 
+     AC_PATH_PROG(XFT_CONFIG, xft-config, no)
+@@ -122,21 +124,17 @@ if test x$enable_xft != xno; then
+       AC_DEFINE(USE_XFT, [1], [Use Xft])
+       SUPPORTS_XFT=1    
+       AC_MSG_RESULT(yes)
++      MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XFT_CFLAGS"
++      MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XFT_LIBS"
+     fi
+   fi
+ fi
+ 
+ XLIBS_CFLAGS="$XLIBS_CLAGS $XFT_CFLAGS"
+-XLIBS_LIBS="$X_LIBS $XFT_LIBS -lX11 -lXext"
+-
+-MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS"
++XLIBS_LIBS="$XLIBS_LIBS $XFT_LIBS -lX11 -lXext"
+ 
+ fi
+ 
+-# do this here for freetype include
+-MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XLIBS_CFLAGS"
+-
+-
+ dnl ------ Check for Pango ---------------------------------------------------
+ 
+ if test x$enable_pango != xno; then
+@@ -172,7 +170,7 @@ if test x$enable_png != xno; then
+             AC_DEFINE(USE_PNG, [1], [Use Png])
+ 	    SUPPORTS_PNG=1
+             PNG_LIBS="-lpng -lz"
+-            MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS $PNG_LIBS"
++            MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS"
+         else
+ 	    AC_MSG_WARN([*** Cannot find PNG, disabling support])
+             enable_png=no
+@@ -340,6 +338,7 @@ AC_SUBST(MB_EXTRA_CFLAGS)
+ AC_SUBST(XLIBS_REQUIRED)
+ AC_SUBST(PANGO_REQUIRED)
+ AC_SUBST(PNG_REQUIRED)
++AC_SUBST(XFT_REQUIRED)
+ 
+ dnl ------ Below used for mbconfig.h ----------------------------------------
+ 
+Index: libmatchbox-1.9/libmb.pc.in
+===================================================================
+--- libmatchbox-1.9.orig/libmb.pc.in	2007-11-11 22:30:47.000000000 +0000
++++ libmatchbox-1.9/libmb.pc.in	2007-11-11 22:31:01.000000000 +0000
+@@ -7,6 +7,6 @@ Name: libmb
+ Description: Utility Library used by Matchbox utilities.
+ Version: @VERSION@
+ 
+-Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@
++Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ @XFT_REQUIRED@
+ Libs: -L${libdir} -lmb @MB_EXTRA_LIBS@
+ Cflags: -I${includedir} @MB_EXTRA_CFLAGS@
============================================================
--- packages/linux/linux-2.6.24/cm-x270/0001-cm-x270-match-type.patch	ce421f7708d6cf607dac08b8b4d125819b4cf2c3
+++ packages/linux/linux-2.6.24/cm-x270/0001-cm-x270-match-type.patch	ce421f7708d6cf607dac08b8b4d125819b4cf2c3
@@ -0,0 +1,25 @@
+From 1ae549fbb28ce1d57dc5201375b9f5bfa4a8c11d Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 18:58:27 -0400
+Subject: [PATCH] cm-x270-match-type
+
+---
+ arch/arm/boot/compressed/head-xscale.S |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S
+index 67ea99e..2e63ba2 100644
+--- a/arch/arm/boot/compressed/head-xscale.S
++++ b/arch/arm/boot/compressed/head-xscale.S
+@@ -44,3 +44,8 @@ __XScale_start:
+ 		str	r1, [r0, #0x18]
+ #endif
+ 
++#if defined(CONFIG_MACH_ARMCORE)
++		mov r7, #(MACH_TYPE_ARMCORE & 0xFF00)
++		add r7, r7, #(MACH_TYPE_ARMCORE & 0xFF)
++#endif
++
+-- 
+1.5.4.rc4
+
============================================================
--- packages/linux/linux-2.6.24/cm-x270/0002-ramdisk_load.patch	596b212fef6751dfd8b8aeaa142c6bea4a4f9019
+++ packages/linux/linux-2.6.24/cm-x270/0002-ramdisk_load.patch	596b212fef6751dfd8b8aeaa142c6bea4a4f9019
@@ -0,0 +1,81 @@
+From e2e1f41847cdd2ec6cbcfa97ca47972301fec10e Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 19:01:50 -0400
+Subject: [PATCH] ramdisk_load
+
+---
+ arch/arm/mach-pxa/cm-x270.c        |    6 ++++++
+ include/asm-arm/arch-pxa/cm-x270.h |    4 ++++
+ init/initramfs.c                   |   16 ++++++++++++++++
+ 3 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
+index %s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list