diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-05-19 00:19:25 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-05-19 00:19:25 +0000 |
| commit | ed8124e6f54fb0b1baa02bc443f1d4bf419bae35 (patch) | |
| tree | e61f0367d7de17a76f87fa9701047cb82f568751 | |
| parent | 1eb0034152636b9945af02360af6ca8be131d671 (diff) | |
| parent | 5e2947cec6215bdce81b2359e0ea79320e675637 (diff) | |
merge of '5ffcacd9125004bbcb65a5f2d933272d313bee84'
and 'd78b6d9ef4e4f3d1ced7dfccfda038bcffbb221c'
| -rw-r--r-- | conf/distro/include/moko-autorev.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 3 | ||||
| -rw-r--r-- | packages/efl1/edbus_cvs.bb | 7 | ||||
| -rw-r--r-- | packages/efl1/epsilon/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/efl1/epsilon/fix_alignment_error.patch | 13 | ||||
| -rw-r--r-- | packages/efl1/epsilon_cvs.bb | 2 |
6 files changed, 6 insertions, 20 deletions
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 0edb4ef0ae..c411149cd9 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -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}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 7721d97ce6..835bfadabe 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -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_enhance ?= "${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}" diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb index be9b64378b..812da033ec 100644 --- a/packages/efl1/edbus_cvs.bb +++ b/packages/efl1/edbus_cvs.bb @@ -6,9 +6,10 @@ PR = "r5" 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" diff --git a/packages/efl1/epsilon/.mtn2git_empty b/packages/efl1/epsilon/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/efl1/epsilon/.mtn2git_empty +++ /dev/null diff --git a/packages/efl1/epsilon/fix_alignment_error.patch b/packages/efl1/epsilon/fix_alignment_error.patch deleted file mode 100644 index 7a635bcf88..0000000000 --- a/packages/efl1/epsilon/fix_alignment_error.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: epsilon/src/lib/exiftags/canon.c -=================================================================== ---- epsilon.orig/src/lib/exiftags/canon.c 2007-12-03 17:45:27.000000000 -0300 -+++ epsilon/src/lib/exiftags/canon.c 2007-12-03 17:46:59.000000000 -0300 -@@ -52,7 +52,7 @@ - struct ccstm { - int32_t val; - struct descrip *table; -- const char descr[]; -+ const char *descr; - }; - - diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb index e5e422a887..906a60c2a4 100644 --- a/packages/efl1/epsilon_cvs.bb +++ b/packages/efl1/epsilon_cvs.bb @@ -8,8 +8,6 @@ PR = "r0" 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" |