From 2b35aea349b2c791bfb16aa2c505011859fa990a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Sun, 25 Oct 2015 11:28:25 +0100
Subject: fix pango compile, update to latest. reported by oliver

---
 package/pango/Makefile                  | 16 +++++++---------
 package/pango/patches/patch-Makefile_am | 10 ++++++++++
 package/pango/patches/patch-Makefile_in | 11 -----------
 3 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 package/pango/patches/patch-Makefile_am
 delete mode 100644 package/pango/patches/patch-Makefile_in

(limited to 'package/pango')

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		\
-- 
cgit v1.2.3