[oe-commits] org.oe.dev merge of '6279441596d7826ca811822cd78f2118f9eb57e2'

[oe commit]

merge of '6279441596d7826ca811822cd78f2118f9eb57e2'
     and 'e667f22b2fcceae83ed7110622269ddd2194a9b8'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: ff172bfb16be34bdc1c254ae6fc8a230cc5521d0
ViewMTN: http://monotone.openembedded.org/revision/info/ff172bfb16be34bdc1c254ae6fc8a230cc5521d0
Files:
1
packages/php/php-5.2.5/autotools.patch
packages/php/files
packages/nonworking/php/files
packages/php/php-native_4.4.4.bb
packages/nonworking/php/php-native_4.4.4.bb
packages/php/php_4.4.4.bb
packages/nonworking/php/php_4.4.4.bb
packages/nonworking/php
packages/php/php.inc
packages/php/php_5.1.4.bb
packages/efl1/epsilon
packages/efl1/epsilon/fix_alignment_error.patch
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
packages/efl1/edbus_cvs.bb
packages/efl1/epsilon_cvs.bb
Diffs:

#
# mt diff -r6279441596d7826ca811822cd78f2118f9eb57e2 -rff172bfb16be34bdc1c254ae6fc8a230cc5521d0
#
#
#
# delete "packages/php/php-5.2.5/autotools.patch"
# 
# rename "packages/php/files"
#     to "packages/nonworking/php/files"
# 
# rename "packages/php/php-native_4.4.4.bb"
#     to "packages/nonworking/php/php-native_4.4.4.bb"
# 
# rename "packages/php/php_4.4.4.bb"
#     to "packages/nonworking/php/php_4.4.4.bb"
# 
# add_dir "packages/nonworking/php"
# 
# patch "packages/php/php.inc"
#  from [05d469fc771d0798c8e8fc750ab8e1c1dde63c41]
#    to [dfffa043ad00443f54decd01beb7e463d1549492]
# 
# patch "packages/php/php_5.1.4.bb"
#  from [e3f518eac4c616faa17ae879f81b81abae3ad3e2]
#    to [6dada38712cbc4601f615e341b87181924fa2e27]
#
============================================================
--- packages/php/php.inc	05d469fc771d0798c8e8fc750ab8e1c1dde63c41
+++ packages/php/php.inc	dfffa043ad00443f54decd01beb7e463d1549492
@@ -5,7 +5,6 @@ SRC_URI =     "http://us2.php.net/distri
 DEPENDS = "zlib libxml2 mysql virtual/libiconv php-native"
 
 SRC_URI =     "http://us2.php.net/distributions/php-${PV}.tar.bz2\
-               file://autotools.patch;patch=1 \
                file://acinclude-xml2-config.patch;patch=1"
 
 inherit autotools
============================================================
--- packages/php/php_5.1.4.bb	e3f518eac4c616faa17ae879f81b81abae3ad3e2
+++ packages/php/php_5.1.4.bb	6dada38712cbc4601f615e341b87181924fa2e27
@@ -2,6 +2,8 @@ PR = "r3"
 
 PR = "r3"
 
+SRC_URI += "file://autotools.patch;patch=1"
+
 inherit autotools
 
 export THREADS="pthread"


#
# mt diff -re667f22b2fcceae83ed7110622269ddd2194a9b8 -rff172bfb16be34bdc1c254ae6fc8a230cc5521d0
#
#
#
# delete "packages/efl1/epsilon"
# 
# delete "packages/efl1/epsilon/fix_alignment_error.patch"
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [cf51729787fd2fd25f76ebaf652e629b2c27a8b4]
#    to [89ce7f49f72eea705ed63b4f98b6ffa6d6a02bed]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [e993ffd4e275abdc019bd768b83fe75481e9f12a]
#    to [a840f12073131fc6d5922a4f7d4eaf3c0fbe93ba]
# 
# patch "packages/efl1/edbus_cvs.bb"
#  from [ecd6cb444aeac48cd019c31f15055fb2cca6157a]
#    to [7f6f010883128a2dc595086674f08caa1bf29d74]
# 
# patch "packages/efl1/epsilon_cvs.bb"
#  from [06a4ccc0ac1208566731c847fc2ac20246de3ec5]
#    to [83ada598b7cf56e16b6d9c1101d88249c5112649]
#
============================================================
--- conf/distro/include/moko-autorev.inc	cf51729787fd2fd25f76ebaf652e629b2c27a8b4
+++ conf/distro/include/moko-autorev.inc	89ce7f49f72eea705ed63b4f98b6ffa6d6a02bed
@@ -1,4 +1,3 @@
-EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}"
 SRCREV_pn-assassin ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcdates.inc	e993ffd4e275abdc019bd768b83fe75481e9f12a
+++ conf/distro/include/sane-srcdates.inc	a840f12073131fc6d5922a4f7d4eaf3c0fbe93ba
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE ?= "20080428"
+EFL_SRCDATE ?= "20080518"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -80,6 +80,7 @@ SRCDATE_evolve ?= "${EFL_SRCDATE}"
 SRCDATE_engrave ?= "${EFL_SRCDATE}"
 SRCDATE_evolve-native ?= "${EFL_SRCDATE}"
 SRCDATE_evolve ?= "${EFL_SRCDATE}"
+SRCDATE_exquisite ?= "${EFL_SRCDATE}"
 SRCDATE_gevas2 ?= "${EFL_SRCDATE}"
 SRCDATE_imlib2 ?= "${EFL_SRCDATE}"
 
============================================================
--- packages/efl1/edbus_cvs.bb	ecd6cb444aeac48cd019c31f15055fb2cca6157a
+++ packages/efl1/edbus_cvs.bb	7f6f010883128a2dc595086674f08caa1bf29d74
@@ -6,9 +6,10 @@ inherit efl
 
 inherit efl
 
-SRC_URI = "${E_CVS};module=e17/libs/e_dbus \
-           http://people.openmoko.org/stefan/e_nm-big-hack.patch;patch=1;pnum=1;mindate=20080330 \
-			"
+SRC_URI = "\
+  ${E_CVS};module=e17/libs/e_dbus \
+  http://people.openmoko.org/stefan/e_nm-big-hack.patch;patch=1;pnum=1;mindate=20080330;maxdate=20080501 \
+"
 S = "${WORKDIR}/e_dbus"
 
 EXTRA_OECONF = "--enable-build-test-gui"
============================================================
--- packages/efl1/epsilon_cvs.bb	06a4ccc0ac1208566731c847fc2ac20246de3ec5
+++ packages/efl1/epsilon_cvs.bb	83ada598b7cf56e16b6d9c1101d88249c5112649
@@ -8,8 +8,6 @@ inherit efl
 
 inherit efl
 
-SRC_URI += "file://fix_alignment_error.patch;patch=1"
-
 # a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well
 EXTRA_OECONF = "--disable-xine"