diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-20 19:33:24 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-20 19:33:24 +0000 |
| commit | 364dd693a0d3ccea4a215ea38bfe20587a330c39 (patch) | |
| tree | 9c06e58a510bddc7c81e58b155b7be0cf82d7280 | |
| parent | 713ffb0ef8118b1fe233a209a95c740d2885b1e1 (diff) | |
| parent | 3833d213c0eb428b3664e27e4622fbecdcb3b76e (diff) | |
merge of 595aea330d5742253d5d1cca25ea86a0c2814685
and 82bcdbbeb00c95318d566c7433ccdc8ac512737e
29 files changed, 989 insertions, 55 deletions
diff --git a/packages/gpe-mininet/gpe-mininet-0.4/.mtn2git_empty b/packages/contacts/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpe-mininet/gpe-mininet-0.4/.mtn2git_empty +++ b/packages/contacts/.mtn2git_empty diff --git a/packages/contacts/contacts_0.1.bb b/packages/contacts/contacts_0.1.bb new file mode 100644 index 0000000000..aff86a1c65 --- /dev/null +++ b/packages/contacts/contacts_0.1.bb @@ -0,0 +1,32 @@ +LICENSE = "LGPL" +SECTION = "x11" +DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" +MAINTAINER = "Chris Lord <chris@openedhand.com>" +DESCRIPTION = "Contacts is an address-book application." + +SRC_URI = "svn://svn.o-hand.com/repos/${PN}/tags;module=release-0.1;proto=http \ + file://stock_contact.png \ + file://stock_person.png \ + file://index.theme" + +inherit autotools pkgconfig + +S = "${WORKDIR}/release-0.1" + +do_install_append () { + install -d ${D}/${datadir}/icons/hicolor/48x48/stock/net + install -d ${D}/${datadir}/icons/hicolor/48x48/stock/generic + + install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/icons/hicolor/48x48/stock/net + install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/icons/hicolor/48x48/stock/generic + install -m 0644 ${WORKDIR}/index.theme ${D}/${datadir}/icons/hicolor +} + +FILES_${PN} += "${datadir}/icons/hicolor/48x48/apps/oh-contacts.png \ + ${datadir}/icons/hicolor/48x48/stock/*/*.png \ + ${datadir}/icons/hicolor/index.theme" + +pkg_postinst_${PN} () { + gtk-update-icon-cache /usr/share/icons/hicolor +} + diff --git a/packages/contacts/contacts_svn.bb b/packages/contacts/contacts_svn.bb new file mode 100644 index 0000000000..f73c52f857 --- /dev/null +++ b/packages/contacts/contacts_svn.bb @@ -0,0 +1,39 @@ +LICENSE = "LGPL" +SECTION = "x11" +DEPENDS = "glib-2.0 gtk+ libglade eds-dbus gnome-vfs" +RDEPENDS = "gnome-vfs-plugin-file" +RRECOMMENDS = "gnome-vfs-plugin-http" +MAINTAINER = "Richard Purdie <richard@openedhand.com>" +DESCRIPTION = "Contacts is an address-book application." +PR = "r3" + +PV = "0.1+svn${SRCDATE}" + +SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ + file://stock_contact.png \ + file://stock_person.png \ + file://index.theme" + +inherit autotools pkgconfig + +S = "${WORKDIR}/trunk" + +EXTRA_OECONF = "--enable-gnome-vfs" + +do_install_append () { + install -d ${D}/${datadir}/icons/hicolor/48x48/stock/net + install -d ${D}/${datadir}/icons/hicolor/48x48/stock/generic + + install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/icons/hicolor/48x48/stock/net + install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/icons/hicolor/48x48/stock/generic + install -m 0644 ${WORKDIR}/index.theme ${D}/${datadir}/icons/hicolor +} + +FILES_${PN} += "${datadir}/icons/hicolor/48x48/apps/oh-contacts.png \ + ${datadir}/icons/hicolor/48x48/stock/*/*.png \ + ${datadir}/icons/hicolor/index.theme" + +pkg_postinst_${PN} () { + gtk-update-icon-cache /usr/share/icons/hicolor +} + diff --git a/packages/contacts/files/.mtn2git_empty b/packages/contacts/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/contacts/files/.mtn2git_empty diff --git a/packages/contacts/files/index.theme b/packages/contacts/files/index.theme new file mode 100644 index 0000000000..4e9cf67820 --- /dev/null +++ b/packages/contacts/files/index.theme @@ -0,0 +1,654 @@ +[Icon Theme] +Name=Hicolor +Comment=Fallback icon theme +Hidden=true +Directories=192x192/apps,128x128/actions,128x128/apps,128x128/devices,128x128/filesystems,128x128/mimetypes,96x96/actions,96x96/apps,96x96/devices,96x96/filesystems,96x96/mimetypes,72x72/apps,64x64/actions,64x64/apps,64x64/devices,64x64/filesystems,64x64/mimetypes,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,36x36/apps,32x32/actions,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes,22x22/actions,22x22/apps,22x22/devices,22x22/filesystems,22x22/mimetypes,16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,scalable/actions,scalable/apps,scalable/devices,scalable/filesystems,scalable/mimetypes,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,24x24/actions,24x24/apps,24x24/devices,24x24/filesystems,24x24/mimetypes,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/document,32x32/stock/form,32x32/stock/generic,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/document,36x36/stock/form,36x36/stock/generic,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/document,48x48/stock/form,48x48/stock/generic,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,scalable/emblems,192x192/emblems,96x96/emblems,72x72/emblems,48x48/emblems,36x36/emblems,24x24/emblems,16x16/emblems,12x12/emblems + +[16x16/actions] +Size=16 +Context=Actions +Type=Threshold + +[16x16/apps] +Size=16 +Context=Applications +Type=Threshold + +[16x16/devices] +Size=16 +Context=Devices +Type=Threshold + +[16x16/filesystems] +Size=16 +Context=FileSystems +Type=Threshold + +[16x16/mimetypes] +Size=16 +Context=MimeTypes +Type=Threshold + +[22x22/actions] +Size=22 +Context=Actions +Type=Threshold + +[22x22/apps] +Size=22 +Context=Applications +Type=Threshold + +[22x22/devices] +Size=22 +Context=Devices +Type=Threshold + +[22x22/filesystems] +Size=22 +Context=FileSystems +Type=Threshold + +[22x22/mimetypes] +Size=22 +Context=MimeTypes +Type=Threshold + +[24x24/actions] +Size=24 +Context=Actions +Type=Threshold + +[24x24/apps] +Size=24 +Context=Applications +Type=Threshold + +[24x24/devices] +Size=24 +Context=Devices +Type=Threshold + +[24x24/filesystems] +Size=24 +Context=FileSystems +Type=Threshold + +[24x24/mimetypes] +Size=24 +Context=MimeTypes +Type=Threshold + +[32x32/actions] +Size=32 +Context=Actions +Type=Threshold + +[32x32/apps] +Size=32 +Context=Applications +Type=Threshold + +[32x32/devices] +Size=32 +Context=Devices +Type=Threshold + +[32x32/filesystems] +Size=32 +Context=FileSystems +Type=Threshold + +[32x32/mimetypes] +Size=32 +Context=MimeTypes +Type=Threshold + +[36x36/apps] +Size=36 +Context=Applications +Type=Threshold + +[48x48/actions] +Size=48 +Context=Actions +Type=Threshold + +[48x48/apps] +Size=48 +Context=Applications +Type=Threshold + +[48x48/devices] +Size=48 +Context=Devices +Type=Threshold + +[48x48/filesystems] +Size=48 +Context=FileSystems +Type=Threshold + +[48x48/mimetypes] +Size=48 +Context=MimeTypes +Type=Threshold + +[64x64/actions] +Size=64 +Context=Actions +Type=Threshold + +[64x64/apps] +Size=64 +Context=Applications +Type=Threshold + +[64x64/devices] +Size=64 +Context=Devices +Type=Threshold + +[64x64/filesystems] +Size=64 +Context=FileSystems +Type=Threshold + +[64x64/mimetypes] +Size=64 +Context=MimeTypes +Type=Threshold + +[72x72/apps] +Size=72 +Context=Applications +Type=Threshold + +[96x96/actions] +Size=96 +Context=Actions +Type=Threshold + +[96x96/apps] +Size=96 +Context=Applications +Type=Threshold + +[96x96/devices] +Size=96 +Context=Devices +Type=Threshold + +[96x96/filesystems] +Size=96 +Context=FileSystems +Type=Threshold + +[96x96/mimetypes] +Size=96 +Context=MimeTypes +Type=Threshold + +[128x128/actions] +Size=128 +Context=Actions +Type=Threshold + +[128x128/apps] +Size=128 +Context=Applications +Type=Threshold + +[128x128/devices] +Size=128 +Context=Devices +Type=Threshold + +[128x128/filesystems] +Size=128 +Context=FileSystems +Type=Threshold + +[128x128/mimetypes] +Size=128 +Context=MimeTypes +Type=Threshold + +[192x192/apps] +Size=192 +Context=Applications +Type=Threshold + + +[scalable/actions] +MinSize=1 +Size=128 +MaxSize=256 +Context=Actions +Type=Scalable + +[scalable/apps] +MinSize=1 +Size=128 +MaxSize=256 +Context=Applications +Type=Scalable + +[scalable/devices] +MinSize=1 +Size=128 +MaxSize=256 +Context=Devices +Type=Scalable + +[scalable/filesystems] +MinSize=1 +Size=128 +MaxSize=256 +Context=FileSystems +Type=Scalable + +[scalable/mimetypes] +MinSize=1 +Size=128 +MaxSize=256 +Context=MimeTypes +Type=Scalable + +[16x16/stock/chart] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/code] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/data] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/document] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/form] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/generic] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/image] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/io] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/media] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/navigation] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/net] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/object] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/table] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/text] +Size=16 +Context=Stock +Type=Threshold + +[24x24/stock/chart] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/code] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/data] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/document] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/form] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/generic] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/image] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/io] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/media] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/navigation] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/net] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/object] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/table] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/text] +Size=24 +Context=Stock +Type=Threshold + +[32x32/stock/chart] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/code] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/data] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/document] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/form] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/generic] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/image] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/io] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/media] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/navigation] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/net] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/object] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/table] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/text] +Size=32 +Context=Stock +Type=Threshold + +[36x36/stock/chart] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/code] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/data] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/document] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/form] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/generic] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/image] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/io] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/media] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/navigation] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/net] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/object] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/table] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/text] +Size=36 +Context=Stock +Type=Threshold + +[48x48/stock/chart] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/code] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/data] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/document] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/form] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/generic] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/image] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/io] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/media] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/navigation] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/net] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/object] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/table] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/text] +Size=48 +Context=Stock +Type=Threshold + +[scalable/emblems] +MinSize=1 +Size=128 +MaxSize=256 +Context=Emblems +Type=Scalable + +[192x192/emblems] +Size=192 +Context=Emblems +Type=Threshold + +[96x96/emblems] +Size=96 +Context=Emblems +Type=Threshold + +[72x72/emblems] +Size=72 +Context=Emblems +Type=Threshold + +[48x48/emblems] +Size=48 +Context=Emblems +Type=Threshold + +[36x36/emblems] +Size=36 +Context=Emblems +Type=Threshold + +[24x24/emblems] +Size=24 +Context=Emblems +Type=Threshold + +[16x16/emblems] +Size=16 +Context=Emblems +Type=Threshold + +[12x12/emblems] +Size=12 +Context=Emblems +Type=Threshold + diff --git a/packages/contacts/files/stock_contact.png b/packages/contacts/files/stock_contact.png Binary files differnew file mode 100644 index 0000000000..123b4485ac --- /dev/null +++ b/packages/contacts/files/stock_contact.png diff --git a/packages/contacts/files/stock_person.png b/packages/contacts/files/stock_person.png Binary files differnew file mode 100644 index 0000000000..2b1328b4e2 --- /dev/null +++ b/packages/contacts/files/stock_person.png diff --git a/packages/dates/.mtn2git_empty b/packages/dates/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dates/.mtn2git_empty diff --git a/packages/dates/dates_svn.bb b/packages/dates/dates_svn.bb new file mode 100644 index 0000000000..1013b08f2c --- /dev/null +++ b/packages/dates/dates_svn.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPL" +SECTION = "x11" +DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" +MAINTAINER = "Richard Purdie <richard@openedhand.com>" +DESCRIPTION = "Dates is a calendar application." + +PR = "r3" + +PV = "0.0+svn${SRCDATE}" +S = "${WORKDIR}/${PN}" + +SRC_URI = "svn://svn.o-hand.com/repos/;module=${PN};proto=http" + +inherit autotools pkgconfig + +CFLAGS_prepend = " -DFRAMES=5 " +FILES_${PN} += "${datadir}/icons/hicolor/48x48/apps/oh-dates.png" + +pkg_postinst_${PN} () { + if [ "x$D" != "x" ]; then + gtk-update-icon-cache /usr/share/icons/hicolor + fi +} diff --git a/packages/eds/.mtn2git_empty b/packages/eds/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/eds/.mtn2git_empty diff --git a/packages/eds/eds-dbus/.mtn2git_empty b/packages/eds/eds-dbus/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/eds/eds-dbus/.mtn2git_empty diff --git a/packages/eds/eds-dbus/disable_orbit.patch b/packages/eds/eds-dbus/disable_orbit.patch new file mode 100644 index 0000000000..8757666e9d --- /dev/null +++ b/packages/eds/eds-dbus/disable_orbit.patch @@ -0,0 +1,13 @@ +Index: trunk/configure.in +=================================================================== +--- trunk.orig/configure.in 2006-01-20 02:08:42.555073776 +0000 ++++ trunk/configure.in 2006-01-20 10:19:13.631870024 +0000 +@@ -1114,7 +1114,7 @@ + AC_MSG_RESULT($with_bug_buddy) + + if test "x${with_dbus}" = "xno"; then +- AM_PATH_ORBIT2(2.9.8) ++dnl AM_PATH_ORBIT2(2.9.8) + + AC_MSG_CHECKING(for CORBA include paths) + IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config --variable=idldir bonobo-activation-2.0` diff --git a/packages/eds/eds-dbus/iconv-detect.h b/packages/eds/eds-dbus/iconv-detect.h new file mode 100644 index 0000000000..46f476d5bc --- /dev/null +++ b/packages/eds/eds-dbus/iconv-detect.h @@ -0,0 +1,5 @@ +/* This is an auto-generated header, DO NOT EDIT! */ + +#define ICONV_ISO_D_FORMAT "iso-%d-%d" +#define ICONV_ISO_S_FORMAT "iso-%d-%s" +#define ICONV_10646 "iso-10646" diff --git a/packages/eds/eds-dbus/no_iconv_test.patch b/packages/eds/eds-dbus/no_iconv_test.patch new file mode 100644 index 0000000000..6e33c7889e --- /dev/null +++ b/packages/eds/eds-dbus/no_iconv_test.patch @@ -0,0 +1,70 @@ +Index: trunk/configure.in +=================================================================== +--- trunk.orig/configure.in 2005-09-28 17:34:08.000000000 +0000 ++++ trunk/configure.in 2005-09-28 19:13:22.000000000 +0000 +@@ -213,39 +213,6 @@ + if test $ac_cv_libiconv = no; then + AC_CHECK_FUNCS(gnu_get_libc_version) + fi +- AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_TRY_RUN([ +-#include <iconv.h> +-#include <stdlib.h> +-#include <string.h> +-#ifdef HAVE_GNU_GET_LIBC_VERSION +-#include <gnu/libc-version.h> +-#endif +- +-int main (int argc, char **argv) +-{ +- const char *from = "Some Text \xA4"; +- const char *utf8 = "Some Text \xC2\xA4"; +- char *transbuf = malloc (20), *trans = transbuf; +- iconv_t cd; +- size_t from_len = strlen (from), utf8_len = 20; +- size_t utf8_real_len = strlen (utf8); +- +-#ifdef HAVE_GNU_GET_LIBC_VERSION +- /* glibc 2.1.2's iconv is broken in hard to test ways. */ +- if (!strcmp (gnu_get_libc_version (), "2.1.2")) +- exit (1); +-#endif +- +- cd = iconv_open ("UTF-8", "ISO_8859-1"); +- if (cd == (iconv_t) -1) +- exit (1); +- if (iconv (cd, &from, &from_len, &trans, &utf8_len) == -1 || from_len != 0) +- exit (1); +- if (memcmp (utf8, transbuf, utf8_real_len) != 0) +- exit (1); +- +- exit (0); +-}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=no; have_iconv=no])) + fi + + if test "$have_iconv" = no; then +@@ -254,25 +221,6 @@ + AC_SUBST(ICONV_CFLAGS) + AC_SUBST(ICONV_LIBS) + +-CFLAGS="$CFLAGS -I$srcdir" +- +-AC_MSG_CHECKING(preferred charset formats for system iconv) +-AC_TRY_RUN([ +-#define CONFIGURE_IN +-#include "iconv-detect.c" +-],[ +- AC_MSG_RESULT(found) +-],[ +- AC_MSG_RESULT(not found) +- AC_WARN([ +- *** The iconv-detect program was unable to determine the +- *** preferred charset formats recognized by your system +- *** iconv library. It is suggested that you install a +- *** working iconv library such as the one found at +- *** ftp://ftp.gnu.org/pub/gnu/libiconv +- ]) +-]) +- + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS" + diff --git a/packages/eds/eds-dbus/no_libdb.patch b/packages/eds/eds-dbus/no_libdb.patch new file mode 100644 index 0000000000..ae9a66deac --- /dev/null +++ b/packages/eds/eds-dbus/no_libdb.patch @@ -0,0 +1,14 @@ +Index: configure.in +=================================================================== +--- trunk/configure.in (revision 306) ++++ trunk/configure.in (working copy) +@@ -1353,9 +1353,6 @@ + if test $enable_calendar = yes; then + AC_CONFIG_SUBDIRS(calendar/libical) + fi +-if test $dynamic_libdb = no; then +- AC_CONFIG_SUBDIRS(libdb/dist) +-fi + + AC_OUTPUT([ + Makefile diff --git a/packages/eds/eds-dbus/no_libedataserverui.patch b/packages/eds/eds-dbus/no_libedataserverui.patch new file mode 100644 index 0000000000..bb6f78d9f7 --- /dev/null +++ b/packages/eds/eds-dbus/no_libedataserverui.patch @@ -0,0 +1,13 @@ +Index: Makefile.am +=================================================================== +--- trunk/Makefile.am (revision 306) ++++ trunk/Makefile.am (working copy) +@@ -16,7 +16,7 @@ + endif + + if ENABLE_DBUS +-SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui docs art po ++SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) docs art po + else + SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po + endif diff --git a/packages/eds/eds-dbus/no_libgnome.patch b/packages/eds/eds-dbus/no_libgnome.patch new file mode 100644 index 0000000000..a8bae50d03 --- /dev/null +++ b/packages/eds/eds-dbus/no_libgnome.patch @@ -0,0 +1,45 @@ +Index: trunk/configure.in +=================================================================== +--- trunk.orig/configure.in 2005-09-28 20:01:02.000000000 +0000 ++++ trunk/configure.in 2005-09-28 21:02:35.000000000 +0000 +@@ -1120,7 +1120,12 @@ + AC_SUBST(E_DATA_SERVER_CFLAGS) + AC_SUBST(E_DATA_SERVER_LIBS) + +-E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0" ++if test "x${with_libgnome}" != "xno"; then ++ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0" ++else ++ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0" ++fi ++ + + EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS) + AC_SUBST(E_DATA_SERVER_UI_CFLAGS) +@@ -1128,7 +1133,7 @@ + + dnl --- evolution-addressbook flags + +-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS gnome-vfs-2.0 " ++EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS " + + EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) + AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) +@@ -1136,7 +1141,7 @@ + + dnl --- evolution-calendar flags + +-EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 gnome-vfs-2.0 dbus-glib-1" ++EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 dbus-glib-1" + + EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS) + AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) +@@ -1145,7 +1150,7 @@ + if test "x${with_dbus}" = "xno"; then + dnl --- factory flags + +- E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr" ++ E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 $mozilla_nspr" + + EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) + AC_SUBST(E_FACTORY_CFLAGS) diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb new file mode 100644 index 0000000000..3337970fee --- /dev/null +++ b/packages/eds/eds-dbus_svn.bb @@ -0,0 +1,53 @@ +LICENSE = "LGPL" +DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv" +RDEPENDS = "gconf dbus-1 db libiconv" +MAINTAINER = "Richard Purdie <richard@openedhand.com>" +DESCRIPTION = "Evolution database backend server" +PV = "1.4.0+cvs${SRCDATE}" +PR = "r14" + +SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ + file://no_libdb.patch;patch=1 \ + file://no_iconv_test.patch;patch=1 \ + file://no_libedataserverui.patch;patch=1 \ + file://disable_orbit.patch;patch=1 \ + file://iconv-detect.h" + +S = "${WORKDIR}/trunk" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb41=${STAGING_DIR}/${HOST_SYS} --disable-smime --disable-nss --disable-camel --disable-nntp --disable-gtk-doc" + +acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros " + +FILES_${PN} += "${libdir}/evolution-data-server-1.2/extensions/*.so \ + ${libdir}/evolution-data-server-1.2/camel-providers/*.so \ + ${libdir}/evolution-data-server-1.2/camel-providers/*.urls \ + ${datadir}/evolution-data-server-1.4/zoneinfo/zones.tab \ + ${datadir}/evolution-data-server-1.4/zoneinfo/*/*.ics \ + ${datadir}/evolution-data-server-1.4/zoneinfo/*/*/*.ics \ + ${datadir}/dbus-1/services/*.service" +FILES_${PN}-dev += "${libdir}/evolution-data-server-1.2/extensions/*.la \ + ${libdir}/evolution-data-server-1.2/camel-providers/*.la" + + +do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} " + +do_stage () { + oe_libinstall -so -C addressbook/libebook-dbus libebook-1.2 ${STAGING_LIBDIR} + oe_libinstall -so -C addressbook/libedata-book-dbus libedata-book-1.2 ${STAGING_LIBDIR} + oe_libinstall -so -C calendar/libecal-dbus libecal-1.2 ${STAGING_LIBDIR} + oe_libinstall -so -C calendar/libedata-cal-dbus libedata-cal-1.2 ${STAGING_LIBDIR} + oe_libinstall -so -C libedataserver libedataserver-1.2 ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/camel ${STAGING_INCDIR}/libebook \ + ${STAGING_INCDIR}/libecal ${STAGING_INCDIR}/libedataserver \ + ${STAGING_INCDIR}/libical + install -m 0644 ${S}/camel/*.h ${STAGING_INCDIR}/camel + install -m 0644 ${S}/addressbook/libebook-dbus/*.h ${STAGING_INCDIR}/libebook + install -m 0644 ${S}/calendar/libecal-dbus/*.h ${STAGING_INCDIR}/libecal + install -m 0644 ${S}/libedataserver/*.h ${STAGING_INCDIR}/libedataserver + install -m 0644 ${S}/calendar/libical/src/libical/*.h ${STAGING_INCDIR}/libical +} + diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index 194ca00263..dcd5209989 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -17,6 +17,8 @@ SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ inherit pkgconfig autotools S = "${WORKDIR}/trunk" +PARALLEL_MAKE = "" + FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*" EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" diff --git a/packages/gpe-mininet/gpe-mininet-0.4/mininet-main.patch b/packages/gpe-mininet/gpe-mininet-0.4/mininet-main.patch deleted file mode 100644 index 3427673006..0000000000 --- a/packages/gpe-mininet/gpe-mininet-0.4/mininet-main.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: main.c -=================================================================== -RCS file: /cvs/gpe/base/gpe-mininet/main.c,v -retrieving revision 1.7 -diff -u -r1.7 main.c ---- main.c 9 Jun 2004 22:52:09 -0000 1.7 -+++ main.c 9 Jul 2004 18:46:58 -0000 -@@ -329,7 +329,7 @@ - GdkPixbuf *pixmap; - - /* first check firewall stuff */ -- activate_networking_rules(); -+// activate_networking_rules(); - - if (gpe_application_init (&argc, &argv) == FALSE) - exit (1); diff --git a/packages/gpe-mininet/gpe-mininet-0.4/netlink.patch b/packages/gpe-mininet/gpe-mininet-0.4/netlink.patch deleted file mode 100644 index 4f65dc7eaf..0000000000 --- a/packages/gpe-mininet/gpe-mininet-0.4/netlink.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: netlink.c -=================================================================== -RCS file: /cvs/gpe/base/gpe-mininet/netlink.c,v -retrieving revision 1.2 -diff -u -r1.2 netlink.c ---- netlink.c 17 Apr 2004 16:14:03 -0000 1.2 -+++ netlink.c 9 Jul 2004 06:12:37 -0000 -@@ -16,7 +16,6 @@ - #include <stdio.h> - #include <sys/socket.h> - #include <linux/types.h> --#include <linux/uio.h> - - #include <linux/netlink.h> - #include <linux/rtnetlink.h> diff --git a/packages/gpe-mininet/gpe-mininet_0.4.bb b/packages/gpe-mininet/gpe-mininet_0.4.bb deleted file mode 100644 index 79b9e7b26d..0000000000 --- a/packages/gpe-mininet/gpe-mininet_0.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -inherit gpe pkgconfig - -PR = "r1" -LICENSE = "GPL" -DEPENDS = "libgpewidget gpe-icons gpe-conf matchbox-panel" -SECTION = "gpe" - -DESCRIPTION = "GPE network connection checker" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ - file://netlink.patch;patch=1;pnum=0 \ - file://mininet-main.patch;patch=1;pnum=0" - -FILES_${PN} = " ${bindir} ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN} += " ${datadir}/gpe/pixmaps" - -export CVSBUILD="no" diff --git a/packages/gpe-mininet/gpe-mininet_0.7.bb b/packages/gpe-mininet/gpe-mininet_0.7.bb new file mode 100644 index 0000000000..da95c97343 --- /dev/null +++ b/packages/gpe-mininet/gpe-mininet_0.7.bb @@ -0,0 +1,14 @@ +inherit autotools gpe pkgconfig + +PR = "r0" +LICENSE = "GPL" +DEPENDS = "libgpewidget gpe-icons gpe-conf" +RRECOMMENDS = "gpe-conf" +SECTION = "gpe" + +DESCRIPTION = "GPE network connection checker" + +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" + +FILES_${PN} = " ${bindir} ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN} += " ${datadir}/gpe/pixmaps" diff --git a/packages/libtiff/tiff_3.7.2.bb b/packages/libtiff/tiff_3.7.2.bb index a1c5e89bcc..8ef0556377 100644 --- a/packages/libtiff/tiff_3.7.2.bb +++ b/packages/libtiff/tiff_3.7.2.bb @@ -3,7 +3,7 @@ LICENSE = "" HOMEPAGE = "http://www.remotesensing.org/libtiff/" DEPENDS = "zlib jpeg" -SRC_URI = "http://dl.maptools.org/dl/libtiff/tiff-${PV}.tar.gz" +SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz" inherit autotools diff --git a/packages/links/links-x11_2.1pre20.bb b/packages/links/links-x11_2.1pre20.bb index 685ca73fd8..ab2b71cd12 100644 --- a/packages/links/links-x11_2.1pre20.bb +++ b/packages/links/links-x11_2.1pre20.bb @@ -16,6 +16,6 @@ EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ --without-libtiff --without-svgalib --without-fb \ --without-directfb --without-pmshell --without-atheos \ - --with-x --without-gpm" + --with-x --without-gpm --without-sdl" S = "${WORKDIR}/links-${PV}" diff --git a/packages/linux/ixp4xx-kernel_2.6.15.1.bb b/packages/linux/ixp4xx-kernel_2.6.15.1.bb index 8e120fd0df..b4cde1bf41 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.1.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.1.bb @@ -3,12 +3,12 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "0" +PR_CONFIG = "1" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r0.${PR_CONFIG}" +PR = "r8.${PR_CONFIG}" include ixp4xx-kernel.inc @@ -21,7 +21,6 @@ IXP4XX_PATCHES += "file://11-mtdpart-redboot-config-byteswap.patch;patch=1" IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1" IXP4XX_PATCHES += "file://40-rtc-class.patch;patch=1" IXP4XX_PATCHES += "file://45-eeprom-notifier.patch;patch=1" -IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1" IXP4XX_PATCHES += "file://50-nas100d-arch.patch;patch=1" IXP4XX_PATCHES += "file://55-rtc-pcf8563.patch;patch=1" IXP4XX_PATCHES += "file://60-nas100d-i2c.patch;patch=1" @@ -38,5 +37,6 @@ IXP4XX_PATCHES += "file://91-maclist.patch;patch=1" IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1" IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1" IXP4XX_PATCHES += "file://93-loft-maclist.patch;patch=1" +IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1" IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1" IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1" diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb index 13f682cb65..8df47ef8f7 100644 --- a/packages/linux/linux-openzaurus_2.6.15.bb +++ b/packages/linux/linux-openzaurus_2.6.15.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r0" +PR = "r1" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -62,7 +62,10 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ ${RPSRC}/alsa/alsa-soc-0.9.patch;patch=1 \ ${RPSRC}/alsa/alsa-soc-0.9-0.10rc1.patch;patch=1 \ ${RPSRC}/alsa_soc_rpupdate7-r2.patch;patch=1 \ + ${RPSRC}/alsa_akita_fix-r0.patch;patch=1 \ ${RPSRC}/pm_changes-r0.patch;patch=1 \ + ${RPSRC}/corgi-bl-generic-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_pm-do-r1.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ diff --git a/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/packages/matchbox-panel/matchbox-panel_0.9.2.bb index 90797cf853..0b7df29693 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.2.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.2.bb @@ -1,8 +1,10 @@ include matchbox-panel.inc -PR="r5" +PR="r6" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://add_hostap.patch;patch=1 \ + http://handhelds.org/~pb/mb-panel-0.9.2-polling.patch;patch=1 \ + http://handhelds.org/~pb/mb-panel-0.9.2-msgcancel.patch;patch=1 \ file://kernel2.6.patch;patch=1" diff --git a/packages/puzzles/puzzles_r6358.bb b/packages/puzzles/puzzles_r6505.bb index c3725ac8f7..c3725ac8f7 100644 --- a/packages/puzzles/puzzles_r6358.bb +++ b/packages/puzzles/puzzles_r6505.bb |
