[oe-commits] org.oe.dev merge of 'b9249f27ed481c5d02d4b0a68b50c1e6688fe484'
mickeyl commit
oe at amethyst.openembedded.net
Thu Sep 4 11:04:11 UTC 2008
merge of 'b9249f27ed481c5d02d4b0a68b50c1e6688fe484'
and 'c8025b1589420ff484c99ad1c0e06906ad36b85d'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 5af45981b215587dfbcb2c800c89e5322177591b
ViewMTN: http://monotone.openembedded.org/revision/info/5af45981b215587dfbcb2c800c89e5322177591b
Files:
1
packages/kexecboot/files/rootdelay.patch
packages/nonworking/clucene/clucene-0.8.12-pre
packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch
packages/nonworking/clucene/clucene_0.8.12-pre.bb
packages/nonworking/clucene
packages/clucene
packages/kde4
packages/classpath/files/cp-byte-loophelper.patch
packages/classpath/files/decimalformat.patch
packages/clucene/clucene-core_0.9.21.bb
packages/kde4/akonadi_1.0.bb
packages/kde4/automoc-native_svn.bb
packages/kde4/gmm_3.0.bb
packages/kde4/kde4-native.inc
packages/kde4/kde4.inc
packages/kde4/qca_2.0.0.bb
packages/kde4/soprano_2.1.bb
packages/kde4/strigi_0.5.10.bb
packages/kexecboot/files/kexecboot-rewrite.patch
packages/classpath/classpath-minimal_0.97.2.bb
packages/classpath/classpath-native_0.97.2.bb
packages/classpath/classpath_0.97.2.bb
packages/kexecboot/initramfs-kexecboot_1.0.bb
packages/kexecboot/kexecboot_0.3.bb
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-akita
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-bootcdx86
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-c7x0
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-htcuniversal
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-hx2000
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-poodle
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-qemuarm
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-qemux86
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-spitz
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-zylonite
packages/kexecboot/linux-kexecboot.inc
packages/kexecboot/linux-kexecboot_2.6.26.bb
conf/distro/include/sane-srcrevs.inc
packages/e17/e-wm_svn.bb
packages/e17/illume_svn.bb
packages/images/fso-image.bb
packages/openmoko-projects/tichy_svn.bb
Diffs:
#
# mt diff -rb9249f27ed481c5d02d4b0a68b50c1e6688fe484 -r5af45981b215587dfbcb2c800c89e5322177591b
#
#
#
# delete "packages/kexecboot/files/rootdelay.patch"
#
# delete "packages/nonworking/clucene/clucene-0.8.12-pre"
#
# delete "packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch"
#
# delete "packages/nonworking/clucene/clucene_0.8.12-pre.bb"
#
# rename "packages/nonworking/clucene"
# to "packages/clucene"
#
# add_dir "packages/kde4"
#
# add_file "packages/classpath/files/cp-byte-loophelper.patch"
# content [3d61e02534f06d6b4b63bc8924fb24f0f8658e64]
#
# add_file "packages/classpath/files/decimalformat.patch"
# content [9bb1d10f056daf0875603e27fba7c95ac5541b0d]
#
# add_file "packages/clucene/clucene-core_0.9.21.bb"
# content [dae00620f34a32ad1e3db098afcf75322e9840bd]
#
# add_file "packages/kde4/akonadi_1.0.bb"
# content [5d8691a0640cfb4a5247513c6b6863efc83ac636]
#
# add_file "packages/kde4/automoc-native_svn.bb"
# content [9acabdbfd6bc9987aac16d973ce31412d6e4aba7]
#
# add_file "packages/kde4/gmm_3.0.bb"
# content [c9eb9deeabc3e1d5a9f0ccc4f431e4e714f974eb]
#
# add_file "packages/kde4/kde4-native.inc"
# content [0e7ea00b643e2bb80546fdda97b07bd2ef4ac986]
#
# add_file "packages/kde4/kde4.inc"
# content [f57698146a8b7caf172621fe9ebdb6b67bcaf071]
#
# add_file "packages/kde4/qca_2.0.0.bb"
# content [087ac932b5dc8f6b288cbc81592e6b6e90debb04]
#
# add_file "packages/kde4/soprano_2.1.bb"
# content [8834522284fac6810714a134e2c660a6f7da0809]
#
# add_file "packages/kde4/strigi_0.5.10.bb"
# content [be310a384240e28023da1b34432487efe8cbfaf8]
#
# add_file "packages/kexecboot/files/kexecboot-rewrite.patch"
# content [c170a72f30755508c630b99d3fd340fc32776280]
#
# patch "packages/classpath/classpath-minimal_0.97.2.bb"
# from [fe0236b7b3c70cfc9ae4ae7c9162e46c136eb1ef]
# to [177179004b0872961bb82b3f0478fbb4305e68b0]
#
# patch "packages/classpath/classpath-native_0.97.2.bb"
# from [537d513b9558846909bfcff51984e4dacdc7b586]
# to [435684f1e26b8284b25fcf75ceb62504efc4ba3e]
#
# patch "packages/classpath/classpath_0.97.2.bb"
# from [002223e29d941c20e5c67e5abd59a0367f5f759a]
# to [cad408a93df036893e2573d5d16baa2b07bd8b08]
#
# patch "packages/kexecboot/initramfs-kexecboot_1.0.bb"
# from [d3cfea5e56d92934495f6342d176e974b5c9baf3]
# to [f558f2a042364b5409d377c478b4b9e541fda455]
#
# patch "packages/kexecboot/kexecboot_0.3.bb"
# from [549463678e80781a4efa57e3c566d8668953cb08]
# to [4457d2c86b13054d5904309706de64d592eb0f3e]
#
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-akita"
# from [064c36530b213dae882be1b6bb2cbab8615906f8]
# to [00830ed0414849cf715b07e153eb67fac87aef14]
#
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-bootcdx86"
# from [83dbfc0474bb18348ca67718d27d2dcc262095a3]
# to [0960055873f1123a6ae52f2a7abe375f01994cdb]
#
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-c7x0"
# from [9840eec605b360f4cdcf976973331ce274a89b6f]
# to [d15a5f05587c98203f9ee732dd0be56761cf05ee]
#
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-htcuniversal"
# from [afcff96c3bba46e09d06200f4431c95fdb419893]
# to [6c9ef9588353eeb60af452de25604dbe0f35763f]
#
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-hx2000"
# from [8d4023e3a924b2d01a60011c6aa81cca7bc83d06]
# to [b491304337aae46a85a5c7c191e03a79d45c11b3]
#
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-poodle"
# from [823d2a1579f2e5312396ba4c0d40a7405bcebd4f]
# to [2e731fc9d5746cb9b2b147d9da0bb2c6c7bbcf25]
#
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-qemuarm"
# from [19a7a240f8a4fd58732db1ccb11767dac8fc7221]
# to [9adc75c32cc284f318660b9d75d14b29fe350e7d]
#
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-qemux86"
# from [8f2d48208eb79e7a2e00941efcaee2cad2d34737]
# to [677db0668430d8b88a0da1a72b719bb9a3b6e0e7]
#
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-spitz"
# from [121ce2ca2da79de4072c338f63ad9e345f2674bb]
# to [a02d87cbebf6c43d557d077d9c6f64313fe0fc1b]
#
# patch "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-zylonite"
# from [71cf26b625ad773ac5468869fe7052854759f70f]
# to [8c64e0a32731e6a643f99ed460377cc59dbd487f]
#
# patch "packages/kexecboot/linux-kexecboot.inc"
# from [01dd6603a2a2fb2e9c3c56c171153b59ac8ec096]
# to [47955a0785e93132f8a4394a9ae8191654a2fc62]
#
# patch "packages/kexecboot/linux-kexecboot_2.6.26.bb"
# from [c81d28c54ee3911d010f1fe10568274d5cba04ca]
# to [af32ba85c12b9255c62cb27b05b4ca1a50cb72d4]
#
============================================================
--- packages/classpath/files/cp-byte-loophelper.patch 3d61e02534f06d6b4b63bc8924fb24f0f8658e64
+++ packages/classpath/files/cp-byte-loophelper.patch 3d61e02534f06d6b4b63bc8924fb24f0f8658e64
@@ -0,0 +1,68 @@
+Index: gnu/java/nio/charset/ByteDecodeLoopHelper.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/java/nio/charset/ByteDecodeLoopHelper.java,v
+retrieving revision 1.1
+diff -u -r1.1 ByteDecodeLoopHelper.java
+--- gnu/java/nio/charset/ByteDecodeLoopHelper.java 23 Nov 2007 16:11:17 -0000 1.1
++++ gnu/java/nio/charset/ByteDecodeLoopHelper.java 3 Sep 2008 23:11:29 -0000
+@@ -119,6 +119,8 @@
+ int inRemaining = in.remaining();
+ int outRemaining = out.remaining();
+ CoderResult result;
++
++ bailOut:
+ if (inRemaining <= outRemaining)
+ {
+ for (int i = 0; i < inRemaining; i++)
+@@ -129,7 +131,7 @@
+ {
+ inPos--;
+ result = CoderResult.unmappableForLength(1);
+- break;
++ break bailOut;
+ }
+ char c = mapToChar(b);
+ outArray[outPos] = c;
+@@ -147,7 +149,7 @@
+ {
+ inPos--;
+ result = CoderResult.unmappableForLength(1);
+- break;
++ break bailOut;
+ }
+ char c = mapToChar(b);
+ outArray[outPos] = c;
+Index: gnu/java/nio/charset/ByteEncodeLoopHelper.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/java/nio/charset/ByteEncodeLoopHelper.java,v
+retrieving revision 1.1
+diff -u -r1.1 ByteEncodeLoopHelper.java
+--- gnu/java/nio/charset/ByteEncodeLoopHelper.java 23 Nov 2007 16:11:17 -0000 1.1
++++ gnu/java/nio/charset/ByteEncodeLoopHelper.java 3 Sep 2008 23:11:29 -0000
+@@ -120,6 +120,8 @@
+ int inRemaining = in.remaining();
+ int outRemaining = out.remaining();
+ CoderResult result;
++
++ bailOut:
+ if (inRemaining <= outRemaining)
+ {
+ for (int i = 0; i < inRemaining; i++)
+@@ -130,7 +132,7 @@
+ {
+ inPos--;
+ result = CoderResult.unmappableForLength(1);
+- break;
++ break bailOut;
+ }
+ byte b = mapToByte(inChar);
+ outArray[outPos] = b;
+@@ -148,7 +150,7 @@
+ {
+ inPos--;
+ result = CoderResult.unmappableForLength(1);
+- break;
++ break bailOut;
+ }
+ byte b = mapToByte(inChar);
+ outArray[outPos] = b;
============================================================
--- packages/classpath/files/decimalformat.patch 9bb1d10f056daf0875603e27fba7c95ac5541b0d
+++ packages/classpath/files/decimalformat.patch 9bb1d10f056daf0875603e27fba7c95ac5541b0d
@@ -0,0 +1,31 @@
+Index: classpath-0.97.2/java/text/DecimalFormat.java
+===================================================================
+--- classpath-0.97.2.orig/java/text/DecimalFormat.java
++++ classpath-0.97.2/java/text/DecimalFormat.java
+@@ -1296,7 +1296,7 @@ public class DecimalFormat extends Numbe
+ currencySymbol = this.symbols.getCurrencySymbol();
+
+ // if \u00A4 is doubled, we use the international currency symbol
+- if (i < len && pattern.charAt(i + 1) == '\u00A4')
++ if ((i + 1) < len && pattern.charAt(i + 1) == '\u00A4')
+ {
+ currencySymbol = this.symbols.getInternationalCurrencySymbol();
+ i++;
+@@ -1320,7 +1320,7 @@ public class DecimalFormat extends Numbe
+ else if (ch == '\'')
+ {
+ // QUOTE
+- if (i < len && pattern.charAt(i + 1) == '\'')
++ if ((i + 1) < len && pattern.charAt(i + 1) == '\'')
+ {
+ // we need to add ' to the buffer
+ buffer.append(ch);
+@@ -1692,7 +1692,7 @@ public class DecimalFormat extends Numbe
+ else if (ch == '\'')
+ {
+ // QUOTE
+- if (i < len && pattern.charAt(i + 1) == '\'')
++ if ((i + 1) < len && pattern.charAt(i + 1) == '\'')
+ {
+ // we need to add ' to the buffer
+ buffer.append(ch);
============================================================
--- packages/clucene/clucene-core_0.9.21.bb dae00620f34a32ad1e3db098afcf75322e9840bd
+++ packages/clucene/clucene-core_0.9.21.bb dae00620f34a32ad1e3db098afcf75322e9840bd
@@ -0,0 +1,23 @@
+DESCRIPTION = "CLucene is a C++ port of Lucene: the high-performance, full-featured text search engine written in Java."
+SECTION = "libs"
+LICENSE = "LGPL"
+
+DEPENDS = "libtool"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/clucene/clucene-core-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-multithreading dps_static_const_type=2"
+
+do_configure() {
+ gnu-configize
+ cp ${STAGING_DATADIR}/libtool/config.sub ${S}/config
+ oe_runconf
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN}-dev += "${libdir}/CLucene"
============================================================
--- packages/kde4/akonadi_1.0.bb 5d8691a0640cfb4a5247513c6b6863efc83ac636
+++ packages/kde4/akonadi_1.0.bb 5d8691a0640cfb4a5247513c6b6863efc83ac636
@@ -0,0 +1,9 @@
+require kde4.inc
+
+DEPENDS += "automoc-native"
+
+PV = "1.0"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/akonadi;module=1.0;proto=svn"
+
+S= "${WORKDIR}/1.0"
+
============================================================
--- packages/kde4/automoc-native_svn.bb 9acabdbfd6bc9987aac16d973ce31412d6e4aba7
+++ packages/kde4/automoc-native_svn.bb 9acabdbfd6bc9987aac16d973ce31412d6e4aba7
@@ -0,0 +1,8 @@
+require kde4.inc
+require kde4-native.inc
+inherit native
+
+SRC_URI = "svn://anonsvn.kde.org/home/kde/trunk/kdesupport;module=automoc;proto=svn"
+
+S = "${WORKDIR}/automoc"
+
============================================================
--- packages/kde4/gmm_3.0.bb c9eb9deeabc3e1d5a9f0ccc4f431e4e714f974eb
+++ packages/kde4/gmm_3.0.bb c9eb9deeabc3e1d5a9f0ccc4f431e4e714f974eb
@@ -0,0 +1,12 @@
+DESCRIPTION = "The Getfem++ project focuses on the development of a generic and efficient C++ library for finite element methods."
+LICENSE = "LGPLv2"
+
+inherit autotools
+
+SRC_URI = "http://download.gna.org/getfem/stable/gmm-3.0.tar.gz"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/kde4/kde4-native.inc 0e7ea00b643e2bb80546fdda97b07bd2ef4ac986
+++ packages/kde4/kde4-native.inc 0e7ea00b643e2bb80546fdda97b07bd2ef4ac986
@@ -0,0 +1,14 @@
+
+# Ugly, use qt4 from the buildhost till someone adds a qt4-native recipe
+
+EXTRA_OECMAKE = "-DQT_LIBRARY_DIR=/usr/lib \
+ -DQT_INSTALL_LIBS=/usr/lib \
+ -DQT_INCLUDE_DIR=/usr/include/qt4 \
+ -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
+ -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
+ -DQT_UIC3_EXECUTABLE=${OE_QMAKE_UIC3} \
+ -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
+ -DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
+ -DQT_QTCORE_INCLUDE_DIR=/usr/include/qt4/QtCore \
+ "
+
============================================================
--- packages/kde4/kde4.inc f57698146a8b7caf172621fe9ebdb6b67bcaf071
+++ packages/kde4/kde4.inc f57698146a8b7caf172621fe9ebdb6b67bcaf071
@@ -0,0 +1,46 @@
+LICENSE = "GPL"
+
+inherit qt4x11 cmake
+
+PV = "4.1+svnr${SRCREV}"
+SRCREV = "856719"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/4.1;module=${PN};proto=svn"
+
+# OE lacks some native qt4 tools, so we use the ones form the host :/
+EXTRA_OECMAKE = "-DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
+ -DQT_INSTALL_LIBS=${OE_QMAKE_LIBDIR_QT} \
+ -DQT_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT} \
+ -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
+ -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
+ -DQT_UIC3_EXECUTABLE=${OE_QMAKE_UIC3} \
+ -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
+ -DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
+ -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
+ -DQT_DBUSXML2CPP_EXECUTABLE=/usr/bin/qdbusxml2cpp \
+ -DQT_DBUSCPP2XML_EXECUTABLE=/usr/bin/qdbuscpp2xml \
+ "
+
+
+S = "${WORKDIR}/${PN}"
+
+
+do_install_append() {
+ install -d ${D}/${libdir}/qt4
+ mv ${D}/${STAGING_DIR_TARGET}/qt4/plugins* ${D}/${libdir}/qt4 || true
+}
+
+FILES_${PN} += "${libdir}/qt4 \
+ ${datadir}/mime \
+ ${datadir}/dbus-1 \
+ ${datadir}/config \
+ "
+
+FILES_${PN}-dbg += "${libdir}/qt4/.debug \
+ ${libdir}/qt4/*/.debug \
+ ${libdir}/qt4/*/*/.debug"
+
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/kde4/qca_2.0.0.bb 087ac932b5dc8f6b288cbc81592e6b6e90debb04
+++ packages/kde4/qca_2.0.0.bb 087ac932b5dc8f6b288cbc81592e6b6e90debb04
@@ -0,0 +1,7 @@
+require kde4.inc
+
+PV = "2.0.0"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/qca;module=2.0.0;proto=svn"
+
+S= "${WORKDIR}/2.0.0"
+
============================================================
--- packages/kde4/soprano_2.1.bb 8834522284fac6810714a134e2c660a6f7da0809
+++ packages/kde4/soprano_2.1.bb 8834522284fac6810714a134e2c660a6f7da0809
@@ -0,0 +1,9 @@
+require kde4.inc
+
+DEPENDS += "automoc-native clucene-core"
+
+PV = "2.1"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/soprano;module=${PV};proto=svn"
+
+S= "${WORKDIR}/${PV}"
+
============================================================
--- packages/kde4/strigi_0.5.10.bb be310a384240e28023da1b34432487efe8cbfaf8
+++ packages/kde4/strigi_0.5.10.bb be310a384240e28023da1b34432487efe8cbfaf8
@@ -0,0 +1,17 @@
+inherit qt4x11 cmake
+
+DEPENDS += "clucene-core pidgin expat gamin"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/strigi/strigi-${PV}.tar.bz2"
+
+EXTRA_OECMAKE = "-DENABLE_FAM:BOOL=ON \
+ -DENABLE_EXPAT:BOOL=ON \
+ -DENABLE_INOTIFY:BOOL=ON \
+ -DGAMIN_LIBARIES:STRING=${STAGING_LIBDIR} \
+ -DGAMIN_LIBRARIES:STRING=${STAGING_LIBDIR} \
+ "
+
+FILES_${PN} += "${datadir}/dbus-1 \
+ "
+
+
============================================================
--- packages/kexecboot/files/kexecboot-rewrite.patch c170a72f30755508c630b99d3fd340fc32776280
+++ packages/kexecboot/files/kexecboot-rewrite.patch c170a72f30755508c630b99d3fd340fc32776280
@@ -0,0 +1,344 @@
+--- kexecboot-0.3.orig/kexecboot.h 2008-09-03 02:35:40.000000000 +0400
++++ kexecboot-0.3/kexecboot.h 2008-09-03 02:36:04.000000000 +0400
+@@ -24,6 +24,10 @@
+ #include <string.h>
+ #include <linux/input.h>
+ #include <termios.h>
++#include <unistd.h>
++#include <signal.h>
++#include <sys/wait.h>
++#include <ctype.h>
+ #include "fb.h"
+ #include "devicescan.h"
+ #include "res/logo-img.h"
+@@ -33,4 +37,14 @@
+ #include "res/memory-img.h"
+ #include "res/radeon-font.h"
+
++/* Macro for dealing with NULL strings */
++#define strlenn(s) ( (NULL != s) ? (strlen(s)) : 0 )
++
++/* Tags we want from /proc/cmdline */
++char *wanted_tags[] = {
++ "mtdparts",
++ NULL
++};
++
++
+ #endif
+--- kexecboot-0.3.orig/kexecboot.c 2008-09-03 02:35:40.000000000 +0400
++++ kexecboot-0.3/kexecboot.c 2008-09-03 03:33:05.000000000 +0400
+@@ -78,20 +78,293 @@
+ fb_render(fb);
+ }
+
++/*
++ * Function: get_extra_cmdline()
++ * It gets wanted tags from original cmdline.
++ * Takes 2 args:
++ * - extra_cmdline - buffer to store cmdline parameters;
++ * - extra_cmdline_size - size of buffer
++ * (inc. terminating '\0').
++ * Return values:
++ * - length of extra_cmdline on success (w/o term. zero);
++ * - -1 on error;
++ * - (- length of extra_cmdline - 1) on insufficient buffer space.
++ */
++
++int get_extra_cmdline(char *const extra_cmdline, const size_t extra_cmdline_size)
++{
++ char *p, *t, *tag = NULL;
%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rc8025b1589420ff484c99ad1c0e06906ad36b85d -r5af45981b215587dfbcb2c800c89e5322177591b
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [6093c706b26cd5f5224fe3815530fb8f7a237e41]
# to [f91aae6535b6f654b682188cd9b38d22eeb9ac9c]
#
# patch "packages/e17/e-wm_svn.bb"
# from [31e37ed1d926bba319e08d51364517f6a2733054]
# to [6a946a3dba1311a21cbf60f7c6610489b8311265]
#
# patch "packages/e17/illume_svn.bb"
# from [2ab6738c659f003fae47e269585c37a5f62e8801]
# to [042e9033db9dc33830b308b01828e66474d92c30]
#
# patch "packages/images/fso-image.bb"
# from [bb6fcd20d903b540d25167c4e360ed2fbbcc7db6]
# to [6bc4b8ec1a0b100e0b0ddf88f58b0bab5d2866e2]
#
# patch "packages/openmoko-projects/tichy_svn.bb"
# from [3db3dbc56b7c3213e909b48cf04cf2c90298886b]
# to [45cfa4ee87aa72478e4ccb6e09aa9350c0dd9898]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc 6093c706b26cd5f5224fe3815530fb8f7a237e41
+++ conf/distro/include/sane-srcrevs.inc f91aae6535b6f654b682188cd9b38d22eeb9ac9c
@@ -53,7 +53,6 @@ SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "35605"
SRCREV_pn-illume-theme-asu ?= "170"
SRCREV_pn-illume-theme-freesmartphone ?= "fcadedec08294c5eebd176483695828959a76e0b"
SRCREV_pn-kismet ?= "2285"
@@ -192,7 +191,7 @@ SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCREV ?= "35592"
+EFL_SRCREV ?= "35727"
SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
SRCREV_pn-edb ?= "${EFL_SRCREV}"
SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
============================================================
--- packages/e17/e-wm_svn.bb 31e37ed1d926bba319e08d51364517f6a2733054
+++ packages/e17/e-wm_svn.bb 6a946a3dba1311a21cbf60f7c6610489b8311265
@@ -6,6 +6,8 @@ inherit e update-alternatives
inherit e update-alternatives
+RDEPENDS += "shared-mime-info mime-support"
+
SRC_URI = "\
svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \
file://disable-e-cursor.patch;patch=1 \
@@ -16,6 +18,7 @@ EXTRA_OECONF = "\
EXTRA_OECONF = "\
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+ --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
--enable-simple-x11 \
@@ -43,8 +46,6 @@ do_install_append() {
install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
}
-RDEPENDS += "shared-mime-info mime-support"
-
FILES_${PN} = "\
${bindir}/* \
${libdir}/enlightenment/modules/*/*.* \
============================================================
--- packages/e17/illume_svn.bb 2ab6738c659f003fae47e269585c37a5f62e8801
+++ packages/e17/illume_svn.bb 042e9033db9dc33830b308b01828e66474d92c30
@@ -20,8 +20,7 @@ RRECOMMENDS_${PN} = "\
"
RRECOMMENDS_${PN} = "\
- wamerican \
- ${PN}-config \
+ ${PN}-config-illume \
${PN}-theme \
${PN}-dicts-english-us \
${PN}-keyboards-default \
@@ -30,18 +29,22 @@ PACKAGES =+ "\
"
PACKAGES =+ "\
- ${PN}-config \
+ ${PN}-config-illume \
+ ${PN}-config-asu \
${PN}-dicts-english-us \
${PN}-keyboards-default \
${PN}-keyboards-numbers \
${PN}-keyboards-terminal \
"
-PACKAGE_ARCH_${PN}-config = "all"
+PACKAGE_ARCH_${PN}-config-illume = "all"
+PACKAGE_ARCH_${PN}-config-asu = "all"
PACKAGE_ARCH_${PN}-dicts-english-us = "all"
PACKAGE_ARCH_${PN}-keyboards-default = "all"
PACKAGE_ARCH_${PN}-keyboards-numbers = "all"
+PACKAGE_ARCH_${PN}-keyboards-terminal = "all"
-FILES_${PN}-config = "${datadir}/enlightenment/data/config/*/* ${datadir}/illume"
+FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume/*"
+FILES_${PN}-config-asu = "${datadir}/enlightenment/data/config/asu/*"
FILES_${PN}-dicts-english-us = "${libdir}/enlightenment/modules/illume/dicts/English_*.dic"
FILES_${PN}-keyboards-default = "${libdir}/enlightenment/modules/illume/keyboards/Default.kbd"
FILES_${PN}-keyboards-numbers = "${libdir}/enlightenment/modules/illume/keyboards/Numbers.kbd"
============================================================
--- packages/images/fso-image.bb bb6fcd20d903b540d25167c4e360ed2fbbcc7db6
+++ packages/images/fso-image.bb 6bc4b8ec1a0b100e0b0ddf88f58b0bab5d2866e2
@@ -24,6 +24,11 @@ X_INSTALL = "\
X_INSTALL = "\
e-wm \
illume \
+ illume-config-illume \
+ illume-dicts-english-us \
+ illume-keyboards-default \
+ illume-keyboards-numbers \
+ illume-keyboards-terminal \
illume-theme-freesmartphone \
${XSERVER} \
xserver-kdrive-common \
@@ -113,6 +118,7 @@ IMAGE_INSTALL = "\
${TOOLS_INSTALL} \
${PYTHON_INSTALL} \
${ZHONE_INSTALL} \
+ tichy \
"
inherit image
@@ -140,6 +146,8 @@ fso_rootfs_postprocess() {
# minimal gtk theme foo
mkdir -p ./etc/gtk-2.0/
echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc
+ # fix strange iconv/gconf bug
+ ln -s libc.so.6 ./lib/libc.so
cd $curdir
}
============================================================
--- packages/openmoko-projects/tichy_svn.bb 3db3dbc56b7c3213e909b48cf04cf2c90298886b
+++ packages/openmoko-projects/tichy_svn.bb 45cfa4ee87aa72478e4ccb6e09aa9350c0dd9898
@@ -11,3 +11,4 @@ FILES_${PN} += "${datadir}"
inherit distutils
FILES_${PN} += "${datadir}"
+RDEPENDS_${PN} += "python-pygame"
More information about the Openembedded-commits
mailing list