fix pango compile, update to latest. reported by oliver

5 files changed, 36 insertions, 21 deletions

diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile
index 774006b49..86bc2c8a6 100644
--- a/package/harfbuzz/Makefile
+++ b/package/harfbuzz/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		harfbuzz
 PKG_VERSION:=		1.0.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		f616a7fbdc78a627043f9029000bf08c0c71df59cde4143fc92a014f6a993b26
 PKG_DESCR:=		opentype text shaping engine
 PKG_SECTION:=		libs/fonts
diff --git a/package/harfbuzz/patches/patch-src_harfbuzz_pc_in b/package/harfbuzz/patches/patch-src_harfbuzz_pc_in
new file mode 100644
index 000000000..2c5697bfe
--- /dev/null
+++ b/package/harfbuzz/patches/patch-src_harfbuzz_pc_in
@@ -0,0 +1,18 @@
+--- harfbuzz-1.0.6.orig/src/harfbuzz.pc.in	2015-08-11 12:47:09.000000000 +0200
++++ harfbuzz-1.0.6/src/harfbuzz.pc.in	2015-10-25 10:54:18.000000000 +0100
+@@ -1,13 +1,10 @@
+ prefix=%prefix%
+-exec_prefix=%exec_prefix%
+-libdir=%libdir%
+-includedir=%includedir%
+ 
+ Name: harfbuzz
+ Description: HarfBuzz text shaping library
+ Version: %VERSION%
+ 
+-Libs: -L${libdir} -lharfbuzz
++Libs: -L${prefix}/lib -lharfbuzz
+ Libs.private: %libs_private%
+ Requires.private: %requires_private%
+-Cflags: -I${includedir}/harfbuzz
++Cflags: -I${prefix}/include/harfbuzz
diff --git a/package/pango/Makefile b/package/pango/Makefile
index 8f7c5a155..c74fd3c9c 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -4,10 +4,10 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		pango
-PKG_VERSION:=		1.36.8
-PKG_EXTRAVER:=		1.36
+PKG_VERSION:=		1.38.1
+PKG_EXTRAVER:=		1.38
 PKG_RELEASE:=		1
-PKG_HASH:=		18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07
+PKG_HASH:=		1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7
 PKG_DESCR:=		library for laying out and rendering of text
 PKG_SECTION:=		libs/fonts
 PKG_DEPENDS:=		libstdcxx
@@ -23,16 +23,14 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,PANGO,pango,$(PKG_VERSION)-$(PKG_RELEASE)))
 $(eval $(call PKG_template,PANGO,pango,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
+AUTOTOOLS_STYLE:=	autoreconf
 CONFIGURE_ENV+=		ac_cv_path_EGREP="grep -E"
 CONFIGURE_ARGS+=	--disable-man
 
 pango-install:
-	$(INSTALL_DIR) $(IDIR_PANGO)/etc/pango
-	$(INSTALL_DIR) $(IDIR_PANGO)/usr/lib/pango/1.8.0/modules
-	$(INSTALL_DATA) ./files/pango.modules $(IDIR_PANGO)/etc/pango
-	$(CP) $(WRKINST)/usr/lib/libpango*.so* $(IDIR_PANGO)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/pango/1.8.0/modules/*.so \
-		$(IDIR_PANGO)/usr/lib/pango/1.8.0/modules
+	$(INSTALL_DIR) $(IDIR_PANGO)/etc/pango $(IDIR_PANGO)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libpango*.so* \
+		$(IDIR_PANGO)/usr/lib
 
 include $(ADK_TOPDIR)/mk/host-bottom.mk
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/pango/patches/patch-Makefile_am b/package/pango/patches/patch-Makefile_am
new file mode 100644
index 000000000..d7240f677
--- /dev/null
+++ b/package/pango/patches/patch-Makefile_am
@@ -0,0 +1,10 @@
+--- pango-1.38.1.orig/Makefile.am	2015-04-15 19:37:43.000000000 +0200
++++ pango-1.38.1/Makefile.am	2015-10-25 11:08:45.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in.
+ 
+-SUBDIRS= pango pango-view examples docs tools tests build
++SUBDIRS= pango pango-view tools build
+ 
+ EXTRA_DIST = 			\
+ 	autogen.sh		\
diff --git a/package/pango/patches/patch-Makefile_in b/package/pango/patches/patch-Makefile_in
deleted file mode 100644
index 6c1d80129..000000000
--- a/package/pango/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- pango-1.36.3.orig/Makefile.in	2014-03-18 02:02:20.000000000 +0100
-+++ pango-1.36.3/Makefile.in	2014-06-24 21:04:26.640904774 +0200
-@@ -418,7 +418,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pango modules pango-view examples docs tools tests build
-+SUBDIRS = pango modules pango-view examples docs tools build
- EXTRA_DIST = \
- 	autogen.sh		\
- 	pango.pc.in		\