[oe-commits] org.oe.dev merge of '07e364c1caaec127626ec4949f3b7150cb090b5d'
pfalcon commit
openembedded-commits at lists.openembedded.org
Thu Jul 19 07:57:39 UTC 2007
merge of '07e364c1caaec127626ec4949f3b7150cb090b5d'
and '64298b1eccb4cb0a71eec967d40f9b07077b3e4f'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 572633436d96eba5cd6c1c108152458d425bd6df
ViewMTN: http://monotone.openembedded.org/revision.psp?id=572633436d96eba5cd6c1c108152458d425bd6df
Files:
1
packages/bluez/bluez-gnome_cvs.bb
packages/bluez/bluez-gnome_git.bb
packages/linux/ixp4xx-kernel_2.6.21.5.bb
packages/linux/ixp4xx-kernel_2.6.21.6.bb
packages/bluez/files/pkgconfig-add-gthread.patch
packages/coreutils/coreutils-5.3.0/futimens.patch
packages/libsdl/files/kernel-asm-page.patch
packages/sylpheed/claws-mail.inc
packages/sylpheed/claws-mail_2.9.1.bb
packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb
packages/sylpheed/claws-plugin-mailmbox_1.13.bb
packages/sylpheed/claws-plugin-rssyl_0.13.bb
packages/sylpheed/files/desktop.patch
packages/sylpheed/files/streamline-ui.patch
conf/distro/include/slugos.inc
conf/machine/compulab-pxa270.conf
packages/coreutils/coreutils_5.3.0.bb
packages/gstreamer/gst-plugins-base_0.10.12.bb
packages/libsdl/libsdl-native_1.2.11.bb
packages/linphone/linphone_1.6.0.bb
packages/webkit/webkit/WebKit.pri
packages/qte/qte-2.3.10/c700-hardware.patch
packages/qte/qte-2.3.10/deprecated/c700-hardware.patch
packages/qte/qte-2.3.10/kernel-keymap-CXK.patch
packages/qte/qte-2.3.10/spitz-adhoc-keypad-rotate.patch
packages/qte/qte-2.3.10/simpad-defaultkbd.patch
packages/qte/qte-2.3.10/deprecated/simpad-defaultkbd.patch
packages/qte/qte-2.3.10/simpad.patch
packages/qte/qte-2.3.10/deprecated/simpad.patch
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
packages/tasks/task-opie.bb
Diffs:
#
# mt diff -r07e364c1caaec127626ec4949f3b7150cb090b5d -r572633436d96eba5cd6c1c108152458d425bd6df
#
#
#
# rename "packages/bluez/bluez-gnome_cvs.bb"
# to "packages/bluez/bluez-gnome_git.bb"
#
# rename "packages/linux/ixp4xx-kernel_2.6.21.5.bb"
# to "packages/linux/ixp4xx-kernel_2.6.21.6.bb"
#
# add_file "packages/bluez/files/pkgconfig-add-gthread.patch"
# content [6c09cd3241b74b602c6af47bd99cbda71e53d7e0]
#
# add_file "packages/coreutils/coreutils-5.3.0/futimens.patch"
# content [8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86]
#
# add_file "packages/libsdl/files/kernel-asm-page.patch"
# content [c330d9173694f5d2da97b4be571622fb8ad8d195]
#
# add_file "packages/sylpheed/claws-mail.inc"
# content [70dc56c3455d2a0844a513547e62dd0a066acb6f]
#
# add_file "packages/sylpheed/claws-mail_2.9.1.bb"
# content [9c76d7640bf39645ce37ffa98021de5d835b2427]
#
# add_file "packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb"
# content [d73fb5b9c737c95ee038731dd97b16a271288e97]
#
# add_file "packages/sylpheed/claws-plugin-mailmbox_1.13.bb"
# content [c30ec52d9c35c4540aaab1048d113479f86fd866]
#
# add_file "packages/sylpheed/claws-plugin-rssyl_0.13.bb"
# content [d11e21e5ff03c258c29f668c8416de99cd346425]
#
# add_file "packages/sylpheed/files/desktop.patch"
# content [55d0bbbe039f37d150f9574de2d124fc9d1c16e4]
#
# add_file "packages/sylpheed/files/streamline-ui.patch"
# content [6f7fed506bb96c5de5538ebb8ec4ecd4e7cba24f]
#
# patch "conf/distro/include/slugos.inc"
# from [3e36695f3609a3860b7ddbfbf78b4d746f8dccc9]
# to [e2b01734de8b2e6dca970ce26b4168e0b7fa033c]
#
# patch "conf/machine/compulab-pxa270.conf"
# from [e1433a559cc7c747740b88df5f017a83d402e34a]
# to [d9dda180b32b678bbc7dc3203f202d0227bd7798]
#
# patch "packages/bluez/bluez-gnome_git.bb"
# from [42803f40aaa448142b85aff6d1c1dc49cdcf1d4d]
# to [ad5f43c2750098ef22df298f118dfcd64ccffd01]
#
# patch "packages/coreutils/coreutils_5.3.0.bb"
# from [e3c222c8a27658bb6f3092680fe67a444fd60c47]
# to [2223f1c92c49c889593d31301609cfa7d888d1cb]
#
# patch "packages/gstreamer/gst-plugins-base_0.10.12.bb"
# from [869ff5fd4c0a0a6c0be50c18079d9aaaa40ceb38]
# to [42b568147310d58a2ca061df2db79c873973b472]
#
# patch "packages/libsdl/libsdl-native_1.2.11.bb"
# from [e9e581735b9f05b42424cddeb52b17e590296483]
# to [5e5d90533f76a9b2ce70d129759c139f4c7df596]
#
# patch "packages/linphone/linphone_1.6.0.bb"
# from [77c69b1286f82211e37b6d6cde29f8fc492c17c7]
# to [12fa57bdfc35f887f98bd8c835b566f34d02f011]
#
# patch "packages/linux/ixp4xx-kernel_2.6.21.6.bb"
# from [e9a048ca3969704b32d14ddaf7a1b15c1413e95f]
# to [0b15c2bd8e24d2c3c24fab57a684fe921123a952]
#
# patch "packages/webkit/webkit/WebKit.pri"
# from [66a2198f6e713621703e637cb558322feb4153e5]
# to [94510fbc949e86f0ce4710c19900c4a6a8c163a9]
#
============================================================
--- packages/bluez/files/pkgconfig-add-gthread.patch 6c09cd3241b74b602c6af47bd99cbda71e53d7e0
+++ packages/bluez/files/pkgconfig-add-gthread.patch 6c09cd3241b74b602c6af47bd99cbda71e53d7e0
@@ -0,0 +1,50 @@
+Index: git/configure.in
+===================================================================
+--- git.orig/configure.in 2007-07-17 17:25:52.000000000 +0100
++++ git/configure.in 2007-07-17 17:25:52.000000000 +0100
+@@ -75,6 +75,10 @@
+ AC_SUBST(OPENOBEX_CFLAGS)
+ AC_SUBST(OPENOBEX_LIBS)
+
++PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.10, dummy=yes, dummy=no)
++AC_SUBST(GTHREAD_CFLAGS)
++AC_SUBST(GTHREAD_LIBS)
++
+ AC_ARG_BLUEZ
+
+ AC_OUTPUT(Makefile compat/Makefile common/Makefile applet/Makefile properties/Makefile sendto/Makefile wizard/Makefile proximity/Makefile po/Makefile.in)
+Index: git/applet/Makefile.am
+===================================================================
+--- git.orig/applet/Makefile.am 2007-07-17 17:25:52.000000000 +0100
++++ git/applet/Makefile.am 2007-07-17 17:25:52.000000000 +0100
+@@ -4,12 +4,12 @@
+ bluetooth_applet_SOURCES = main.c
+
+ bluetooth_applet_LDADD = $(top_builddir)/compat/libcompat.a $(top_builddir)/common/libcommon.a \
+- @NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@
++ @NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@
+
+ nodist_bluetooth_applet_SOURCES = $(top_builddir)/common/passkey-agent-glue.h \
+ $(top_builddir)/common/auth-agent-glue.h
+
+-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\"
++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ @GTHREAD_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\"
+
+ INCLUDES = -I$(top_builddir)/common -I$(top_srcdir)/compat
+
+Index: git/properties/Makefile.am
+===================================================================
+--- git.orig/properties/Makefile.am 2007-07-17 17:28:11.000000000 +0100
++++ git/properties/Makefile.am 2007-07-17 17:28:44.000000000 +0100
+@@ -4,9 +4,9 @@
+ bluetooth_properties_SOURCES = main.c
+
+ bluetooth_properties_LDADD = $(top_builddir)/common/libcommon.a \
+- @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@
++ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@
+
+-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@
++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @GTHREAD_CFLAGS@
+
+ INCLUDES = -I$(top_srcdir)/common
+
============================================================
--- packages/coreutils/coreutils-5.3.0/futimens.patch 8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86
+++ packages/coreutils/coreutils-5.3.0/futimens.patch 8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86
@@ -0,0 +1,44 @@
+Index: coreutils-5.3.0/lib/utimens.c
+===================================================================
+--- coreutils-5.3.0.orig/lib/utimens.c 2005-01-03 22:19:15.000000000 +0000
++++ coreutils-5.3.0/lib/utimens.c 2007-07-01 19:12:32.000000000 +0000
+@@ -55,8 +55,8 @@
+ If TIMESPEC is null, set the time stamps to the current time. */
+
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
+- char const *file, struct timespec const timespec[2])
++gl_futimens (int fd ATTRIBUTE_UNUSED,
++ char const *file, struct timespec const timespec[2])
+ {
+ /* There's currently no interface to set file timestamps with
+ nanosecond resolution, so do the best we can, discarding any
+@@ -117,5 +117,5 @@
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+- return futimens (-1, file, timespec);
++ return gl_futimens (-1, file, timespec);
+ }
+Index: coreutils-5.3.0/lib/utimens.h
+===================================================================
+--- coreutils-5.3.0.orig/lib/utimens.h 2004-11-23 20:54:33.000000000 +0000
++++ coreutils-5.3.0/lib/utimens.h 2007-07-01 19:12:37.000000000 +0000
+@@ -1,3 +1,3 @@
+ #include "timespec.h"
+-int futimens (int, char const *, struct timespec const [2]);
++int gl_futimens (int, char const *, struct timespec const [2]);
+ int utimens (char const *, struct timespec const [2]);
+Index: coreutils-5.3.0/src/touch.c
+===================================================================
+--- coreutils-5.3.0.orig/src/touch.c 2004-11-23 20:54:35.000000000 +0000
++++ coreutils-5.3.0/src/touch.c 2007-07-01 19:11:52.000000000 +0000
+@@ -191,7 +191,7 @@
+ t = timespec;
+ }
+
+- ok = (futimens (fd, file, t) == 0);
++ ok = (gl_futimens (fd, file, t) == 0);
+ if (fd != -1)
+ ok &= (close (fd) == 0);
+
============================================================
--- packages/libsdl/files/kernel-asm-page.patch c330d9173694f5d2da97b4be571622fb8ad8d195
+++ packages/libsdl/files/kernel-asm-page.patch c330d9173694f5d2da97b4be571622fb8ad8d195
@@ -0,0 +1,13 @@
+diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c
+index 4e3d662..de38a3c 100644
+--- a/src/video/Xext/Xxf86dga/XF86DGA.c
++++ b/src/video/Xext/Xxf86dga/XF86DGA.c
+@@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
+ #define HAS_MMAP_ANON
+ #include <sys/types.h>
+ #include <sys/mman.h>
+-#include <asm/page.h> /* PAGE_SIZE */
++#include <unistd.h>
+ #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
+ #define HAS_GETPAGESIZE
+ #endif /* linux */
============================================================
--- packages/sylpheed/claws-mail.inc 70dc56c3455d2a0844a513547e62dd0a066acb6f
+++ packages/sylpheed/claws-mail.inc 70dc56c3455d2a0844a513547e62dd0a066acb6f
@@ -0,0 +1,54 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ libetpan openssl aspell"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "\
+ ${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \
+ file://desktop.patch;patch=1 \
+ file://streamline-ui.patch;patch=1 \
+ "
+
+FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
+
+EXTRA_OECONF = "--disable-aspell-test \
+ --enable--aspell \
+ --disable-manual \
+ --disable-crash-dialog \
+ --disable-jpilot \
+ --disable-trayicon-plugin \
+ --disable-spamassassin-plugin \
+ --disable-bogofilter-plugin \
+ --disable-pgpcore-plugin \
+ --disable-pgpmime-plugin \
+ --disable-pgpinline-plugin \
+ --disable-dillo-viewer-plugin \
+ --disable-clamav-plugin \
+ --disable-gnomeprint \
+ --disable-valgrind \
+ "
+
+CFLAGS += "-D_GNU_SOURCE"
+
+inherit autotools pkgconfig
+
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+do_install_append() {
+ install -d ${D}${datadir}/applications
+ install -m 0644 claws-mail.desktop ${D}${datadir}/applications/
+ install -d ${D}${datadir}/pixmaps
+ install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
+ mv ${D}${bindir}/${TARGET_SYS}-claws-mail ${D}${bindir}/${PN}
+}
+
+do_stage () {
+ autotools_stage_all
+}
+
============================================================
--- packages/sylpheed/claws-mail_2.9.1.bb 9c76d7640bf39645ce37ffa98021de5d835b2427
+++ packages/sylpheed/claws-mail_2.9.1.bb 9c76d7640bf39645ce37ffa98021de5d835b2427
@@ -0,0 +1 @@
+require claws-mail.inc
============================================================
--- packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb d73fb5b9c737c95ee038731dd97b16a271288e97
+++ packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb d73fb5b9c737c95ee038731dd97b16a271288e97
@@ -0,0 +1,20 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent plugins"
+DEPENDS = "claws-mail gtkhtml2 curl"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/gtkhtml2_viewer-${PV}"
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
+
============================================================
--- packages/sylpheed/claws-plugin-mailmbox_1.13.bb c30ec52d9c35c4540aaab1048d113479f86fd866
+++ packages/sylpheed/claws-plugin-mailmbox_1.13.bb c30ec52d9c35c4540aaab1048d113479f86fd866
@@ -0,0 +1,20 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent plugins"
+DEPENDS = "claws-mail"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/mailmbox-${PV}"
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
+FILES_${PN}-dbg = "${libdir}/claws-mail/plugins/.debug"
============================================================
--- packages/sylpheed/claws-plugin-rssyl_0.13.bb d11e21e5ff03c258c29f668c8416de99cd346425
+++ packages/sylpheed/claws-plugin-rssyl_0.13.bb d11e21e5ff03c258c29f668c8416de99cd346425
@@ -0,0 +1,20 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent plugins"
+DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/rssyl-${PV}"
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
+
============================================================
--- packages/sylpheed/files/desktop.patch 55d0bbbe039f37d150f9574de2d124fc9d1c16e4
+++ packages/sylpheed/files/desktop.patch 55d0bbbe039f37d150f9574de2d124fc9d1c16e4
@@ -0,0 +1,19 @@
+Index: claws-mail-2.9.1/claws-mail.desktop
+===================================================================
+--- claws-mail-2.9.1.orig/claws-mail.desktop 2007-04-24 17:40:20.000000000 +0100
++++ claws-mail-2.9.1/claws-mail.desktop 2007-04-25 07:08:36.000000000 +0100
+@@ -1,11 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=Claws Mail
++Name=Mail
+ Exec=claws-mail
+ Icon=claws-mail
+-Info="Claws Mail"
++Info=Email Application
+ Categories=GTK;Network;Email;
+-Comment="Gtk+ based Mail Client"
++Comment=Email Application
+ Terminal=false
+ Type=Application
+ StartupNotify=true
============================================================
--- packages/sylpheed/files/streamline-ui.patch 6f7fed506bb96c5de5538ebb8ec4ecd4e7cba24f
+++ packages/sylpheed/files/streamline-ui.patch 6f7fed506bb96c5de5538ebb8ec4ecd4e7cba24f
@@ -0,0 +1,1008 @@
+Index: claws-mail-2.9.1/src/mainwindow.c
+===================================================================
+--- claws-mail-2.9.1.orig/src/mainwindow.c 2007-04-25 07:40:10.000000000 +0100
++++ claws-mail-2.9.1/src/mainwindow.c 2007-04-25 10:26:40.000000000 +0100
+@@ -189,9 +189,6 @@
+ static void toggle_statusbar_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+-static void set_layout_cb (MainWindow *mainwin,
+- guint action,
+- GtkWidget *widget);
+
+ static void addressbook_open_cb (MainWindow *mainwin,
+ guint action,
+@@ -538,94 +535,24 @@
+ {N_("/_Edit/_Search folder..."), "<shift><control>F", search_cb, 1, NULL},
+ {N_("/_Edit/_Quick search"), "slash", mainwindow_quicksearch, 0, NULL},
+ {N_("/_View"), NULL, NULL, 0, "<Branch>"},
+- {N_("/_View/Show or hi_de"), NULL, NULL, 0, "<Branch>"},
+- {N_("/_View/Show or hi_de/_Message view"),
+- "V", toggle_message_cb, 0, "<ToggleItem>"},
+- {N_("/_View/Show or hi_de/_Toolbar"),
+- NULL, NULL, 0, "<Branch>"},
+- {N_("/_View/Show or hi_de/_Toolbar/Text _below icons"),
+- NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
+- {N_("/_View/Show or hi_de/_Toolbar/Text be_side icons"),
+- NULL, toggle_toolbar_cb, TOOLBAR_BOTH_HORIZ, "/View/Show or hide/Toolbar/Text below icons"},
+- {N_("/_View/Show or hi_de/_Toolbar/_Icons only"),
+- NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Text below icons"},
+- {N_("/_View/Show or hi_de/_Toolbar/_Text only"),
+- NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Text below icons"},
+- {N_("/_View/Show or hi_de/_Toolbar/_Hide"),
+- NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Text below icons"},
+- {N_("/_View/Show or hi_de/Status _bar"),
+- NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
+ {N_("/_View/Set displayed _columns"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/Set displayed _columns/in _Folder list..."), NULL, set_folder_display_item_cb, 0, NULL},
+ {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
+
+ {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
+- {N_("/_View/La_yout"), NULL, NULL, 0, "<Branch>"},
+- {N_("/_View/Layout/_Standard"), NULL, set_layout_cb, NORMAL_LAYOUT, "<RadioItem>"},
+- {N_("/_View/Layout/_Three columns"), NULL, set_layout_cb, VERTICAL_LAYOUT, "/View/Layout/Standard"},
+- {N_("/_View/Layout/_Wide message"), NULL, set_layout_cb, WIDE_LAYOUT, "/View/Layout/Standard"},
+- {N_("/_View/Layout/W_ide message list"),NULL, set_layout_cb, WIDE_MSGLIST_LAYOUT, "/View/Layout/Standard"},
+- {N_("/_View/Layout/S_mall screen"), NULL, set_layout_cb, SMALL_LAYOUT, "/View/Layout/Standard"},
+- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Sort"), NULL, NULL, 0, "<Branch>"},
+- {N_("/_View/_Sort/by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
+- {N_("/_View/_Sort/by S_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
+- {N_("/_View/_Sort/by _Date"), NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"},
+- {N_("/_View/_Sort/by _From"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"},
+- {N_("/_View/_Sort/by _To"), NULL, sort_summary_cb, S%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r64298b1eccb4cb0a71eec967d40f9b07077b3e4f -r572633436d96eba5cd6c1c108152458d425bd6df
#
#
#
# rename "packages/qte/qte-2.3.10/c700-hardware.patch"
# to "packages/qte/qte-2.3.10/deprecated/c700-hardware.patch"
#
# rename "packages/qte/qte-2.3.10/kernel-keymap-CXK.patch"
# to "packages/qte/qte-2.3.10/spitz-adhoc-keypad-rotate.patch"
#
# rename "packages/qte/qte-2.3.10/simpad-defaultkbd.patch"
# to "packages/qte/qte-2.3.10/deprecated/simpad-defaultkbd.patch"
#
# rename "packages/qte/qte-2.3.10/simpad.patch"
# to "packages/qte/qte-2.3.10/deprecated/simpad.patch"
#
# patch "packages/qte/qte-common_2.3.10.inc"
# from [a8284b7deef4a1ca0d5158e8652e7e712758cba6]
# to [b549ccc23e3835c6b9c8bdf16203186b0a257fc0]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [82877749c15b87c3894f9a82392b7125e7091e16]
# to [c56ea112970c4b9497e435e36e7686a99e24da15]
#
# patch "packages/tasks/task-opie.bb"
# from [d9b3a961501d5c121f18763d6efbd94634b0ebb4]
# to [3dd6719f9c7ba4832d9d3d9e23b649733e187673]
#
============================================================
--- packages/qte/qte-common_2.3.10.inc a8284b7deef4a1ca0d5158e8652e7e712758cba6
+++ packages/qte/qte-common_2.3.10.inc b549ccc23e3835c6b9c8bdf16203186b0a257fc0
@@ -25,12 +25,10 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
file://no-moc.patch;patch=1 \
file://gcc3.patch;patch=1 \
file://gcc4.patch;patch=1 \
- file://c700-hardware.patch;patch=1 \
file://encoding.patch;patch=1 \
file://fix-qgfxraster.patch;patch=1 \
file://qt-visibility.patch;patch=1 \
file://tslib.patch;patch=1 \
- file://simpad.patch;patch=1 \
file://handhelds.patch;patch=1 \
file://qiconview-speed.patch;patch=1 \
file://qtabbar.patch;patch=1 \
@@ -43,7 +41,6 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
file://key.patch;patch=1 \
file://bidimetrics.patch;patch=5 \
file://fix-native-build.patch;patch=1 \
- file://simpad-defaultkbd.patch;patch=1 \
file://fix-errno-exception-spec.patch;patch=1 \
file://keyboardless-buttonmap.patch;patch=1 \
file://kernel-keymap.patch;patch=1 \
@@ -61,8 +58,8 @@ SRC_URI_append_c7x0 = "${W100_AC
file://suspend-resume-hooks.patch;patch=1"
SRC_URI_append_c7x0 = "${W100_ACCEL_PATCHES} "
-SRC_URI_append_spitz = "file://kernel-keymap-CXK.patch;patch=1 "
-SRC_URI_append_akita = "file://kernel-keymap-CXK.patch;patch=1 "
+SRC_URI_append_spitz = "file://spitz-adhoc-keypad-rotate.patch;patch=1 "
+SRC_URI_append_akita = "file://spitz-adhoc-keypad-rotate.patch;patch=1 "
# "ipaqs" used to have this, but later were proven to at least work
# without it. Review again and see if has interesting bits to be applied
@@ -117,10 +114,10 @@ EXTRA_DEFINES_palmz72 = "-DQT_QWS_TSLIB
EXTRA_DEFINES_palmt650 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
EXTRA_DEFINES_palmtx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
EXTRA_DEFINES_palmz72 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD"
-EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700"
-EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK"
-EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK"
+EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
+EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
============================================================
--- packages/qte/qte-mt_2.3.10.bb 82877749c15b87c3894f9a82392b7125e7091e16
+++ packages/qte/qte-mt_2.3.10.bb c56ea112970c4b9497e435e36e7686a99e24da15
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
require qte-common_${PV}.inc
-PR = "r20"
+PR = "r21"
EXTRA_OECONF += "-thread"
============================================================
--- packages/tasks/task-opie.bb d9b3a961501d5c121f18763d6efbd94634b0ebb4
+++ packages/tasks/task-opie.bb 3dd6719f9c7ba4832d9d3d9e23b649733e187673
@@ -5,7 +5,7 @@ PROVIDES = "task-opie-everything"
LICENSE = "MIT"
PROVIDES = "task-opie-everything"
-PR = "r10"
+PR = "r11"
PACKAGES = "task-opie-base \
task-opie-base-applets task-opie-base-apps \
@@ -26,10 +26,11 @@ RDEPENDS_task-opie-base = "opie-init opi
# Dependencies to get the launcher up and running
#
RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklauncher \
- opie-taskbar opie-taskbar-images-240x320 opie-pics opie-sounds opie-freetype \
+ opie-taskbar opie-pics opie-sounds opie-freetype \
ttf-dejavu-sans ttf-dejavu-sans-mono"
-# TODO: Instead of opie-taskbar-images-240x320 version for target machine should be used, pending
-# mechanism to specify screen size for all machines.
+# Recommend both landscape and portrait backgrounds
+RRECOMMENDS_task-opie-base = "opie-taskbar-images-${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
+ opie-taskbar-images-${MACHINE_DISPLAY_HEIGHT_PIXELS}x${MACHINE_DISPLAY_WIDTH_PIXELS}"
#
# things for reasonable bootstrap image
More information about the Openembedded-commits
mailing list