EFL upgrade and few small fixes and additions

new file mode 100755
index 0000000000000000000000000000000000000000..b74a2d809a1bca11ec8548cb9dfcd7501c5f346d
GIT binary patch

index 2805b92..860ed21 100644
@@ -1,7 +1,15 @@
 require midori.inc
 
+PR = "r1"
+
 SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
+           file://waf \
           "
+
+do_configure_prepend() {
+  cp -f ${WORKDIR}/waf ${S}/
+}
+
 SRC_URI[midori.md5sum] = "33dde203cd71ae2b1d2adcc7f5739f65"
 SRC_URI[midori.sha256sum] = "b3c77ddb6f562a0ea3d2e6fbb756ca0dc158ad8410f4b60f8e5998c2f7305f07"
 

new file mode 100644
index 0000000..8a17c9a
@@ -0,0 +1,32 @@
+From 95d741d6849a2faddf8c1e930c7250ead90e7bed Mon Sep 17 00:00:00 2001
+From: Klaus Kurzmann <[email protected]>
+Date: Thu, 20 Oct 2011 09:05:43 +0200
+Subject: [PATCH] gta04
+
+Signed-off-by: Klaus Kurzmann <[email protected]>
+---
+ X11/xserver-common |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/X11/xserver-common b/X11/xserver-common
+index 448b262..208bbfd 100644
+--- a/X11/xserver-common
++++ b/X11/xserver-common
+@@ -161,6 +161,14 @@ else
+                 ARGS="$ARGS -dpi ${DPI} -nocursor"
+             fi
+             ;;
++        "gta04")
++            DPI="280"
++            if [ "$XSERVER" != "Xorg" ] ; then
++                ARGS="$ARGS -screen ${SCREEN_SIZE}"
++            else
++                ARGS="$ARGS -dpi ${DPI} -nocursor"
++            fi
++            ;;
+         "motorola_ezx_platform")
+             ARGS="$ARGS -screen 240x320"
+             DPI="170" ;;
+-- 
+1.7.7
+

index 6e4fe2e..4f99a90 100644
@@ -22,6 +22,7 @@ SRC_URI_append = " \
                    file://Xserver.n900.patch \
                    file://Xserver.nexuss.patch \
                    file://Xserver.nexusone.patch \
+                   file://Xserver.gta04.patch \
 "
 
 

deleted file mode 100644
index d511905..0000000
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

70 lines not on this page · raw message

deleted file mode 100644
index 8688d0c..0000000
@@ -1,32 +0,0 @@
-DESCRIPTION = "Navit is a car navigation system with routing engine."
-LICENSE = "GPLv2"
-# taken from main navit package
-LIC_FILES_CHKSUM = "file://${WORKDIR}/GPL-2;md5=751419260aa954499f7abaabaa882bbe"
-SECTION = "x11/applications"
-DEPENDS = "glib-2.0 gtk+ imagemagick-native librsvg-native"
-
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r3"
-
-EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned  --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher"
-
-S = "${WORKDIR}/xpm"
-
-inherit autotools allarch
-
-FILES_${PN} = " /usr/share/navit/xpm/"
-
-SRCREV = "3915"
-
-#use different URL than navit_svn does, to prevent upgrade/downgrade cycle in downloads dir
-SRC_URI = "svn://[email protected]/svnroot/navit/trunk/navit/navit;module=xpm;proto=https \
-           file://GPL-2 \
-           file://configure.in"
-
-do_configure_prepend() {
-  cp ${WORKDIR}/configure.in ${S}/
-  # replace include with just xpmdir variable
-  sed -i 's#.*Makefile.inc.*#xpmdir=$(pkgdatadir)/xpm#g' ${S}/Makefile.am
-  # don't install desktopfile and icons
-  sed -i 's/^\(EXTRADIST.*\) $(DESKTOPFILE_DATA) $(ICON128_DATA) $(ICON22_DATA) \(.*\)$/\1\2/g' ${S}/Makefile.am
-}

index 25a7b8d..1baa145 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a4c51733b63d82df87995454bdc4b654 \
 
 SECTION = "x11/applications"
 DEPENDS = "glib-2.0 gtk+ qt4-x11-free gd gypsy librsvg-native"
-RDEPENDS_${PN} = " navit-icons ${PN}-config "
+RDEPENDS_${PN} = " ${PN}-icons ${PN}-config "
 RDEPENDS_${PN}-gui-qml = "qt4-plugin-imageformat-svg"
 RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk"
 RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool"

@@ -33,7 +33,7 @@ EXTRA_OECONF += " \
 require navit-fpu.inc
 EXTRA_OECONF += "${@get_navit_fpu_setting(bb, d)}"
 
-PACKAGES =+ "${PN}-maptool ${PN}-config ${PN}-dbus ${PN}-speech-cmdline ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-internal ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-gtk ${PN}-graphics-qt"
+PACKAGES =+ "${PN}-maptool ${PN}-config ${PN}-dbus ${PN}-speech-cmdline ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-internal ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-gtk ${PN}-graphics-qt ${PN}-icons"
 
 EXTRA_AUTORECONF = " -I m4"
 

@@ -65,10 +65,9 @@ FILES_${PN}-gui-internal = " ${libdir}/${PN}/gui/libgui_internal.so "
 FILES_${PN}-graphics-sdl = " ${libdir}/${PN}/graphics/libgraphics_sdl.so "
 FILES_${PN}-graphics-qt = " ${libdir}/${PN}/graphics/libgraphics_qt_qpainter.so "
 FILES_${PN}-graphics-gtk = " ${libdir}/${PN}/graphics/libgraphics_gtk_drawing_area.so "
+FILES_${PN}-icons = "/usr/share/navit/xpm/"
 
 do_configure_prepend() {
-  #Remove xpm building, replaced by icons in own package
-  sed -i 's/\(.*SUBDIRS.*\) xpm\( \|$\)\(.*\)/\1\2\3/g' ${S}/navit/Makefile.am
   # MOC=`$PKG_CONFIG QtGui --variable=moc_location` returns only /usr/bin/moc4 which is not available on hosts without Qt
   sed -i "s#MOC=#MOC=${STAGING_DIR_NATIVE}#g" ${S}/configure.in
 }

index b5484fa..67da7a9 100644
@@ -1,8 +1,8 @@
 require navit.inc
 
-SRCREV = "4495"
+SRCREV = "4841"
 PV = "0.2.0+svnr${SRCPV}"
-PR = "${INC_PR}.12"
+PR = "${INC_PR}.0"
 
-S = "${WORKDIR}/navit"
+S = "${WORKDIR}/${PN}"
 SRC_URI += "svn://[email protected]/svnroot/navit/trunk;module=navit;proto=http "

index 39ce890..d2e2f86 100755
@@ -17,6 +17,13 @@ case "$1" in
     if [ "$2" != "background" ]; then
       $0 $1 background &
     else
+       # work around from /etc/X11/Xinit
+       export USER=root
+       export HOME=/home/root
+       if [ ! -d $HOME ] && [ -d /root ]; then
+         HOME=/root
+       fi
+
        . /etc/profile
 
        echo "Starting Xserver"

index 17fe4d8..496b342 100644
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "file://xserver-nodm \
            file://xserver-nodm.service \

new file mode 100644
index 0000000..9be4ffb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Library for interacting with ID3 tags."
+SECTION = "libs/multimedia"
+PRIORITY = "optional"
+DEPENDS = "zlib"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "files://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz;name=archive \
+           http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz;name=patch \
+          "
+
+SRC_URI[archive.md5sum] = "19f27ddd2dda4b2d26a559a4f0f402a7"
+SRC_URI[archive.sha256sum] = "2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079"
+SRC_URI[patch.md5sum] = "805c0320a2efb21c40ce06fa13cd7c4b"
+SRC_URI[patch.sha256sum] = "9f03b59ccc8826a5be55a3dcde2f889067d58bdc72bf846416a198c9b933704c"

new file mode 100644
index 0000000..03c4352
@@ -0,0 +1,13 @@
+DESCRIPTION = "Liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.1.0 Standard Annex 14, Revision 22"
+HOMEPAGE = "http://vimgadgets.sourceforge.net/liblinebreak/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "zlib"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=3715191da62bafb5cfc4ff36195b2ec3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/vimgadgets/liblinebreak/${PV}/liblinebreak-${PV}.tar.gz"
+
+inherit autotools
+
+SRC_URI[md5sum] = "d18039259001ccb24b5dd4648c49c5ad"
+SRC_URI[sha256sum] = "9efcb0cb1afc75ad1e92d2b2dbf4d9c77b072d6656c5f1a150af8b718d0c7b76"

index ed08105..18df79b 100644
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
 # usually tracks svn trunk HEAD
-EFL_SRCREV ?= "64150"
+EFL_SRCREV ?= "64506"
 # revision when 1.0.0 was released, for recipes which don't need rebuild so often
 EFL_SRCREV_1.0.0 ?= "56356"
 

deleted file mode 100644
index 3d04453..0000000
@@ -1,12 +0,0 @@
-diff -uNr ecore.orig//src/lib/ecore_con/ecore_con_info.c ecore/src/lib/ecore_con/ecore_con_info.c
---- ecore.orig//src/lib/ecore_con/ecore_con_info.c	2010-08-13 14:31:18.000000000 +0200
-+++ ecore/src/lib/ecore_con/ecore_con_info.c	2010-08-13 14:49:37.000000000 +0200
-@@ -283,7 +283,7 @@
-         
-         err = write(fd[1], "", 1);
-         close(fd[1]);
--#ifdef __USE_ISOC99
-+#if defined(__USE_ISOC99) && !defined(__UCLIBC__)
-         _Exit(0);
- #else
-         _exit(0);

56 lines not on this page · raw message

index 99fb3e2..c71c1b9 100644
@@ -7,7 +7,6 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \
-  file://exit_uclibc.patch \
   file://fix-ecore-fb-initialization.patch \
 "
 S = "${WORKDIR}/${SRCNAME}"

index 1034e0f..6162abd 100644
@@ -2,8 +2,7 @@ DESCRIPTION = "EFL based widget set for mobile devices"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cdc6c12b238ccd62635a7517dfe89438"
 DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb"
-PV = "0.7.0+svnr${SRCPV}"
-PR = "r12"
+PV = "0.8.0+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
 inherit efl gettext

new file mode 100644
index 0000000..59127d3
@@ -0,0 +1,16 @@
+DESCRIPTION = "Login manager for Enlightenment"
+DEPENDS = "efreet eina eet ecore elementary"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+SECTION = "e/apps"
+
+inherit e gettext
+SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+PV = "0.0.4+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV}"
+
+#RDEPENDS_${PN} = "${PN}-themes"

new file mode 100644
index 0000000..86de1ec
@@ -0,0 +1,24 @@
+DESCRIPTION = "Task for a image with Xserver"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+PR = "r9"
+
+inherit task
+
+# for backwards compatibility
+RPROVIDES_${PN} = "task-x11-server"
+
+XSERVER ?= "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-fbdev \
+           xf86-input-keyboard \
+"
+
+
+RDEPENDS_${PN} = " \
+  ${XSERVER} \
+"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+

similarity index 46%
rename from meta-oe/recipes-core/tasks/task-x11.bb
rename to meta-oe/recipes-core/tasks/task-x11_1.0.bb
index a7faa00..2cac01a 100644
@@ -2,37 +2,26 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b
 SECTION = "x11/server"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PV = "1.0"
-PR = "r8"
-
-# WORK IN PROGRESS
+PR = "r9"
 
 inherit task
 
-PACKAGES += "\
-  ${PN}-server \
-  ${PN}-utils \
-"
+PACKAGES += "${PN}-utils"
 
 RRECOMMENDS_${PN} = "\
   ${PN}-server \
   ${PN}-utils \
 "
 
-# Some machines don't set a *runtime* provider for X, so default to Xfbdev here
-# virtual/xserver won't work, since the kdrive recipes will build multiple xserver packages
-XSERVER ?= "xserver-xorg"
-XSERVER_COMMON ?= "xserver-common"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+# xserver-common, x11-common
+VIRTUAL-RUNTIME_xserver-common ?= "xserver-common"
 
-RDEPENDS_${PN}-server = "\
-  ${XSERVER} \
-"
+# elsa, xserver-nodm-init
+VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
 
 RDEPENDS_${PN}-utils = "\
-  ${XSERVER_COMMON} \
-  xserver-nodm-init \
+  ${VIRTUAL-RUNTIME_xserver-common} \
+  ${VIRTUAL-RUNTIME_graphical_init_manager} \
   xauth \
   xhost \
   xset \

index 86d833e..9294869 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Systemd serial config"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
-SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
+SERIAL_CONSOLE ?= "115200 ttyS0"
 
 SRC_URI = "file://LICENSE \
            file://[email protected]"

new file mode 100644
index 0000000..ad1c259
@@ -0,0 +1,105 @@
+From d3a6b1e06165bf01b2dfc364e6820fc5e8a530a7 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Sat, 29 Oct 2011 12:00:32 +0200
+Subject: [PATCH] elfe: update again to even newer elementary API
+
+Upstream-Status: Submitted
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ E-MODULES-EXTRA/elfe/src/desktop.c |    8 ++++----
+ E-MODULES-EXTRA/elfe/src/dock.c    |    2 +-
+ E-MODULES-EXTRA/elfe/src/main.c    |    4 ++--
+ E-MODULES-EXTRA/elfe/src/winlist.c |    6 +++---
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/E-MODULES-EXTRA/elfe/src/desktop.c b/E-MODULES-EXTRA/elfe/src/desktop.c
+index e833f54..5b14f9a 100644
+--- a/E-MODULES-EXTRA/elfe/src/desktop.c
++++ b/E-MODULES-EXTRA/elfe/src/desktop.c
+@@ -333,7 +333,7 @@ _dock_allapps_clicked_cb(void *data , Evas_Object *obj __UNUSED__, void *event_i
+ 	     evas_object_smart_callback_add(desk->allapps, "gadget,longpressed", _gadget_longpressed_cb, desk);
+ 	     evas_object_smart_callback_add(desk->allapps, "item,selected", _allapps_item_selected_cb, desk);
+ 	     evas_object_show(desk->allapps);
+-	     elm_layout_content_set(desk->layout, "elfe.swallow.allapps", desk->allapps);
++	     elm_object_content_part_set(desk->layout, "elfe.swallow.allapps", desk->allapps);
+ 	  }
+ 
+ 	o_edje = elm_layout_edje_get(desk->layout);
+@@ -493,9 +493,9 @@ elfe_desktop_add(Evas_Object *parent, E_Zone *zone)
+ 
+    evas_object_data_set(desk->layout, "elfe_desktop", desk);
+ 
+-   elm_layout_content_set(desk->layout, "elfe.swallow.content", desk->sc);
+-   elm_layout_content_set(desk->layout, "elfe.swallow.selector", desk->selector);
+-   elm_layout_content_set(desk->layout, "elfe.swallow.dock", desk->dock);
++   elm_object_content_part_set(desk->layout, "elfe.swallow.content", desk->sc);
++   elm_object_content_part_set(desk->layout, "elfe.swallow.selector", desk->selector);
++   elm_object_content_part_set(desk->layout, "elfe.swallow.dock", desk->dock);
+ 
+    return desk->layout;
+ 
+diff --git a/E-MODULES-EXTRA/elfe/src/dock.c b/E-MODULES-EXTRA/elfe/src/dock.c
+index 9375792..2fa97ff 100644
+--- a/E-MODULES-EXTRA/elfe/src/dock.c
++++ b/E-MODULES-EXTRA/elfe/src/dock.c
+@@ -261,7 +261,7 @@ elfe_dock_add(Evas_Object *parent)
+    evas_object_show(dock->edje);
+    evas_object_data_set(dock->edje, "dock", dock);
+ 
+-   elm_layout_content_set(dock->edje, "elfe.swallow.content", dock->table);
++   elm_object_content_part_set(dock->edje, "elfe.swallow.content", dock->table);
+ 
+    return dock->edje;
+ }
+diff --git a/E-MODULES-EXTRA/elfe/src/main.c b/E-MODULES-EXTRA/elfe/src/main.c
+index 8237e58..46863f5 100644
+--- a/E-MODULES-EXTRA/elfe/src/main.c
++++ b/E-MODULES-EXTRA/elfe/src/main.c
+@@ -208,10 +208,10 @@ _elfe_home_win_new(E_Zone *zone)
+ 
+    elm_scroller_content_set(hwin->bg_scroller, hwin->o_bg);
+    evas_object_show(hwin->bg_scroller);
+-   elm_layout_content_set(hwin->layout, "elfe.swallow.background", hwin->bg_scroller);
++   elm_object_content_part_set(hwin->layout, "elfe.swallow.background", hwin->bg_scroller);
+ 
+    hwin->desktop = elfe_desktop_add(hwin->layout, hwin->zone);
+-   elm_layout_content_set(hwin->layout, "elfe.swallow.desktop", hwin->desktop);
++   elm_object_content_part_set(hwin->layout, "elfe.swallow.desktop", hwin->desktop);
+    evas_object_smart_callback_add(hwin->desktop, "scroll", _scroll_anim_cb, hwin);
+ 
+ 
+diff --git a/E-MODULES-EXTRA/elfe/src/winlist.c b/E-MODULES-EXTRA/elfe/src/winlist.c
+index cd4b813..236f878 100644
+--- a/E-MODULES-EXTRA/elfe/src/winlist.c
++++ b/E-MODULES-EXTRA/elfe/src/winlist.c
+@@ -298,7 +298,7 @@ _transit_win_anim_del_cb(void *data, Elm_Transit *transit)
+ {
+    Elfe_Winlist_Item *it = data;
+ 
+-   elm_layout_content_set(it->layout, "elfe.swallow.content", it->win);
++   elm_object_content_part_set(it->layout, "elfe.swallow.content", it->win);
+    if (it->bd->client.netwm.name)
+      elm_object_text_part_set(it->layout, "elfe.text.label",
+                               it->bd->client.netwm.name);
+@@ -489,7 +489,7 @@ _elfe_action(const char *params, int modifiers, int method)
+ 	elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+ 	elm_scroller_page_relative_set(sc, 1.0, 1.0);
+ 	evas_object_show(sc);
+-        elm_layout_content_set(winlist->layout, "elfe.swallow.windows", sc);
++        elm_object_content_part_set(winlist->layout, "elfe.swallow.windows", sc);
+ 
+ 	bx = elm_box_add(sc);
+ 	evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+@@ -611,7 +611,7 @@ _elfe_action(const char *params, int modifiers, int method)
+              evas_object_size_hint_aspect_set(item->placeholder,
+                                               EVAS_ASPECT_CONTROL_BOTH,
+                                               cw->bd->w/2, cw->bd->h/2);
+-             elm_layout_content_set(layout, "elfe.swallow.content", item->placeholder);
++             elm_object_content_part_set(layout, "elfe.swallow.content", item->placeholder);
+              elm_table_pack(tb, item->layout, 1, 1, 1, 1);
+              evas_object_show(item->placeholder);
+              evas_object_event_callback_add(item->placeholder, EVAS_CALLBACK_RESIZE, _item_layout_resize_cb, item);
+-- 
+1.7.7.1
+

index 151ef7e..5b703dc 100644
@@ -5,4 +5,6 @@ PR = "${INC_PR}.1"
 
 require e-module.inc
 
+SRC_URI += "file://0001-elfe-update-again-to-even-newer-elementary-API.patch"
+
 DEPENDS += "elementary"