From 9b442191d9f9347bf485f505e4047c7c66299686 Mon Sep 17 00:00:00 2001
From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 24 May 2008 17:11:10 +0000
Subject: [PATCH] fixes package instalation for X f00

git-svn-id: svn://svn.openwrt.org/openwrt/packages@11259 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 XOrg/lib/atk/Makefile         |  2 +-
 XOrg/lib/cairo/Makefile       |  2 +-
 XOrg/lib/gtk-2.10.14/Makefile |  8 +++++++-
 XOrg/lib/pango/Makefile       | 16 ++++++++++------
 XOrg/lib/pixman/Makefile      |  6 ++++--
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/XOrg/lib/atk/Makefile b/XOrg/lib/atk/Makefile
index 86b7e30b4..60bca396d 100644
--- a/XOrg/lib/atk/Makefile
+++ b/XOrg/lib/atk/Makefile
@@ -51,7 +51,7 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
 endef
 
-define Package/atk/Install
+define Package/atk/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
 endef
diff --git a/XOrg/lib/cairo/Makefile b/XOrg/lib/cairo/Makefile
index e714b197a..af9dc3edd 100644
--- a/XOrg/lib/cairo/Makefile
+++ b/XOrg/lib/cairo/Makefile
@@ -43,7 +43,7 @@ define Build/InstallDev
 	$(SED)  "s,$(STAGING_DIR)$(STAGING_DIR),$(STAGING_DIR),g" $(1)/usr/lib/libcairo.la
 endef
 
-define Package/cairo/Install
+define Package/cairo/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
 endef
diff --git a/XOrg/lib/gtk-2.10.14/Makefile b/XOrg/lib/gtk-2.10.14/Makefile
index e7fc7167a..a3723af33 100644
--- a/XOrg/lib/gtk-2.10.14/Makefile
+++ b/XOrg/lib/gtk-2.10.14/Makefile
@@ -38,10 +38,16 @@ endef
 define Build/InstallDev
 	$(INSTALL_DIR)	$(1)/usr/{lib/pkgconfig,include}
 	$(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*} $(1)/usr/lib/
+	$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*,so} $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
 endef
 
+define Package/gtk-2.10.14/install
+	$(INSTALL_DIR)	$(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so.*,so} $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,gtk-2.10.14))
 $(eval $(call RequireCommand,gdk-pixbuf-csource, \
 	Please install gtk2.0-dev \
diff --git a/XOrg/lib/pango/Makefile b/XOrg/lib/pango/Makefile
index 1c11e5e5a..a4cc9c54e 100644
--- a/XOrg/lib/pango/Makefile
+++ b/XOrg/lib/pango/Makefile
@@ -13,7 +13,7 @@ PKG_VERSION:=1.19.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.gnome.org/pub/gnome/sources/pango/1.19/ 
+PKG_SOURCE_URL:=ftp://ftp.gnome.org/pub/gnome/sources/pango/1.19/
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
@@ -42,10 +42,11 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)
-	#$(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
-	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{lib/pkgconfig,include/pango-1.0/pango/}
+	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{lib/pkgconfig,include/pango-1.0/pango/,bin/,lib/pango/1.6.0/modules}
 	$(CP) $(PKG_BUILD_DIR)/pango/.libs/*so* $(PKG_INSTALL_DIR)/usr/lib/
 	rm -f $(PKG_INSTALL_DIR)/usr/lib/*T
+	$(CP) $(PKG_BUILD_DIR)/pango/.libs/pango-querymodules $(PKG_INSTALL_DIR)/usr/bin/
+	cd $(PKG_BUILD_DIR) ;for a in `find -name pango-*.so`; do cp $$$$a $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/;done
 	$(CP) $(PKG_BUILD_DIR)/pango/*.la $(PKG_INSTALL_DIR)/usr/lib/
 	$(CP) $(PKG_BUILD_DIR)/*.pc $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/
 	rm $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*uninstalled.pc
@@ -55,14 +56,17 @@ endef
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/{lib,include}
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pango/ $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(SED)  "s,Libs:,Libs: -L$$$${libdir}/libiconv/lib/ -L$$$${libdir}/libintl/lib/ ,g" $(1)/usr/lib/pkgconfig/pango*.pc
+	$(SED)  's,Libs:,Libs: -L${libdir}/libiconv/lib/ -L${libdir}/libintl/lib/ ,g' $(1)/usr/lib/pkgconfig/pango*.pc
 endef
 
-define Package/pango/Install
-	$(INSTALL_DIR) $(1)/usr/lib
+define Package/pango/install
+	$(INSTALL_DIR) $(1)/usr/{lib,bin}
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+	$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pango/ $(1)/usr/lib
 endef
 
 $(eval $(call BuildPackage,pango))
diff --git a/XOrg/lib/pixman/Makefile b/XOrg/lib/pixman/Makefile
index df1ada0b4..970fd2e71 100644
--- a/XOrg/lib/pixman/Makefile
+++ b/XOrg/lib/pixman/Makefile
@@ -18,12 +18,14 @@ PKG_MD5SUM:=41804ac38025102dcc9891dfd4a3d105
 
 include $(INCLUDE_DIR)/package.mk
 
+EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
+
 define Package/pixman
   SECTION:=xorg-libs
   CATEGORY:=Xorg
   SUBMENU:=libraries
   TITLE:=pixman
-  DEPENDS:=+xorg-server-essentials 
+  DEPENDS:=+xorg-server-essentials +gtk2.10.14 
 endef
 
 define Build/Configure
@@ -48,7 +50,7 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
-define Package/pixman/Install
+define Package/pixman/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
 endef
-- 
2.11.0