summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/geoclue/Makefile29
-rw-r--r--package/harfbuzz/Makefile10
-rw-r--r--package/icu4c/Makefile47
-rw-r--r--package/json-glib/Makefile27
-rw-r--r--package/libcroco/Makefile32
-rw-r--r--package/librsvg/Makefile34
-rw-r--r--package/libsecret/Makefile31
-rw-r--r--package/libsecret/patches/patch-Makefile_am26
-rw-r--r--package/libsecret/patches/patch-Makefile_am.orig11
-rw-r--r--package/libsecret/patches/patch-configure_ac44
-rw-r--r--package/libsecret/patches/patch-configure_ac.orig35
-rw-r--r--package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am20
-rw-r--r--package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig11
-rw-r--r--package/libsecret/patches/patch-libsecret_Makefile_am95
-rw-r--r--package/libsecret/patches/patch-libsecret_tests_Makefile_am113
-rw-r--r--package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig72
-rw-r--r--package/libsoup/Makefile31
-rw-r--r--package/libsoup/patches/patch-Makefile_am20
-rw-r--r--package/libsoup/patches/patch-build-aux_config_guess447
-rw-r--r--package/libsoup/patches/patch-build-aux_config_sub183
-rw-r--r--package/libsoup/patches/patch-build-aux_depcomp682
-rw-r--r--package/libsoup/patches/patch-build-aux_missing440
-rw-r--r--package/libsoup/patches/patch-configure_ac10
-rw-r--r--package/libwebp/Makefile25
-rw-r--r--package/ltrace/Makefile26
-rw-r--r--package/ltrace/patches/patch-breakpoints_c14
-rw-r--r--package/ltrace/patches/patch-breakpoints_c.orig14
-rw-r--r--package/ltrace/patches/patch-handle_event_c19
-rw-r--r--package/ltrace/patches/patch-proc_c32
-rw-r--r--package/midori/Makefile40
-rw-r--r--package/vala/Makefile33
-rw-r--r--package/webkitgtk/Makefile43
32 files changed, 2693 insertions, 3 deletions
diff --git a/package/geoclue/Makefile b/package/geoclue/Makefile
new file mode 100644
index 000000000..113d400eb
--- /dev/null
+++ b/package/geoclue/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= geoclue
+PKG_VERSION:= 1.99.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 514efbecd69c78b3e0a3d86012b7d88c
+PKG_DESCR:= D-Bus service that provides location information
+PKG_SECTION:= libs
+PKG_DEPENDS:= json-glib
+PKG_BUILDDEP:= json-glib
+PKG_URL:= http://www.freedesktop.org/wiki/Software/GeoClue/
+PKG_SITES:= http://www.freedesktop.org/software/geoclue/releases/1.99/
+PKG_OPTS:= dev
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GEOCLUE,geoclue,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+geoclue-install:
+ $(INSTALL_DIR) $(IDIR_GEOCLUE)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/geoclue*.so* \
+ $(IDIR_GEOCLUE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile
index d2530b5a1..07a84a5b4 100644
--- a/package/harfbuzz/Makefile
+++ b/package/harfbuzz/Makefile
@@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= harfbuzz
PKG_VERSION:= 0.9.9
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= e901ffe556d706b7d43b272f83be7f09
PKG_DESCR:= OpenType text shaping engine
PKG_SECTION:= libs
PKG_SITES:= http://www.freedesktop.org/software/harfbuzz/release/
-PKG_DEPENDS:= libstdcxx cairo
-PKG_BUILDDEP:= libstdcxx cairo
+PKG_DEPENDS:= libstdcxx cairo icu4c
+PKG_BUILDDEP:= libstdcxx cairo icu4c
PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
@@ -22,6 +22,10 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+pre-install:
+ $(INSTALL_DIR) $(WRKINST)/usr/include/harfbuzz
+ $(CP) $(WRKBUILD)/src/hb-icu.h $(WRKINST)/usr/include/harfbuzz
+
harfbuzz-install:
$(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib
$(CP) $(WRKINST)/usr/lib/libharfbuzz*.so* \
diff --git a/package/icu4c/Makefile b/package/icu4c/Makefile
new file mode 100644
index 000000000..772e147b5
--- /dev/null
+++ b/package/icu4c/Makefile
@@ -0,0 +1,47 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= icu4c
+PKG_VERSION:= 52.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 9e96ed4c1d99c0d14ac03c140f9f346c
+PKG_DESCR:= unicode and globalization library
+PKG_SECTION:= libs
+PKG_BUILDDEP:= icu4c-host
+PKG_URL:= http://icu-project.org
+PKG_SITES:= http://download.icu-project.org/files/icu4c/52.1/
+PKG_OPTS:= dev
+
+DISTFILES:= ${PKG_NAME}-52_1-src.tgz
+
+WRKDIST= ${WRKDIR}/icu/source
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+HOST_STYLE:= auto
+HOST_CONFIGURE_ARGS+= --enable-extras=no \
+ --enable-samples=no \
+ --enable-tests=no \
+ --enable-shared=no \
+ --enable-dyload=no \
+ --enable-static
+CONFIGURE_ARGS+= --with-cross-build=${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host/icu/source \
+ --enable-extras=no \
+ --enable-samples=no \
+ --enable-tests=no \
+
+icu4c-hostinstall:
+
+icu4c-install:
+ $(INSTALL_DIR) $(IDIR_ICU4C)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libicuuc.so* \
+ $(IDIR_ICU4C)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/json-glib/Makefile b/package/json-glib/Makefile
new file mode 100644
index 000000000..f293c8384
--- /dev/null
+++ b/package/json-glib/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= json-glib
+PKG_VERSION:= 0.14.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 2a22832c4654156a35b38ee027f6f065
+PKG_DESCR:= a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format
+PKG_SECTION:= libs
+PKG_URL:= https://wiki.gnome.org/JsonGlib/
+PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.14/
+PKG_OPTS:= dev
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JSON_GLIB,json-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+json-glib-install:
+ $(INSTALL_DIR) $(IDIR_JSON_GLIB)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libjson-glib*.so* \
+ $(IDIR_JSON_GLIB)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libcroco/Makefile b/package/libcroco/Makefile
new file mode 100644
index 000000000..8e6775354
--- /dev/null
+++ b/package/libcroco/Makefile
@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libcroco
+PKG_VERSION:= 0.6.8
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 767e73c4174f75b99695d4530fd9bb80
+PKG_DESCR:= CSS2 parsing and manipulation library
+PKG_SECTION:= libs
+PKG_URL:= https://github.com/GNOME/libcroco
+PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/
+PKG_OPTS:= dev
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,LIBCROCO,libcroco,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBCROCO,libcroco,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+HOST_STYLE:= auto
+
+libcroco-install:
+ $(INSTALL_DIR) $(IDIR_LIBCROCO)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libcroco*.so* \
+ $(IDIR_LIBCROCO)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/librsvg/Makefile b/package/librsvg/Makefile
new file mode 100644
index 000000000..39eeaab5d
--- /dev/null
+++ b/package/librsvg/Makefile
@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= librsvg
+PKG_VERSION:= 2.40.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= acdecdb9f08f3bf662a68bf7dafb8b82
+PKG_DESCR:= SVG library
+PKG_BUILDDEP:= libcroco
+HOST_BUILDDEP:= libcroco-host
+PKG_SECTION:= libs
+PKG_URL:= https://wiki.gnome.org/action/show/Projects/LibRsvg?action=show&redirect=LibRsvg
+PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+HOST_STYLE:= auto
+CONFIGURE_ARGS+= --enable-introspection=no
+
+librsvg-install:
+ $(INSTALL_DIR) $(IDIR_LIBRSVG)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/librsvg*.so* \
+ $(IDIR_LIBRSVG)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libsecret/Makefile b/package/libsecret/Makefile
new file mode 100644
index 000000000..6659cbc67
--- /dev/null
+++ b/package/libsecret/Makefile
@@ -0,0 +1,31 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libsecret
+PKG_VERSION:= 0.16
+PKG_RELEASE:= 1
+PKG_MD5SUM:= ab0edcd5887a6fe78c948e36b6341858
+PKG_DESCR:= library for storing and retrieving passwords
+PKG_SECTION:= libs
+PKG_DEPENDS:= libgcrypt
+PKG_BUILDDEP:= autotool libgcrypt
+PKG_URL:= https://wiki.gnome.org/Libsecret
+PKG_SITES:= https://git.gnome.org/browse/libsecret/snapshot/
+PKG_OPTS:= dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSECRET,libsecret,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+AUTOTOOL_STYLE:= autoreconf
+CONFIGURE_ARGS+= --enable-vala=no \
+ --enable-gcrypt
+
+libsecret-install:
+ $(INSTALL_DIR) $(IDIR_LIBSECRET)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libsecret*.so* \
+ $(IDIR_LIBSECRET)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libsecret/patches/patch-Makefile_am b/package/libsecret/patches/patch-Makefile_am
new file mode 100644
index 000000000..50af269ea
--- /dev/null
+++ b/package/libsecret/patches/patch-Makefile_am
@@ -0,0 +1,26 @@
+--- libsecret-0.16.orig/Makefile.am 2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/Makefile.am 2013-11-22 14:38:52.000000000 +0100
+@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
+
+ ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
+
+-SUBDIRS = build egg libsecret tool po docs .
++SUBDIRS = build egg libsecret tool .
+
+ DISTCHECK_CONFIGURE_FLAGS = \
+ --enable-debug=yes \
+@@ -42,14 +42,9 @@ upload-release: $(DIST_ARCHIVES)
+ upload-docs:
+ rsync -Hvax docs/reference/libsecret/html/./ master.gnome.org:public_html/libsecret-docs/
+
+-if HAVE_VALAC
+-dist-check-valac:
+-
+-else
+ dist-check-valac:
+ @echo "*** valac must be installed and enabled in order to make dist"
+ @false
+-endif
+
+ dist-hook: dist-check-valac
+
diff --git a/package/libsecret/patches/patch-Makefile_am.orig b/package/libsecret/patches/patch-Makefile_am.orig
new file mode 100644
index 000000000..8273c753c
--- /dev/null
+++ b/package/libsecret/patches/patch-Makefile_am.orig
@@ -0,0 +1,11 @@
+--- libsecret-0.16.orig/Makefile.am 2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/Makefile.am 2013-11-21 12:03:12.000000000 +0100
+@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
+
+ ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
+
+-SUBDIRS = build egg libsecret tool po docs .
++SUBDIRS = build egg libsecret tool .
+
+ DISTCHECK_CONFIGURE_FLAGS = \
+ --enable-debug=yes \
diff --git a/package/libsecret/patches/patch-configure_ac b/package/libsecret/patches/patch-configure_ac
new file mode 100644
index 000000000..e9de60534
--- /dev/null
+++ b/package/libsecret/patches/patch-configure_ac
@@ -0,0 +1,44 @@
+--- libsecret-0.16.orig/configure.ac 2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/configure.ac 2013-11-22 18:00:42.000000000 +0100
+@@ -43,7 +43,6 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AM_PROG_LIBTOOL
+-IT_PROG_INTLTOOL([0.35.0])
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ GETTEXT_PACKAGE=libsecret
+@@ -66,9 +65,6 @@ PKG_CHECK_MODULES(GLIB,
+ LIBS="$LIBS $GLIB_LIBS"
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
+
+-GTK_DOC_CHECK(1.9)
+-
+-GOBJECT_INTROSPECTION_CHECK([1.29])
+ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
+
+ # --------------------------------------------------------------------
+@@ -88,14 +84,6 @@ AM_CONDITIONAL(WITH_MANPAGES, test x$ena
+ # --------------------------------------------------------------------
+ # Vala
+
+-VALA_REQUIRED=0.17.2.12
+-
+-VAPIGEN_CHECK($VALA_REQUIRED)
+-
+-if test "$enable_vala" != "no"; then
+- AC_PATH_PROG([VALAC], [valac], [])
+-fi
+-AM_CONDITIONAL(HAVE_VALAC, test "x$VALAC" != "x")
+
+ # --------------------------------------------------------------------
+ # libgcrypt
+@@ -267,8 +255,6 @@ AC_CONFIG_FILES([
+ docs/reference/libsecret/version-major.xml
+ egg/Makefile
+ egg/tests/Makefile
+- po/Makefile.in
+- po/Makefile
+ libsecret/Makefile
+ libsecret/libsecret.pc
+ libsecret/libsecret-unstable.pc
diff --git a/package/libsecret/patches/patch-configure_ac.orig b/package/libsecret/patches/patch-configure_ac.orig
new file mode 100644
index 000000000..a26aab5cb
--- /dev/null
+++ b/package/libsecret/patches/patch-configure_ac.orig
@@ -0,0 +1,35 @@
+--- libsecret-0.16.orig/configure.ac 2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/configure.ac 2013-11-21 15:23:11.000000000 +0100
+@@ -43,7 +43,6 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AM_PROG_LIBTOOL
+-IT_PROG_INTLTOOL([0.35.0])
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ GETTEXT_PACKAGE=libsecret
+@@ -66,9 +65,6 @@ PKG_CHECK_MODULES(GLIB,
+ LIBS="$LIBS $GLIB_LIBS"
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
+
+-GTK_DOC_CHECK(1.9)
+-
+-GOBJECT_INTROSPECTION_CHECK([1.29])
+ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
+
+ # --------------------------------------------------------------------
+@@ -88,14 +84,6 @@ AM_CONDITIONAL(WITH_MANPAGES, test x$ena
+ # --------------------------------------------------------------------
+ # Vala
+
+-VALA_REQUIRED=0.17.2.12
+-
+-VAPIGEN_CHECK($VALA_REQUIRED)
+-
+-if test "$enable_vala" != "no"; then
+- AC_PATH_PROG([VALAC], [valac], [])
+-fi
+-AM_CONDITIONAL(HAVE_VALAC, test "x$VALAC" != "x")
+
+ # --------------------------------------------------------------------
+ # libgcrypt
diff --git a/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am b/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am
new file mode 100644
index 000000000..1a749c19e
--- /dev/null
+++ b/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am
@@ -0,0 +1,20 @@
+--- libsecret-0.16.orig/docs/reference/libsecret/Makefile.am 2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/docs/reference/libsecret/Makefile.am 2013-11-21 12:01:48.000000000 +0100
+@@ -92,13 +92,13 @@ GTKDOC_LIBS= $(GLIB_LIBS) $(GOBJECT_LIBS
+ $(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la
+
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
++#include $(top_srcdir)/gtk-doc.make
+
+ # Other files to distribute
+ # e.g. EXTRA_DIST += version.xml.in
+-EXTRA_DIST += \
+- version.xml.in \
+- version-major.xml.in
++#EXTRA_DIST += \
++# version.xml.in \
++# version-major.xml.in
+
+ # Files not to distribute
+ # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
diff --git a/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig b/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig
new file mode 100644
index 000000000..02e2351a3
--- /dev/null
+++ b/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig
@@ -0,0 +1,11 @@
+--- libsecret-0.16.orig/docs/reference/libsecret/Makefile.am 2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/docs/reference/libsecret/Makefile.am 2013-11-21 11:59:27.000000000 +0100
+@@ -92,7 +92,7 @@ GTKDOC_LIBS= $(GLIB_LIBS) $(GOBJECT_LIBS
+ $(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la
+
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
++#include $(top_srcdir)/gtk-doc.make
+
+ # Other files to distribute
+ # e.g. EXTRA_DIST += version.xml.in
diff --git a/package/libsecret/patches/patch-libsecret_Makefile_am b/package/libsecret/patches/patch-libsecret_Makefile_am
new file mode 100644
index 000000000..88e9ef5fb
--- /dev/null
+++ b/package/libsecret/patches/patch-libsecret_Makefile_am
@@ -0,0 +1,95 @@
+--- libsecret-0.16.orig/libsecret/Makefile.am 2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/libsecret/Makefile.am 2013-11-21 12:06:37.000000000 +0100
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/Makefile.decl
+
+-SUBDIRS = . tests
++SUBDIRS = .
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+@@ -107,84 +107,6 @@ secret-enum-types.c: secret-enum-types.c
+
+ CLEANFILES =
+
+-# ------------------------------------------------------------------
+-# INTROSPECTION
+-
+-if HAVE_INTROSPECTION
+-
+-include $(INTROSPECTION_MAKEFILE)
+-
+-INTROSPECTION_GIRS = Secret-@SECRET_MAJOR@.gir SecretUnstable-0.gir
+-INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=$(srcdir) --add-include-path=.
+-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
+-
+-Secret-@SECRET_MAJOR@.gir: libsecret-@SECRET_MAJOR@.la
+-
+-Secret_@SECRET_MAJOR@_gir_NAMESPACE = Secret
+-Secret_@SECRET_MAJOR@_gir_EXPORT_PACKAGES = libsecret-@SECRET_MAJOR@
+-Secret_@SECRET_MAJOR@_gir_INCLUDES = GObject-2.0 Gio-2.0
+-Secret_@SECRET_MAJOR@_gir_LIBS = libsecret-@SECRET_MAJOR@.la
+-Secret_@SECRET_MAJOR@_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DSECRET_COMPILATION
+-Secret_@SECRET_MAJOR@_gir_FILES = $(STABLE_FILES)
+-Secret_@SECRET_MAJOR@_gir_SCANNERFLAGS = --c-include "libsecret/secret.h"
+-
+-SecretUnstable-0.gir: Secret-@SECRET_MAJOR@.gir
+-
+-SecretUnstable_0_gir_NAMESPACE = SecretUnstable
+-SecretUnstable_0_gir_EXPORT_PACKAGES = libsecret-unstable
+-SecretUnstable_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+-SecretUnstable_0_gir_LIBS = libsecret-@SECRET_MAJOR@.la
+-SecretUnstable_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DSECRET_COMPILATION -DSECRET_API_SUBJECT_TO_CHANGE
+-SecretUnstable_0_gir_FILES = $(UNSTABLE_FILES)
+-SecretUnstable_0_gir_SCANNERFLAGS = --c-include "libsecret/secret.h" --identifier-prefix=Secret --symbol-prefix=secret --include-uninstalled=$(builddir)/Secret-@SECRET_MAJOR@.gir
+-
+-girdir = $(datadir)/gir-1.0
+-gir_DATA = $(INTROSPECTION_GIRS)
+-
+-typelibsdir = $(libdir)/girepository-1.0
+-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+-
+-if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+-
+-libsecret-@SECRET_MAJOR@.vapi: Secret-@SECRET_MAJOR@.gir Secret-@SECRET_MAJOR@.metadata libsecret-@SECRET_MAJOR@.deps
+-
+-libsecret-unstable.vapi: SecretUnstable-0.gir SecretUnstable-0.metadata libsecret-unstable.deps
+-
+-VAPIGEN_VAPIS = \
+- libsecret-@SECRET_MAJOR@.vapi \
+- libsecret-unstable.vapi
+-
+-libsecret_@SECRET_MAJOR@_vapi_DEPS = glib-2.0 gio-2.0
+-libsecret_@SECRET_MAJOR@_vapi_METADATADIRS = $(srcdir)
+-libsecret_@SECRET_MAJOR@_vapi_FILES = Secret-@SECRET_MAJOR@.gir
+-
+-libsecret_unstable_vapi_DEPS = gio-2.0 libsecret-@SECRET_MAJOR@
+-libsecret_unstable_vapi_METADATADIRS = $(srcdir)
+-libsecret_unstable_vapi_VAPIDIRS = $(builddir)
+-libsecret_unstable_vapi_GIRDIRS = $(builddir)
+-# ... because _GIRDIRS above is broken, yes, this is ugly
+-libsecret_unstable_vapi_FILES = --girdir=$(builddir)
+-libsecret_unstable_vapi_FILES += SecretUnstable-0.gir
+-
+-VAPI_DEPS = $(VAPIGEN_VAPIS:.vapi=.deps)
+-
+-libsecret-$(SECRET_MAJOR).deps: Makefile.am
+- $(AM_V_GEN) echo $(libsecret_@SECRET_MAJOR@_vapi_DEPS) | tr ' ' '\n' > $@
+-libsecret-unstable.deps: Makefile.am
+- $(AM_V_GEN) echo $(libsecret_unstable_vapi_DEPS) | tr ' ' '\n' > $@
+-
+-vapidir = $(datadir)/vala/vapi
+-vapi_DATA = \
+- $(VAPIGEN_VAPIS) \
+- $(VAPI_DEPS)
+-
+-CLEANFILES += \
+- $(VAPIGEN_VAPIS) \
+- $(VAPI_DEPS)
+-
+-endif # ENABLE_VAPIGEN
+-endif # HAVE_INTROSPECTION
+
+ # ------------------------------------------------------------------
+ # PKG CONFIG
diff --git a/package/libsecret/patches/patch-libsecret_tests_Makefile_am b/package/libsecret/patches/patch-libsecret_tests_Makefile_am
new file mode 100644
index 000000000..d168c022e
--- /dev/null
+++ b/package/libsecret/patches/patch-libsecret_tests_Makefile_am
@@ -0,0 +1,113 @@
+--- libsecret-0.16.orig/libsecret/tests/Makefile.am 2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/libsecret/tests/Makefile.am 2013-11-21 15:35:42.000000000 +0100
+@@ -73,59 +73,6 @@ PY_TESTS = \
+
+ PY_ENV = $(JS_ENV)
+
+-# ------------------------------------------------------------------
+-# VALA
+-
+-VALA_V = $(VALA_V_$(V))
+-VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
+-VALA_V_0 = @echo " VALAC " $^;
+-
+-VALA_TESTS = \
+- test-vala-lang \
+- test-vala-unstable \
+- $(NULL)
+-
+-VALA_FLAGS = \
+- --vapidir=$(builddir)/.. \
+- --pkg gio-2.0
+-
+-VALA_TESTS_VAPIS = \
+- $(builddir)/../libsecret-unstable.vapi \
+- $(builddir)/../libsecret-@SECRET_MAJOR@.vapi \
+- $(builddir)/mock-service-0.vapi
+-
+-VALA_SRCS = $(VALA_TESTS:=.vala)
+-VALA_C_SRCS = $(VALA_SRCS:.vala=.c)
+-
+-if HAVE_VALAC
+-$(VALA_C_SRCS): %.c: %.vala $(VALA_TESTS_VAPIS)
+- $(VALA_V)$(VALAC) $(VALA_FLAGS) $(VALA_TESTS_VAPIS) -C $<
+-endif
+-
+-test_vala_lang_CFLAGS = -w
+-test_vala_unstable_CFLAGS = -DSECRET_WITH_UNSTABLE -w
+-
+-nodist_test_vala_lang_SOURCES = test-vala-lang.c
+-nodist_test_vala_unstable_SOURCES = test-vala-unstable.c
+-
+-DISTCLEANFILES = $(VALA_C_SRCS)
+-
+-test-vala: $(VALA_TESTS)
+- @gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(VALA_TESTS)
+-
+-VALA_TEST_TARGET =
+-
+-if HAVE_INTROSPECTION
+-if ENABLE_VAPIGEN
+-if HAVE_VALAC
+-
+-VALA_TEST_TARGET += test-vala
+-
+-TEST_PROGS += $(VALA_TESTS)
+-
+-endif # HAVE_VALAC
+-endif # ENABLE_VAPIGEN
+-endif # HAVE_INTROSPECTION
+
+ test-c: $(C_TESTS)
+ @gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(C_TESTS)
+@@ -138,50 +85,6 @@ test-py:
+
+ test: test-c test-py test-js $(VALA_TEST_TARGET)
+
+-# ------------------------------------------------------------------
+-# INTROSPECTION
+-
+-if HAVE_INTROSPECTION
+-
+-include $(INTROSPECTION_MAKEFILE)
+-
+-INTROSPECTION_GIRS = MockService-0.gir
+-INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=$(srcdir) --add-include-path=.
+-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
+-
+-MockService-0.gir: libmock_service.la
+-
+-MockService_0_gir_PACKAGES = gobject-2.0 gio-2.0
+-MockService_0_gir_EXPORT_PACKAGES = mock-service-0
+-MockService_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+-MockService_0_gir_LIBS = libmock_service.la
+-MockService_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir)
+-MockService_0_gir_FILES = $(libmock_service_la_SOURCES)
+-MockService_0_gir_SCANNERFLAGS = --c-include "mock-service.h"
+-
+-noinst_DATA = \
+- $(INTROSPECTION_GIRS) \
+- $(INTROSPECTION_GIRS:.gir=.typelib)
+-
+-if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+-
+-mock-service-0.vapi: MockService-0.gir $(builddir)/../libsecret-@SECRET_MAJOR@.vapi
+-
+-VAPIGEN_VAPIS = mock-service-0.vapi
+-
+-mock_service_0_vapi_DEPS = gio-2.0 libsecret-@SECRET_MAJOR@
+-mock_service_0_vapi_METADATADIRS = $(builddir)
+-mock_service_0_vapi_VAPIDIRS = $(builddir) $(builddir)/..
+-mock_service_0_vapi_FILES = MockService-0.gir
+-
+-vapidir = $(datadir)/vala/vapi
+-vapi_DATA = mock-service-0.vapi
+-
+-noinst_DATA += $(VAPIGEN_VAPIS)
+-
+-endif # ENABLE_VAPIGEN
+-endif # HAVE_INTROSPECTION
+
+ #--------------------------------------------------------------------
+
diff --git a/package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig b/package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig
new file mode 100644
index 000000000..efe20a44f
--- /dev/null
+++ b/package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig
@@ -0,0 +1,72 @@
+--- libsecret-0.16.orig/libsecret/tests/Makefile.am 2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/libsecret/tests/Makefile.am 2013-11-21 12:15:40.000000000 +0100
+@@ -115,18 +115,6 @@ test-vala: $(VALA_TESTS)
+
+ VALA_TEST_TARGET =
+
+-if HAVE_INTROSPECTION
+-if ENABLE_VAPIGEN
+-if HAVE_VALAC
+-
+-VALA_TEST_TARGET += test-vala
+-
+-TEST_PROGS += $(VALA_TESTS)
+-
+-endif # HAVE_VALAC
+-endif # ENABLE_VAPIGEN
+-endif # HAVE_INTROSPECTION
+-
+ test-c: $(C_TESTS)
+ @gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(C_TESTS)
+
+@@ -138,50 +126,6 @@ test-py:
+
+ test: test-c test-py test-js $(VALA_TEST_TARGET)
+
+-# ------------------------------------------------------------------
+-# INTROSPECTION
+-
+-if HAVE_INTROSPECTION
+-
+-include $(INTROSPECTION_MAKEFILE)
+-
+-INTROSPECTION_GIRS = MockService-0.gir
+-INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=$(srcdir) --add-include-path=.
+-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
+-
+-MockService-0.gir: libmock_service.la
+-
+-MockService_0_gir_PACKAGES = gobject-2.0 gio-2.0
+-MockService_0_gir_EXPORT_PACKAGES = mock-service-0
+-MockService_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+-MockService_0_gir_LIBS = libmock_service.la
+-MockService_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir)
+-MockService_0_gir_FILES = $(libmock_service_la_SOURCES)
+-MockService_0_gir_SCANNERFLAGS = --c-include "mock-service.h"
+-
+-noinst_DATA = \
+- $(INTROSPECTION_GIRS) \
+- $(INTROSPECTION_GIRS:.gir=.typelib)
+-
+-if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+-
+-mock-service-0.vapi: MockService-0.gir $(builddir)/../libsecret-@SECRET_MAJOR@.vapi
+-
+-VAPIGEN_VAPIS = mock-service-0.vapi
+-
+-mock_service_0_vapi_DEPS = gio-2.0 libsecret-@SECRET_MAJOR@
+-mock_service_0_vapi_METADATADIRS = $(builddir)
+-mock_service_0_vapi_VAPIDIRS = $(builddir) $(builddir)/..
+-mock_service_0_vapi_FILES = MockService-0.gir
+-
+-vapidir = $(datadir)/vala/vapi
+-vapi_DATA = mock-service-0.vapi
+-
+-noinst_DATA += $(VAPIGEN_VAPIS)
+-
+-endif # ENABLE_VAPIGEN
+-endif # HAVE_INTROSPECTION
+
+ #--------------------------------------------------------------------
+
diff --git a/package/libsoup/Makefile b/package/libsoup/Makefile
new file mode 100644
index 000000000..967f375bb
--- /dev/null
+++ b/package/libsoup/Makefile
@@ -0,0 +1,31 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libsoup
+PKG_VERSION:= 2.44.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 92aa3667357157e8f3489bcca287f2fa
+PKG_DESCR:= HTTP client/server library
+PKG_SECTION:= libs
+PKG_DEPENDS:= libsqlite
+PKG_BUILDDEP:= autotool sqlite
+PKG_URL:= https://wiki.gnome.org/LibSoup
+PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.44/
+PKG_OPTS:= dev
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSOUP,libsoup,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+AUTOTOOL_STYLE:= autoreconf
+
+libsoup-install:
+ $(INSTALL_DIR) $(IDIR_LIBSOUP)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libsoup*.so* \
+ $(IDIR_LIBSOUP)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libsoup/patches/patch-Makefile_am b/package/libsoup/patches/patch-Makefile_am
new file mode 100644
index 000000000..50a47de27
--- /dev/null
+++ b/package/libsoup/patches/patch-Makefile_am
@@ -0,0 +1,20 @@
+--- libsoup-2.44.2.orig/Makefile.am 2013-11-11 16:02:00.000000000 +0100
++++ libsoup-2.44.2/Makefile.am 2014-04-14 17:24:56.713849496 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+-SUBDIRS = libsoup po tests examples docs
++SUBDIRS = libsoup
+
+ EXTRA_DIST = \
+ data/effective_tld_names.dat \
+@@ -12,8 +12,6 @@ EXTRA_DIST = \
+ m4/introspection.m4 \
+ Makefile.glib
+
+-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+-
+ pkgconfigdir = $(libdir)/pkgconfig
+
+ pkgconfig_DATA = libsoup-2.4.pc
diff --git a/package/libsoup/patches/patch-build-aux_config_guess b/package/libsoup/patches/patch-build-aux_config_guess
new file mode 100644
index 000000000..a3a438b4f
--- /dev/null
+++ b/package/libsoup/patches/patch-build-aux_config_guess
@@ -0,0 +1,447 @@
+--- libsoup-2.44.2.orig/build-aux/config.guess 2013-10-18 00:01:48.000000000 +0200
++++ libsoup-2.44.2/build-aux/config.guess 2014-04-14 17:21:42.176934834 +0200
+@@ -1,10 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-# 2011, 2012, 2013 Free Software Foundation, Inc.
++# Copyright 1992-2014 Free Software Foundation, Inc.
+
+-timestamp='2012-12-29'
++timestamp='2014-01-25'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -26,7 +24,7 @@ timestamp='2012-12-29'
+ # program. This Exception is an additional permission under section 7
+ # of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# Originally written by Per Bothner.
++# Originally written by Per Bothner.
+ #
+ # You can get the latest version of this script from:
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+@@ -52,9 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+-2012, 2013 Free Software Foundation, Inc.
++Copyright 1992-2014 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
++case "${UNAME_SYSTEM}" in
++Linux|GNU|GNU/*)
++ # If the system lacks a compiler, then just pick glibc.
++ # We could probably try harder.
++ LIBC=gnu
++
++ eval $set_cc_for_build
++ cat <<-EOF > $dummy.c
++ #include <features.h>
++ #if defined(__UCLIBC__)
++ LIBC=uclibc
++ #elif defined(__dietlibc__)
++ LIBC=dietlibc
++ #else
++ LIBC=gnu
++ #endif
++ EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ ;;
++esac
++
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -857,21 +874,21 @@ EOF
+ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ exit ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
+ aarch64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -884,59 +901,54 @@ EOF
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
++ arc:Linux:*:* | arceb:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ else
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ else
+- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ fi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ cris:Linux:*:*)
+- echo ${UNAME_MACHINE}-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ exit ;;
+ crisv32:Linux:*:*)
+- echo ${UNAME_MACHINE}-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ exit ;;
+ frv:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ hexagon:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ i*86:Linux:*:*)
+- LIBC=gnu
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ exit ;;
+ ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ m32r*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ m68*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+@@ -955,54 +967,63 @@ EOF
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ ;;
++ or1k:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
+ or32:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ padre:Linux:*:*)
+- echo sparc-unknown-linux-gnu
++ echo sparc-unknown-linux-${LIBC}
+ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ echo hppa64-unknown-linux-${LIBC}
+ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+- PA7*) echo hppa1.1-unknown-linux-gnu ;;
+- PA8*) echo hppa2.0-unknown-linux-gnu ;;
+- *) echo hppa-unknown-linux-gnu ;;
++ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
++ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
++ *) echo hppa-unknown-linux-${LIBC} ;;
+ esac
+ exit ;;
+ ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
++ echo powerpc64-unknown-linux-${LIBC}
+ exit ;;
+ ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
++ echo powerpc-unknown-linux-${LIBC}
++ exit ;;
++ ppc64le:Linux:*:*)
++ echo powerpc64le-unknown-linux-${LIBC}
++ exit ;;
++ ppcle:Linux:*:*)
++ echo powerpcle-unknown-linux-${LIBC}
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+- echo ${UNAME_MACHINE}-ibm-linux
++ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ sh*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ tile*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ vax:Linux:*:*)
+- echo ${UNAME_MACHINE}-dec-linux-gnu
++ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ exit ;;
+ x86_64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ xtensa*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1235,19 +1256,31 @@ EOF
+ exit ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+- case $UNAME_PROCESSOR in
+- i386)
+- eval $set_cc_for_build
+- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+- grep IS_64BIT_ARCH >/dev/null
+- then
+- UNAME_PROCESSOR="x86_64"
+- fi
+- fi ;;
+- unknown) UNAME_PROCESSOR=powerpc ;;
+- esac
++ eval $set_cc_for_build
++ if test "$UNAME_PROCESSOR" = unknown ; then
++ UNAME_PROCESSOR=powerpc
++ fi
++ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ case $UNAME_PROCESSOR in
++ i386) UNAME_PROCESSOR=x86_64 ;;
++ powerpc) UNAME_PROCESSOR=powerpc64 ;;
++ esac
++ fi
++ fi
++ elif test "$UNAME_PROCESSOR" = i386 ; then
++ # Avoid executing cc on OS X 10.9, as it ships with a stub
++ # that puts up a graphical alert prompting to install
++ # developer tools. Any system running Mac OS X 10.7 or
++ # later (Darwin 11 and later) is required to have a 64-bit
++ # processor. This is not true of the ARM version of Darwin
++ # that Apple uses in portable devices.
++ UNAME_PROCESSOR=x86_64
++ fi
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+@@ -1338,154 +1371,6 @@ EOF
+ exit ;;
+ esac
+
+-eval $set_cc_for_build
+-cat >$dummy.c <<EOF
+-#ifdef _SEQUENT_
+-# include <sys/types.h>
+-# include <sys/utsname.h>
+-#endif
+-main ()
+-{
+-#if defined (sony)
+-#if defined (MIPSEB)
+- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+- I don't know.... */
+- printf ("mips-sony-bsd\n"); exit (0);
+-#else
+-#include <sys/param.h>
+- printf ("m68k-sony-newsos%s\n",
+-#ifdef NEWSOS4
+- "4"
+-#else
+- ""
+-#endif
+- ); exit (0);
+-#endif
+-#endif
+-
+-#if defined (__arm) && defined (__acorn) && defined (__unix)
+- printf ("arm-acorn-riscix\n"); exit (0);
+-#endif
+-
+-#if defined (hp300) && !defined (hpux)
+- printf ("m68k-hp-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (NeXT)
+-#if !defined (__ARCHITECTURE__)
+-#define __ARCHITECTURE__ "m68k"
+-#endif
+- int version;
+- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+- if (version < 4)
+- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+- else
+- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+- exit (0);
+-#endif
+-
+-#if defined (MULTIMAX) || defined (n16)
+-#if defined (UMAXV)
+- printf ("ns32k-encore-sysv\n"); exit (0);
+-#else
+-#if defined (CMU)
+- printf ("ns32k-encore-mach\n"); exit (0);
+-#else
+- printf ("ns32k-encore-bsd\n"); exit (0);
+-#endif
+-#endif
+-#endif
+-
+-#if defined (__386BSD__)
+- printf ("i386-pc-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (sequent)
+-#if defined (i386)
+- printf ("i386-sequent-dynix\n"); exit (0);
+-#endif
+-#if defined (ns32000)
+- printf ("ns32k-sequent-dynix\n"); exit (0);
+-#endif
+-#endif
+-
+-#if defined (_SEQUENT_)
+- struct utsname un;
+-
+- uname(&un);
+-
+- if (strncmp(un.version, "V2", 2) == 0) {
+- printf ("i386-sequent-ptx2\n"); exit (0);
+- }
+- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+- printf ("i386-sequent-ptx1\n"); exit (0);
+- }
+- printf ("i386-sequent-ptx\n"); exit (0);
+-
+-#endif
+-
+-#if defined (vax)
+-# if !defined (ultrix)
+-# include <sys/param.h>
+-# if defined (BSD)
+-# if BSD == 43
+- printf ("vax-dec-bsd4.3\n"); exit (0);
+-# else
+-# if BSD == 199006
+- printf ("vax-dec-bsd4.3reno\n"); exit (0);
+-# else
+- printf ("vax-dec-bsd\n"); exit (0);
+-# endif
+-# endif
+-# else
+- printf ("vax-dec-bsd\n"); exit (0);
+-# endif
+-# else
+- printf ("vax-dec-ultrix\n"); exit (0);
+-# endif
+-#endif
+-
+-#if defined (alliant) && defined (i860)
+- printf ("i860-alliant-bsd\n"); exit (0);
+-#endif
+-
+- exit (1);
+-}
+-EOF
+-
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+- { echo "$SYSTEM_NAME"; exit; }
+-
+-# Apollos put the system type in the environment.
+-
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+-
+-# Convex versions that predate uname can use getsysinfo(1)
+-
+-if [ -x /usr/convex/getsysinfo ]
+-then
+- case `getsysinfo -f cpu_type` in
+- c1*)
+- echo c1-convex-bsd
+- exit ;;
+- c2*)
+- if getsysinfo -f scalar_acc
+- then echo c32-convex-bsd
+- else echo c2-convex-bsd
+- fi
+- exit ;;
+- c34*)
+- echo c34-convex-bsd
+- exit ;;
+- c38*)
+- echo c38-convex-bsd
+- exit ;;
+- c4*)
+- echo c4-convex-bsd
+- exit ;;
+- esac
+-fi
+-
+ cat >&2 <<EOF
+ $0: unable to guess system type
+
diff --git a/package/libsoup/patches/patch-build-aux_config_sub b/package/libsoup/patches/patch-build-aux_config_sub
new file mode 100644
index 000000000..623cd9420
--- /dev/null
+++ b/package/libsoup/patches/patch-build-aux_config_sub
@@ -0,0 +1,183 @@
+--- libsoup-2.44.2.orig/build-aux/config.sub 2013-10-18 00:01:48.000000000 +0200
++++ libsoup-2.44.2/build-aux/config.sub 2014-04-14 17:21:42.176934834 +0200
+@@ -1,10 +1,8 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-# 2011, 2012, 2013 Free Software Foundation, Inc.
++# Copyright 1992-2014 Free Software Foundation, Inc.
+
+-timestamp='2012-12-29'
++timestamp='2014-01-01'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -70,9 +68,7 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+-2012, 2013 Free Software Foundation, Inc.
++Copyright 1992-2014 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -256,12 +252,12 @@ case $basic_machine in
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc \
++ | arc | arceb \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+ | be32 | be64 \
+ | bfin \
+- | c4x | clipper \
++ | c4x | c8051 | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+ | epiphany \
+ | fido | fr30 | frv \
+@@ -269,6 +265,7 @@ case $basic_machine in
+ | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
++ | k1om \
+ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+@@ -290,16 +287,17 @@ case $basic_machine in
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
++ | mipsr5900 | mipsr5900el \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
+ | moxie \
+ | mt \
+ | msp430 \
+ | nds32 | nds32le | nds32be \
+- | nios | nios2 \
++ | nios | nios2 | nios2eb | nios2el \
+ | ns16k | ns32k \
+ | open8 \
+- | or32 \
++ | or1k | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pyramid \
+@@ -327,7 +325,7 @@ case $basic_machine in
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+@@ -369,13 +367,13 @@ case $basic_machine in
+ | aarch64-* | aarch64_be-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
+ | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+- | clipper-* | craynv-* | cydra-* \
++ | c8051-* | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+@@ -384,6 +382,7 @@ case $basic_machine in
+ | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
++ | k1om-* \
+ | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+@@ -407,12 +406,13 @@ case $basic_machine in
+ | mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
++ | mipsr5900-* | mipsr5900el-* \
+ | mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | mt-* \
+ | msp430-* \
+ | nds32-* | nds32le-* | nds32be-* \
+- | nios-* | nios2-* \
++ | nios-* | nios2-* | nios2eb-* | nios2el-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
+ | orion-* \
+@@ -796,7 +796,7 @@ case $basic_machine in
+ os=-mingw64
+ ;;
+ mingw32)
+- basic_machine=i386-pc
++ basic_machine=i686-pc
+ os=-mingw32
+ ;;
+ mingw32ce)
+@@ -832,7 +832,7 @@ case $basic_machine in
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
+ msys)
+- basic_machine=i386-pc
++ basic_machine=i686-pc
+ os=-msys
+ ;;
+ mvs)
+@@ -1008,7 +1008,7 @@ case $basic_machine in
+ ;;
+ ppc64) basic_machine=powerpc64-unknown
+ ;;
+- ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ basic_machine=powerpc64le-unknown
+@@ -1354,7 +1354,7 @@ case $os in
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+- | -sym* | -kopensolaris* \
++ | -sym* | -kopensolaris* | -plan9* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1500,9 +1500,6 @@ case $os in
+ -aros*)
+ os=-aros
+ ;;
+- -kaos*)
+- os=-kaos
+- ;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
+@@ -1551,6 +1548,9 @@ case $basic_machine in
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
++ c8051-*)
++ os=-elf
++ ;;
+ hexagon-*)
+ os=-elf
+ ;;
+@@ -1594,6 +1594,9 @@ case $basic_machine in
+ mips*-*)
+ os=-elf
+ ;;
++ or1k-*)
++ os=-elf
++ ;;
+ or32-*)
+ os=-coff
+ ;;
diff --git a/package/libsoup/patches/patch-build-aux_depcomp b/package/libsoup/patches/patch-build-aux_depcomp
new file mode 100644
index 000000000..730162b43
--- /dev/null
+++ b/package/libsoup/patches/patch-build-aux_depcomp
@@ -0,0 +1,682 @@
+--- libsoup-2.44.2.orig/build-aux/depcomp 2013-10-18 00:01:49.000000000 +0200
++++ libsoup-2.44.2/build-aux/depcomp 2014-04-14 17:21:42.708937363 +0200
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2013-05-30.07; # UTC
++scriptversion=2012-03-27.16; # UTC
+
+-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
++# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -27,9 +27,9 @@ scriptversion=2013-05-30.07; # UTC
+
+ case $1 in
+ '')
+- echo "$0: No command. Try '$0 --help' for more information." 1>&2
+- exit 1;
+- ;;
++ echo "$0: No command. Try '$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
+ -h | --h*)
+ cat <<\EOF
+ Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+@@ -56,65 +56,11 @@ EOF
+ ;;
+ esac
+
+-# Get the directory component of the given path, and save it in the
+-# global variables '$dir'. Note that this directory component will
+-# be either empty or ending with a '/' character. This is deliberate.
+-set_dir_from ()
+-{
+- case $1 in
+- */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+- *) dir=;;
+- esac
+-}
+-
+-# Get the suffix-stripped basename of the given path, and save it the
+-# global variable '$base'.
+-set_base_from ()
+-{
+- base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+-}
+-
+-# If no dependency file was actually created by the compiler invocation,
+-# we still have to create a dummy depfile, to avoid errors with the
+-# Makefile "include basename.Plo" scheme.
+-make_dummy_depfile ()
+-{
+- echo "#dummy" > "$depfile"
+-}
+-
+-# Factor out some common post-processing of the generated depfile.
+-# Requires the auxiliary global variable '$tmpdepfile' to be set.
+-aix_post_process_depfile ()
+-{
+- # If the compiler actually managed to produce a dependency file,
+- # post-process it.
+- if test -f "$tmpdepfile"; then
+- # Each line is of the form 'foo.o: dependency.h'.
+- # Do two passes, one to just change these to
+- # $object: dependency.h
+- # and one to simply output
+- # dependency.h:
+- # which is needed to avoid the deleted-header problem.
+- { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+- sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+- } > "$depfile"
+- rm -f "$tmpdepfile"
+- else
+- make_dummy_depfile
+- fi
+-}
+-
+ # A tabulation character.
+ tab=' '
+ # A newline character.
+ nl='
+ '
+-# Character ranges might be problematic outside the C locale.
+-# These definitions help.
+-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+-lower=abcdefghijklmnopqrstuvwxyz
+-digits=0123456789
+-alpha=${upper}${lower}
+
+ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+@@ -128,9 +74,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile"
+
+ rm -f "$tmpdepfile"
+
+-# Avoid interferences from the environment.
+-gccflag= dashmflag=
+-
+ # Some modes work just like other modes, but use different flags. We
+ # parameterize here, but still list the modes in the big case below,
+ # to make depend.m4 easier to write. Note that we *cannot* use a case
+@@ -142,32 +85,32 @@ if test "$depmode" = hp; then
+ fi
+
+ if test "$depmode" = dashXmstdout; then
+- # This is just like dashmstdout with a different argument.
+- dashmflag=-xM
+- depmode=dashmstdout
++ # This is just like dashmstdout with a different argument.
++ dashmflag=-xM
++ depmode=dashmstdout
+ fi
+
+ cygpath_u="cygpath -u -f -"
+ if test "$depmode" = msvcmsys; then
+- # This is just like msvisualcpp but w/o cygpath translation.
+- # Just convert the backslash-escaped backslashes to single forward
+- # slashes to satisfy depend.m4
+- cygpath_u='sed s,\\\\,/,g'
+- depmode=msvisualcpp
++ # This is just like msvisualcpp but w/o cygpath translation.
++ # Just convert the backslash-escaped backslashes to single forward
++ # slashes to satisfy depend.m4
++ cygpath_u='sed s,\\\\,/,g'
++ depmode=msvisualcpp
+ fi
+
+ if test "$depmode" = msvc7msys; then
+- # This is just like msvc7 but w/o cygpath translation.
+- # Just convert the backslash-escaped backslashes to single forward
+- # slashes to satisfy depend.m4
+- cygpath_u='sed s,\\\\,/,g'
+- depmode=msvc7
++ # This is just like msvc7 but w/o cygpath translation.
++ # Just convert the backslash-escaped backslashes to single forward
++ # slashes to satisfy depend.m4
++ cygpath_u='sed s,\\\\,/,g'
++ depmode=msvc7
+ fi
+
+ if test "$depmode" = xlc; then
+- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+- gccflag=-qmakedep=gcc,-MF
+- depmode=gcc
++ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
++ gccflag=-qmakedep=gcc,-MF
++ depmode=gcc
+ fi
+
+ case "$depmode" in
+@@ -190,7 +133,8 @@ gcc3)
+ done
+ "$@"
+ stat=$?
+- if test $stat -ne 0; then
++ if test $stat -eq 0; then :
++ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+@@ -198,17 +142,13 @@ gcc3)
+ ;;
+
+ gcc)
+-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+-## (see the conditional assignment to $gccflag above).
+ ## There are various ways to get dependency output from gcc. Here's
+ ## why we pick this rather obscure method:
+ ## - Don't want to use -MD because we'd like the dependencies to end
+ ## up in a subdir. Having to rename by hand is ugly.
+ ## (We might end up doing this anyway to support other compilers.)
+ ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+-## -MM, not -M (despite what the docs say). Also, it might not be
+-## supported by the other compilers which use the 'gcc' depmode.
++## -MM, not -M (despite what the docs say).
+ ## - Using -M directly means running the compiler twice (even worse
+ ## than renaming).
+ if test -z "$gccflag"; then
+@@ -216,14 +156,15 @@ gcc)
+ fi
+ "$@" -Wp,"$gccflag$tmpdepfile"
+ stat=$?
+- if test $stat -ne 0; then
++ if test $stat -eq 0; then :
++ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+- # The second -e expression handles DOS-style file names with drive
+- # letters.
++ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
++## The second -e expression handles DOS-style file names with drive letters.
+ sed -e 's/^[^:]*: / /' \
+ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+ ## This next piece of magic avoids the "deleted header file" problem.
+@@ -232,15 +173,15 @@ gcc)
+ ## typically no way to rebuild the header). We avoid this by adding
+ ## dummy dependencies for each header file. Too bad gcc doesn't do
+ ## this for us directly.
++ tr ' ' "$nl" < "$tmpdepfile" |
+ ## Some versions of gcc put a space before the ':'. On the theory
+ ## that the space means something, we add a space to the output as
+ ## well. hp depmode also adds that space, but also prefixes the VPATH
+ ## to the object. Take care to not repeat it in the output.
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+- tr ' ' "$nl" < "$tmpdepfile" \
+- | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+- | sed -e 's/$/ :/' >> "$depfile"
++ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
++ | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+@@ -258,7 +199,8 @@ sgi)
+ "$@" -MDupdate "$tmpdepfile"
+ fi
+ stat=$?
+- if test $stat -ne 0; then
++ if test $stat -eq 0; then :
++ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+@@ -266,6 +208,7 @@ sgi)
+
+ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
+ echo "$object : \\" > "$depfile"
++
+ # Clip off the initial element (the dependent). Don't try to be
+ # clever and replace this with sed code, as IRIX sed won't handle
+ # lines with more than a fixed number of characters (4096 in
+@@ -273,15 +216,19 @@ sgi)
+ # the IRIX cc adds comments like '#:fec' to the end of the
+ # dependency line.
+ tr ' ' "$nl" < "$tmpdepfile" \
+- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+- | tr "$nl" ' ' >> "$depfile"
++ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
++ tr "$nl" ' ' >> "$depfile"
+ echo >> "$depfile"
++
+ # The second pass generates a dummy entry for each header file.
+ tr ' ' "$nl" < "$tmpdepfile" \
+- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+- >> "$depfile"
++ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
++ >> "$depfile"
+ else
+- make_dummy_depfile
++ # The sourcefile does not contain any dependencies, so just
++ # store a dummy comment line, to avoid errors with the Makefile
++ # "include basename.Plo" scheme.
++ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+@@ -299,8 +246,9 @@ aix)
+ # current directory. Also, the AIX compiler puts '$object:' at the
+ # start of each line; $object doesn't have directory information.
+ # Version 6 uses the directory in both cases.
+- set_dir_from "$object"
+- set_base_from "$object"
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+@@ -313,7 +261,9 @@ aix)
+ "$@" -M
+ fi
+ stat=$?
+- if test $stat -ne 0; then
++
++ if test $stat -eq 0; then :
++ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+@@ -322,113 +272,65 @@ aix)
+ do
+ test -f "$tmpdepfile" && break
+ done
+- aix_post_process_depfile
+- ;;
+-
+-tcc)
+- # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+- # FIXME: That version still under development at the moment of writing.
+- # Make that this statement remains true also for stable, released
+- # versions.
+- # It will wrap lines (doesn't matter whether long or short) with a
+- # trailing '\', as in:
+- #
+- # foo.o : \
+- # foo.c \
+- # foo.h \
+- #
+- # It will put a trailing '\' even on the last line, and will use leading
+- # spaces rather than leading tabs (at least since its commit 0394caf7
+- # "Emit spaces for -MD").
+- "$@" -MD -MF "$tmpdepfile"
+- stat=$?
+- if test $stat -ne 0; then
+- rm -f "$tmpdepfile"
+- exit $stat
++ if test -f "$tmpdepfile"; then
++ # Each line is of the form 'foo.o: dependent.h'.
++ # Do two passes, one to just change these to
++ # '$object: dependent.h' and one to simply 'dependent.h:'.
++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++ else
++ # The sourcefile does not contain any dependencies, so just
++ # store a dummy comment line, to avoid errors with the Makefile
++ # "include basename.Plo" scheme.
++ echo "#dummy" > "$depfile"
+ fi
+- rm -f "$depfile"
+- # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+- # We have to change lines of the first kind to '$object: \'.
+- sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+- # And for each line of the second kind, we have to emit a 'dep.h:'
+- # dummy dependency, to avoid the deleted-header problem.
+- sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+-## The order of this option in the case statement is important, since the
+-## shell code in configure will try each of these formats in the order
+-## listed in this file. A plain '-MD' option would be understood by many
+-## compilers, so we must ensure this comes after the gcc and icc options.
+-pgcc)
+- # Portland's C compiler understands '-MD'.
+- # Will always output deps to 'file.d' where file is the root name of the
+- # source file under compilation, even if file resides in a subdirectory.
+- # The object file name does not affect the name of the '.d' file.
+- # pgcc 10.2 will output
++icc)
++ # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
++ # However on
++ # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
++ # ICC 7.0 will fill foo.d with something like
++ # foo.o: sub/foo.c
++ # foo.o: sub/foo.h
++ # which is wrong. We want
++ # sub/foo.o: sub/foo.c
++ # sub/foo.o: sub/foo.h
++ # sub/foo.c:
++ # sub/foo.h:
++ # ICC 7.1 will output
+ # foo.o: sub/foo.c sub/foo.h
+- # and will wrap long lines using '\' :
++ # and will wrap long lines using '\':
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
+- set_dir_from "$object"
+- # Use the source, not the object, to determine the base name, since
+- # that's sadly what pgcc will do too.
+- set_base_from "$source"
+- tmpdepfile=$base.d
+-
+- # For projects that build the same source file twice into different object
+- # files, the pgcc approach of using the *source* file root name can cause
+- # problems in parallel builds. Use a locking strategy to avoid stomping on
+- # the same $tmpdepfile.
+- lockdir=$base.d-lock
+- trap "
+- echo '$0: caught signal, cleaning up...' >&2
+- rmdir '$lockdir'
+- exit 1
+- " 1 2 13 15
+- numtries=100
+- i=$numtries
+- while test $i -gt 0; do
+- # mkdir is a portable test-and-set.
+- if mkdir "$lockdir" 2>/dev/null; then
+- # This process acquired the lock.
+- "$@" -MD
+- stat=$?
+- # Release the lock.
+- rmdir "$lockdir"
+- break
+- else
+- # If the lock is being held by a different process, wait
+- # until the winning process is done or we timeout.
+- while test -d "$lockdir" && test $i -gt 0; do
+- sleep 1
+- i=`expr $i - 1`
+- done
+- fi
+- i=`expr $i - 1`
+- done
+- trap - 1 2 13 15
+- if test $i -le 0; then
+- echo "$0: failed to acquire lock after $numtries attempts" >&2
+- echo "$0: check lockdir '$lockdir'" >&2
+- exit 1
+- fi
+-
+- if test $stat -ne 0; then
++ # tcc 0.9.26 (FIXME still under development at the moment of writing)
++ # will emit a similar output, but also prepend the continuation lines
++ # with horizontal tabulation characters.
++ "$@" -MD -MF "$tmpdepfile"
++ stat=$?
++ if test $stat -eq 0; then :
++ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+- # Each line is of the form `foo.o: dependent.h',
+- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
++ # Each line is of the form 'foo.o: dependent.h',
++ # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+- # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+- # Some versions of the HPUX 10.20 sed can't process this invocation
+- # correctly. Breaking it into two sed invocations is a workaround.
+- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+- | sed -e 's/$/ :/' >> "$depfile"
++ # '$object: dependent.h' and one to simply 'dependent.h:'.
++ sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
++ < "$tmpdepfile" > "$depfile"
++ sed '
++ s/[ '"$tab"'][ '"$tab"']*/ /g
++ s/^ *//
++ s/ *\\*$//
++ s/^[^:]*: *//
++ /^$/d
++ /:$/d
++ s/$/ :/
++ ' < "$tmpdepfile" >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+@@ -439,8 +341,9 @@ hp2)
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+- set_dir_from "$object"
+- set_base_from "$object"
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir.libs/$base.d
+@@ -451,7 +354,8 @@ hp2)
+ "$@" +Maked
+ fi
+ stat=$?
+- if test $stat -ne 0; then
++ if test $stat -eq 0; then :
++ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+@@ -461,61 +365,76 @@ hp2)
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+- sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add 'dependent.h:' lines.
+ sed -ne '2,${
+- s/^ *//
+- s/ \\*$//
+- s/$/:/
+- p
+- }' "$tmpdepfile" >> "$depfile"
++ s/^ *//
++ s/ \\*$//
++ s/$/:/
++ p
++ }' "$tmpdepfile" >> "$depfile"
+ else
+- make_dummy_depfile
++ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
+ tru64)
+- # The Tru64 compiler uses -MD to generate dependencies as a side
+- # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+- # dependencies in 'foo.d' instead, so we check for that too.
+- # Subdirectories are respected.
+- set_dir_from "$object"
+- set_base_from "$object"
++ # The Tru64 compiler uses -MD to generate dependencies as a side
++ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
++ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
++ # dependencies in 'foo.d' instead, so we check for that too.
++ # Subdirectories are respected.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+- if test "$libtool" = yes; then
+- # Libtool generates 2 separate objects for the 2 libraries. These
+- # two compilations output dependencies in $dir.libs/$base.o.d and
+- # in $dir$base.o.d. We have to check for both files, because
+- # one of the two compilations can be disabled. We should prefer
+- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+- # automatically cleaned when .libs/ is deleted, while ignoring
+- # the former would cause a distcleancheck panic.
+- tmpdepfile1=$dir$base.o.d # libtool 1.5
+- tmpdepfile2=$dir.libs/$base.o.d # Likewise.
+- tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
+- "$@" -Wc,-MD
+- else
+- tmpdepfile1=$dir$base.d
+- tmpdepfile2=$dir$base.d
+- tmpdepfile3=$dir$base.d
+- "$@" -MD
+- fi
++ if test "$libtool" = yes; then
++ # With Tru64 cc, shared objects can also be used to make a
++ # static library. This mechanism is used in libtool 1.4 series to
++ # handle both shared and static libraries in a single compilation.
++ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
++ #
++ # With libtool 1.5 this exception was removed, and libtool now
++ # generates 2 separate objects for the 2 libraries. These two
++ # compilations output dependencies in $dir.libs/$base.o.d and
++ # in $dir$base.o.d. We have to check for both files, because
++ # one of the two compilations can be disabled. We should prefer
++ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
++ # automatically cleaned when .libs/ is deleted, while ignoring
++ # the former would cause a distcleancheck panic.
++ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
++ tmpdepfile2=$dir$base.o.d # libtool 1.5
++ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
++ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
++ "$@" -Wc,-MD
++ else
++ tmpdepfile1=$dir$base.o.d
++ tmpdepfile2=$dir$base.d
++ tmpdepfile3=$dir$base.d
++ tmpdepfile4=$dir$base.d
++ "$@" -MD
++ fi
+
+- stat=$?
+- if test $stat -ne 0; then
+- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+- exit $stat
+- fi
++ stat=$?
++ if test $stat -eq 0; then :
++ else
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++ exit $stat
++ fi
+
+- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+- do
+- test -f "$tmpdepfile" && break
+- done
+- # Same post-processing that is required for AIX mode.
+- aix_post_process_depfile
+- ;;
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++ do
++ test -f "$tmpdepfile" && break
++ done
++ if test -f "$tmpdepfile"; then
++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++ else
++ echo "#dummy" > "$depfile"
++ fi
++ rm -f "$tmpdepfile"
++ ;;
+
+ msvc7)
+ if test "$libtool" = yes; then
+@@ -526,7 +445,8 @@ msvc7)
+ "$@" $showIncludes > "$tmpdepfile"
+ stat=$?
+ grep -v '^Note: including file: ' "$tmpdepfile"
+- if test $stat -ne 0; then
++ if test "$stat" = 0; then :
++ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+@@ -552,7 +472,6 @@ $ {
+ G
+ p
+ }' >> "$depfile"
+- echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+ rm -f "$tmpdepfile"
+ ;;
+
+@@ -604,14 +523,13 @@ dashmstdout)
+ # in the target name. This is to cope with DOS-style filenames:
+ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+ "$@" $dashmflag |
+- sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
++ sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+- # Some versions of the HPUX 10.20 sed can't process this sed invocation
+- # correctly. Breaking it into two sed invocations is a workaround.
+- tr ' ' "$nl" < "$tmpdepfile" \
+- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+- | sed -e 's/$/ :/' >> "$depfile"
++ tr ' ' "$nl" < "$tmpdepfile" | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly. Breaking it into two sed invocations is a workaround.
++ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+@@ -664,12 +582,10 @@ makedepend)
+ # makedepend may prepend the VPATH from the source file name to the object.
+ # No need to regex-escape $object, excess matching of '.' is harmless.
+ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+- # Some versions of the HPUX 10.20 sed can't process the last invocation
+- # correctly. Breaking it into two sed invocations is a workaround.
+- sed '1,2d' "$tmpdepfile" \
+- | tr ' ' "$nl" \
+- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+- | sed -e 's/$/ :/' >> "$depfile"
++ sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly. Breaking it into two sed invocations is a workaround.
++ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile" "$tmpdepfile".bak
+ ;;
+
+@@ -705,10 +621,10 @@ cpp)
+ esac
+ done
+
+- "$@" -E \
+- | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+- | sed '$ s: \\$::' > "$tmpdepfile"
++ "$@" -E |
++ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++ sed '$ s: \\$::' > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ cat < "$tmpdepfile" >> "$depfile"
+@@ -740,15 +656,15 @@ msvisualcpp)
+ shift
+ ;;
+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+- set fnord "$@"
+- shift
+- shift
+- ;;
++ set fnord "$@"
++ shift
++ shift
++ ;;
+ *)
+- set fnord "$@" "$arg"
+- shift
+- shift
+- ;;
++ set fnord "$@" "$arg"
++ shift
++ shift
++ ;;
+ esac
+ done
+ "$@" -E 2>/dev/null |
diff --git a/package/libsoup/patches/patch-build-aux_missing b/package/libsoup/patches/patch-build-aux_missing
new file mode 100644
index 000000000..d51cb4f26
--- /dev/null
+++ b/package/libsoup/patches/patch-build-aux_missing
@@ -0,0 +1,440 @@
+--- libsoup-2.44.2.orig/build-aux/missing 2013-10-18 00:01:48.000000000 +0200
++++ libsoup-2.44.2/build-aux/missing 2014-04-14 17:21:42.180934853 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+-# Common wrapper for a few potentially missing GNU programs.
++# Common stub for a few missing GNU programs while installing.
+
+-scriptversion=2012-06-26.16; # UTC
++scriptversion=2012-01-06.18; # UTC
+
+-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
++# Copyright (C) 1996-2012 Free Software Foundation, Inc.
++# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -29,33 +29,61 @@ if test $# -eq 0; then
+ exit 1
+ fi
+
+-case $1 in
++run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+- --is-lightweight)
+- # Used by our autoconf macros to check whether the available missing
+- # script is modern enough.
+- exit 0
+- ;;
++# In the cases where this matters, 'missing' is being run in the
++# srcdir already.
++if test -f configure.ac; then
++ configure_ac=configure.ac
++else
++ configure_ac=configure.in
++fi
+
+- --run)
+- # Back-compat with the calling convention used by older automake.
+- shift
+- ;;
++msg="missing on your system"
++
++case $1 in
++--run)
++ # Try to run requested program, and just exit if it succeeds.
++ run=
++ shift
++ "$@" && exit 0
++ # Exit code 63 means version mismatch. This often happens
++ # when the user try to use an ancient version of a tool on
++ # a file that requires a minimum version. In this case we
++ # we should proceed has if the program had been absent, or
++ # if --run hadn't been passed.
++ if test $? = 63; then
++ run=:
++ msg="probably too old"
++ fi
++ ;;
+
+ -h|--h|--he|--hel|--help)
+ echo "\
+ $0 [OPTION]... PROGRAM [ARGUMENT]...
+
+-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+-to PROGRAM being missing or too old.
++Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
++error status if there is no known handling for PROGRAM.
+
+ Options:
+ -h, --help display this help and exit
+ -v, --version output version information and exit
++ --run try to run the given command, and emulate it if it fails
+
+ Supported PROGRAM values:
+- aclocal autoconf autoheader autom4te automake makeinfo
+- bison yacc flex lex help2man
++ aclocal touch file 'aclocal.m4'
++ autoconf touch file 'configure'
++ autoheader touch file 'config.h.in'
++ autom4te touch the output file, or create a stub one
++ automake touch all 'Makefile.in' files
++ bison create 'y.tab.[ch]', if possible, from existing .[ch]
++ flex create 'lex.yy.c', if possible, from existing .c
++ help2man touch the output file
++ lex create 'lex.yy.c', if possible, from existing .c
++ makeinfo touch the output file
++ yacc create 'y.tab.[ch]', if possible, from existing .[ch]
+
+ Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+ 'g' are ignored when checking the name.
+@@ -70,141 +98,228 @@ Send bug reports to <bug-automake@gnu.or
+ ;;
+
+ -*)
+- echo 1>&2 "$0: unknown '$1' option"
++ echo 1>&2 "$0: Unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
+ exit 1
+ ;;
+
+ esac
+
+-# Run the given program, remember its exit status.
+-"$@"; st=$?
++# normalize program name to check for.
++program=`echo "$1" | sed '
++ s/^gnu-//; t
++ s/^gnu//; t
++ s/^g//; t'`
+
+-# If it succeeded, we are done.
+-test $st -eq 0 && exit 0
++# Now exit if we have it, but it failed. Also exit now if we
++# don't have it and --version was passed (most likely to detect
++# the program). This is about non-GNU programs, so use $1 not
++# $program.
++case $1 in
++ lex*|yacc*)
++ # Not GNU programs, they don't have --version.
++ ;;
+
+-# Also exit now if we it failed (or wasn't found), and '--version' was
+-# passed; such an option is passed most likely to detect whether the
+-# program is present and works.
+-case $2 in --version|--help) exit $st;; esac
++ *)
++ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
++ # We have it, but it failed.
++ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ # Could not run --version or --help. This is probably someone
++ # running '$TOOL --version' or '$TOOL --help' to check whether
++ # $TOOL exists and not knowing $TOOL uses missing.
++ exit 1
++ fi
++ ;;
++esac
+
+-# Exit code 63 means version mismatch. This often happens when the user
+-# tries to use an ancient version of a tool on a file that requires a
+-# minimum version.
+-if test $st -eq 63; then
+- msg="probably too old"
+-elif test $st -eq 127; then
+- # Program was missing.
+- msg="missing on your system"
+-else
+- # Program was found and executed, but failed. Give up.
+- exit $st
+-fi
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case $program in
++ aclocal*)
++ echo 1>&2 "\
++WARNING: '$1' is $msg. You should only need it if
++ you modified 'acinclude.m4' or '${configure_ac}'. You might want
++ to install the Automake and Perl packages. Grab them from
++ any GNU archive site."
++ touch aclocal.m4
++ ;;
+
+-perl_URL=http://www.perl.org/
+-flex_URL=http://flex.sourceforge.net/
+-gnu_software_URL=http://www.gnu.org/software
++ autoconf*)
++ echo 1>&2 "\
++WARNING: '$1' is $msg. You should only need it if
++ you modified '${configure_ac}'. You might want to install the
++ Autoconf and GNU m4 packages. Grab them from any GNU
++ archive site."
++ touch configure
++ ;;
+
+-program_details ()
+-{
+- case $1 in
+- aclocal|automake)
+- echo "The '$1' program is part of the GNU Automake package:"
+- echo "<$gnu_software_URL/automake>"
+- echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+- echo "<$gnu_software_URL/autoconf>"
+- echo "<$gnu_software_URL/m4/>"
+- echo "<$perl_URL>"
+- ;;
+- autoconf|autom4te|autoheader)
+- echo "The '$1' program is part of the GNU Autoconf package:"
+- echo "<$gnu_software_URL/autoconf/>"
+- echo "It also requires GNU m4 and Perl in order to run:"
+- echo "<$gnu_software_URL/m4/>"
+- echo "<$perl_URL>"
+- ;;
+- esac
+-}
++ autoheader*)
++ echo 1>&2 "\
++WARNING: '$1' is $msg. You should only need it if
++ you modified 'acconfig.h' or '${configure_ac}'. You might want
++ to install the Autoconf and GNU m4 packages. Grab them
++ from any GNU archive site."
++ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
++ test -z "$files" && files="config.h"
++ touch_files=
++ for f in $files; do
++ case $f in
++ *:*) touch_files="$touch_files "`echo "$f" |
++ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
++ *) touch_files="$touch_files $f.in";;
++ esac
++ done
++ touch $touch_files
++ ;;
+
+-give_advice ()
+-{
+- # Normalize program name to check for.
+- normalized_program=`echo "$1" | sed '
+- s/^gnu-//; t
+- s/^gnu//; t
+- s/^g//; t'`
++ automake*)
++ echo 1>&2 "\
++WARNING: '$1' is $msg. You should only need it if
++ you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
++ You might want to install the Automake and Perl packages.
++ Grab them from any GNU archive site."
++ find . -type f -name Makefile.am -print |
++ sed 's/\.am$/.in/' |
++ while read f; do touch "$f"; done
++ ;;
+
+- printf '%s\n' "'$1' is $msg."
++ autom4te*)
++ echo 1>&2 "\
++WARNING: '$1' is needed, but is $msg.
++ You might have modified some files without having the
++ proper tools for further handling them.
++ You can get '$1' as part of Autoconf from any GNU
++ archive site."
+
+- configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+- case $normalized_program in
+- autoconf*)
+- echo "You should only need it if you modified 'configure.ac',"
+- echo "or m4 files included by it."
+- program_details 'autoconf'
+- ;;
+- autoheader*)
+- echo "You should only need it if you modified 'acconfig.h' or"
+- echo "$configure_deps."
+- program_details 'autoheader'
+- ;;
+- automake*)
+- echo "You should only need it if you modified 'Makefile.am' or"
+- echo "$configure_deps."
+- program_details 'automake'
+- ;;
+- aclocal*)
+- echo "You should only need it if you modified 'acinclude.m4' or"
+- echo "$configure_deps."
+- program_details 'aclocal'
+- ;;
+- autom4te*)
+- echo "You might have modified some maintainer files that require"
+- echo "the 'automa4te' program to be rebuilt."
+- program_details 'autom4te'
+- ;;
+- bison*|yacc*)
+- echo "You should only need it if you modified a '.y' file."
+- echo "You may want to install the GNU Bison package:"
+- echo "<$gnu_software_URL/bison/>"
+- ;;
+- lex*|flex*)
+- echo "You should only need it if you modified a '.l' file."
+- echo "You may want to install the Fast Lexical Analyzer package:"
+- echo "<$flex_URL>"
+- ;;
+- help2man*)
+- echo "You should only need it if you modified a dependency" \
+- "of a man page."
+- echo "You may want to install the GNU Help2man package:"
+- echo "<$gnu_software_URL/help2man/>"
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
++ touch $file
++ else
++ test -z "$file" || exec >$file
++ echo "#! /bin/sh"
++ echo "# Created by GNU Automake missing as a replacement of"
++ echo "# $ $@"
++ echo "exit 0"
++ chmod +x $file
++ exit 1
++ fi
+ ;;
+- makeinfo*)
+- echo "You should only need it if you modified a '.texi' file, or"
+- echo "any other file indirectly affecting the aspect of the manual."
+- echo "You might want to install the Texinfo package:"
+- echo "<$gnu_software_URL/texinfo/>"
+- echo "The spurious makeinfo call might also be the consequence of"
+- echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+- echo "want to install GNU make:"
+- echo "<$gnu_software_URL/make/>"
+- ;;
+- *)
+- echo "You might have modified some files without having the proper"
+- echo "tools for further handling them. Check the 'README' file, it"
+- echo "often tells you about the needed prerequisites for installing"
+- echo "this package. You may also peek at any GNU archive site, in"
+- echo "case some other package contains this missing '$1' program."
+- ;;
+- esac
+-}
+
+-give_advice "$1" | sed -e '1s/^/WARNING: /' \
+- -e '2,$s/^/ /' >&2
++ bison*|yacc*)
++ echo 1>&2 "\
++WARNING: '$1' $msg. You should only need it if
++ you modified a '.y' file. You may need the Bison package
++ in order for those modifications to take effect. You can get
++ Bison from any GNU archive site."
++ rm -f y.tab.c y.tab.h
++ if test $# -ne 1; then
++ eval LASTARG=\${$#}
++ case $LASTARG in
++ *.y)
++ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
++ if test -f "$SRCFILE"; then
++ cp "$SRCFILE" y.tab.c
++ fi
++ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
++ if test -f "$SRCFILE"; then
++ cp "$SRCFILE" y.tab.h
++ fi
++ ;;
++ esac
++ fi
++ if test ! -f y.tab.h; then
++ echo >y.tab.h
++ fi
++ if test ! -f y.tab.c; then
++ echo 'main() { return 0; }' >y.tab.c
++ fi
++ ;;
+
+-# Propagate the correct exit status (expected to be 127 for a program
+-# not found, 63 for a program that failed due to version mismatch).
+-exit $st
++ lex*|flex*)
++ echo 1>&2 "\
++WARNING: '$1' is $msg. You should only need it if
++ you modified a '.l' file. You may need the Flex package
++ in order for those modifications to take effect. You can get
++ Flex from any GNU archive site."
++ rm -f lex.yy.c
++ if test $# -ne 1; then
++ eval LASTARG=\${$#}
++ case $LASTARG in
++ *.l)
++ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
++ if test -f "$SRCFILE"; then
++ cp "$SRCFILE" lex.yy.c
++ fi
++ ;;
++ esac
++ fi
++ if test ! -f lex.yy.c; then
++ echo 'main() { return 0; }' >lex.yy.c
++ fi
++ ;;
++
++ help2man*)
++ echo 1>&2 "\
++WARNING: '$1' is $msg. You should only need it if
++ you modified a dependency of a manual page. You may need the
++ Help2man package in order for those modifications to take
++ effect. You can get Help2man from any GNU archive site."
++
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
++ touch $file
++ else
++ test -z "$file" || exec >$file
++ echo ".ab help2man is required to generate this page"
++ exit $?
++ fi
++ ;;
++
++ makeinfo*)
++ echo 1>&2 "\
++WARNING: '$1' is $msg. You should only need it if
++ you modified a '.texi' or '.texinfo' file, or any other file
++ indirectly affecting the aspect of the manual. The spurious
++ call might also be the consequence of using a buggy 'make' (AIX,
++ DU, IRIX). You might want to install the Texinfo package or
++ the GNU make package. Grab either from any GNU archive site."
++ # The file to touch is that specified with -o ...
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -z "$file"; then
++ # ... or it is the one specified with @setfilename ...
++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++ file=`sed -n '
++ /^@setfilename/{
++ s/.* \([^ ]*\) *$/\1/
++ p
++ q
++ }' $infile`
++ # ... or it is derived from the source name (dir/f.texi becomes f.info)
++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
++ fi
++ # If the file does not exist, the user really needs makeinfo;
++ # let's fail without touching anything.
++ test -f $file || exit 1
++ touch $file
++ ;;
++
++ *)
++ echo 1>&2 "\
++WARNING: '$1' is needed, and is $msg.
++ You might have modified some files without having the
++ proper tools for further handling them. Check the 'README' file,
++ it often tells you about the needed prerequisites for installing
++ this package. You may also peek at any GNU archive site, in case
++ some other package would contain this missing '$1' program."
++ exit 1
++ ;;
++esac
++
++exit 0
+
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/package/libsoup/patches/patch-configure_ac b/package/libsoup/patches/patch-configure_ac
new file mode 100644
index 000000000..099b01b2a
--- /dev/null
+++ b/package/libsoup/patches/patch-configure_ac
@@ -0,0 +1,10 @@
+--- libsoup-2.44.2.orig/configure.ac 2013-11-11 23:40:56.000000000 +0100
++++ libsoup-2.44.2/configure.ac 2014-04-14 17:20:43.656655730 +0200
+@@ -116,7 +116,6 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32
+ dnl ************************
+ dnl *** gettext/intltool ***
+ dnl ************************
+-IT_PROG_INTLTOOL([0.35.0])
+ GETTEXT_PACKAGE=libsoup
+ AC_SUBST([GETTEXT_PACKAGE])
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gettext domain name])
diff --git a/package/libwebp/Makefile b/package/libwebp/Makefile
new file mode 100644
index 000000000..8a22e3fa8
--- /dev/null
+++ b/package/libwebp/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libwebp
+PKG_VERSION:= 0.3.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= dc862bb4006d819b7587767a9e83d31f
+PKG_DESCR:= new image format for the web
+PKG_SECTION:= libs
+PKG_URL:= https://developers.google.com/speed/webp/
+PKG_SITES:= https://webp.googlecode.com/files/
+PKG_OPTS:= dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBWEBP,libwebp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libwebp-install:
+ $(INSTALL_DIR) $(IDIR_LIBWEBP)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libwebp*.so* \
+ $(IDIR_LIBWEBP)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ltrace/Makefile b/package/ltrace/Makefile
new file mode 100644
index 000000000..a8464d55a
--- /dev/null
+++ b/package/ltrace/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= ltrace
+PKG_VERSION:= 0.7.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 2cb7660738b1e28fd84ce0dc06f6ea69
+PKG_DESCR:= intercepts and records dynamic library calls
+PKG_SECTION:= debug
+PKG_DEPENDS:= libelf
+PKG_BUILDDEP:= libelf
+PKG_URL:= http://ltrace.org/
+PKG_SITES:= https://alioth.debian.org/frs/download.php/file/3948/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LTRACE,ltrace,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+ltrace-install:
+ $(INSTALL_DIR) $(IDIR_LTRACE)/usr/sbin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/ltrace \
+ $(IDIR_LTRACE)/usr/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ltrace/patches/patch-breakpoints_c b/package/ltrace/patches/patch-breakpoints_c
new file mode 100644
index 000000000..0c8d77c8b
--- /dev/null
+++ b/package/ltrace/patches/patch-breakpoints_c
@@ -0,0 +1,14 @@
+--- ltrace-0.7.3.orig/breakpoints.c 2013-09-09 11:46:54.000000000 +0200
++++ ltrace-0.7.3/breakpoints.c 2013-10-16 11:26:00.000000000 +0200
+@@ -159,9 +159,10 @@ int
+ breakpoint_clone(struct breakpoint *retp, struct Process *new_proc,
+ struct breakpoint *bp, struct Process *old_proc)
+ {
++ __attribute__((unused))int rc;
+ struct library_symbol *libsym = NULL;
+ if (bp->libsym != NULL) {
+- int rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
++ rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
+ assert(rc == 0);
+ }
+
diff --git a/package/ltrace/patches/patch-breakpoints_c.orig b/package/ltrace/patches/patch-breakpoints_c.orig
new file mode 100644
index 000000000..6c69f0d34
--- /dev/null
+++ b/package/ltrace/patches/patch-breakpoints_c.orig
@@ -0,0 +1,14 @@
+--- ltrace-0.7.3.orig/breakpoints.c 2013-09-09 11:46:54.000000000 +0200
++++ ltrace-0.7.3/breakpoints.c 2013-10-16 11:13:21.000000000 +0200
+@@ -159,9 +159,10 @@ int
+ breakpoint_clone(struct breakpoint *retp, struct Process *new_proc,
+ struct breakpoint *bp, struct Process *old_proc)
+ {
++ int rc;
+ struct library_symbol *libsym = NULL;
+ if (bp->libsym != NULL) {
+- int rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
++ rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
+ assert(rc == 0);
+ }
+
diff --git a/package/ltrace/patches/patch-handle_event_c b/package/ltrace/patches/patch-handle_event_c
new file mode 100644
index 000000000..c40853052
--- /dev/null
+++ b/package/ltrace/patches/patch-handle_event_c
@@ -0,0 +1,19 @@
+--- ltrace-0.7.3.orig/handle_event.c 2013-02-05 12:05:39.000000000 +0100
++++ ltrace-0.7.3/handle_event.c 2013-10-16 11:29:03.000000000 +0200
+@@ -533,6 +533,7 @@ calc_time_spent(Process *proc) {
+
+ static void
+ handle_sysret(Event *event) {
++ __attribute__((unused))unsigned d;
+ debug(DEBUG_FUNCTION, "handle_sysret(pid=%d, sysnum=%d)", event->proc->pid, event->e_un.sysnum);
+ if (event->proc->state != STATE_IGNORED) {
+ if (opt_T || options.summary) {
+@@ -544,7 +545,7 @@ handle_sysret(Event *event) {
+ event->e_un.sysnum));
+
+ assert(event->proc->callstack_depth > 0);
+- unsigned d = event->proc->callstack_depth - 1;
++ d = event->proc->callstack_depth - 1;
+ assert(event->proc->callstack[d].is_syscall);
+ callstack_pop(event->proc);
+ }
diff --git a/package/ltrace/patches/patch-proc_c b/package/ltrace/patches/patch-proc_c
new file mode 100644
index 000000000..5571a51c3
--- /dev/null
+++ b/package/ltrace/patches/patch-proc_c
@@ -0,0 +1,32 @@
+--- ltrace-0.7.3.orig/proc.c 2013-02-05 12:05:39.000000000 +0100
++++ ltrace-0.7.3/proc.c 2013-10-16 11:37:49.000000000 +0200
+@@ -329,6 +329,7 @@ clone_single_bp(void *key, void *value,
+ int
+ process_clone(struct Process *retp, struct Process *proc, pid_t pid)
+ {
++ __attribute__((unused))int rc;
+ if (process_bare_init(retp, proc->filename, pid, 0) < 0) {
+ fail1:
+ fprintf(stderr, "failed to clone process %d->%d : %s\n",
+@@ -432,7 +433,7 @@ process_clone(struct Process *retp, stru
+ * library. */
+ if (!elem->is_syscall && elem->c_un.libfunc != NULL) {
+ struct library_symbol *libfunc = elem->c_un.libfunc;
+- int rc = proc_find_symbol(retp, libfunc,
++ rc = proc_find_symbol(retp, libfunc,
+ NULL, &elem->c_un.libfunc);
+ assert(rc == 0);
+ }
+@@ -937,10 +938,11 @@ proc_add_breakpoint(struct Process *proc
+ void
+ proc_remove_breakpoint(struct Process *proc, struct breakpoint *bp)
+ {
++ __attribute__((unused))struct breakpoint *removed;
+ debug(DEBUG_FUNCTION, "proc_remove_breakpoint(pid=%d, %s@%p)",
+ proc->pid, breakpoint_name(bp), bp->addr);
+ check_leader(proc);
+- struct breakpoint *removed = dict_remove(proc->breakpoints, bp->addr);
++ removed = dict_remove(proc->breakpoints, bp->addr);
+ assert(removed == bp);
+ }
+
diff --git a/package/midori/Makefile b/package/midori/Makefile
new file mode 100644
index 000000000..13a916bc0
--- /dev/null
+++ b/package/midori/Makefile
@@ -0,0 +1,40 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= midori
+PKG_VERSION:= 0.5.8
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 5815eac39f4d9511ce2c71a81567647f
+PKG_DESCR:= web browser
+PKG_SECTION:= x11/apps
+PKG_DEPENDS:= libnotify webkitgtk
+PKG_BUILDDEP:= autotool cmake-host vala-host libnotify webkitgtk
+PKG_BUILDDEP+= librsvg-host librsvg
+PKG_URL:= http://www.midori-browser.org
+PKG_SITES:= http://www.midori-browser.org/downloads/
+
+WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,MIDORI,midori,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:= manual
+
+do-configure:
+ (cd $(WRKBUILD) && PATH='${HOST_PATH}' \
+ cmake -DCMAKE_SYSTEM_NAME=Linux \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DENABLE_NLS=0 \
+ -DUSE_ZEITGEIST=0 \
+ $(WRKSRC)/)
+
+midori-install:
+ $(INSTALL_DIR) $(IDIR_MIDORI)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/midori \
+ $(IDIR_MIDORI)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/vala/Makefile b/package/vala/Makefile
new file mode 100644
index 000000000..5a84b76a4
--- /dev/null
+++ b/package/vala/Makefile
@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= vala
+PKG_VERSION:= 0.24.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= beddeff9c06d3c278988b237da0e7401
+PKG_DESCR:= compiler for the GObject type system
+PKG_SECTION:= lang
+PKG_BUILDDEP:= glib
+HOST_BUILDDEP:= glib-host
+PKG_URL:= https://wiki.gnome.org/Vala
+PKG_SITES:= http://download.gnome.org/sources/vala/0.24/
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,VALA,vala,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,VALA,vala,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+HOST_STYLE:= auto
+
+vala-install:
+ $(INSTALL_DIR) $(IDIR_VALA)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/valac \
+ $(IDIR_VALA)/usr/bin
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile
new file mode 100644
index 000000000..b98149666
--- /dev/null
+++ b/package/webkitgtk/Makefile
@@ -0,0 +1,43 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= webkitgtk
+PKG_VERSION:= 2.4.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= c759bf11fe4cadd1268630f16a97f7b9
+PKG_DESCR:= web browser engine
+PKG_SECTION:= libs
+PKG_DEPENDS:= glib icu4c zlib libwebp libgtk libsoup
+PKG_DEPENDS+= libsecret libxt
+PKG_DEPENDS+= gst-plugins-base gstreamer
+PKG_BUILDDEP:= glib icu4c zlib libwebp gtk+
+PKG_BUILDDEP+= libsoup libsecret libXt
+PKG_BUILDDEP+= gst-plugins-base gstreamer
+PKG_URL:= http://www.webkitgtk.org/
+PKG_SITES:= http://webkitgtk.org/releases/
+PKG_OPTS:= dev
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,WEBKITGTK,webkitgtk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+MAKE_FILE:= GNUmakefile
+CONFIGURE_ENV+= AR_FLAGS="cr"
+CONFIGURE_ARGS+= --with-gtk=2.0 \
+ --disable-webkit2 \
+ --disable-geolocation
+
+pre-build:
+ mkdir -p $(WRKBUILD)/DerivedSources/{webkit,webkitdom,InjectedBundle,Platform}
+ mkdir -p $(WRKBUILD)/DerivedSources/WebKit2/webkit2gtk/webkit2
+
+webkitgtk-install:
+ $(INSTALL_DIR) $(IDIR_WEBKITGTK)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/webkitgtk*.so* \
+ $(IDIR_WEBKITGTK)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk