diff options
24 files changed, 195 insertions, 47 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 8a1eaadf22..7ad6c8f706 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -173,7 +173,7 @@ PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -PREFERRED_VERSION_dbus ?= "0.92" +PREFERRED_VERSION_dbus ?= "1.0.1" PREFERRED_VERSION_dbus-glib ?= "0.71" PREFERRED_VERSION_gstreamer ?= "0.10.6" diff --git a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/changelog b/contrib/distro-packages/debian/openembedded-essential-1.0/debian/changelog deleted file mode 100644 index 4d6268aafd..0000000000 --- a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/changelog +++ /dev/null @@ -1,6 +0,0 @@ -openembedded-essential (1.0-1) unstable; urgency=low - - * Initial release - - -- Marcin Juszkiewicz <hrw@openembedded.org> Tue, 17 Oct 2006 12:05:35 +0200 - diff --git a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/copyright b/contrib/distro-packages/debian/openembedded-essential-1.0/debian/copyright deleted file mode 100644 index 6eabc18b58..0000000000 --- a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/copyright +++ /dev/null @@ -1,22 +0,0 @@ -This package was debianized by Marcin Juszkiewicz <hrw@hrw.one.pl> on -Tue, 17 Oct 2006 12:05:35 +0200. - -It was downloaded from <fill in http/ftp site> - -Upstream Author: <put author(s) name and email here> - -Copyright: <put the year(s) of the copyright, and the names of the - copyright holder(s) here> - -License: - -<Put the license of the package here> - - -The Debian packaging is (C) 2006, Marcin Juszkiewicz <hrw@hrw.one.pl> and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. - - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. - diff --git a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/files b/contrib/distro-packages/debian/openembedded-essential-1.0/debian/files deleted file mode 100644 index 7b062562ec..0000000000 --- a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/files +++ /dev/null @@ -1 +0,0 @@ -openembedded-essential_1.0-1_all.deb devel optional diff --git a/contrib/distro-packages/debian/openembedded-essential-1.0/.mtn2git_empty b/contrib/distro-packages/debian/openembedded-essential-1.2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/contrib/distro-packages/debian/openembedded-essential-1.0/.mtn2git_empty +++ b/contrib/distro-packages/debian/openembedded-essential-1.2/.mtn2git_empty diff --git a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/.mtn2git_empty b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/.mtn2git_empty +++ b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/.mtn2git_empty diff --git a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/changelog b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/changelog new file mode 100644 index 0000000000..c0eb3d660c --- /dev/null +++ b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/changelog @@ -0,0 +1,19 @@ +openembedded-essential (1.2) unstable; urgency=low + + * fixed packaging to make lintian happy + * switched to native numbering + + -- Marcin Juszkiewicz <hrw@openembedded.org> Wed, 8 Nov 2006 11:17:42 +0100 + +openembedded-essential (1.1) unstable; urgency=low + + * added gawk + + -- Marcin Juszkiewicz <hrw@openembedded.org> Wed, 8 Nov 2006 11:17:42 +0100 + +openembedded-essential (1.0-1) unstable; urgency=low + + * Initial release + + -- Marcin Juszkiewicz <hrw@openembedded.org> Tue, 17 Oct 2006 12:05:35 +0200 + diff --git a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/compat b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/compat index 7ed6ff82de..7ed6ff82de 100644 --- a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/compat +++ b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/compat diff --git a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/control b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/control index bc6ac81320..c7a7e5b9f7 100644 --- a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/control +++ b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.7.2 Package: openembedded-essential Architecture: all -Depends: python (>= 2.3), ccache, build-essential, quilt, sed, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils +Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk Description: Metapackage to install all needed packages to start using OpenEmbedded OpenEmbedded is a full-featured development environment allowing users to target a wide variety of devices. Supporting multiple build, release paths and diff --git a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/copyright b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/copyright new file mode 100644 index 0000000000..9e4905f97e --- /dev/null +++ b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by Marcin Juszkiewicz <hrw@hrw.one.pl> on +Tue, 17 Oct 2006 12:05:35 +0200. + +Upstream Author: Marcin Juszkiewicz <hrw@hrw.one.pl> + +Copyright: +2006 Marcin Juszkiewicz <hrw@hrw.one.pl> + +License: GPLv2 + +The Debian packaging is (C) 2006, Marcin Juszkiewicz <hrw@hrw.one.pl> and +is licensed under the GPLv2, see `/usr/share/common-licenses/GPL-2'. diff --git a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/rules b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/rules index 26ec328e83..586b2ff42f 100755 --- a/contrib/distro-packages/debian/openembedded-essential-1.0/debian/rules +++ b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f build: +binary-arch: clean: @@ -16,4 +17,4 @@ binary-indep: dh_builddeb binary: binary-indep -.PHONY: build clean binary-indep binary +.PHONY: build clean binary-indep binary binary-arch diff --git a/contrib/distro-packages/rpm/openembedded-essential-1.0.spec b/contrib/distro-packages/rpm/openembedded-essential-1.1.spec index 701c2b07d0..2ffa7c413e 100644 --- a/contrib/distro-packages/rpm/openembedded-essential-1.0.spec +++ b/contrib/distro-packages/rpm/openembedded-essential-1.1.spec @@ -1,12 +1,12 @@ Summary: Metapackage to install all needed packages to start using OpenEmbedded Name: openembedded-essential -Version: 1.0 +Version: 1.1 Release: 1 License: MIT Group: Devel BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} -Requires: python, ccache, quilt, sed, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, docbook-utils +Requires: python, ccache, quilt, sed, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, docbook-utils, gawk %description OpenEmbedded is a full-featured development environment allowing users to @@ -19,6 +19,12 @@ This metapackage depends on all software required by OpenEmbedded. %changelog +* Tue Nov 19 2006 Marcin Juszkiewicz <hrw@openembedded.org> + +openembedded-essential (1.1-1) unstable; urgency=low + + * Added gawk + * Tue Oct 17 2006 Marcin Juszkiewicz <hrw@openembedded.org> openembedded-essential (1.0-1) unstable; urgency=low @@ -26,4 +32,4 @@ openembedded-essential (1.0-1) unstable; urgency=low * Initial release %files -/rpm/openembedded-essential-1.0.spec +/rpm/openembedded-essential-1.1.spec diff --git a/packages/cherokee/cherokee-0.5.5/configure.in.patch b/packages/cherokee/cherokee-0.5.5/configure.in.patch index 7017243222..d6b75f9f1f 100644 --- a/packages/cherokee/cherokee-0.5.5/configure.in.patch +++ b/packages/cherokee/cherokee-0.5.5/configure.in.patch @@ -43,8 +43,8 @@ Index: cherokee-0.5.5/configure.in - AC_MSG_RESULT(yes), - [ AC_MSG_RESULT(no) - AC_DEFINE([HAVE_SENDFILE_BROKEN], [1], [broken sendfile]) ]) -+ } ], cherokee_cv_func_sendfile_works=yes,cherokee_cv_func_sendfile_works=no,cherokee_cv_func_sendfile_works=false)]) -+if test "$cherokee_cv_func_sendfile_works" = false; then ++ } ], cherokee_cv_func_sendfile_works=yes,cherokee_cv_func_sendfile_works=no,cherokee_cv_func_sendfile_works=no)]) ++if test "$cherokee_cv_func_sendfile_works" = no; then + AC_DEFINE([HAVE_SENDFILE_BROKEN], [1], [broken sendfile]) +fi diff --git a/packages/cherokee/cherokee.inc b/packages/cherokee/cherokee.inc index 4adc283173..9736370cb4 100644 --- a/packages/cherokee/cherokee.inc +++ b/packages/cherokee/cherokee.inc @@ -21,8 +21,12 @@ do_install_append () { install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee } -PACKAGES =+ "cget libcherokee-server libcherokee-client libcherokee-base" +# Put -dev near the front so we can move the .la files into it with a wildcard +PACKAGES = "${PN}-dbg ${PN}-dev \ + libcherokee-server libcherokee-client libcherokee-base \ + cget ${PN} ${PN}-doc ${PN}-locale" +FILES_${PN}-dev += "${libdir}/cherokee/*.la" FILES_cget = "${bindir}/cget" FILES_libcherokee-server = "${libdir}/libcherokee-server*" FILES_libcherokee-client = "${libdir}/libcherokee-client*" diff --git a/packages/cherokee/cherokee_0.5.3.bb b/packages/cherokee/cherokee_0.5.3.bb index 45746ccded..c0f1396c7d 100644 --- a/packages/cherokee/cherokee_0.5.3.bb +++ b/packages/cherokee/cherokee_0.5.3.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r7" SRC_URI_append = "file://configure.patch;patch=1 \ file://Makefile.in.patch;patch=1 \ diff --git a/packages/cherokee/cherokee_0.5.5.bb b/packages/cherokee/cherokee_0.5.5.bb index 02d94db117..e1fe602282 100644 --- a/packages/cherokee/cherokee_0.5.5.bb +++ b/packages/cherokee/cherokee_0.5.5.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r4" SRC_URI_append = "file://configure.in.patch;patch=1 \ file://Makefile.am.patch;patch=1" diff --git a/packages/cherokee/files/cherokee.init b/packages/cherokee/files/cherokee.init index 0ea0fd3a99..ea1263aff5 100644 --- a/packages/cherokee/files/cherokee.init +++ b/packages/cherokee/files/cherokee.init @@ -12,7 +12,7 @@ test ! -r "$CONFIG" && exit 0 case "$1" in start) echo "Starting $DESC: " - start-stop-daemon --oknodo -S -x $DAEMON -- -b + start-stop-daemon --oknodo -S -x $DAEMON -- -b -C $CONFIG ;; stop) diff --git a/packages/contacts/contacts_0.2.bb b/packages/contacts/contacts_0.2.bb new file mode 100644 index 0000000000..071c827709 --- /dev/null +++ b/packages/contacts/contacts_0.2.bb @@ -0,0 +1,22 @@ +LICENSE = "LGPL" +SECTION = "x11" +DEPENDS = "glib-2.0 gtk+ libglade libbacon eds-dbus" +DESCRIPTION = "Contacts is an address-book application." +PR = "r0" + +SRC_URI = "http://projects.o-hand.com/sources/contacts/contacts-0.2.tar.gz \ + file://stock_contact.png \ + file://stock_person.png" + +inherit autotools pkgconfig + + +do_install_append () { + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps +} + +FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ + ${datadir}/pixmaps/stock_person.png" + diff --git a/packages/dbus/dbus-1.0.1/dbus-1.init b/packages/dbus/dbus-1.0.1/dbus-1.init index 4829c0d4a8..38e7574ad5 100644 --- a/packages/dbus/dbus-1.0.1/dbus-1.init +++ b/packages/dbus/dbus-1.0.1/dbus-1.init @@ -10,6 +10,7 @@ NAME=dbus DAEMONUSER=messagebus PIDDIR=/var/run/dbus PIDFILE=$PIDDIR/pid +UUIDDIR=/var/lib/dbus DESC="system message bus" EVENTDIR=/etc/dbus-1/event.d @@ -40,8 +41,15 @@ start_it_up() rm -f $PIDFILE fi fi + + if [ ! -d $UUIDDIR ]; then + mkdir -p $UUIDDIR + chown $DAEMONUSER $UUIDDIR + chgrp $DAEMONUSER $UUIDDIR + fi dbus-uuidgen --ensure + echo -n "Starting $DESC: " start-stop-daemon --start --quiet --pidfile $PIDFILE \ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS diff --git a/packages/dbus/dbus_1.0.1.bb b/packages/dbus/dbus_1.0.1.bb index 688e5c630f..49112f3ee4 100644 --- a/packages/dbus/dbus_1.0.1.bb +++ b/packages/dbus/dbus_1.0.1.bb @@ -6,6 +6,8 @@ DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" +PR = "r1" + SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch;patch=1 \ file://dbus-1.init \ diff --git a/packages/gnome/libbacon_cvs.bb b/packages/gnome/libbacon_cvs.bb new file mode 100644 index 0000000000..cbe1a9ad47 --- /dev/null +++ b/packages/gnome/libbacon_cvs.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Bacon is a multimedia library" +LICENSE = "GPLv2" + +DEPENDS = "glib-2.0" + +PV = "0.0+cvs${SRCDATE}" + +inherit gnome + +SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=${PN}" + +S = "${WORKDIR}/${PN}" + +do_stage() { + autotools_stage_all +} + + + + diff --git a/packages/tinymail/files/iconv-detect.h b/packages/tinymail/files/iconv-detect.h new file mode 100644 index 0000000000..46f476d5bc --- /dev/null +++ b/packages/tinymail/files/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/tinymail/files/no-iconv-detect.patch b/packages/tinymail/files/no-iconv-detect.patch new file mode 100644 index 0000000000..558cbb2f93 --- /dev/null +++ b/packages/tinymail/files/no-iconv-detect.patch @@ -0,0 +1,78 @@ +--- /tmp/ticonv.m4 2006-11-19 12:01:18.000000000 +0100 ++++ trunk/m4/ticonv.m4 2006-11-19 12:14:50.378554000 +0100 +@@ -14,12 +14,7 @@ + save_LIBS="$LIBS" + CFLAGS="$CFLAGS $ICONV_CFLAGS" + LIBS="$LIBS $ICONV_LIBS -liconv" +-AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +-#include <iconv.h> +-]], [[ +- iconv_t cd; +- cd = iconv_open ("UTF-8", "ISO-8859-1"); +-]])],[ac_cv_libiconv=yes],[ac_cv_libiconv=no])) ++ + if test $ac_cv_libiconv = yes; then + ICONV_LIBS="$ICONV_LIBS -liconv" + have_iconv=yes +@@ -33,39 +28,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_RUN_IFELSE([AC_LANG_SOURCE([[ +-#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 +@@ -73,20 +35,5 @@ + fi + AC_SUBST(ICONV_CFLAGS) + AC_SUBST(ICONV_LIBS) +- +-CFLAGS="$CFLAGS -I$srcdir" +- +-AC_MSG_CHECKING(preferred charset formats for system iconv) +-AC_RUN_IFELSE([AC_LANG_SOURCE([[ +-#define CONFIGURE_IN +-#include "iconv-detect.c" +-]])],[ +- AC_MSG_RESULT(found) +-],[ +- AC_MSG_RESULT(not found) +-],[]) +- +-CFLAGS="$save_CFLAGS" +-LIBS="$save_LIBS" +- + ]) ++ diff --git a/packages/tinymail/tinymail_svn.bb b/packages/tinymail/tinymail_svn.bb index cc889489ac..416aa0f4e3 100644 --- a/packages/tinymail/tinymail_svn.bb +++ b/packages/tinymail/tinymail_svn.bb @@ -1,16 +1,17 @@ SECTION = "x11/utils" -DEPENDS = "gtk+ glib-2.0 gnome-vfs-dbus libgnomeui eds-dbus libiconv" +DEPENDS = "gtk+ glib-2.0 gnome-vfs-dbus gconf-dbus libgnomeui eds-dbus" DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile devices" LICENSE = "GPL" PV = "0.0+svn${SRCDATE}" -PR = "r2" +PR = "r3" EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none" -#camel-lite-configure-hack.patch is still needed after the maxdate, but needs fixing SRC_URI = "svn://svn.tinymail.org/svn/tinymail/;module=trunk;proto=http \ file://camel-lite-configure-hack.patch;patch=1;maxdate=20061113 \ + file://no-iconv-detect.patch;patch=1;mindate=20061114 \ + file://iconv-detect.h \ file://gtk-doc.m4 \ file://gtk-doc.make" @@ -21,6 +22,8 @@ do_configure_prepend() { mkdir -p m4 install ${WORKDIR}/gtk-doc.m4 ./m4/ install ${WORKDIR}/gtk-doc.make ./ + + cp ${WORKDIR}/iconv-detect.h ${S}/libtinymail-camel/camel-lite/ } @@ -50,7 +53,4 @@ FILES_tinymail-camel-lite-dev += "${libdir}/libcamel-lite*.so \ ${libdir}/camel-lite-1.2/camel-providers/*.a " FILES_tinymail-camel-lite-dbg += "${libdir}/camel-lite-1.2/camel-providers/.debug" -PARALLEL_MAKE = "" -LDFLAGS += "-liconv" - |