[oe-commits] org.oe.dev merge of '7591223f9cc09ec1cac67f361556f5e52509ce2e'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:29:55 UTC 2007
merge of '7591223f9cc09ec1cac67f361556f5e52509ce2e'
and 'f5edc19dd1057109ae156f97cd6387f3a74993fe'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: e7a4d4e9a0961d043f5fdb44415c51c6b9fcd45e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e7a4d4e9a0961d043f5fdb44415c51c6b9fcd45e
Files:
1
packages/gpe-dm/files
packages/gpe-dm/files/Xserver-cxk.patch
packages/gpe-dm/files/collie-suspend-hack.patch
packages/gpe-dm/files/mnci.patch
packages/gpe-dm/files/remove-X-scripts.patch
packages/gpe-dm/files/source-xsession-scripts.patch
packages/libmrss/files
packages/gpe-dm/gpe-dm_0.50.bb
packages/gpe-edit/gpe-edit_0.40.bb
packages/gtk-webcore/files/build_silence.patch
packages/libmimedir/libmimedir_svn.bb
packages/libmrss/files/atom-changes.patch
packages/libmrss/files/bump-version.patch
packages/libmrss/files/fix-memleaks.patch
packages/libmrss/files/fix_atom_date_locale.patch
packages/monotone/monotone-6_0.34.bb
classes/base.bbclass
classes/sanity.bbclass
conf/checksums.ini
conf/distro/include/sane-srcdates.inc
conf/machine/include/zaurus-2.6.conf
packages/esound/esound_0.2.36.bb
packages/gpe-calendar/gpe-calendar_svn.bb
packages/gpe-conf/gpe-conf_0.2.5.bb
packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
packages/gtk-webcore/osb-nrcore_svn.bb
packages/libgpevtype/libgpevtype_svn.bb
packages/libmrss/libmrss_0.17.bb
packages/libnxml/libnxml_0.16.bb
packages/matchbox-common/matchbox_0.9.1.bb
packages/matchbox-panel/matchbox-panel_0.9.3.bb
packages/matchbox2/matchbox-panel-2_svn.bb
packages/openmoko-base/files/session
packages/openmoko-base/openmoko-session_svn.bb
packages/perl/perl-native_5.8.7.bb
packages/pulseaudio/pulseaudio_0.9.5.bb
packages/tasks/task-slugos.bb
Diffs:
#
# mt diff -r7591223f9cc09ec1cac67f361556f5e52509ce2e -re7a4d4e9a0961d043f5fdb44415c51c6b9fcd45e
#
#
#
# delete "packages/gpe-dm/files"
#
# delete "packages/gpe-dm/files/Xserver-cxk.patch"
#
# delete "packages/gpe-dm/files/collie-suspend-hack.patch"
#
# delete "packages/gpe-dm/files/mnci.patch"
#
# delete "packages/gpe-dm/files/remove-X-scripts.patch"
#
# delete "packages/gpe-dm/files/source-xsession-scripts.patch"
#
# add_dir "packages/gpe-dm/files"
#
# add_dir "packages/libmrss/files"
#
# add_file "packages/gpe-dm/gpe-dm_0.50.bb"
# content [2c147cfdc601399b055a282959e04d5adb1365f5]
#
# add_file "packages/gpe-edit/gpe-edit_0.40.bb"
# content [0b292e8f7204bdeeef68424853d218c260d446ca]
#
# add_file "packages/gtk-webcore/files/build_silence.patch"
# content [5827b3be5177a88a31de6af20f33a1c2ee99bb54]
#
# add_file "packages/libmimedir/libmimedir_svn.bb"
# content [ed54dc2680f5a700afec18c6b40df99cf3e1f055]
#
# add_file "packages/libmrss/files/atom-changes.patch"
# content [e9ef3499454d0c5d2e808f46d622d586a5eb77fa]
#
# add_file "packages/libmrss/files/bump-version.patch"
# content [6784feb150398e54582cc389af5cc6befe047dfe]
#
# add_file "packages/libmrss/files/fix-memleaks.patch"
# content [6d7b32fcef4e7abab745508da393b6803576f0e0]
#
# add_file "packages/libmrss/files/fix_atom_date_locale.patch"
# content [a4a5fda410e3f399d283704fd7fb5602f26d01fe]
#
# add_file "packages/monotone/monotone-6_0.34.bb"
# content [a186d7c48bd53253dee62d2a674f1e770d3bb2cc]
#
# patch "classes/base.bbclass"
# from [006ad453eaf8bd5e1aed92af95d36743bef8e480]
# to [c00c5a0bc606c6209272cc163bc4334e0a694b53]
#
# patch "classes/sanity.bbclass"
# from [6a40f531897ddaa3dc24c8ef68dba8a620d47b27]
# to [5fcaa7e649d6a851bbd8d5d2b0a8c6105ba0f6fd]
#
# patch "conf/checksums.ini"
# from [0c38bb7a1017481435b26403e8e11e18f1b562f6]
# to [7d665c9556184e1ed9740cce1255af4f4e76d59f]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [dd52ff7ad2985d48718bb3032e3cb30275be6a2f]
# to [b8fa84d6abb67703de0a2d4d6928ff85ae4b5f48]
#
# patch "conf/machine/include/zaurus-2.6.conf"
# from [01fc9b9fcfb922d37523ae0dff39bfc7a30b945f]
# to [9f44eb5ef3076cb859e62200ce45ee8d40071123]
#
# patch "packages/esound/esound_0.2.36.bb"
# from [32e765f1c7f7c76230a41491fac98a36dd3e45d1]
# to [e345be8b49774ccb5224ad647704bc8575c20d8a]
#
# patch "packages/gpe-calendar/gpe-calendar_svn.bb"
# from [90ef3b3a56d8cc4a0260d8e6984b3652f1bb43af]
# to [ef80fcb469a26fc3fbe6d465eb6735d040c89413]
#
# patch "packages/gpe-conf/gpe-conf_0.2.5.bb"
# from [32f9ca0dbf4d34f51860bbf8577d298b54c50a15]
# to [a44663c51fbd9853f8bb2e6242c2dac345e04a53]
#
# patch "packages/gpe-session-scripts/gpe-session-scripts_0.67.bb"
# from [833fe5e8e71f04daa2ab57ac4873f7de38d477d0]
# to [1fb474eada53d5e8a4c4fcd539a0708916752c46]
#
# patch "packages/gtk-webcore/osb-nrcore_svn.bb"
# from [69009ed88ac6747a5dc35dbefbe3cac9a794b34c]
# to [d697a2a8b0422410529046ec743a6a655fab7294]
#
# patch "packages/libgpevtype/libgpevtype_svn.bb"
# from [6bfdf308476ff45be71881a081df58f88b777c5f]
# to [5a073bafd91865f732e48110a8725097b8a3abc2]
#
# patch "packages/libmrss/libmrss_0.17.bb"
# from [2dc5c5b104a09e840eeec7934868236b5e5adf84]
# to [8163473c66c5f4511aabbf766ccdb7802cf7f979]
#
# patch "packages/libnxml/libnxml_0.16.bb"
# from [bf428f8fbf8ead9448805a1d38598879fee5e173]
# to [f144c2c8369efc36f35fa9066b475444b0f5ae2b]
#
# patch "packages/matchbox-common/matchbox_0.9.1.bb"
# from [f1e8f25e5727099d4ff24b4b0df036e82b9716b3]
# to [84f1fd3d5c42d0803e1634e235220a58c4f600dc]
#
# patch "packages/matchbox-panel/matchbox-panel_0.9.3.bb"
# from [88bb4cd140f00eb927baad4ef7d871698a529cad]
# to [8d3ed70c8ed662cef656421e61c24db3eae804c0]
#
# patch "packages/matchbox2/matchbox-panel-2_svn.bb"
# from [fde2b3bfd152a139af50a4ccc599ce4d82f62f03]
# to [815f1bdec4bc8bca3dee767a2c176c56df0980ae]
#
# patch "packages/openmoko-base/files/session"
# from [64279020945c686bee8b822767ab8f2fa2a077ff]
# to [33df90f25edd5e09d695cc4eb6f45d3348e2b0ca]
#
# patch "packages/openmoko-base/openmoko-session_svn.bb"
# from [d495903bb4086806bbd311e136eec7e36de43090]
# to [3f17a7823eead3f056bf8d8b366cee21e7563448]
#
# patch "packages/perl/perl-native_5.8.7.bb"
# from [f4b80cf91ded9b8824b71a0244baa0ca4c8023e8]
# to [eeb5efcb3ecb9505ac36af970e4725249ff033e5]
#
# patch "packages/pulseaudio/pulseaudio_0.9.5.bb"
# from [1111063a77617afb9cecba3638421a409b84b8f9]
# to [03f67d3f8d0ebc4410868be3a107429ead92cb0b]
#
# patch "packages/tasks/task-slugos.bb"
# from [938c715f3405fb9d354e80593c163c2eb4975644]
# to [95960d2112da74b840992625901b634a55408fee]
#
============================================================
--- packages/gpe-dm/gpe-dm_0.50.bb 2c147cfdc601399b055a282959e04d5adb1365f5
+++ packages/gpe-dm/gpe-dm_0.50.bb 2c147cfdc601399b055a282959e04d5adb1365f5
@@ -0,0 +1,13 @@
+DESCRIPTION = "GPE Display Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xserver-common"
+RDEPENDS_${PN} += "procps xserver-common"
+
+GPE_TARBALL_SUFFIX ?= "bz2"
+
+inherit gpe autotools update-rc.d
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
============================================================
--- packages/gpe-edit/gpe-edit_0.40.bb 0b292e8f7204bdeeef68424853d218c260d446ca
+++ packages/gpe-edit/gpe-edit_0.40.bb 0b292e8f7204bdeeef68424853d218c260d446ca
@@ -0,0 +1,8 @@
+DESCRIPTION = "Editor for the GPE Palmtop Environment"
+SECTION = "gpe"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget"
+
+GPE_TARBALL_SUFFIX ?= "bz2"
+
+inherit gpe autotools
============================================================
--- packages/gtk-webcore/files/build_silence.patch 5827b3be5177a88a31de6af20f33a1c2ee99bb54
+++ packages/gtk-webcore/files/build_silence.patch 5827b3be5177a88a31de6af20f33a1c2ee99bb54
@@ -0,0 +1,32 @@
+Index: configure.in
+===================================================================
+--- configure.in (revision 46)
++++ configure.in (working copy)
+@@ -134,9 +134,9 @@
+ AC_SUBST(LIBCURL_LIBS) #needed by the osb-nrcore.pc.in
+
+
+-CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++"
++CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++ -DLOG_DISABLED"
+
+-CPPFLAGS="$CPPFLAGS -include \"\$(top_srcdir)/WebCorePrefix.h\" $PACKAGE_CFLAGS $X_CFLAGS $JSCORE_CFLAGS $DEFINES"
++CPPFLAGS="$CPPFLAGS -include \"\$(top_srcdir)/WebCorePrefix.h\" $PACKAGE_CFLAGS $X_CFLAGS $JSCORE_CFLAGS $DEFINES -DLOG_DISABLED"
+ LDFLAGS="$LDFLAGS $PACKAGE_LIBS $X_LIBS $JSCORE_LIBS \
+ -nodefaultlibs -lgcc -lc"
+
+Index: kwiq/KWQEvent.cpp
+===================================================================
+--- kwiq/KWQEvent.cpp (revision 46)
++++ kwiq/KWQEvent.cpp (working copy)
+@@ -759,10 +759,10 @@
+ #if 0
+ if (state & GDK_MOD1_MASK)
+ qstate |= Qt::AltButton;
+-#endif
+
+ if (state & GDK_META_MASK)
+ qstate |= Qt::MetaButton;
++#endif
+
+ if (isKeypadEvent(event))
+ qstate |= Qt::Keypad;
============================================================
--- packages/libmimedir/libmimedir_svn.bb ed54dc2680f5a700afec18c6b40df99cf3e1f055
+++ packages/libmimedir/libmimedir_svn.bb ed54dc2680f5a700afec18c6b40df99cf3e1f055
@@ -0,0 +1,27 @@
+DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "intltool-native"
+
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.4.1+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "${GPE_SVN}"
+
+S = "${WORKDIR}/libmimedir"
+
+inherit autotools pkgconfig lib_package
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+ autotools_stage_all
+}
+
+PACKAGES += "libmimedir-utils"
+
+FILES_libmimedir-utils = "${bindir}"
+
============================================================
--- packages/libmrss/files/atom-changes.patch e9ef3499454d0c5d2e808f46d622d586a5eb77fa
+++ packages/libmrss/files/atom-changes.patch e9ef3499454d0c5d2e808f46d622d586a5eb77fa
@@ -0,0 +1,17 @@
+Make sure to always set a pubDate
+
+Index: libmrss-0.17/src/mrss_parser.c
+===================================================================
+--- libmrss-0.17.orig/src/mrss_parser.c 2007-03-22 19:40:54.000000000 +0100
++++ libmrss-0.17/src/mrss_parser.c 2007-03-22 19:44:15.000000000 +0100
+@@ -270,6 +270,10 @@
+ && data->version == MRSS_VERSION_ATOM_1_0)
+ item->pubDate =
+ __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
++ else if (!strcmp(cur->value, "updated" ) && !item->pubDate
++ && data->version == MRSS_VERSION_ATOM_1_0)
++ item->pubDate =
++ __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
+
+ /* issued -> pubDate (Atom 0.3) */
+ else if (!strcmp (cur->value, "issued") && !item->pubDate)
============================================================
--- packages/libmrss/files/bump-version.patch 6784feb150398e54582cc389af5cc6befe047dfe
+++ packages/libmrss/files/bump-version.patch 6784feb150398e54582cc389af5cc6befe047dfe
@@ -0,0 +1,16 @@
+Bump the version info, specially as I changed the struct in a binary
+incompatible way.
+
+Index: libmrss-0.17/src/Makefile.am
+===================================================================
+--- libmrss-0.17.orig/src/Makefile.am 2007-04-01 16:43:58.000000000 +0200
++++ libmrss-0.17/src/Makefile.am 2007-04-01 16:44:10.000000000 +0200
+@@ -10,7 +10,7 @@
+ mrss_options.c \
+ mrss_search.c
+
+-libmrss_la_LDFLAGS = -version-info 0:16:0
++libmrss_la_LDFLAGS = -version-info 0:17:0
+
+ EXTRA_DIST = mrss.h mrss_internal.h
+
============================================================
--- packages/libmrss/files/fix-memleaks.patch 6d7b32fcef4e7abab745508da393b6803576f0e0
+++ packages/libmrss/files/fix-memleaks.patch 6d7b32fcef4e7abab745508da393b6803576f0e0
@@ -0,0 +1,17 @@
+Index: libmrss-0.17/src/mrss_parser.c
+===================================================================
+--- libmrss-0.17.orig/src/mrss_parser.c 2007-04-01 22:23:22.000000000 +0200
++++ libmrss-0.17/src/mrss_parser.c 2007-04-01 22:23:42.000000000 +0200
+@@ -186,10 +186,10 @@
+ cat->allocated = 1;
+ cat->category = c;
+
+- if (!(c = nxmle_find_attribute (cur, "scheme", NULL)))
++ if (c = nxmle_find_attribute (cur, "scheme", NULL))
+ cat->domain = c;
+
+- if (!(c = nxmle_find_attribute (cur, "label", NULL)))
++ if (c = nxmle_find_attribute (cur, "label", NULL))
+ cat->label = c;
+
+ if (!*category)
============================================================
--- packages/libmrss/files/fix_atom_date_locale.patch a4a5fda410e3f399d283704fd7fb5602f26d01fe
+++ packages/libmrss/files/fix_atom_date_locale.patch a4a5fda410e3f399d283704fd7fb5602f26d01fe
@@ -0,0 +1,121 @@
+The Atom date formating code tries to create a RFC822 date. This date
+requires to use the C locale for the date (for weekday-names and month-names).
+
+This patch uses new POSIX functionality to create a C locale and strftime_l
+to create a right RFC822 date.
+
+Index: libmrss-0.17/src/mrss.h
+===================================================================
+--- libmrss-0.17.orig/src/mrss.h 2007-02-02 12:23:49.000000000 +0100
++++ libmrss-0.17/src/mrss.h 2007-04-01 19:46:41.000000000 +0200
+@@ -364,6 +364,9 @@
+ mrss_element_t element;
+ int allocated;
+
++ /** For internal use only: */
++ void* c_locale;
++
+ /* Data: */
+
+ char *file;
+Index: libmrss-0.17/src/mrss_free.c
+===================================================================
+--- libmrss-0.17.orig/src/mrss_free.c 2007-02-02 12:47:46.000000000 +0100
++++ libmrss-0.17/src/mrss_free.c 2007-04-01 19:46:41.000000000 +0200
+@@ -22,9 +22,14 @@
+ # error Use configure; make; make install
+ #endif
+
++#define _GNU_SOURCE
++
+ #include "mrss.h"
+ #include "mrss_internal.h"
+
++#include <locale.h>
++
++
+ static void __mrss_free_channel (mrss_t * mrss);
+ static void __mrss_free_category (mrss_category_t * category);
+ static void __mrss_free_hour (mrss_hour_t * hour);
+@@ -202,6 +207,9 @@
+ __mrss_free_item ((mrss_item_t *) old);
+ }
+
++ if (mrss->c_locale)
++ freelocale (mrss->c_locale);
++
+ if (mrss->allocated)
+ free (mrss);
+ }
+Index: libmrss-0.17/src/mrss_parser.c
+===================================================================
+--- libmrss-0.17.orig/src/mrss_parser.c 2007-04-01 19:46:41.000000000 +0200
++++ libmrss-0.17/src/mrss_parser.c 2007-04-01 20:38:06.000000000 +0200
+@@ -22,9 +22,13 @@
+ # error Use configure; make; make install
+ #endif
+
++#define _GNU_SOURCE
++
+ #include "mrss.h"
+ #include "mrss_internal.h"
+
++#include <locale.h>
++
+ static void
+ __mrss_parse_tag_insert (mrss_tag_t ** where, mrss_tag_t * what)
+ {
+@@ -133,7 +137,7 @@
+ }
+
+ static char *
+-__mrss_atom_prepare_date (char *datestr)
++__mrss_atom_prepare_date (mrss_t *data, char *datestr)
+ {
+ char *ret = NULL;
+ if (datestr)
+@@ -150,8 +154,13 @@
+ stm.tm_year -= 1900;
+ char datebuf[256];
+ free (datestr);
+- strftime (datebuf, sizeof (datebuf), "%a, %d %b %Y %H:%M:%S %z",
+- &stm);
++
++ if (!data->c_locale) {
++ data->c_locale = newlocale(LC_ALL_MASK,"C",NULL);
++ }
++
++ strftime_l (datebuf, sizeof (datebuf), "%a, %d %b %Y %H:%M:%S %z",
++ &stm, data->c_locale);
+ ret = strdup (datebuf);
+ }
+ }
+@@ -269,16 +278,16 @@
+ else if (!strcmp (cur->value, "published") && !item->pubDate
+ && data->version == MRSS_VERSION_ATOM_1_0)
+ item->pubDate =
+- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
++ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL));
+ else if (!strcmp(cur->value, "updated" ) && !item->pubDate
+ && data->version == MRSS_VERSION_ATOM_1_0)
+ item->pubDate =
+- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
++ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL));
+
+ /* issued -> pubDate (Atom 0.3) */
+ else if (!strcmp (cur->value, "issued") && !item->pubDate)
+ item->pubDate =
+- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
++ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL));
+
+ /* id -> guid */
+ else if (!strcmp (cur->value, "id") && !item->guid
+@@ -701,7 +710,7 @@
+ /* updated -> lastBuildDate */
+ else if (!strcmp (cur->value, "updated"))
+ data->lastBuildDate =
+- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
++ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL));
+
+ /* author -> managingeditor */
+ else if (!strcmp (cur->value, "author"))
============================================================
--- packages/monotone/monotone-6_0.34.bb a186d7c48bd53253dee62d2a674f1e770d3bb2cc
+++ packages/monotone/monotone-6_0.34.bb a186d7c48bd53253dee62d2a674f1e770d3bb2cc
@@ -0,0 +1,52 @@
+DESCRIPTION = "Monotone is a distributed Source Control System"
+HOMEPAGE = "http://www.monotone.ca/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "MIT"
+DEPENDS = "boost"
+
+PROVIDES = "monotone"
+RPROVIDES = "monotone"
+
+S = "${WORKDIR}/monotone-${PV}"
+# no cross compile support - it tries to run the test program even with
+# --enable_ipv6=yes
+EXTRA_OECONF = "--disable-ipv6 \
+ --disable-dependency-tracking \
+ --disable-rpath \
+ --disable-nls \
+ --with-gnu-ld \
+ --with-bundled-lua --with-bundled-sqlite"
+
+inherit autotools
+
+# Release 0.22 reveals bugs in g++ for thumb (g++ generates
+# relocations which the linker cannot represent)
+#FIXME: remove the following
+ARM_INSTRUCTION_SET = "arm"
+
+PR = "r0"
+
+SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \
+ file://txt2c-cross-post-0.22.patch;patch=1 \
+ file://uclibc.database.hh.stdarg.patch;patch=1 \
+ file://configure.ac-no-sync-with-stdio-0.31.patch;patch=1 \
+ "
+do_compile_append() {
+ touch testsuite
+}
+
+# This makes the testsuite as a package and renames the monotone executable
+# to include the netsync suffix.
+do_install_append() {
+ install -d ${D}${tsd}
+ install -c -m 755 testsuite ${D}${tsd}/testsuite
+ cp -pPR tests ${D}${tsd}/tests
+ rm ${D}/home/monotone/monotone-6/tests/diff_a_binary_file/binary
+}
+
+PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite"
+tsd = "/home/monotone/${PN}"
+FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests"
+RDEPENDS_${PN}-testsuite += "bash sed gr%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rf5edc19dd1057109ae156f97cd6387f3a74993fe -re7a4d4e9a0961d043f5fdb44415c51c6b9fcd45e
#
#
# no changes
#
More information about the Openembedded-commits
mailing list