merge of 224679d0d1adfe1e36b72ea199644249ab797df3

     and b8bb8279a60f23addb3b8d68e1bdc2549d5c7f12

9 files changed, 140 insertions, 0 deletions

diff --git a/packages/cairo/libsvg-0.1.4/.mtn2git_empty b/packages/cairo/libsvg-0.1.4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cairo/libsvg-0.1.4/.mtn2git_empty
diff --git a/packages/cairo/libsvg-0.1.4/gcc4_and_expat.patch b/packages/cairo/libsvg-0.1.4/gcc4_and_expat.patch
new file mode 100644
index 0000000000..feec4ab74d
--- /dev/null
+++ b/packages/cairo/libsvg-0.1.4/gcc4_and_expat.patch
@@ -0,0 +1,19 @@
+diff -bur libsvg-0.1.4~orig/src/svg_parser_expat.c libsvg-0.1.4/src/svg_parser_expat.c
+--- libsvg-0.1.4~orig/src/svg_parser_expat.c	2005-02-14 11:26:26.000000000 -0600
++++ libsvg-0.1.4/src/svg_parser_expat.c	2006-02-10 21:58:20.000000000 -0600
+@@ -30,6 +30,7 @@
+ #include "svgint.h"
+ #include "svg_hash.h"
+ 
++#ifndef LIBSVG_EXPAT
+ static void
+ _svg_parser_sax_start_element (void		*closure,
+ 			       const XML_Char	*name,
+@@ -43,6 +44,7 @@
+ _svg_parser_sax_characters (void		*closure,
+ 			    const XML_Char	*ch,
+ 			    int			len);
++#endif
+ 
+ static void
+ _svg_parser_sax_warning (void		*closure,
diff --git a/packages/cairo/libsvg_0.1.4.bb b/packages/cairo/libsvg_0.1.4.bb
new file mode 100644
index 0000000000..77d86c7674
--- /dev/null
+++ b/packages/cairo/libsvg_0.1.4.bb
@@ -0,0 +1,17 @@
+SECTION = "libs"
+LICENSE = "LGPL"
+PRIORITY = "optional"
+DEPENDS = "expat jpeg zlib libpng"
+DESCRIPTION = "SVG parser library"
+PR = "r0"
+
+SRC_URI = "http://cairographics.org/snapshots/libsvg-${PV}.tar.gz \
+           file://gcc4_and_expat.patch;patch=1"
+
+EXTRA_OECONF = "--with-expat"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	autotools_stage_all()
+}
diff --git a/packages/dpkg/dpkg-1.13.11/.mtn2git_empty b/packages/dpkg/dpkg-1.13.11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dpkg/dpkg-1.13.11/.mtn2git_empty
diff --git a/packages/dpkg/dpkg-1.13.11/autofoo.patch b/packages/dpkg/dpkg-1.13.11/autofoo.patch
new file mode 100644
index 0000000000..691121e418
--- /dev/null
+++ b/packages/dpkg/dpkg-1.13.11/autofoo.patch
@@ -0,0 +1,48 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- dpkg-1.10.23/configure.in~autofoo
++++ dpkg-1.10.23/configure.in
+@@ -227,21 +227,36 @@
+ # OpenBSD passes AC_TRY_COMPILE for va_copy even though 
+ # it doesn't seem to exist, which is odd. We need to use
+ # AC_TRY_RUN.
++#
++# If crosscompiling, use AC_TRY_COMPILE. -CL
+ AC_TRY_RUN([
+ #include <stdarg.h>
+ main(){
+ va_list v1,v2;
+ va_copy(v1, v2);
+ exit(0);}
+-], [AC_MSG_RESULT(yes)
+-AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no)
+-AC_MSG_CHECKING([for va_list assignment copy])
++], [dpkg_cv_va_copy=yes], [dpkg_cv_va_copy=no],
+ AC_TRY_COMPILE([
+ #include <stdarg.h>
++main(){
++va_list v1,v2;
++va_copy(v1, v2);
++exit(0);}
++], [dpkg_cv_va_copy=yes], [dpkg_vc_va_copy=no]))
++
++if test "$dpkg_cv_va_copy" = "yes"; then
++	AC_MSG_RESULT(yes)
++	AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])
++else
++	AC_MSG_RESULT(no)
++	AC_MSG_CHECKING([for va_list assignment copy])
++	AC_TRY_COMPILE([
++#include <stdarg.h>
+ ],[
+ va_list v1,v2;
+ v1 = v2;
+-], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))])
++], AC_MSG_RESULT(yes), AC_MSG_ERROR(no))
++fi
+ 
+ DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.],
+   DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.])
diff --git a/packages/dpkg/dpkg_1.13.11.bb b/packages/dpkg/dpkg_1.13.11.bb
new file mode 100644
index 0000000000..c6ce0c9e66
--- /dev/null
+++ b/packages/dpkg/dpkg_1.13.11.bb
@@ -0,0 +1,11 @@
+include dpkg.inc
+DEPENDS += "bzip2"
+
+inherit autotools gettext
+
+EXTRA_OECONF = "--without-static-progs \
+		--without-dselect \
+		--with-start-stop-daemon \
+		--with-zlib \
+		--with-bz2lib \
+		--without-sgml-doc"
diff --git a/packages/expat/expat-2.0.0/.mtn2git_empty b/packages/expat/expat-2.0.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/expat/expat-2.0.0/.mtn2git_empty
diff --git a/packages/expat/expat-2.0.0/autotools.patch b/packages/expat/expat-2.0.0/autotools.patch
new file mode 100644
index 0000000000..77aee3a833
--- /dev/null
+++ b/packages/expat/expat-2.0.0/autotools.patch
@@ -0,0 +1,13 @@
+diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in
+--- expat-2.0.0~orig/configure.in	2006-01-10 19:10:46.000000000 -0600
++++ expat-2.0.0/configure.in	2006-02-10 19:12:24.000000000 -0600
+@@ -50,9 +50,6 @@
+ 
+ AC_CONFIG_HEADER(expat_config.h)
+ 
+-sinclude(conftools/libtool.m4)
+-sinclude(conftools/ac_c_bigendian_cross.m4)
+-
+ AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL
+ 
diff --git a/packages/expat/expat_2.0.0.bb b/packages/expat/expat_2.0.0.bb
new file mode 100644
index 0000000000..b3bbe54b02
--- /dev/null
+++ b/packages/expat/expat_2.0.0.bb
@@ -0,0 +1,32 @@
+SECTION = "libs"
+DESCRIPTION = "Jim Clarkes XML parser library."
+HOMEPAGE = "http://expat.sourceforge.net/"
+LICENSE = "MIT"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
+	   file://autotools.patch;patch=1"
+S = "${WORKDIR}/expat-${PV}"
+
+inherit autotools lib_package
+export LTCC = "${CC}"
+
+do_configure () {
+	rm -f ${S}/conftools/libtool.m4
+	autotools_do_configure
+}
+
+do_stage () {
+	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/lib/expat_external.h ${STAGING_INCDIR}/
+	oe_libinstall -so libexpat ${STAGING_LIBDIR}
+}
+
+do_install () {
+	oe_runmake prefix="${D}${prefix}" \
+		bindir="${D}${bindir}" \
+		libdir="${D}${libdir}" \
+		includedir="${D}${includedir}" \
+		man1dir="${D}${mandir}/man1" \
+		install
+}