summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-10-20 06:57:59 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2006-10-20 06:57:59 +0000
commit272312d86a6d0d5e8045b66e9f381b1974a2ffca (patch)
tree621db03a4288ae84a28be7f39b66f29509e371e3
parentc6ea5e057c49dbf40b6e495ea1e29890cbeb2ae0 (diff)
parente59264b9bfe147bf874cb884bc474882cc1e73d1 (diff)
merge of '2754e872d313aa16f8b70a6b1475a5fe5cd1b5c0'
and 'f8e3d83965086984baadee15f33b6b7a0bdfe743'
-rw-r--r--conf/machine/logicpd-pxa270.conf9
-rw-r--r--packages/sdcc/files/.mtn2git_empty0
-rw-r--r--packages/sdcc/files/gcc4.patch13
-rw-r--r--packages/sdcc/sdcc_2.5.0.bb5
-rw-r--r--packages/sylpheed/sylpheed_2.2.9.bb32
5 files changed, 55 insertions, 4 deletions
diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
index 206958c2ce..efb19aea93 100644
--- a/conf/machine/logicpd-pxa270.conf
+++ b/conf/machine/logicpd-pxa270.conf
@@ -16,7 +16,12 @@ SERIAL_CONSOLE = "115200 ttyS0"
# used by opie-collections.inc
ROOT_FLASH_SIZE = "32"
-# EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000"
-EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000"
+
+# default flash partition setup of the LogicPD flash board is:
+# 0x00000000-0x000c0000 : "Bootloader"
+# 0x000c0000-0x01000000 : "YAFFS"
+# 0x01000000-0x02000000 : "Filesystem" (JFFS2)
+
+EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
diff --git a/packages/sdcc/files/.mtn2git_empty b/packages/sdcc/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sdcc/files/.mtn2git_empty
diff --git a/packages/sdcc/files/gcc4.patch b/packages/sdcc/files/gcc4.patch
new file mode 100644
index 0000000000..31eed50df8
--- /dev/null
+++ b/packages/sdcc/files/gcc4.patch
@@ -0,0 +1,13 @@
+Index: sdcc/sim/ucsim/cmd.src/newcmdcl.h
+===================================================================
+--- sdcc.orig/sim/ucsim/cmd.src/newcmdcl.h
++++ sdcc/sim/ucsim/cmd.src/newcmdcl.h
+@@ -124,7 +124,7 @@ public:
+ cl_console(int portnumber, class cl_app *the_app);
+ #endif
+ virtual ~cl_console(void);
+- virtual class cl_console *cl_console::clone_for_exec(char *fin);
++ virtual class cl_console *clone_for_exec(char *fin);
+ virtual int init(void);
+
+ virtual bool accept_last(void);
diff --git a/packages/sdcc/sdcc_2.5.0.bb b/packages/sdcc/sdcc_2.5.0.bb
index 65eaf02d44..117770efd8 100644
--- a/packages/sdcc/sdcc_2.5.0.bb
+++ b/packages/sdcc/sdcc_2.5.0.bb
@@ -2,9 +2,10 @@ DESCRIPTION= "SDCC - Small Device C Compiler"
LICENSE = "GPL"
SECTION = "devel"
HOMEPAGE = "http://sdcc.sourceforge.net"
-PR = "r0"
+PR = "r1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-${PV}.tar.gz \
+ file://gcc4.patch;patch=1"
S = "${WORKDIR}/sdcc"
PARALLEL_MAKE = ""
diff --git a/packages/sylpheed/sylpheed_2.2.9.bb b/packages/sylpheed/sylpheed_2.2.9.bb
new file mode 100644
index 0000000000..6223624fc5
--- /dev/null
+++ b/packages/sylpheed/sylpheed_2.2.9.bb
@@ -0,0 +1,32 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ gpgme gnutls"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \
+ file://sylpheed-2.2.2-libsylph-Makefile-am.patch;patch=1 \
+ file://sylpheed-2.2.2-src-Makefile-am.patch;patch=1 \
+ file://sylpheed-gnutls_2.2.4.patch;patch=1"
+
+
+FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN}-doc += "${datadir}"
+
+EXTRA_OECONF = "--disable-ssl --enable-gnutls"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_configure_prepend() {
+ mkdir -p m4
+}
+
+inherit autotools
+
+do_install_append() {
+ install -d ${D}${datadir}/applications
+ install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
+ install -d ${D}${datadir}/pixmaps
+ install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
+}
+