Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 7 insertions, 30 deletions

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 02086f234..3afdc4e13 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		glib
 PKG_VERSION:=		2.28.1
 PKG_EXTRAVER:=		2.28
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		9f6e85e1e38490c3956f4415bcd33e6e
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
@@ -42,19 +42,6 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			ac_cv_func_posix_getpwuid_r=yes \
 			ac_cv_func_posix_getgrgid_r=yes
 
-pre-configure:
-ifeq ($(OStype),Linux)
-	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
-               ./configure --prefix=$(STAGING_HOST_DIR) \
-                       --with-libiconv=gnu \
-	)
-	${MAKE} -C ${WRKBUILD} V=1
-	$(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin
-	$(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin
-	$(CP) ${WRKBUILD}/gobject/glib-mkenums ${STAGING_HOST_DIR}/bin
-	${MAKE} -C ${WRKBUILD} clean
-endif
-
 
 glib-install:
 	${INSTALL_DIR} ${IDIR_GLIB}/usr/lib
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index 3e9804449..054769e18 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		5dba047cf278e5ac77cd0f19f7195fb9
 PKG_DESCR:=		X11 rendering library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		renderproto
+PKG_BUILDDEP:=		renderproto libX11
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBXRENDER LIBXRENDER_DEV
diff --git a/package/pango/Makefile b/package/pango/Makefile
index 04c4b01ee..efa57159b 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		22ad1c8d3fda7e73b0798035f3dd96bc
 PKG_DESCR:=		pango library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		libXft
+PKG_BUILDDEP:=		libXft glib cairo
 PKG_URL:=		http://www.pango.org/
 PKG_SITES:=		${MASTER_SITE_GNOME:=pango/1.28/}
 PKG_NEED_CXX:=		1
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 548891921..63a2dde73 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -4,14 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
-PKG_VERSION:=		4.6
+PKG_VERSION:=		4.5.20
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e537b2b1afeec70c0e6e27a0d0fd671e
+PKG_MD5SUM:=		64dfe10d9db0c1e34030891695ffca4b
 PKG_DESCR:=		System call trace program
 PKG_SECTION:=		debug
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/strace/patches/patch-Makefile_in b/package/strace/patches/patch-Makefile_in
deleted file mode 100644
index 38329e3ac..000000000
--- a/package/strace/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- strace-4.6.orig/Makefile.in	2011-03-15 19:23:18.000000000 +0100
-+++ strace-4.6/Makefile.in	2011-09-02 09:14:19.198484990 +0200
-@@ -270,7 +270,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = tests
-+SUBDIRS =
- man_MANS = strace.1
- bin_SCRIPTS = strace-graph
- 
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 46662de1b..2bed1e209 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -77,6 +77,7 @@ if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
 	NEED_YASM="$NEED_YASM firefox"
 	NEED_LIBIDL="$NEED_LIBIDL firefox"
 	NEED_PYTHON="$NEED_PYTHON firefox"
+	NEED_ZIP="$NEED_ZIP firefox"
 fi
 
 if [[ -n $ADK_COMPILE_HEIMDAL ]]; then