From 546ec1d75f1760b07d9d6337ba2dd1c4801b4e2d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Wed, 23 Oct 2013 21:47:25 +0200
Subject: fix build and run depends

---
 package/imlib2/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package')

diff --git a/package/imlib2/Makefile b/package/imlib2/Makefile
index c1c4c4e6d..16f6178e9 100644
--- a/package/imlib2/Makefile
+++ b/package/imlib2/Makefile
@@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		imlib2
 PKG_VERSION:=		1.4.4
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		20d59c7cda06742015baade6f5975415
 PKG_DESCR:=		Version 2 of an advanced replacement library for libraries like libXpm
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libfreetype zlib libpng libtiff
-PKG_BUILDDEP:=		freetype zlib libpng libtiff
+PKG_DEPENDS:=		libfreetype zlib libpng libtiff libx11 libxext
+PKG_BUILDDEP:=		freetype zlib libpng libtiff libX11 libXext
 PKG_URL:=		http://www.enlightenment.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 PKG_OPTS:=		dev
-- 
cgit v1.2.3


From 3a58d6a95405fcb1121860137ace1b136319dcbe Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Wed, 23 Oct 2013 22:09:19 +0200
Subject: spkg-install must be before script install logic

---
 mk/pkg-bottom.mk        | 2 +-
 package/imlib2/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 1a35599fd..c3bf0b848 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -143,6 +143,7 @@ else
 	@echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
 	@exit 1
 endif
+	env ${MAKE_ENV} ${MAKE} spkg-install $(MAKE_TRACE)
 	@rm -f '${STAGING_PKG_DIR}/${PKG_NAME}.scripts'
 	@for a in ${WRKINST}/usr/bin/*-config*; do \
 		[[ -e $$a ]] || continue; \
@@ -158,7 +159,6 @@ endif
 		sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \
 		${STAGING_DIR}/usr/lib/pkgconfig/$$(basename $$a); \
 	done
-	env ${MAKE_ENV} ${MAKE} spkg-install $(MAKE_TRACE)
 ifeq (,$(filter noremove,${PKG_OPTS}))
 	@if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \
 		cd '${STAGING_DIR}'; \
diff --git a/package/imlib2/Makefile b/package/imlib2/Makefile
index 16f6178e9..c2c975908 100644
--- a/package/imlib2/Makefile
+++ b/package/imlib2/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		imlib2
 PKG_VERSION:=		1.4.4
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		20d59c7cda06742015baade6f5975415
 PKG_DESCR:=		Version 2 of an advanced replacement library for libraries like libXpm
 PKG_SECTION:=		libs
-- 
cgit v1.2.3