Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r2364 - in trunk/oe/packages: . openmoko-apps openmoko-base
openmoko-inputmethods openmoko-panel-plugins
([EMAIL PROTECTED])
2. r2365 - in trunk/oe/packages: . db db/db3-3.2.9
([EMAIL PROTECTED])
3. r2366 -
trunk/src/target/OM-2007/applications/openmoko-dialer/data
([EMAIL PROTECTED])
4. r2367 - trunk/src/target/OM-2007/openmoko-libs/libmokoui
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-07-06 14:44:08 +0200 (Fri, 06 Jul 2007)
New Revision: 2364
Added:
trunk/oe/packages/openmoko-apps/oe-sync
trunk/oe/packages/openmoko-base/oe-sync
trunk/oe/packages/openmoko-inputmethods/oe-sync
trunk/oe/packages/openmoko-panel-plugins/oe-sync
Modified:
trunk/oe/packages/oe-to-verify
Log:
sync openmoko-base, openmoko-apps, openmoko-panel-plugins,
openmoko-inputmethods w/ org.openembedded.dev
Modified: trunk/oe/packages/oe-to-verify
===================================================================
--- trunk/oe/packages/oe-to-verify 2007-07-06 09:14:14 UTC (rev 2363)
+++ trunk/oe/packages/oe-to-verify 2007-07-06 12:44:08 UTC (rev 2364)
@@ -1,8 +1,6 @@
alsa
initscripts
linux
-openmoko*
-task-openmoko
u-boot
x11-c-locale
Added: trunk/oe/packages/openmoko-apps/oe-sync
===================================================================
Added: trunk/oe/packages/openmoko-base/oe-sync
===================================================================
Added: trunk/oe/packages/openmoko-inputmethods/oe-sync
===================================================================
Added: trunk/oe/packages/openmoko-panel-plugins/oe-sync
===================================================================
--- End Message ---
--- Begin Message ---
Author: alphaone
Date: 2007-07-06 18:28:42 +0200 (Fri, 06 Jul 2007)
New Revision: 2365
Added:
trunk/oe/packages/db/
trunk/oe/packages/db/db3-3.2.9/
trunk/oe/packages/db/db3-3.2.9/autofoo.patch
trunk/oe/packages/db/db3-native_3.2.9.bb
trunk/oe/packages/db/db3_3.2.9.bb
Log:
* Updated URL of packages/db/db3_3.2.9.bb (Closes bug #629)
Added: trunk/oe/packages/db/db3-3.2.9/autofoo.patch
===================================================================
--- trunk/oe/packages/db/db3-3.2.9/autofoo.patch 2007-07-06 12:44:08 UTC
(rev 2364)
+++ trunk/oe/packages/db/db3-3.2.9/autofoo.patch 2007-07-06 16:28:42 UTC
(rev 2365)
@@ -0,0 +1,71 @@
+--- dist/Makefile.in 2000-11-30 17:07:33.000000000 -0600
++++ dist/Makefile.in 2004-09-01 19:47:37.000000000 -0500
+@@ -2,6 +2,7 @@
+
+ srcdir= @srcdir@/..
+ builddir=.
++top_builddir=.
+
+ ##################################################
+ # C, C++
+--- dist/configure.in 2001-01-19 11:36:43.000000000 -0600
++++ dist/configure.in 2004-09-01 19:45:35.000000000 -0500
+@@ -38,7 +38,6 @@
+ AC_SUBST(LIBJSO_LIBS)
+ AC_SUBST(LIBS)
+ AC_SUBST(LIBSO_LIBS)
+-AC_SUBST(LIBTOOL)
+ AC_SUBST(LIBTSO_LIBS)
+ AC_SUBST(LIBXSO_LIBS)
+ AC_SUBST(MAKEFILE_CC)
+@@ -48,7 +47,6 @@
+ AC_SUBST(RPC_OBJS)
+ AC_SUBST(SOFLAGS)
+ AC_SUBST(SOLINK)
+-AC_SUBST(SOSUFFIX)
+
+ dnl $o is set to ".o" or ".lo", and is the file suffix used in the
+ dnl Makefile instead of .o
+@@ -205,27 +203,15 @@
+ dnl Dynamic library and libtool configuration; optional, but required for
+ dnl Tcl or Java support.
+ LIBDB_ARGS="libdb.a"
+-LIBTOOL="nolibtool"
+ POSTLINK="@true"
+-SOSUFFIX="so"
+ if test "$db_cv_dynamic" = "yes"; then
++ AM_PROG_LIBTOOL
+ SAVE_CC="${MAKEFILE_CC}"
+ SAVE_CXX="${MAKEFILE_CXX}"
+
+- # Configure libtool.
+- AC_MSG_CHECKING(libtool configuration)
+- AC_MSG_RESULT([])
+- ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
+- --no-verify $srcdir/ltmain.sh \
+- --output=./libtool $host_os \
+- --disable-static \
+- || AC_MSG_ERROR([libtool configure failed])
+-
+- SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e
's/.*\.\([[a-zA-Z0-9_]]*\).*/\1/' ./libtool`
+ DEFAULT_LIB="\$(libso_target)"
+ DEFAULT_INSTALL="install_dynamic"
+ LIBDB_ARGS="\$(libso_linkname)"
+- LIBTOOL="\$(SHELL) ./libtool"
+
+ MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${SAVE_CC}"
+ MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${SAVE_CXX}"
+@@ -373,13 +359,6 @@
+ AC_REPLACE_FUNCS(getcwd getopt memcmp memcpy memmove)
+ AC_REPLACE_FUNCS(raise snprintf strcasecmp strerror vsnprintf)
+
+-dnl XXX
+-dnl Nasty hack. AC_REPLACE_FUNCS added entries of the form xxx.o to the
+-dnl LIBOBJS variable. They have to be xxx.lo if we are building shared
+-dnl libraries. Use sed, configure already requires it.
+-tmp="`echo \"$LIBOBJS\" | sed \"s/\.o/${o}/g\"`"
+-LIBOBJS="$tmp"
+-
+ dnl Check for system functions we optionally use.
+ AC_CHECK_FUNCS(getuid pstat_getdynamic sysconf sched_yield strtoul yield)
+
Added: trunk/oe/packages/db/db3-native_3.2.9.bb
===================================================================
--- trunk/oe/packages/db/db3-native_3.2.9.bb 2007-07-06 12:44:08 UTC (rev
2364)
+++ trunk/oe/packages/db/db3-native_3.2.9.bb 2007-07-06 16:28:42 UTC (rev
2365)
@@ -0,0 +1,8 @@
+SECTION = "libs"
+VIRTUAL_NAME = "virtual/db-native"
+CONFLICTS = "db-native"
+inherit native
+require db3_${PV}.bb
+
+FILESPATH = "[EMAIL PROTECTED]([ '${FILE_DIRNAME}/db3-${PV}',
'${FILE_DIRNAME}/db3', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+PACKAGES = ""
Added: trunk/oe/packages/db/db3_3.2.9.bb
===================================================================
--- trunk/oe/packages/db/db3_3.2.9.bb 2007-07-06 12:44:08 UTC (rev 2364)
+++ trunk/oe/packages/db/db3_3.2.9.bb 2007-07-06 16:28:42 UTC (rev 2365)
@@ -0,0 +1,87 @@
+SECTION = "libs"
+DESCRIPTION = "Berkeley DB v3."
+HOMEPAGE = "http://www.sleepycat.com";
+LICENSE = "BSD Sleepycat"
+PR = "r3"
+VIRTUAL_NAME ?= "virtual/db"
+CONFLICTS = "db"
+
+# it doesn't make any sense to have multiple relational
+# databases on an embedded machine, virtual/db allows
+# a build to select the desired one.
+PROVIDES += "${VIRTUAL_NAME}"
+
+SRC_URI = "http://download-west.oracle.com/berkeley-db/db-${PV}.tar.gz \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/db-${PV}/dist"
+B = "${WORKDIR}/db-${PV}/build_unix"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-shared --enable-compat185 --enable-static"
+EXTRA_OEMAKE = "'SHELL=/bin/sh' 'ar=`which ${AR}` cr' 'chmod=`which chmod`' \
+ 'cp=`which cp`' 'ln=`which ln`' 'mkdir=`which mkdir`'
'ranlib=`which ${RANLIB}`' \
+ 'rm=`which rm`' 'strip=`which ${STRIP}`'"
+
+PACKAGES = "${PN} ${PN}-bin ${PN}-dev ${PN}-doc ${PN}-locale"
+
+FILES_${PN} = "${libdir}/libdb-3.2*so*"
+FILES_${PN}-bin = "${bindir}"
+FILES_${PN}-dev = "${includedir} ${libdir}/libdb.so ${libdir}/libdb.a \
+ ${libdir}/libdb-3.so ${libdir}/libdb.la
${libdir}/libdb-3.2.a \
+ ${libdir}/libdb-3.2.la"
+
+do_configure_prepend () {
+ set -e
+ (
+ cd ${S}
+ . ./RELEASE
+ (echo "AC_DEFUN(AM_VERSION_SET, [" &&
+ echo "AC_SUBST(DB_VERSION_MAJOR)" &&
+ echo "AC_DEFINE(DB_VERSION_MAJOR, [$DB_VERSION_MAJOR])" &&
+ echo "DB_VERSION_MAJOR=$DB_VERSION_MAJOR" &&
+ echo "AC_SUBST(DB_VERSION_MINOR)" &&
+ echo "AC_DEFINE(DB_VERSION_MINOR, [$DB_VERSION_MINOR])" &&
+ echo "DB_VERSION_MINOR=$DB_VERSION_MINOR" &&
+ echo "AC_SUBST(DB_VERSION_PATCH)" &&
+ echo "AC_DEFINE(DB_VERSION_PATCH, [$DB_VERSION_PATCH])" &&
+ echo "DB_VERSION_PATCH=$DB_VERSION_PATCH" &&
+ echo "AC_SUBST(DB_VERSION_STRING)" &&
+ echo "AC_DEFINE(DB_VERSION_STRING, [$DB_VERSION_STRING])" &&
+ echo "DB_VERSION_STRING=\"\\\"\$DB_VERSION_STRING\\\"\"" &&
+ echo "])dnl") > acinclude.m4
+ )
+}
+
+do_configure () {
+ rm -f ${S}/configure
+ autotools_do_configure
+}
+
+do_compile () {
+ oe_runmake
+}
+
+do_stage () {
+ install -m 0644 db_185.h ../include/db_cxx.h db.h ${STAGING_INCDIR}/
+ oe_libinstall -so -a libdb-3.2 ${STAGING_LIBDIR}
+ ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb.so
+ ln -sf libdb-3.2.a ${STAGING_LIBDIR}/libdb.a
+}
+
+do_install () {
+ oe_runmake \
+ prefix=${D}${prefix} \
+ exec_prefix=${D}${exec_prefix} \
+ bindir=${D}${bindir} \
+ includedir=${D}${includedir} \
+ libdir=${D}${libdir} \
+ docdir=${D}${docdir} \
+ install
+}
+
+python do_package() {
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bb.data.setVar('PKG_${PN}', 'libdb3', d)
+ bb.build.exec_func('package_do_package', d)
+}
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-07-06 19:10:09 +0200 (Fri, 06 Jul 2007)
New Revision: 2366
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
Log:
Add dist_ to service_in_files, so it is included in tars
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-07-06 16:28:42 UTC (rev 2365)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-07-06 17:10:09 UTC (rev 2366)
@@ -51,7 +51,7 @@
# Dbus service file
#
servicedir = $(datadir)/dbus-1/services
-service_in_files = org.openmoko.Dialer.service.in
+dist_service_in_files = org.openmoko.Dialer.service.in
service_DATA = $(service_in_files:.service.in=.service)
# Expand the bindir in the service file
--- End Message ---
--- Begin Message ---
Author: alphaone
Date: 2007-07-06 19:19:55 +0200 (Fri, 06 Jul 2007)
New Revision: 2367
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
Log:
* openmoko-libs/libmokoui/moko-tree-view.c:
(moko_tree_view_size_request): Make function static
* openmoko-libs/libmokoui/moko-message-dialog.c:
Prevent a segfault in moko_message_dialog_realize_cb
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
2007-07-06 17:10:09 UTC (rev 2366)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
2007-07-06 17:19:55 UTC (rev 2367)
@@ -205,6 +205,8 @@
{
rc_style = widget->style->rc_style;
+ g_return_if_fail(rc_style != NULL);
+
priv->background_pixbuf = gdk_pixbuf_new_from_file
(rc_style->bg_pixmap_name[GTK_STATE_NORMAL], &error);
if (priv->background_pixbuf == NULL)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
2007-07-06 17:10:09 UTC (rev 2366)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
2007-07-06 17:19:55 UTC (rev 2367)
@@ -31,7 +31,7 @@
#define TREE_VIEW_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
MOKO_TYPE_TREE_VIEW, MokoTreeViewPrivate))
/* forward declarations */
-void moko_tree_view_size_request(GtkWidget* widget, GtkRequisition*
requisition);
+static void moko_tree_view_size_request(GtkWidget* widget, GtkRequisition*
requisition);
static void
moko_tree_view_dispose (GObject *object)
@@ -83,7 +83,8 @@
}
/* reimplemented to enforce entry-height granularity */
-void moko_tree_view_size_request(GtkWidget* widget, GtkRequisition*
requisition)
+static void
+moko_tree_view_size_request(GtkWidget* widget, GtkRequisition* requisition)
{
moko_debug( "moko_tree_view_size_request" );
GTK_WIDGET_CLASS(moko_tree_view_parent_class)->size_request( widget,
requisition );
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
