diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-05-13 18:27:19 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-13 18:27:19 +0000 |
| commit | 348f2ded2310934f32774fce605625e2976a2d5e (patch) | |
| tree | 7d9201971ddf6c5b7f9dfdb87ddf99e247071ebf /packages | |
| parent | 86263c55f7025aa4d0e7c1619a28ed2459d97897 (diff) | |
| parent | bbd7bd75f82d177e6ea894672148a76f0b0e6d92 (diff) | |
merge of af4df6cf6c1c2920365147ec393e688fdb85b6de
and c8459c74f176dc141188b488b5c3e56beb6ebf13
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/e17/e-wm/remove-large-fonts.patch | 25 | ||||
| -rw-r--r-- | packages/e17/e-wm_0.16.999.026.bb (renamed from packages/e17/e-wm_0.16.999.025.bb) | 1 | ||||
| -rw-r--r-- | packages/e17/entrance/disable-autodetect.patch | 7 | ||||
| -rw-r--r-- | packages/e17/entrance_0.9.0.007.bb (renamed from packages/e17/entrance_0.9.0.006.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/e_0.16.999.026.bb (renamed from packages/efl/e_0.16.999.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/ecore-fb_0.9.9.026.bb (renamed from packages/efl/ecore-fb_0.9.9.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/ecore-native_0.9.9.026.bb (renamed from packages/efl/ecore-native_0.9.9.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/ecore-x11_0.9.9.026.bb (renamed from packages/efl/ecore-x11_0.9.9.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/edb-native_1.0.5.007.bb (renamed from packages/efl/edb-native_1.0.5.006.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/edb-utils_1.0.5.007.bb (renamed from packages/efl/edb-utils_1.0.5.006.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/edb_1.0.5.007.bb (renamed from packages/efl/edb_1.0.5.006.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/edje-native_0.5.0.026.bb (renamed from packages/efl/edje-native_0.5.0.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/edje-utils_0.5.0.026.bb (renamed from packages/efl/edje-utils_0.5.0.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/edje_0.5.0.026.bb (renamed from packages/efl/edje_0.5.0.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/eet-native_0.9.10.026.bb (renamed from packages/efl/eet-native_0.9.10.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/eet_0.9.10.026.bb (renamed from packages/efl/eet_0.9.10.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/embryo-native_0.9.1.026.bb (renamed from packages/efl/embryo-native_0.9.1.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/embryo-utils_0.9.1.026.bb (renamed from packages/efl/embryo-utils_0.9.1.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/embryo_0.9.1.026.bb (renamed from packages/efl/embryo_0.9.1.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/epeg_0.9.0.007.bb (renamed from packages/efl/epeg_0.9.0.006.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/epsilon_0.3.0.007.bb (renamed from packages/efl/epsilon_0.3.0.006.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/esmart-fb_0.9.0.007.bb (renamed from packages/efl/esmart-fb_0.9.0.006.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/esmart-x11_0.9.0.007.bb (renamed from packages/efl/esmart-x11_0.9.0.006.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/evas-fb_0.9.9.026.bb (renamed from packages/efl/evas-fb_0.9.9.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/evas-native_0.9.9.026.bb (renamed from packages/efl/evas-native_0.9.9.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/evas-x11_0.9.9.026.bb (renamed from packages/efl/evas-x11_0.9.9.025.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/evas/fix-configure-0.9.9.025.patch | 35 | ||||
| -rw-r--r-- | packages/efl/evas/fix-configure-0.9.9.026.patch (renamed from packages/efl/evas/fix-configure-0.9.9.023.patch) | 0 | ||||
| -rw-r--r-- | packages/efl/evas/fix-configure-20060113.patch | 45 | ||||
| -rw-r--r-- | packages/efl/ewl_0.0.4.007.bb (renamed from packages/efl/ewl_0.0.4.006.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/imlib2-fb_1.2.2.001.bb (renamed from packages/efl/imlib2-fb_1.2.1.011.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/imlib2-native_1.2.2.001.bb (renamed from packages/efl/imlib2-native_1.2.1.011.bb) | 0 | ||||
| -rw-r--r-- | packages/efl/imlib2-x11_1.2.2.001.bb (renamed from packages/efl/imlib2-x11_1.2.1.011.bb) | 0 | ||||
| -rw-r--r-- | packages/gcc/gcc3-build.inc | 3 | ||||
| -rw-r--r-- | packages/glibc/glibc_2.3.5+cvs20050627.bb | 5 | ||||
| -rw-r--r-- | packages/linux/linux-ezx/defconfig-e680 | 1295 | ||||
| -rw-r--r-- | packages/linux/linux-ezx/ezx-mmc-ro.patch | 24 | ||||
| -rw-r--r-- | packages/linux/linux-ezx/series | 26 | ||||
| -rw-r--r-- | packages/linux/linux-ezx_2.6.16.13.bb | 28 | ||||
| -rw-r--r-- | packages/linux/unslung-kernel/pl2303_mdmctl.patch | 59 | ||||
| -rw-r--r-- | packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 3 | ||||
| -rw-r--r-- | packages/ltrace/ltrace_0.3.36.bb | 5 | ||||
| -rw-r--r-- | packages/meta/task-opie.bb | 3 | ||||
| -rw-r--r-- | packages/nslu2-binary-only/unslung-rootfs/NOTES | 2 | ||||
| -rw-r--r-- | packages/python/python-pysqlite2_2.2.2.bb (renamed from packages/python/python-pysqlite2_2.0.2.bb) | 0 | ||||
| -rw-r--r-- | packages/qpphoto/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/qpphoto/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/qpphoto/files/draw.patch | 35 | ||||
| -rw-r--r-- | packages/qpphoto/files/drawview.patch | 11 | ||||
| -rw-r--r-- | packages/qpphoto/files/drawwidget.patch | 2414 | ||||
| -rw-r--r-- | packages/qpphoto/qpphoto_1.0.2.bb | 37 | ||||
| -rw-r--r-- | packages/tcltk/tk_8.4.11.bb | 4 | ||||
| -rw-r--r-- | packages/xlibs/libxi_X11R7.0-1.0.0.bb | 3 | ||||
| -rw-r--r-- | packages/xmms-embedded/xmms-embedded_20040327.bb | 11 |
54 files changed, 3915 insertions, 166 deletions
diff --git a/packages/e17/e-wm/remove-large-fonts.patch b/packages/e17/e-wm/remove-large-fonts.patch deleted file mode 100644 index 8ac1721a56..0000000000 --- a/packages/e17/e-wm/remove-large-fonts.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nur e~/data/fonts/Makefile.am e/data/fonts/Makefile.am ---- e~/data/fonts/Makefile.am 2005-08-31 09:54:20.000000000 -0700 -+++ e/data/fonts/Makefile.am 2005-08-31 09:54:42.000000000 -0700 -@@ -15,10 +15,6 @@ - baekmuk.COPYING \ - dotum.ttf \ - fonts.alias \ --fonts.dir \ --kochi-gothic.ttf \ --kochi.COPYING \ --fireflysung.ttf \ --fireflysung.COPYING -+fonts.dir - - EXTRA_DIST = $(files_DATA) -diff -Nur e~/data/fonts/fonts.dir e/data/fonts/fonts.dir ---- e~/data/fonts/fonts.dir 2005-08-31 09:54:20.000000000 -0700 -+++ e/data/fonts/fonts.dir 2005-08-31 09:54:56.000000000 -0700 -@@ -50,6 +50,3 @@ - VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-15 - VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-9 - dotum.ttf -misc-Baekmuk Dotum-medium-r-normal--0-0-0-0-p-0-iso8859-1 --kochi-gothic.ttf -misc-Kochi Gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0 --kochi-gothic.ttf -misc-Kochi Gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1 --fireflysung.ttf -misc-New Sung-medium-r-normal--0-0-0-0-p-0-iso8859-1 diff --git a/packages/e17/e-wm_0.16.999.025.bb b/packages/e17/e-wm_0.16.999.026.bb index 85ff7e6a03..df78fbdcd0 100644 --- a/packages/e17/e-wm_0.16.999.025.bb +++ b/packages/e17/e-wm_0.16.999.026.bb @@ -7,7 +7,6 @@ inherit e SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ - file://remove-large-fonts.patch;patch=1 \ file://Xsession.d/98enlightenment" # cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" diff --git a/packages/e17/entrance/disable-autodetect.patch b/packages/e17/entrance/disable-autodetect.patch index 7bb8fa4e74..a0412b3706 100644 --- a/packages/e17/entrance/disable-autodetect.patch +++ b/packages/e17/entrance/disable-autodetect.patch @@ -1,7 +1,8 @@ ---- entrance-0.9.0.006/Makefile.am.orig 2006-04-12 22:22:44.000000000 -0700 -+++ entrance-0.9.0.006/Makefile.am 2006-04-12 22:26:01.000000000 -0700 +diff -Nur entrance-0.9.0.007~/Makefile.am entrance-0.9.0.007/Makefile.am +--- entrance-0.9.0.007~/Makefile.am 2006-05-11 12:18:07.000000000 -0700 ++++ entrance-0.9.0.007/Makefile.am 2006-05-11 13:01:41.000000000 -0700 @@ -23,4 +23,3 @@ fi install-data-am: -- sh data/config/autodetect.sh +- sh data/config/autodetect.sh || : diff --git a/packages/e17/entrance_0.9.0.006.bb b/packages/e17/entrance_0.9.0.007.bb index 4237427d63..4237427d63 100644 --- a/packages/e17/entrance_0.9.0.006.bb +++ b/packages/e17/entrance_0.9.0.007.bb diff --git a/packages/efl/e_0.16.999.025.bb b/packages/efl/e_0.16.999.026.bb index 5078c71365..5078c71365 100644 --- a/packages/efl/e_0.16.999.025.bb +++ b/packages/efl/e_0.16.999.026.bb diff --git a/packages/efl/ecore-fb_0.9.9.025.bb b/packages/efl/ecore-fb_0.9.9.026.bb index a957c5dd8c..a957c5dd8c 100644 --- a/packages/efl/ecore-fb_0.9.9.025.bb +++ b/packages/efl/ecore-fb_0.9.9.026.bb diff --git a/packages/efl/ecore-native_0.9.9.025.bb b/packages/efl/ecore-native_0.9.9.026.bb index 299470841c..299470841c 100644 --- a/packages/efl/ecore-native_0.9.9.025.bb +++ b/packages/efl/ecore-native_0.9.9.026.bb diff --git a/packages/efl/ecore-x11_0.9.9.025.bb b/packages/efl/ecore-x11_0.9.9.026.bb index 3a88ad229b..3a88ad229b 100644 --- a/packages/efl/ecore-x11_0.9.9.025.bb +++ b/packages/efl/ecore-x11_0.9.9.026.bb diff --git a/packages/efl/edb-native_1.0.5.006.bb b/packages/efl/edb-native_1.0.5.007.bb index d83a3b77c6..d83a3b77c6 100644 --- a/packages/efl/edb-native_1.0.5.006.bb +++ b/packages/efl/edb-native_1.0.5.007.bb diff --git a/packages/efl/edb-utils_1.0.5.006.bb b/packages/efl/edb-utils_1.0.5.007.bb index 8d47e068a7..8d47e068a7 100644 --- a/packages/efl/edb-utils_1.0.5.006.bb +++ b/packages/efl/edb-utils_1.0.5.007.bb diff --git a/packages/efl/edb_1.0.5.006.bb b/packages/efl/edb_1.0.5.007.bb index a152530b47..a152530b47 100644 --- a/packages/efl/edb_1.0.5.006.bb +++ b/packages/efl/edb_1.0.5.007.bb diff --git a/packages/efl/edje-native_0.5.0.025.bb b/packages/efl/edje-native_0.5.0.026.bb index 5eb077922a..5eb077922a 100644 --- a/packages/efl/edje-native_0.5.0.025.bb +++ b/packages/efl/edje-native_0.5.0.026.bb diff --git a/packages/efl/edje-utils_0.5.0.025.bb b/packages/efl/edje-utils_0.5.0.026.bb index f8eb917e4d..f8eb917e4d 100644 --- a/packages/efl/edje-utils_0.5.0.025.bb +++ b/packages/efl/edje-utils_0.5.0.026.bb diff --git a/packages/efl/edje_0.5.0.025.bb b/packages/efl/edje_0.5.0.026.bb index d51dd119e4..d51dd119e4 100644 --- a/packages/efl/edje_0.5.0.025.bb +++ b/packages/efl/edje_0.5.0.026.bb diff --git a/packages/efl/eet-native_0.9.10.025.bb b/packages/efl/eet-native_0.9.10.026.bb index fa20c9fb30..fa20c9fb30 100644 --- a/packages/efl/eet-native_0.9.10.025.bb +++ b/packages/efl/eet-native_0.9.10.026.bb diff --git a/packages/efl/eet_0.9.10.025.bb b/packages/efl/eet_0.9.10.026.bb index 6e6032e098..6e6032e098 100644 --- a/packages/efl/eet_0.9.10.025.bb +++ b/packages/efl/eet_0.9.10.026.bb diff --git a/packages/efl/embryo-native_0.9.1.025.bb b/packages/efl/embryo-native_0.9.1.026.bb index a33adb7bd2..a33adb7bd2 100644 --- a/packages/efl/embryo-native_0.9.1.025.bb +++ b/packages/efl/embryo-native_0.9.1.026.bb diff --git a/packages/efl/embryo-utils_0.9.1.025.bb b/packages/efl/embryo-utils_0.9.1.026.bb index d507c53cce..d507c53cce 100644 --- a/packages/efl/embryo-utils_0.9.1.025.bb +++ b/packages/efl/embryo-utils_0.9.1.026.bb diff --git a/packages/efl/embryo_0.9.1.025.bb b/packages/efl/embryo_0.9.1.026.bb index 0009c0a149..0009c0a149 100644 --- a/packages/efl/embryo_0.9.1.025.bb +++ b/packages/efl/embryo_0.9.1.026.bb diff --git a/packages/efl/epeg_0.9.0.006.bb b/packages/efl/epeg_0.9.0.007.bb index c35ec63606..c35ec63606 100644 --- a/packages/efl/epeg_0.9.0.006.bb +++ b/packages/efl/epeg_0.9.0.007.bb diff --git a/packages/efl/epsilon_0.3.0.006.bb b/packages/efl/epsilon_0.3.0.007.bb index 58c0f02a45..58c0f02a45 100644 --- a/packages/efl/epsilon_0.3.0.006.bb +++ b/packages/efl/epsilon_0.3.0.007.bb diff --git a/packages/efl/esmart-fb_0.9.0.006.bb b/packages/efl/esmart-fb_0.9.0.007.bb index 35bef239ee..35bef239ee 100644 --- a/packages/efl/esmart-fb_0.9.0.006.bb +++ b/packages/efl/esmart-fb_0.9.0.007.bb diff --git a/packages/efl/esmart-x11_0.9.0.006.bb b/packages/efl/esmart-x11_0.9.0.007.bb index cb5cc1da91..cb5cc1da91 100644 --- a/packages/efl/esmart-x11_0.9.0.006.bb +++ b/packages/efl/esmart-x11_0.9.0.007.bb diff --git a/packages/efl/evas-fb_0.9.9.025.bb b/packages/efl/evas-fb_0.9.9.026.bb index 3f7847874c..3f7847874c 100644 --- a/packages/efl/evas-fb_0.9.9.025.bb +++ b/packages/efl/evas-fb_0.9.9.026.bb diff --git a/packages/efl/evas-native_0.9.9.025.bb b/packages/efl/evas-native_0.9.9.026.bb index cbcbe304e9..cbcbe304e9 100644 --- a/packages/efl/evas-native_0.9.9.025.bb +++ b/packages/efl/evas-native_0.9.9.026.bb diff --git a/packages/efl/evas-x11_0.9.9.025.bb b/packages/efl/evas-x11_0.9.9.026.bb index e130923816..e130923816 100644 --- a/packages/efl/evas-x11_0.9.9.025.bb +++ b/packages/efl/evas-x11_0.9.9.026.bb diff --git a/packages/efl/evas/fix-configure-0.9.9.025.patch b/packages/efl/evas/fix-configure-0.9.9.025.patch deleted file mode 100644 index 61e2446c24..0000000000 --- a/packages/efl/evas/fix-configure-0.9.9.025.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- evas-0.9.9.023/configure.in~ 2006-01-11 21:34:57.000000000 -0800 -+++ evas-0.9.9.023/configure.in 2006-02-03 12:15:45.000000000 -0800 -@@ -152,9 +152,7 @@ - [ - AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true) - AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend]) -- x_dir=${x_dir:-/usr/X11R6} -- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} -- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" -+ x_libs="-lX11 -lXext" - ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load" - ], - [ -@@ -423,10 +421,10 @@ - AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) - AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) - AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) -- x_dir=${x_dir:-/usr/X11R6}; -+ x_dir=${x_dir:-}; - x_cflags=${x_cflags:--I$x_dir/include} - x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" -- gl_cflags="-I/usr/include" -+ gl_cflags="" - gl_libs="-lGL -lGLU -lpthread" - gl_dir="" - ENGINE_GL_X11_PRG="evas_gl_x11_test" -@@ -489,7 +487,7 @@ - AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend]) - AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true) - AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support]) -- x_dir="/usr/X11R6"; -+ x_dir=""; - x_cflags="-I"$x_dir"/include" - x_libs="-L"$x_dir"/lib -lX11 -lXext" - ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test" diff --git a/packages/efl/evas/fix-configure-0.9.9.023.patch b/packages/efl/evas/fix-configure-0.9.9.026.patch index 61e2446c24..61e2446c24 100644 --- a/packages/efl/evas/fix-configure-0.9.9.023.patch +++ b/packages/efl/evas/fix-configure-0.9.9.026.patch diff --git a/packages/efl/evas/fix-configure-20060113.patch b/packages/efl/evas/fix-configure-20060113.patch deleted file mode 100644 index acd50c0282..0000000000 --- a/packages/efl/evas/fix-configure-20060113.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nur evas-0.9.9.015~/configure.in evas-0.9.9.015/configure.in ---- evas-0.9.9.015~/configure.in 2005-09-28 15:12:03.000000000 -0700 -+++ evas-0.9.9.015/configure.in 2005-09-28 15:13:05.000000000 -0700 -@@ -152,9 +152,7 @@ - [ - AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true) - AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend]) -- x_dir=${x_dir:-/usr/X11R6} -- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} -- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" -+ x_libs="-lX11 -lXext"; - ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load" - ], - [ -@@ -216,7 +214,7 @@ - X11/X.h, - [AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, true) - AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend]) -- xcb_dir=${x_dir:-/usr/X11R6} -+ xcb_dir=${x_dir:-} - xcb_cflags="${x_cflags:--I${x_includes:-$x_dir/include}} $XCB_CFLAGS $XCB_ICCCM_CFLAGS" - xcb_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} $XCB_LIBS $XCB_ICCCM_LIBS" - ENGINE_SOFTWARE_XCB_PRG="evas_software_xcb_test evas_software_xcb_perf_test evas_software_xcb_perf_load"], -@@ -430,10 +428,10 @@ - AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) - AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) - AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) -- x_dir=${x_dir:-/usr/X11R6}; -+ x_dir=${x_dir:-}; - x_cflags=${x_cflags:--I$x_dir/include} - x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" -- gl_cflags="-I/usr/include" -+ gl_cflags="" - gl_libs="-lGL -lGLU -lpthread" - gl_dir="" - ENGINE_GL_X11_PRG="evas_gl_x11_test" -@@ -496,7 +494,7 @@ - AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend]) - AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true) - AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support]) -- x_dir="/usr/X11R6"; -+ x_dir=""; - x_cflags="-I"$x_dir"/include" - x_libs="-L"$x_dir"/lib -lX11 -lXext" - ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test" diff --git a/packages/efl/ewl_0.0.4.006.bb b/packages/efl/ewl_0.0.4.007.bb index 85b85e0c05..85b85e0c05 100644 --- a/packages/efl/ewl_0.0.4.006.bb +++ b/packages/efl/ewl_0.0.4.007.bb diff --git a/packages/efl/imlib2-fb_1.2.1.011.bb b/packages/efl/imlib2-fb_1.2.2.001.bb index 09fecdaf8b..09fecdaf8b 100644 --- a/packages/efl/imlib2-fb_1.2.1.011.bb +++ b/packages/efl/imlib2-fb_1.2.2.001.bb diff --git a/packages/efl/imlib2-native_1.2.1.011.bb b/packages/efl/imlib2-native_1.2.2.001.bb index 6f8ebe477a..6f8ebe477a 100644 --- a/packages/efl/imlib2-native_1.2.1.011.bb +++ b/packages/efl/imlib2-native_1.2.2.001.bb diff --git a/packages/efl/imlib2-x11_1.2.1.011.bb b/packages/efl/imlib2-x11_1.2.2.001.bb index fec8b32205..fec8b32205 100644 --- a/packages/efl/imlib2-x11_1.2.1.011.bb +++ b/packages/efl/imlib2-x11_1.2.2.001.bb diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc index b7523c42f2..8048b45fba 100644 --- a/packages/gcc/gcc3-build.inc +++ b/packages/gcc/gcc3-build.inc @@ -10,11 +10,12 @@ S = "${WORKDIR}/gcc-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" BINV ?= "${PV}" -# gcj doesn't work on arm +# gcj doesn't work on some architectures JAVA = ",java" JAVA_arm = "" JAVA_armeb = "" JAVA_mipsel = "" +JAVA_sh3 = "" # gcc4-build sets this to f95 FORTRAN ?= "f77" LANGUAGES ?= "c,c++,${FORTRAN}${JAVA}" diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index d4220c80a6..61e3e84d6d 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -87,6 +87,11 @@ do_munge() { # Integrate ports into tree mv ${WORKDIR}/ports ${S} + # Need to copy some extra folder content for sh arch. - OE bug #954 + case ${TARGET_ARCH} in + sh*) cp ${WORKDIR}/libc/sysdeps/sh/${TARGET_ARCH}/*.S ${WORKDIR}/libc/sysdeps/sh;; + esac + # http://www.handhelds.org/hypermail/oe/51/5135.html # Some files were moved around between directories on # 2005-12-21, which means that any attempt to check out diff --git a/packages/linux/linux-ezx/defconfig-e680 b/packages/linux/linux-ezx/defconfig-e680 new file mode 100644 index 0000000000..d59985244e --- /dev/null +++ b/packages/linux/linux-ezx/defconfig-e680 @@ -0,0 +1,1295 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.16.5 +# Thu May 4 17:12:53 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="-ezx3" +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_EMBEDDED=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_ALL=y +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +# CONFIG_SHMEM is not set +CONFIG_CC_ALIGN_FUNCTIONS=0 +CONFIG_CC_ALIGN_LABELS=0 +CONFIG_CC_ALIGN_LOOPS=0 +CONFIG_CC_ALIGN_JUMPS=0 +CONFIG_SLAB=y +CONFIG_TINY_SHMEM=y +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set +CONFIG_OBSOLETE_INTERMODULE=m + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_OBSOLETE_MODPARM=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_KMOD is not set + +# +# Block layer +# + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_L7200 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_AT91RM9200 is not set +CONFIG_PXA_EZX=y + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_PXA_SHARPSL is not set +CONFIG_PXA_EZX_E680=y +# CONFIG_PXA_EZX_A780 is not set +CONFIG_PXA27x=y +CONFIG_IWMMXT=y +CONFIG_PXA_SSP=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_XSCALE_PMU=y + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootfstype=ext3 rootdelay=5 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off console=tty0 console=ttyS2,115200n8" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=m +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +CONFIG_NET_KEY=m +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=y +# CONFIG_IPV6_PRIVACY is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_INET6_TUNNEL=m +CONFIG_IPV6_TUNNEL=m +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +CONFIG_IP_NF_CONNTRACK_EVENTS=y +CONFIG_IP_NF_CONNTRACK_NETLINK=m +CONFIG_IP_NF_CT_PROTO_SCTP=m +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +CONFIG_IP_NF_NETBIOS_NS=m +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_AMANDA=m +CONFIG_IP_NF_PPTP=m +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_DSCP=m +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_HASHLIMIT=m +CONFIG_IP_NF_MATCH_POLICY=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_IP_NF_NAT_SNMP_BASIC=m +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_NAT_TFTP=m +CONFIG_IP_NF_NAT_AMANDA=m +CONFIG_IP_NF_NAT_PPTP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +# CONFIG_IP_NF_TARGET_ECN is not set +CONFIG_IP_NF_TARGET_DSCP=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_MULTIPORT=m +CONFIG_IP6_NF_MATCH_OWNER=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AHESP=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_POLICY=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set +CONFIG_NET_CLS_ROUTE=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIVHCI=m +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +CONFIG_CONNECTOR=m + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=m +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=3 +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=m +# CONFIG_MTD_BLOCK_RO is not set +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set +CONFIG_MTD_MAP_BANK_WIDTH_2=y +# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +# CONFIG_MTD_CFI_I2 is not set +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_OTP is not set +CONFIG_MTD_CFI_INTELEXT=m +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=m +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +CONFIG_MTD_XIP=y + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_SHARP_SL is not set +CONFIG_MTD_PXA27x=m +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLKMTD is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +CONFIG_MTD_DOC2001PLUS=m +CONFIG_MTD_DOCPROBE=m +CONFIG_MTD_DOCECC=m +# CONFIG_MTD_DOCPROBE_ADVANCED is not set +CONFIG_MTD_DOCPROBE_ADDRESS=0 + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_DISKONCHIP=m +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0 +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH is not set +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +# CONFIG_MTD_NAND_SHARPSL is not set +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM_COUNT=16 +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_ARCH_EZX_ROFLASH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +CONFIG_BLK_DEV_DM=m +CONFIG_DM_CRYPT=m +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=m +CONFIG_INPUT_TSDEV_SCREEN_X=240 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_PXA=y +CONFIG_INPUT_MOUSE=y +# CONFIG_MOUSE_PS2 is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=m +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_LIBPS2 is not set +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_NVRAM is not set +CONFIG_SA1100_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_RAW_DRIVER is not set +# CONFIG_LINUX_LED is not set +# CONFIG_BULVERDE_SRAM_DEV is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PXA=y +CONFIG_I2C_PXA_SLAVE=y +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_RTC_X1205_I2C is not set +# CONFIG_I2C_ADCM2700 is not set +# CONFIG_I2C_A780_CAMERA is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +CONFIG_SPI=y +CONFIG_SPI_DEBUG=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m + +# +# SPI Protocol Masters +# + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# Misc devices +# + +# +# Motorola EZX devices +# +# CONFIG_KEYPAD_A780 is not set +# CONFIG_KEYPAD_E680 is not set +# CONFIG_KEYLIGHT_A780 is not set +# CONFIG_FMRADIO_E680 is not set + +# +# Multimedia Capabilities Port drivers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_MODE_HELPERS is not set +CONFIG_FB_TILEBLITTING=y +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +CONFIG_FONT_MINI_4x6=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_DEVICE=y + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +# CONFIG_USB_DEVICEFS is not set +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +# CONFIG_USB_STORAGE is not set +CONFIG_USB_LIBUSUAL=y + +# +# USB Input Devices +# +# CONFIG_USB_HID is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_MTOUCH is not set +# CONFIG_USB_ITMTOUCH is not set +# CONFIG_USB_EGALAX is not set +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set + +# +# USB Multimedia devices +# +# CONFIG_USB_DABUSB is not set + +# +# Video4Linux support is needed for USB Multimedia device support +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGETKIT is not set +# CONFIG_USB_PHIDGETSERVO is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_LD is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DEBUG_FILES=y +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +CONFIG_USB_GADGET_PXA27X=y +CONFIG_USB_PXA27X=y +# CONFIG_USB_PXA27X_DMA is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=y + +# +# File systems +# +# CONFIG_EXT2_FS is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +CONFIG_ROMFS_FS=m +# CONFIG_INOTIFY is not set +# CONFIG_QUOTA is not set +# CONFIG_DNOTIFY is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +# CONFIG_TMPFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +CONFIG_RELAYFS_FS=m +CONFIG_CONFIGFS_FS=m + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_CRAMFS=y +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +# CONFIG_NFSD_V4 is not set +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=m +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_WAITQ is not set +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_TEST=m + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m + +# +# Dynamic Power Management +# +# CONFIG_DPM is not set diff --git a/packages/linux/linux-ezx/ezx-mmc-ro.patch b/packages/linux/linux-ezx/ezx-mmc-ro.patch new file mode 100644 index 0000000000..7f95c44c62 --- /dev/null +++ b/packages/linux/linux-ezx/ezx-mmc-ro.patch @@ -0,0 +1,24 @@ +This patch fixes the mmc/sd read-only detection, which is obviously only +available on E680 phones, and not on A780, since TransFlash doesn't have any +hardware write protection. + +Index: linux-2.6.16.13-ezx3/arch/arm/mach-pxa/ezx.c +=================================================================== +--- linux-2.6.16.13-ezx3.orig/arch/arm/mach-pxa/ezx.c 2006-05-12 19:32:03.000000000 +0200 ++++ linux-2.6.16.13-ezx3/arch/arm/mach-pxa/ezx.c 2006-05-13 15:22:51.000000000 +0200 +@@ -151,9 +153,13 @@ + static int ezx_mci_get_ro(struct device *dev) + { + printk("%s entered\n", __FUNCTION__); +- return (GPLR3 & 0x800); +- // return GPIO_is_high(96+4); ++#if defined(CONFIG_PXA_EZX_E680) + /* this is only e680, i guess */ ++ // return GPIO_is_high(96+4); ++ return (GPLR3 & 0x800); ++#else ++ return 0; ++#endif + } + + #if defined(CONFIG_PXA_EZX_A780) diff --git a/packages/linux/linux-ezx/series b/packages/linux/linux-ezx/series deleted file mode 100644 index da607fd4f5..0000000000 --- a/packages/linux/linux-ezx/series +++ /dev/null @@ -1,26 +0,0 @@ -patch-2.6.16.13 -dpm-core-2.6.16.patch -dpm-pxa27x-2.6.16.patch -pxa7xx_udc.patch -ezx_usb_gadged_serial_pxa27x.patch -pxa27x_udc-more.patch -ezx_defconfig.patch -ezx_core.patch -ezx_mtd.patch -ezx_roflash.patch -ezx_camera.patch -sa1100_rtc.patch -pxa_serial_bug_workaround.patch -ezx_sound.patch -pxa_serial_dpm.patch -ezxfb-fix-screensave.patch -keypad-module.patch -exz-platformdevices.patch -pxa_mtd_fix.patch -ezx_pxa_ssp.patch -pxamci_debug.patch -ssp_pcap_nobitbang.patch -pxamci-4bit.patch -a780-transflash_power.patch -ezx-kbd.patch -laforge_config.patch diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb index c91f947545..9ba090b69a 100644 --- a/packages/linux/linux-ezx_2.6.16.13.bb +++ b/packages/linux/linux-ezx_2.6.16.13.bb @@ -1,8 +1,8 @@ -DESCRIPTION = "2.6 Linux Development Kernel for the Motorola A780." +DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680" SECTION = "kernel" MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>" LICENSE = "GPL" -PR = "ezx3" +PR = "ezx3-r2" inherit kernel @@ -35,8 +35,10 @@ file://ssp_pcap_nobitbang.patch;patch=1 \ file://pxamci-4bit.patch;patch=1 \ file://a780-transflash_power.patch;patch=1 \ file://ezx-kbd.patch;patch=1 \ -file://laforge_config.patch;patch=1 \ -file://defconfig-a780" +file://ezx-mmc-ro.patch;patch=1 \ +\ +file://defconfig-a780 \ +file://defconfig-e680" S = "${WORKDIR}/linux-2.6.16" ############################################################## @@ -46,20 +48,14 @@ FILES_kernel-image = "" ALLOW_EMPTY = 1 COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(a780)' +COMPATIBLE_MACHINE = '(a780|e680)' -CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" -CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" -CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw" -CMDLINE_OTHER = "dyntick=enable" +CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 noinitrd" +CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5" +# CMDLINE_OTHER = "dyntick=enable" CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' - -CMDLINE_MEM_collie = "mem=${mem}M" -CMDLINE_ROTATE_spitz = "fbcon=rotate:1" -CMDLINE_ROTATE_akita = "fbcon=rotate:1" -CMDLINE_ROTATE_collie = "fbcon=rotate:1" -CMDLINE_ROTATE_poodle = "fbcon=rotate:1" -CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" +CMDLINE_IP = "ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off" +CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" ############################################################### # module configs specific to this kernel diff --git a/packages/linux/unslung-kernel/pl2303_mdmctl.patch b/packages/linux/unslung-kernel/pl2303_mdmctl.patch new file mode 100644 index 0000000000..aeebb9ea6e --- /dev/null +++ b/packages/linux/unslung-kernel/pl2303_mdmctl.patch @@ -0,0 +1,59 @@ +--- linux-2.4.22/drivers/usb/serial/pl2303.c 2006-05-12 16:05:17.000000000 -0400
++++ linux-2.4.22-fred/drivers/usb/serial/pl2303.c 2006-05-12 18:00:39.000000000 -0400
+@@ -642,14 +642,56 @@ static int wait_modem_info(struct usb_se
+ return 0;
+ }
+
++
+ static int pl2303_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg)
+ {
++ struct pl2303_private *priv = port->private;
++ unsigned int value;
++
+ dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd);
+
+ switch (cmd) {
+ case TIOCMIWAIT:
+ dbg("%s (%d) TIOCMIWAIT", __FUNCTION__, port->number);
+ return wait_modem_info(port, arg);
++
++ case TIOCMGET:
++ value = ((priv->line_control & CONTROL_DTR) ? TIOCM_DTR : 0)
++ | ((priv->line_control & CONTROL_RTS) ? TIOCM_RTS : 0)
++ | ((priv->line_status & UART_CTS) ? TIOCM_CTS : 0)
++ | ((priv->line_status & UART_DSR) ? TIOCM_DSR : 0)
++ | ((priv->line_status & UART_RING) ? TIOCM_RI : 0)
++ | ((priv->line_status & UART_DCD) ? TIOCM_CD : 0);
++
++ if (put_user(value, (unsigned int *) arg))
++ return -EFAULT;
++ return 0;
++
++ case TIOCMSET:
++ if (get_user(value, (unsigned int *) arg))
++ return -EFAULT;
++ priv->line_control &= ~(CONTROL_RTS | CONTROL_DTR);
++ priv->line_control |= ((arg & TIOCM_RTS) ? CONTROL_RTS : 0);
++ priv->line_control |= ((arg & TIOCM_DTR) ? CONTROL_DTR : 0);
++ return set_control_lines (port->serial->dev, priv->line_control);
++
++ case TIOCMBIS:
++ if (get_user(value, (unsigned int *) arg))
++ return -EFAULT;
++ if (value & TIOCM_RTS)
++ priv->line_control |= CONTROL_RTS;
++ if (value & TIOCM_DTR)
++ priv->line_control |= CONTROL_DTR;
++ return set_control_lines (port->serial->dev, priv->line_control);
++
++ case TIOCMBIC:
++ if (get_user(value, (unsigned int *) arg))
++ return -EFAULT;
++ if (value & TIOCM_RTS)
++ priv->line_control &= ~CONTROL_RTS;
++ if (value & TIOCM_DTR)
++ priv->line_control &= ~CONTROL_DTR;
++ return set_control_lines (port->serial->dev, priv->line_control);
+
+ default:
+ dbg("%s not supported = 0x%04x", __FUNCTION__, cmd);
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index c397a90efe..64868d289b 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>" -PR = "r12" +PR = "r13" KERNEL_SUFFIX = "unslung" @@ -22,6 +22,7 @@ SRC_URI += "file://linux-kernel-R25_to_R29.patch;patch=1 \ file://ppp_mppe.patch;patch=1 \ file://nfs-blocksize.patch;patch=1 \ file://pl2303.patch;patch=1 \ + file://pl2303_mdmctl.patch;patch=1 \ file://netconsole.patch;patch=1 \ file://ppp_mppe_no_fp_in_kernel.patch;patch=1 \ ${UNSLUNG_KERNEL_EXTRA_SRC_URI}" diff --git a/packages/ltrace/ltrace_0.3.36.bb b/packages/ltrace/ltrace_0.3.36.bb index aa116602ab..ae2c865f72 100644 --- a/packages/ltrace/ltrace_0.3.36.bb +++ b/packages/ltrace/ltrace_0.3.36.bb @@ -1,12 +1,13 @@ DESCRIPTION = "ltrace shows runtime library call information for dynamically linked executables." +HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html" SECTION = "devel" DEPENDS = "libelf" LICENSE = "GPL" +PR = "r1" SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36.orig.tar.gz\ ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz;patch=1\ file://mvc-toolchain.patch;patch=1" -# file://diska-ltrace-conf.patch;patch=1" inherit autotools @@ -22,5 +23,3 @@ export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGE do_compile() { oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} } - -do_install() { diff --git a/packages/meta/task-opie.bb b/packages/meta/task-opie.bb index 80bbd1384d..58feedf6c9 100644 --- a/packages/meta/task-opie.bb +++ b/packages/meta/task-opie.bb @@ -166,7 +166,8 @@ RDEPENDS_task-opie-irda = "irda-utils libopieobex0 obexftp obexpush" RDEPENDS_task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \ opie-rdesktop opie-wellenreiter opie-irc \ opie-mediaplayer2 \ - konqueror-embedded qpdf2" + qpdf2" +# konqueror-embedded RDEPENDS_task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \ opie-tetrix" diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES index 695be929c4..81cff3cb82 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/NOTES +++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES @@ -522,3 +522,5 @@ Include losetup with slingbox (so we have losetup in the firmware). Fix extraneous boot messages from jffs2 filesystem driver (change options used when building the flash jffs image). + +Added pl2303.c patch for TIOCMGET/MSET/MBIS/MBIC. diff --git a/packages/python/python-pysqlite2_2.0.2.bb b/packages/python/python-pysqlite2_2.2.2.bb index 124a2ed5bc..124a2ed5bc 100644 --- a/packages/python/python-pysqlite2_2.0.2.bb +++ b/packages/python/python-pysqlite2_2.2.2.bb diff --git a/packages/qpphoto/.mtn2git_empty b/packages/qpphoto/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qpphoto/.mtn2git_empty diff --git a/packages/qpphoto/files/.mtn2git_empty b/packages/qpphoto/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qpphoto/files/.mtn2git_empty diff --git a/packages/qpphoto/files/draw.patch b/packages/qpphoto/files/draw.patch new file mode 100644 index 0000000000..d4f7dd30a4 --- /dev/null +++ b/packages/qpphoto/files/draw.patch @@ -0,0 +1,35 @@ +--- qpPhoto_1.0.2/draw.cpp 2002-10-29 22:19:05.000000000 +0100 ++++ qpPhoto_1.0.2/draw.cpp.new 2006-05-12 18:42:08.000000000 +0200 +@@ -16,6 +16,7 @@ + #include <qspinbox.h> + #include <qpainter.h> + #include <qlabel.h> ++#include <qlayout.h> + #include <qdialog.h> + #include <qpe/fontdatabase.h> + #include <qstringlist.h> +@@ -781,7 +782,7 @@ + + + +-Draw::Draw( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ) ++Draw::Draw( QWidget* parent, const char* name, WFlags fl ) + :DrawWidget(parent, name, fl) + { + /*currentTool = dtNull; +@@ -799,9 +800,12 @@ + FontDatabase fdb; + availFonts = fdb.families(); + +- +- dv = new DrawView(GrFrame, "dv"); +- dv->setGeometry( QRect( 1, 1, 210, 210) ); ++ dv = new DrawView(this, "dv"); ++ dv->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, dv->sizePolicy().hasHeightForWidth() ) ); ++ dv->setMinimumSize( QSize( 210, 210 ) ); ++ dv->setFrameShape( QFrame::WinPanel ); ++ dv->setFrameShadow( QFrame::Sunken ); ++ Layout7->addWidget( dv ); + + dv->font.setFamily(availFonts[0]); + dv->font.setPointSize(12); diff --git a/packages/qpphoto/files/drawview.patch b/packages/qpphoto/files/drawview.patch new file mode 100644 index 0000000000..f64bef32a7 --- /dev/null +++ b/packages/qpphoto/files/drawview.patch @@ -0,0 +1,11 @@ +--- qpPhoto_1.0.2/drawview.cpp 2002-11-23 03:34:46.000000000 +0100 ++++ qpPhoto_1.0.2/drawview.cpp.new 2006-05-11 22:33:44.000000000 +0200 +@@ -32,7 +32,7 @@ + static const int zoomfactors[nzoomfactors] = {1,2,3,4,8,16,32}; // 25% 50% 75% 100% 200% 400% 800% + #define ZOOMINDEXNORMAL 3 + +-DrawView::DrawView(QWidget* parent = 0, const char* name = 0, WFlags fl = 0) ++DrawView::DrawView(QWidget* parent, const char* name, WFlags fl) + :QScrollView(parent, name, fl) + { + viewX = 0; diff --git a/packages/qpphoto/files/drawwidget.patch b/packages/qpphoto/files/drawwidget.patch new file mode 100644 index 0000000000..95a0a52a63 --- /dev/null +++ b/packages/qpphoto/files/drawwidget.patch @@ -0,0 +1,2414 @@ +--- qpPhoto_1.0.2/drawwidget.ui 2002-08-23 00:42:49.000000000 +0200 ++++ qpPhoto_1.0.2/drawwidget.ui.new 2006-05-12 18:32:14.000000000 +0200 +@@ -11,1160 +11,1287 @@ + <rect> + <x>0</x> + <y>0</y> +- <width>238</width> +- <height>262</height> ++ <width>451</width> ++ <height>294</height> + </rect> + </property> + <property stdset="1"> + <name>caption</name> + <string>DrawWidget</string> + </property> +- <widget> +- <class>QFrame</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>FrStatus</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>2</x> +- <y>236</y> +- <width>232</width> +- <height>18</height> +- </rect> +- </property> ++ <property> ++ <name>layoutMargin</name> ++ </property> ++ <property> ++ <name>layoutSpacing</name> ++ </property> ++ <vbox> + <property stdset="1"> +- <name>frameShape</name> +- <enum>StyledPanel</enum> ++ <name>margin</name> ++ <number>2</number> + </property> + <property stdset="1"> +- <name>frameShadow</name> +- <enum>Sunken</enum> ++ <name>spacing</name> ++ <number>2</number> + </property> + <widget> ++ <class>QLayoutWidget</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>Layout6</cstring> ++ </property> ++ <hbox> ++ <property stdset="1"> ++ <name>margin</name> ++ <number>0</number> ++ </property> ++ <property stdset="1"> ++ <name>spacing</name> ++ <number>6</number> ++ </property> ++ <widget> ++ <class>QLabel</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>TypeLabel</cstring> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string>Font</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QComboBox</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>Selection</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizeLimit</name> ++ <number>12</number> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>font</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QLabel</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>SizeLabel</cstring> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string>Size</string> ++ </property> ++ <property stdset="1"> ++ <name>alignment</name> ++ <set>AlignVCenter|AlignRight</set> ++ </property> ++ <property> ++ <name>hAlign</name> ++ </property> ++ </widget> ++ <widget> ++ <class>QSpinBox</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>Size</cstring> ++ </property> ++ <property stdset="1"> ++ <name>maxValue</name> ++ <number>24</number> ++ </property> ++ <property stdset="1"> ++ <name>minValue</name> ++ <number>6</number> ++ </property> ++ <property stdset="1"> ++ <name>value</name> ++ <number>12</number> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>size</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QComboBox</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>Operation</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizeLimit</name> ++ <number>16</number> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>Bold</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>28</width> ++ <height>28</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image0</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>flat</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>bold</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>Italic</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>28</width> ++ <height>28</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image1</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>flat</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>italic</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>Underline</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>28</width> ++ <height>28</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image2</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>flat</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>underline</string> ++ </property> ++ </widget> ++ <spacer> ++ <property> ++ <name>name</name> ++ <cstring>Spacer2</cstring> ++ </property> ++ <property stdset="1"> ++ <name>orientation</name> ++ <enum>Horizontal</enum> ++ </property> ++ <property stdset="1"> ++ <name>sizeType</name> ++ <enum>Expanding</enum> ++ </property> ++ <property> ++ <name>sizeHint</name> ++ <size> ++ <width>1</width> ++ <height>1</height> ++ </size> ++ </property> ++ </spacer> ++ </hbox> ++ </widget> ++ <widget> ++ <class>QLayoutWidget</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>Layout7</cstring> ++ </property> ++ <property> ++ <name>layoutSpacing</name> ++ </property> ++ <hbox> ++ <property stdset="1"> ++ <name>margin</name> ++ <number>0</number> ++ </property> ++ <property stdset="1"> ++ <name>spacing</name> ++ <number>0</number> ++ </property> ++ <widget> ++ <class>QLayoutWidget</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>Layout3</cstring> ++ </property> ++ <property> ++ <name>layoutSpacing</name> ++ </property> ++ <vbox> ++ <property stdset="1"> ++ <name>margin</name> ++ <number>0</number> ++ </property> ++ <property stdset="1"> ++ <name>spacing</name> ++ <number>0</number> ++ </property> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>PbCursor</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>21</width> ++ <height>21</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image3</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>move selection</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>PbBrush</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>21</width> ++ <height>21</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image4</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>paint</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>PbLine</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>21</width> ++ <height>21</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image5</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>draw lines</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>PbPolygon</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>21</width> ++ <height>21</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image6</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>draw shapes</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>PbSelect</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>21</width> ++ <height>21</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image7</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>select region</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>PbText</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>21</width> ++ <height>21</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>font</name> ++ <font> ++ <family>abisource-courier new</family> ++ <pointsize>14</pointsize> ++ <bold>1</bold> ++ </font> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image8</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>insert text</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>PbFill</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>21</width> ++ <height>21</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image9</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>fill</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>PbPicker</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>21</width> ++ <height>21</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image10</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>pick color</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>PbErazor</cstring> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>21</width> ++ <height>21</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>pixmap</name> ++ <pixmap>image11</pixmap> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property stdset="1"> ++ <name>toggleButton</name> ++ <bool>true</bool> ++ </property> ++ <property> ++ <name>toolTip</name> ++ <string>erease</string> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>FgColor</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>18</width> ++ <height>16</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>palette</name> ++ <palette> ++ <active> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>192</red> ++ <green>192</green> ++ <blue>192</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>128</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ </active> ++ <disabled> ++ <color> ++ <red>128</red> ++ <green>128</green> ++ <blue>128</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>128</red> ++ <green>128</green> ++ <blue>128</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>192</red> ++ <green>192</green> ++ <blue>192</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>128</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ </disabled> ++ <inactive> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>192</red> ++ <green>192</green> ++ <blue>192</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>128</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ </inactive> ++ </palette> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>flat</name> ++ <bool>true</bool> ++ </property> ++ </widget> ++ <widget> ++ <class>QPushButton</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>BgColor</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>18</width> ++ <height>16</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>palette</name> ++ <palette> ++ <active> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>127</red> ++ <green>127</green> ++ <blue>127</blue> ++ </color> ++ <color> ++ <red>170</red> ++ <green>170</green> ++ <blue>170</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>192</red> ++ <green>192</green> ++ <blue>192</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>128</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ </active> ++ <disabled> ++ <color> ++ <red>128</red> ++ <green>128</green> ++ <blue>128</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>127</red> ++ <green>127</green> ++ <blue>127</blue> ++ </color> ++ <color> ++ <red>170</red> ++ <green>170</green> ++ <blue>170</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>128</red> ++ <green>128</green> ++ <blue>128</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>192</red> ++ <green>192</green> ++ <blue>192</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>128</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ </disabled> ++ <inactive> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>127</red> ++ <green>127</green> ++ <blue>127</blue> ++ </color> ++ <color> ++ <red>170</red> ++ <green>170</green> ++ <blue>170</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ <color> ++ <red>192</red> ++ <green>192</green> ++ <blue>192</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>0</blue> ++ </color> ++ <color> ++ <red>0</red> ++ <green>0</green> ++ <blue>128</blue> ++ </color> ++ <color> ++ <red>255</red> ++ <green>255</green> ++ <blue>255</blue> ++ </color> ++ </inactive> ++ </palette> ++ </property> ++ <property stdset="1"> ++ <name>text</name> ++ <string></string> ++ </property> ++ <property stdset="1"> ++ <name>flat</name> ++ <bool>true</bool> ++ </property> ++ </widget> ++ <spacer> ++ <property> ++ <name>name</name> ++ <cstring>Spacer1</cstring> ++ </property> ++ <property stdset="1"> ++ <name>orientation</name> ++ <enum>Vertical</enum> ++ </property> ++ <property stdset="1"> ++ <name>sizeType</name> ++ <enum>Expanding</enum> ++ </property> ++ <property> ++ <name>sizeHint</name> ++ <size> ++ <width>20</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ </vbox> ++ </widget> ++ <widget> ++ <class>QFrame</class> ++ <property stdset="1"> ++ <name>name</name> ++ <cstring>GrFrame</cstring> ++ </property> ++ <property stdset="1"> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>0</hsizetype> ++ <vsizetype>7</vsizetype> ++ </sizepolicy> ++ </property> ++ <property stdset="1"> ++ <name>minimumSize</name> ++ <size> ++ <width>0</width> ++ <height>0</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>maximumSize</name> ++ <size> ++ <width>1</width> ++ <height>32767</height> ++ </size> ++ </property> ++ <property stdset="1"> ++ <name>frameShape</name> ++ <enum>NoFrame</enum> ++ </property> ++ <property stdset="1"> ++ <name>frameShadow</name> ++ <enum>Plain</enum> ++ </property> ++ <property stdset="1"> ++ <name>lineWidth</name> ++ <number>0</number> ++ </property> ++ </widget> ++ </hbox> ++ </widget> ++ <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>StatusLine</cstring> + </property> + <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>2</x> +- <y>2</y> +- <width>228</width> +- <height>14</height> +- </rect> ++ <name>sizePolicy</name> ++ <sizepolicy> ++ <hsizetype>5</hsizetype> ++ <vsizetype>0</vsizetype> ++ </sizepolicy> + </property> + <property stdset="1"> +- <name>text</name> +- <string>Status</string> ++ <name>frameShape</name> ++ <enum>Box</enum> ++ </property> ++ <property stdset="1"> ++ <name>frameShadow</name> ++ <enum>Sunken</enum> + </property> + <property stdset="1"> +- <name>indent</name> +- <number>1</number> ++ <name>text</name> ++ <string>Status</string> + </property> + </widget> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Italic</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>192</x> +- <y>1</y> +- <width>20</width> +- <height>22</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image0</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>flat</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>italic</string> +- </property> +- </widget> +- <widget> +- <class>QSpinBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Size</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>135</x> +- <y>0</y> +- <width>36</width> +- <height>23</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>maxValue</name> +- <number>24</number> +- </property> +- <property stdset="1"> +- <name>minValue</name> +- <number>6</number> +- </property> +- <property stdset="1"> +- <name>value</name> +- <number>12</number> +- </property> +- <property> +- <name>toolTip</name> +- <string>size</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Bold</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>172</x> +- <y>1</y> +- <width>20</width> +- <height>22</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image1</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>flat</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>bold</string> +- </property> +- </widget> +- <widget> +- <class>QLabel</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>TypeLabel</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>1</x> +- <y>3</y> +- <width>27</width> +- <height>20</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Font</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Underline</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>212</x> +- <y>1</y> +- <width>20</width> +- <height>22</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image2</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>flat</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>underline</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>FgColor</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>1</x> +- <y>204</y> +- <width>18</width> +- <height>16</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>palette</name> +- <palette> +- <active> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>192</red> +- <green>192</green> +- <blue>192</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>128</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- </active> +- <disabled> +- <color> +- <red>128</red> +- <green>128</green> +- <blue>128</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>128</red> +- <green>128</green> +- <blue>128</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>192</red> +- <green>192</green> +- <blue>192</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>128</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- </disabled> +- <inactive> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>192</red> +- <green>192</green> +- <blue>192</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>128</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- </inactive> +- </palette> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>flat</name> +- <bool>true</bool> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>BgColor</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>1</x> +- <y>219</y> +- <width>18</width> +- <height>16</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>palette</name> +- <palette> +- <active> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>127</red> +- <green>127</green> +- <blue>127</blue> +- </color> +- <color> +- <red>170</red> +- <green>170</green> +- <blue>170</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>192</red> +- <green>192</green> +- <blue>192</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>128</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- </active> +- <disabled> +- <color> +- <red>128</red> +- <green>128</green> +- <blue>128</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>127</red> +- <green>127</green> +- <blue>127</blue> +- </color> +- <color> +- <red>170</red> +- <green>170</green> +- <blue>170</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>128</red> +- <green>128</green> +- <blue>128</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>192</red> +- <green>192</green> +- <blue>192</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>128</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- </disabled> +- <inactive> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>127</red> +- <green>127</green> +- <blue>127</blue> +- </color> +- <color> +- <red>170</red> +- <green>170</green> +- <blue>170</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- <color> +- <red>192</red> +- <green>192</green> +- <blue>192</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>0</blue> +- </color> +- <color> +- <red>0</red> +- <green>0</green> +- <blue>128</blue> +- </color> +- <color> +- <red>255</red> +- <green>255</green> +- <blue>255</blue> +- </color> +- </inactive> +- </palette> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>flat</name> +- <bool>true</bool> +- </property> +- </widget> +- <widget> +- <class>QLabel</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>SizeLabel</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>111</x> +- <y>4</y> +- <width>23</width> +- <height>16</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Size</string> +- </property> +- <property stdset="1"> +- <name>alignment</name> +- <set>AlignVCenter|AlignRight</set> +- </property> +- <property> +- <name>hAlign</name> +- </property> +- </widget> +- <widget> +- <class>QComboBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Selection</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>32</x> +- <y>0</y> +- <width>80</width> +- <height>23</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>sizeLimit</name> +- <number>12</number> +- </property> +- <property> +- <name>toolTip</name> +- <string>font</string> +- </property> +- </widget> +- <widget> +- <class>QComboBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Operation</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>171</x> +- <y>0</y> +- <width>61</width> +- <height>22</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>sizeLimit</name> +- <number>16</number> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>PbCursor</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>0</x> +- <y>24</y> +- <width>21</width> +- <height>21</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image3</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>move selection</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>PbBrush</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>0</x> +- <y>44</y> +- <width>21</width> +- <height>21</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image4</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>paint</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>PbLine</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>0</x> +- <y>64</y> +- <width>21</width> +- <height>21</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image5</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>draw lines</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>PbPolygon</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>0</x> +- <y>84</y> +- <width>21</width> +- <height>21</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image6</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>draw shapes</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>PbSelect</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>0</x> +- <y>104</y> +- <width>21</width> +- <height>21</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image7</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>select region</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>PbText</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>0</x> +- <y>124</y> +- <width>21</width> +- <height>21</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>font</name> +- <font> +- <family>abisource-courier new</family> +- <pointsize>14</pointsize> +- <bold>1</bold> +- </font> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image8</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>insert text</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>PbFill</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>0</x> +- <y>144</y> +- <width>21</width> +- <height>21</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image9</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>fill</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>PbPicker</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>0</x> +- <y>164</y> +- <width>21</width> +- <height>21</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image10</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>pick color</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>PbErazor</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>0</x> +- <y>184</y> +- <width>21</width> +- <height>21</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- <property stdset="1"> +- <name>pixmap</name> +- <pixmap>image11</pixmap> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>toggleButton</name> +- <bool>true</bool> +- </property> +- <property> +- <name>toolTip</name> +- <string>erease</string> +- </property> +- </widget> +- <widget> +- <class>QFrame</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>GrFrame</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>22</x> +- <y>24</y> +- <width>212</width> +- <height>212</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>frameShape</name> +- <enum>WinPanel</enum> +- </property> +- <property stdset="1"> +- <name>frameShadow</name> +- <enum>Sunken</enum> +- </property> +- </widget> ++ </vbox> + </widget> + <images> + <image> + <name>image0</name> +- <data format="XPM.GZ" length="394">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022230543251d2e253d856405bffcbc54105b19c856360003b0141a40882983009a981e4c884a627021ea882184a822860801147fc08152ad351700811545c3</data> ++ <data format="XPM.GZ" length="394">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022230543251d2e253d856405bffcbc54105b19c856360003b0141a808829c30092981e840b15441183526489619887db5eace629a38be95120866c073c0c90dd871a56b5d65c00316543a8</data> + </image> + <image> + <name>image1</name> +- <data format="XPM.GZ" length="394">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022230543251d2e253d856405bffcbc54105b19c856360003b0141a808829c30092981e840b15441183526489619887db5eace629a38be95120866c073c0c90dd871a56b5d65c00316543a8</data> ++ <data format="XPM.GZ" length="394">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022230543251d2e253d856405bffcbc54105b19c856360003b0141a40882983009a981e4c884a627021ea882184a822860801147fc08152ad351700811545c3</data> + </image> + <image> + <name>image2</name> diff --git a/packages/qpphoto/qpphoto_1.0.2.bb b/packages/qpphoto/qpphoto_1.0.2.bb new file mode 100644 index 0000000000..9cd1314bb0 --- /dev/null +++ b/packages/qpphoto/qpphoto_1.0.2.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Painting program. Small picture editor." +HOMEPAGE = "http://zaurus.colognearts.de/qpphoto/" +SECTION = "opie/applications" +PRIORITY = "optional" +LICENSE = "GPL" +APPNAME = "qpPhoto" +APPTYPE = "binary" +APPDESKTOP = "${S}" + +PR = "r0" + +inherit opie + +SRC_URI = "http://zaurus.colognearts.de/qpphoto/qpPhoto_1.0.2_src.tar.gz \ + file://draw.patch;patch=1 \ + file://drawview.patch;patch=1 \ + file://drawwidget.patch;patch=1 " + +S = "${WORKDIR}/qpPhoto_1.0.2" + +do_compile() { + export STAGING_BINDIR=${STAGING_BINDIR} + oe_runmake clean + oe_runmake +} + +do_install() { +# install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics +# install -d ${D}${bindir} + + install -m 0644 qpPhoto.png ${D}${palmtopdir}/pics +# install -m 0644 qpPhoto.desktop ${D}${palmtopdir}/apps/Applications +# install -m 0755 qpPhoto ${D}${bindir} +} + +# FILES_${PN} = " ${palmtopdir}/apps/Applications/qpPhoto.desktop ${palmtopdir}/pics/qpPhoto.png ${bindir}/qpPhoto " diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb index b3d2733870..09b7c94320 100644 --- a/packages/tcltk/tk_8.4.11.bb +++ b/packages/tcltk/tk_8.4.11.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Tool Command Language ToolKit Extension" LICENSE = "tcl" SECTION = "devel/tcltk" HOMEPAGE = "http://tcl.sourceforge.net" -DEPENDS = "tcl libx11" +DEPENDS = "tcl libx11 libxt" RDEPENDS = "tcl" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ file://disable-xim.patch;patch=1;pnum=0 \ diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb index fa63e588f3..20a29e094a 100644 --- a/packages/xlibs/libxi_X11R7.0-1.0.0.bb +++ b/packages/xlibs/libxi_X11R7.0-1.0.0.bb @@ -1,9 +1,8 @@ DESCRIPTION = "X Input extension library." SECTION = "x11/libs" -#MAINTAINER = "" LICENSE = "MIT-X" -DEPENDS = "xproto libx11 xextproto" +DEPENDS = "xproto libx11 xext" XORG_PN = "libXi" diff --git a/packages/xmms-embedded/xmms-embedded_20040327.bb b/packages/xmms-embedded/xmms-embedded_20040327.bb index 9e8cc13754..c525f6299c 100644 --- a/packages/xmms-embedded/xmms-embedded_20040327.bb +++ b/packages/xmms-embedded/xmms-embedded_20040327.bb @@ -2,9 +2,9 @@ DESCRIPTION = "XMMS embedded - lightweight audio player with video and codec plu SECTION = "opie/multimedia" DEPENDS = "zlib tremor libmad libid3tag libsidplay glib-2.0 libmikmod-3.1.11" LICENSE = "GPL" -PR = "r3" +PR = "r4" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/xmms-embedded;module=xmms-embedded;date=${PV} \ +SRC_URI = "cvs://anonymous@xmms-embedded.cvs.sourceforge.net/cvsroot/xmms-embedded;module=xmms-embedded;date=${PV} \ file://bogusincdir.patch;patch=1 \ file://gtkremoval.patch;patch=1 \ file://removenativeincdir.patch;patch=1 \ @@ -13,14 +13,15 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/xmms-embedded;module=xmms file://bufferdefaults.patch;patch=1 \ file://gcc34.patch;patch=1 \ file://gcc34-enum.patch;patch=1 \ - file://mikmod-endian.patch;patch=1 \ - file://mikmod-update.patch;patch=1 \ + file://mikmod-endian.patch;patch=1 \ + file://mikmod-update.patch;patch=1 \ file://xmms.png" S = "${WORKDIR}/xmms-embedded" inherit palmtop -EXTRA_QMAKEVARS_POST += "CONFIG-=thread LIBS+=-lpthread LIBS+=-Wl,-rpath-link,${STAGING_LIBDIR} DEFINES+=_REENTRANT" +EXTRA_QMAKEVARS_POST += "LIBS+=-Wl,-rpath-link,${STAGING_LIBDIR} DEFINES+=_REENTRANT" + QMAKE_PROFILES = "xmms-e.pro" export OE_QMAKE_LINK="${CXX}" |