diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-01-15 13:51:45 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-01-15 13:51:45 +0100 |
| commit | bb52a587f8f8bd9eaf3408746e8a036077e20031 (patch) | |
| tree | d6fdba27cd6a3bafdc16a12c29eecc911d4cc00d | |
| parent | 98ef486402173060533407e8e31697a2f33fce56 (diff) | |
| parent | bcdf5fc9c548812521c17a6e43b2421a8c2a97e4 (diff) | |
| download | openembedded-bb52a587f8f8bd9eaf3408746e8a036077e20031.tar.gz | |
Merge remote branch 'origin/martin_jansa/srcpv' into shr/merge
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | recipes/e17/illume-keyboard-default_svn.bb | 4 | ||||
| -rw-r--r-- | recipes/fltk/efltk/fix.void.cast.patch | 15 | ||||
| -rw-r--r-- | recipes/tasks/task-shr-feed.bb | 2 |
4 files changed, 19 insertions, 4 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index edffb90f04..517b0c0eeb 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -334,7 +334,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "44960" +EFL_SRCREV ?= "45060" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" diff --git a/recipes/e17/illume-keyboard-default_svn.bb b/recipes/e17/illume-keyboard-default_svn.bb index 8b8dbd4a41..f9fd8fd72f 100644 --- a/recipes/e17/illume-keyboard-default_svn.bb +++ b/recipes/e17/illume-keyboard-default_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The illume default keyboards" SECTION = "x11/data" SRCNAME = "e/src/modules/illume/keyboards" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http" S = "${WORKDIR}/${SRCNAME}" @@ -26,7 +26,7 @@ FILES_${PN}-alpha = "\ ${libdir}${INSTPATH}/alpha.png \ " FILES_${PN}-numeric = "\ - ${libdir}${INSTPATH}/Numeric.kbd \ + ${libdir}${INSTPATH}/Numbers.kbd \ ${libdir}${INSTPATH}/numeric.png \ " FILES_${PN}-terminal = "\ diff --git a/recipes/fltk/efltk/fix.void.cast.patch b/recipes/fltk/efltk/fix.void.cast.patch new file mode 100644 index 0000000000..d66c77f867 --- /dev/null +++ b/recipes/fltk/efltk/fix.void.cast.patch @@ -0,0 +1,15 @@ +From: +http://sourceforge.net/projects/ede/forums/forum/249614/topic/3458921 + +diff -uNr efltk.orig/src/core/filename_list.cpp efltk/src/core/filename_list.cpp +--- efltk.orig/src/core/filename_list.cpp 2007-11-16 14:17:51.000000000 +0100 ++++ efltk/src/core/filename_list.cpp 2010-01-15 01:03:59.000000000 +0100 +@@ -59,7 +59,7 @@ + // The vast majority of Unix systems want the sort function to have this + // prototype, most likely so that it can be passed to qsort without any + // changes: +- return scandir(dir, list, 0, (int(*)(const void*,const void*))sort); ++ return scandir(dir, list, 0, (int(*)(const dirent **,const dirent **))sort); + #else + // This version is when we define our own scandir (WIN32 and perhaps + // some Unix systems) and apparently on Irix: diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 89d034bdb3..54789ac489 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -104,7 +104,7 @@ RDEPENDS_${PN} += "\ libpurple-protocol-icq \ vagalume \ ppp \ -# bluez-hcidump \ + bluez-hcidump \ kbdd \ kexec-tools \ mc \ |