[oe-commits] org.oe.dev merge of 'a5ebc4455c08465bb3119b12db3f0a95ef0ee51a'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Nov 8 16:04:44 UTC 2007
merge of 'a5ebc4455c08465bb3119b12db3f0a95ef0ee51a'
and 'abd46ad11dd10c36a511a2d3d6867a6fb20076ca'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 5c37eafbefc54ff05826ce32eaad994791ea1a06
ViewMTN: http://monotone.openembedded.org/revision/info/5c37eafbefc54ff05826ce32eaad994791ea1a06
Files:
1
packages/openmoko2/openmoko-session2/matchbox-session
packages/matchbox-common/matchbox-common_0.9.1.bb
packages/matchbox-common/matchbox-common_svn.bb
packages/openmoko2/openmoko-session2.bb
packages/tasks/task-openmoko.bb
mtn:execute
true
packages/gnome/epiphany_2.19.6.bb
packages/gpephone/libchenabler
packages/notecase/notecase-1.6.9
packages/quasar
packages/quasar/files
packages/gnome/epiphany_svn.bb
packages/gpephone/libchenabler/po.patch
packages/gpephone/libgemwidget/disable-tests.patch
packages/gpephone/libgemwidget_1.0.bb
packages/notecase/notecase-1.6.9/no-hardcoded-cxx.patch
packages/notecase/notecase.inc
packages/notecase/notecase_1.6.9.bb
packages/quasar/files/cross-compile.patch
packages/quasar/quasar_0.9beta3.bb
conf/distro/include/sane-srcrevs.inc
conf/machine/em-x270.conf
packages/apache2/apache2_2.2.3.bb
packages/gpephone/libchenabler_0.1.bb
packages/icu/icu_3.6.bb
packages/notecase/notecase_1.2.6.bb
packages/tasks/task-native-sdk.bb
packages/uicmoc/uicmoc3-native_3.3.5.bb
Diffs:
#
# mt diff -ra5ebc4455c08465bb3119b12db3f0a95ef0ee51a -r5c37eafbefc54ff05826ce32eaad994791ea1a06
#
#
#
# add_file "packages/openmoko2/openmoko-session2/matchbox-session"
# content [c32dbae334b8f44e316abb4125fc51398d09f80e]
#
# patch "packages/matchbox-common/matchbox-common_0.9.1.bb"
# from [2b1d99f38f0addaaf9b3574f188fd90576231c01]
# to [bddf9d7d1a113a7b887c375bef97a8a3174105be]
#
# patch "packages/matchbox-common/matchbox-common_svn.bb"
# from [68e1cd286264112e4db777b54678f5dc3a6ffc13]
# to [82da4dd192a06a266ab06f22b05743a11900d7c5]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [9b29d38583ef7d185640dabf6d55da8fb198f056]
# to [cc3fb3acd8a64a6ec187b76f9aa4736fe8d52555]
#
# patch "packages/tasks/task-openmoko.bb"
# from [c7424f4f0bbda5341fad86b6fbb43047abeee781]
# to [5dc5506edaaf3e889cc37fc49dda94c482b1d8c3]
#
# set "packages/openmoko2/openmoko-session2/matchbox-session"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/openmoko2/openmoko-session2/matchbox-session c32dbae334b8f44e316abb4125fc51398d09f80e
+++ packages/openmoko2/openmoko-session2/matchbox-session c32dbae334b8f44e316abb4125fc51398d09f80e
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# Very simple session manager for matchbox tools
+#
+
+# Uncomment below to enable parsing of debian menu entrys
+# export MB_USE_DEB_MENUS=1
+
+if [ -e $HOME/.matchbox/session ]
+then
+exec $HOME/.matchbox/session
+fi
+
+if [ -e /etc/matchbox/session ]
+then
+exec /etc/matchbox/session
+fi
+
+# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
+# dont exist.
+
+matchbox-desktop &
+matchbox-panel --orientation south &
+exec matchbox-window-manager $@
============================================================
--- packages/matchbox-common/matchbox-common_0.9.1.bb 2b1d99f38f0addaaf9b3574f188fd90576231c01
+++ packages/matchbox-common/matchbox-common_0.9.1.bb bddf9d7d1a113a7b887c375bef97a8a3174105be
@@ -1,17 +1,20 @@
+DESCRIPTION = "Matchbox window manager common files"
SECTION = "x11/wm"
-DESCRIPTION = "Matchbox window manager common files"
LICENSE = "GPL"
DEPENDS = "libmatchbox"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
file://no-utilities-category.patch;patch=1 \
file://add-media-category.patch;patch=1"
-inherit autotools pkgconfig
+inherit autotools pkgconfig
EXTRA_OECONF = "--enable-pda-folders"
+FILES_${PN} = "\
+ ${bindir} \
+ ${datadir}/matchbox/vfolders \
+ ${datadir}/pixmaps"
+
+PACKAGE_ARCH = "all"
-FILES_${PN} = "${bindir} \
- ${datadir}/matchbox/vfolders \
- ${datadir}/pixmaps"
============================================================
--- packages/matchbox-common/matchbox-common_svn.bb 68e1cd286264112e4db777b54678f5dc3a6ffc13
+++ packages/matchbox-common/matchbox-common_svn.bb 82da4dd192a06a266ab06f22b05743a11900d7c5
@@ -1,17 +1,22 @@
+DESCRIPTION = "Matchbox window manager common files"
SECTION = "x11/wm"
-DESCRIPTION = "Matchbox window manager common files"
LICENSE = "GPL"
DEPENDS = "libmatchbox"
PV = "0.9.1+svn${SRCDATE}"
-S = "${WORKDIR}/matchbox-common"
+PR = "r1"
+
DEFAULT_PREFERENCE = "-1"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-common;proto=http"
+S = "${WORKDIR}/matchbox-common"
inherit autotools pkgconfig
EXTRA_OECONF = " --enable-pda-folders "
+FILES_${PN} = "\
+ ${bindir} \
+ ${datadir}/matchbox/vfolders \
+ ${datadir}/pixmaps"
+
+PACKAGE_ARCH = "all"
-FILES_${PN} = "${bindir} \
- ${datadir}/matchbox/vfolders \
- ${datadir}/pixmaps"
============================================================
--- packages/openmoko2/openmoko-session2.bb 9b29d38583ef7d185640dabf6d55da8fb198f056
+++ packages/openmoko2/openmoko-session2.bb cc3fb3acd8a64a6ec187b76f9aa4736fe8d52555
@@ -1,15 +1,20 @@ SECTION = "x11"
DESCRIPTION = "Custom Matchbox session files for OpenMoko"
LICENSE = "GPL"
SECTION = "x11"
-RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
+RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS = "openmoko-session"
-PR = "r37"
+PR = "r39"
-SRC_URI = "file://etc"
+SRC_URI = "\
+ file://etc \
+ file://matchbox-session \
+"
S = ${WORKDIR}
do_install() {
+ install -d ${D}${bindir}
+ install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir}
install -d ${D}${sysconfdir}
cp -R ${S}/etc/* ${D}${sysconfdir}
rm -fR ${D}${sysconfdir}/.svn
============================================================
--- packages/tasks/task-openmoko.bb c7424f4f0bbda5341fad86b6fbb43047abeee781
+++ packages/tasks/task-openmoko.bb 5dc5506edaaf3e889cc37fc49dda94c482b1d8c3
@@ -1,8 +1,8 @@ PROVIDES = "task-openmoko-everything"
DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r67"
+PR = "r68"
inherit task
@@ -54,7 +54,6 @@ RDEPENDS_task-openmoko-ui = "\
pango-module-basic-x \
pango-module-basic-fc \
gtk+ \
- matchbox-common \
matchbox-wm \
xserver-kdrive-fbdev \
xserver-kdrive-common \
#
# mt diff -rabd46ad11dd10c36a511a2d3d6867a6fb20076ca -r5c37eafbefc54ff05826ce32eaad994791ea1a06
#
#
#
# delete "packages/gnome/epiphany_2.19.6.bb"
#
# add_dir "packages/gpephone/libchenabler"
#
# add_dir "packages/notecase/notecase-1.6.9"
#
# add_dir "packages/quasar"
#
# add_dir "packages/quasar/files"
#
# add_file "packages/gnome/epiphany_svn.bb"
# content [bb3c68a8ba38d098a4e6b2bea9e92930820db03c]
#
# add_file "packages/gpephone/libchenabler/po.patch"
# content [5cf30dbc059ff5f7a210dd529b34a19c7404feee]
#
# add_file "packages/gpephone/libgemwidget/disable-tests.patch"
# content [daf3d0a13202a894c2208e98ff4c93bbb1bd414f]
#
# add_file "packages/gpephone/libgemwidget_1.0.bb"
# content [00affe0fd0344c1c90d39d1466531dc2a2944941]
#
# add_file "packages/notecase/notecase-1.6.9/no-hardcoded-cxx.patch"
# content [51ab9f2f39f13a1affed9594ed4bf1b08d5924ed]
#
# add_file "packages/notecase/notecase.inc"
# content [668f1737dd66663c50c9d3d3e3166c184e45f0b0]
#
# add_file "packages/notecase/notecase_1.6.9.bb"
# content [aeb0a547c5d487b7af7569f01b002beffd26546d]
#
# add_file "packages/quasar/files/cross-compile.patch"
# content [7731ba4a41d73862d99a509af26090ea6deb9729]
#
# add_file "packages/quasar/quasar_0.9beta3.bb"
# content [b0d3c95c0dd2fb1acaa26e90cfaa029ee55e7003]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [aba02b4341afbe8e50d5993e64a67d6d7d800d09]
# to [f77e245ef0b0121bd27da5a99090503b3e4bd658]
#
# patch "conf/machine/em-x270.conf"
# from [5345e7b2b7ee8722993816968ec1019cd30e3669]
# to [5161d9a40fa0ff65ff1078f16f0702198aa872bc]
#
# patch "packages/apache2/apache2_2.2.3.bb"
# from [7ab9278b06b65c96f6f2ec13ecc35a3c75e65517]
# to [cf7893be234d0cad1bef1b7736171b33e9e7a3a3]
#
# patch "packages/gpephone/libchenabler_0.1.bb"
# from [c70ec4111d1d8104ec435b5030b356fecf383f06]
# to [ba17069c8fb66316a30ce37bac1598aaa51aefb2]
#
# patch "packages/icu/icu_3.6.bb"
# from [abeb7fae2e0e0539af931224bce531674ef4fe6a]
# to [5b44aed3810d59f100f97954c8497ac92521c5b7]
#
# patch "packages/notecase/notecase_1.2.6.bb"
# from [9e3c4c5c2c985e5e91939b9b36f848b9da20aba9]
# to [e78e8e5069260de760671e0644ef1592bdb07f2e]
#
# patch "packages/tasks/task-native-sdk.bb"
# from [13fe14442e966c706388a77f8cf5ebbd35a55e9b]
# to [7a8357c0638184a616c5933e9d5a31908b09a3e0]
#
# patch "packages/uicmoc/uicmoc3-native_3.3.5.bb"
# from [f5fb5daae8ef66f9b2d4df4f8372d83f7815347c]
# to [da5a5f21332c7ab3148a8aa41459222db849913b]
#
============================================================
--- packages/gnome/epiphany_svn.bb bb3c68a8ba38d098a4e6b2bea9e92930820db03c
+++ packages/gnome/epiphany_svn.bb bb3c68a8ba38d098a4e6b2bea9e92930820db03c
@@ -0,0 +1,21 @@
+DESCRIPTION = "GNOME default webbrowser"
+DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
+RDEPENDS = "gnome-vfs-plugin-http"
+
+PV = "2.20.1+svnr${SRCREV}"
+PR = "r0"
+
+inherit gnome
+
+SRC_URI = "svn://svn.gnome.org/svn/epiphany;module=trunk;proto=http"
+S = "${WORKDIR}/trunk"
+
+EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
+
+do_configure_prepend() {
+ touch ${S}/gnome-doc-utils.make
+}
+
+FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
+
+
============================================================
--- packages/gpephone/libchenabler/po.patch 5cf30dbc059ff5f7a210dd529b34a19c7404feee
+++ packages/gpephone/libchenabler/po.patch 5cf30dbc059ff5f7a210dd529b34a19c7404feee
@@ -0,0 +1,9 @@
+--- libchenabler-0.1/configure.ac~ 2007-11-08 12:01:26.000000000 +0100
++++ libchenabler-0.1/configure.ac 2007-11-08 12:01:26.000000000 +0100
+@@ -31,5 +31,6 @@
+ src/Makefile
+ database/Makefile
+ libvochenabler.pc
++po/Makefile.in
+ ])
+ AC_OUTPUT
============================================================
--- packages/gpephone/libgemwidget/disable-tests.patch daf3d0a13202a894c2208e98ff4c93bbb1bd414f
+++ packages/gpephone/libgemwidget/disable-tests.patch daf3d0a13202a894c2208e98ff4c93bbb1bd414f
@@ -0,0 +1,8 @@
+--- libgemwidget-1.0/Makefile.am~ 2007-11-08 00:12:10.000000000 +0100
++++ libgemwidget-1.0/Makefile.am 2007-11-08 00:12:10.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = src include pixmaps test po
++SUBDIRS = src include pixmaps po
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libgemwidget.pc
============================================================
--- packages/gpephone/libgemwidget_1.0.bb 00affe0fd0344c1c90d39d1466531dc2a2944941
+++ packages/gpephone/libgemwidget_1.0.bb 00affe0fd0344c1c90d39d1466531dc2a2944941
@@ -0,0 +1,17 @@
+LICENSE = "LiPS"
+DESCRIPTION = "Extended widget library for GPE phone environment."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "gtk+ libiac libgpephone gnome-vfs libxdamage libxcomposite libgpewidget"
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpephone pkgconfig autotools
+
+SRC_URI += " file://disable-tests.patch;patch=1"
+
+FILES_${PN} += "${datadir}/gem"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/notecase/notecase-1.6.9/no-hardcoded-cxx.patch 51ab9f2f39f13a1affed9594ed4bf1b08d5924ed
+++ packages/notecase/notecase-1.6.9/no-hardcoded-cxx.patch 51ab9f2f39f13a1affed9594ed4bf1b08d5924ed
@@ -0,0 +1,38 @@
+--- tmp/Makefile 2007-05-08 12:25:10.000000000 +0200
++++ Makefile 2007-11-03 10:46:51.000000000 +0100
+@@ -131,7 +131,7 @@
+ ifdef WINDIR
+ LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L$(OBJ) -lz
+ else
+- LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -ldl
++ NLD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic $(LOPTIMIZE)
+ endif
+
+ #
+@@ -190,7 +190,7 @@
+ LIBS += hildon-libs hildon-fm libosso
+ endif
+
+-GTKCFLAGS=`pkg-config --cflags $(LIBS)` -I/target/include -I/sw/include
++GTKCFLAGS=`pkg-config --cflags $(LIBS)`
+ GTKLIBS=`pkg-config --libs $(LIBS)`
+
+ #
+@@ -201,7 +201,7 @@
+ $(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS)
+ else
+ notecase$(EXE): updatesrc $(OBJS)
+- $(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) > /dev/null
++ $(NLD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS)
+ endif
+
+ #
+@@ -421,7 +421,7 @@
+ $(CC) $(FLAGS) -c $(GUIPATH)/DocActionFinishDel.cpp -o $(OBJ)/DocActionFinishDel.o $(GTKCFLAGS)
+
+ $(OBJ)/libz.a:
+- @cd ./src/lib/zlib/; $(MAKE); cp ./libz.a ../../../$(OBJ)/
++ @cd ./src/lib/zlib/; cp ./libz.a ../../../$(OBJ)/
+
+ $(OBJ)/ShortcutsList.o: $(GUIPATH)/ShortcutsList.cpp $(GUIPATH)/ShortcutsList.h
+ $(CC) $(FLAGS) -c $(GUIPATH)/ShortcutsList.cpp -o $(OBJ)/ShortcutsList.o $(GTKCFLAGS)
============================================================
--- packages/notecase/notecase.inc 668f1737dd66663c50c9d3d3e3166c184e45f0b0
+++ packages/notecase/notecase.inc 668f1737dd66663c50c9d3d3e3166c184e45f0b0
@@ -0,0 +1,13 @@
+DESCRIPTION = "Hierarchical note manager (aka. outliner)"
+AUTHOR = "Miroslav Rajcic <miroslav.rajcic at inet.hr>"
+HOMEPAGE = "http://notecase.sourceforge.net/"
+SECTION = "x11/utils"
+LICENSE = "BSD"
+DEPENDS = "zlib gtk+ gnome-vfs"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}_src.tar.gz \
+ file://no-hardcoded-cxx.patch;patch=1"
+
+do_compile_prepend() {
+ cp ${STAGING_LIBDIR}/libz.a ${S}/src/lib/zlib/
+}
============================================================
--- packages/notecase/notecase_1.6.9.bb aeb0a547c5d487b7af7569f01b002beffd26546d
+++ packages/notecase/notecase_1.6.9.bb aeb0a547c5d487b7af7569f01b002beffd26546d
@@ -0,0 +1,17 @@
+require notecase.inc
+
+PR = "r1"
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${datadir}/applications
+ install -d ${D}${datadir}/doc
+ install -d ${D}${datadir}/doc/notecase
+ install -d ${D}${datadir}/icons
+ install -m 644 ${S}/docs/notecase.desktop ${D}${datadir}/applications
+ install -m 644 ${S}/docs/help.ncd ${D}${datadir}/doc/notecase/help.ncd
+ install -m 644 ${S}/res/notecase.xpm ${D}${datadir}/icons/notecase.xpm
+ install -m 755 ${S}/bin/notecase ${D}${bindir}/
+}
+
+FILES_${PN} += "${datadir}"
============================================================
--- packages/quasar/files/cross-compile.patch 7731ba4a41d73862d99a509af26090ea6deb9729
+++ packages/quasar/files/cross-compile.patch 7731ba4a41d73862d99a509af26090ea6deb9729
@@ -0,0 +1,31 @@
+--- tmp/quasar-qt.pro 2007-10-29 00:18:03.000000000 +0100
++++ quasar-qt.pro 2007-11-04 09:11:58.000000000 +0100
+@@ -3,13 +3,13 @@
+ TARGET = quasar
+ TEMPLATE = app
+
+-#CONFIG = qt warn_on
+-CONFIG = qt warn_on debug
++CONFIG = qt warn_on release
++#CONFIG = qt warn_on debug
+
+ # for native compilation with ccache:
+-TMAKE_CC = ccache gcc
+-TMAKE_CXX = ccache g++
+-TMAKE_LINK = ccache g++
++#TMAKE_CC = ccache gcc
++#TMAKE_CXX = ccache g++
++#TMAKE_LINK = ccache g++
+
+ # for native compilation with pdaxii13's zgcc:
+ #TMAKE_CC = gcc
+@@ -26,7 +26,8 @@
+ TMAKE_CFLAGS = $$TMAKE_CFLAGS $$SQLITE_FLAGS -DQUASAR -O3
+ TMAKE_CXXFLAGS = $$TMAKE_CXXFLAGS $$SQLITE_FLAGS -DQUASAR -O3
+
+-LIBS = -liconv -lz -lstdc++
++#LIBS = -liconv -lz -lstdc++
++LIBS = -lz
+
+ INCLUDEPATH = \
+ . \
============================================================
--- packages/quasar/quasar_0.9beta3.bb b0d3c95c0dd2fb1acaa26e90cfaa029ee55e7003
+++ packages/quasar/quasar_0.9beta3.bb b0d3c95c0dd2fb1acaa26e90cfaa029ee55e7003
@@ -0,0 +1,28 @@
+DESCRIPTION = "Quasar mediaplayer"
+HOMEPAGE = "http://katastrophos.net/andre/blog/software/quasar-media-player/"
+AUTHOR = "Andre Beckedorf"
+LICENSE = "GPL"
+SECTION = "multimedia"
+RDEPENDS = "mplayer"
+PV = "0.8+0.9beta3"
+S = "${WORKDIR}/v0.9_beta3"
+
+SRC_URI = "http://katastrophos.net/zaurus/sources/quasar/quasar_0.9_beta3_sources.tar.bz2\
+ file://cross-compile.patch;patch=1"
+
+inherit qmake qt3x11
+
+QMAKE_PROFILES = "quasar-qt.pro"
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 quasar ${D}${bindir}
+ install -d ${D}${datadir}/applications
+ install -m 0755 ${S}/distro/skeletons/pdaXrom/usr/share/applications/quasar.desktop ${D}${datadir}/applications/
+ install -d ${D}${datadir}/pixmaps
+ install -m 0755 ${S}/distro/images/quasar.png ${D}${datadir}/pixmaps/
+ install -d ${D}${datadir}/quasar/skins
+ install -d ${D}${datadir}/quasar/skins/default
+ install -m 0755 ${S}/distro/skins/default/* ${D}${datadir}/quasar/skins/default/
+}
+
============================================================
--- conf/distro/include/sane-srcrevs.inc aba02b4341afbe8e50d5993e64a67d6d7d800d09
+++ conf/distro/include/sane-srcrevs.inc f77e245ef0b0121bd27da5a99090503b3e4bd658
@@ -18,7 +18,8 @@ SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-eglibc-initial ?= "3531"
SRCREV_pn-eglibc-intermediate ?= "3531"
SRCREV_pn-ezxd ?= "2074"
-SRCREV_pn-elf2flt="1786"
+SRCREV_pn-elf2flt ?= "1786"
+SRCREV_pn-epiphany ?= "7650"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "606"
@@ -37,7 +38,7 @@ SRCREV_pn-libxosd ?= "627"
SRCREV_pn-libmokoui2 ?= "3229"
SRCREV_pn-libowl ?= "277"
SRCREV_pn-libxosd ?= "627"
-SRCREV_pn-linux-bfin ?= "3745"
+SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-openmoko ?= "2937"
SRCREV_pn-llvm-gcc4 ?= "374"
============================================================
--- conf/machine/em-x270.conf 5345e7b2b7ee8722993816968ec1019cd30e3669
+++ conf/machine/em-x270.conf 5161d9a40fa0ff65ff1078f16f0702198aa872bc
@@ -21,10 +21,10 @@ IMAGE_CMD_jffs2 = " \
ROOT_FLASH_SIZE = "128"
IMAGE_CMD_jffs2 = " \
-/usr/sbin/mkfs.jffs2 --root=${IMAGE_ROOTFS} \
- --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
- --eraseblock=0x20000 --pad --faketime -n; \
-/usr/sbin/sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ mkfs.jffs2 --root=${IMAGE_ROOTFS} \
+ --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ --eraseblock=0x20000 --pad --faketime -n; \
+ sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-e 0x20000 -p; \
cd ${DEPLOY_DIR_IMAGE}; \
============================================================
--- packages/apache2/apache2_2.2.3.bb 7ab9278b06b65c96f6f2ec13ecc35a3c75e65517
+++ packages/apache2/apache2_2.2.3.bb cf7893be234d0cad1bef1b7736171b33e9e7a3a3
@@ -10,7 +10,8 @@ SRC_URI = "http://apache.mirrors.tds.net
file://apr-sockets-patch;patch=1 \
file://configure-patch;patch=1 \
file://server-makefile-patch;patch=1 \
- file://configure-fix-cross-compile-ptr-check.patch;patch=1"
+ file://configure-fix-cross-compile-ptr-check.patch;patch=1 \
+ file://init"
#
# over-ride needed since apache unpacks into httpd
@@ -93,7 +94,7 @@ do_install_append() {
do_install_append() {
install -d ${D}/${sysconfdir}/init.d
- cat ${FILESDIR}/../files/init | \
+ cat ${WORKDIR}/init | \
sed -e 's,/usr/sbin/,${sbindir}/,g' \
-e 's,/usr/bin/,${bindir}/,g' \
-e 's,/usr/lib,${libdir}/,g' \
============================================================
--- packages/gpephone/libchenabler_0.1.bb c70ec4111d1d8104ec435b5030b356fecf383f06
+++ packages/gpephone/libchenabler_0.1.bb ba17069c8fb66316a30ce37bac1598aaa51aefb2
@@ -1,16 +1,22 @@ DEPENDS = "glib-2.0 sqlite3 librecor
LICENSE = "LiPS"
DESCRIPTION = "LiPS voice call library."
SECTION = "gpe/libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 sqlite3 librecord"
-PR = "r0"
+PR = "r1"
GPE_TARBALL_SUFFIX = "gz"
inherit gpephone pkgconfig autotools
+SRC_URI += "file://po.patch;patch=1"
FILES_${PN} += " ${datadir}/vochistory"
+do_configure_prepend () {
+ mkdir "${S}/po"
+ touch "${S}/po/POTFILES.in"
+}
+
do_stage () {
autotools_stage_all
}
============================================================
--- packages/icu/icu_3.6.bb abeb7fae2e0e0539af931224bce531674ef4fe6a
+++ packages/icu/icu_3.6.bb 5b44aed3810d59f100f97954c8497ac92521c5b7
@@ -1,8 +1,8 @@ DEPENDS += "icu-native"
require icu-3.6.inc
DEPENDS += "icu-native"
-PR = "r1"
+PR = "r2"
do_configure_append() {
for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do
@@ -13,6 +13,9 @@ do_configure_append() {
sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true
}
+do_install_append() {
+ chmod +x ${D}${libdir}/lib*
+}
PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"
============================================================
--- packages/notecase/notecase_1.2.6.bb 9e3c4c5c2c985e5e91939b9b36f848b9da20aba9
+++ packages/notecase/notecase_1.2.6.bb e78e8e5069260de760671e0644ef1592bdb07f2e
@@ -1,18 +1,5 @@
-DESCRIPTION = "NoteCase is a hierarchical note manager (aka. outliner)." "
-LICENSE = "BSD"
+require notecase.inc
-DEPENDS = "zlib gtk+ gnome-vfs"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}_src.tar.gz \
- file://no-hardcoded-cxx.patch;patch=1"
-
-inherit pkgconfig
-
-do_compile_prepend() {
- cp ${STAGING_LIBDIR}/libz.a ${S}/src/lib/zlib/
-}
-
-
do_install() {
install -d ${D}${bindir}
install -d ${D}${datadir}/applications
============================================================
--- packages/tasks/task-native-sdk.bb 13fe14442e966c706388a77f8cf5ebbd35a55e9b
+++ packages/tasks/task-native-sdk.bb 7a8357c0638184a616c5933e9d5a31908b09a3e0
@@ -1,9 +1,10 @@ RDEPENDS = "gcc-symlinks g++-symlinks bi
DESCRIPTION = "Packages required for native (on-device) SDK"
LICENSE = "MIT"
DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \
flex flex-dev bison gawk sed grep autoconf automake make \
patch patchutils diffstat diffutils libgcc-s-dev libstdc++-dev"
+PR = "r1"
ALLOW_EMPTY = "1"
PACKAGES = "${PN}"
============================================================
--- packages/uicmoc/uicmoc3-native_3.3.5.bb f5fb5daae8ef66f9b2d4df4f8372d83f7815347c
+++ packages/uicmoc/uicmoc3-native_3.3.5.bb da5a5f21332c7ab3148a8aa41459222db849913b
@@ -1,8 +1,9 @@ LICENSE = "GPL QPL"
DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
PRIORITY = "optional"
LICENSE = "GPL QPL"
+DEPENDS = "qmake-native"
PR = "r3"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \
More information about the Openembedded-commits
mailing list