X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=lang%2Fpygtk%2FMakefile;h=f593ad7d4b7d2cdce09439715ae04051a111b64a;hb=4378da95311dfac766e6b6889b82dbfe87282c71;hp=04e90c17bf48abf247f32a41f2e9a337a9adc473;hpb=b83ef2ca7237ec1460d4a5151bd39fa1e1c8ccd4;p=packages.git

diff --git a/lang/pygtk/Makefile b/lang/pygtk/Makefile
index 04e90c17b..f593ad7d4 100644
--- a/lang/pygtk/Makefile
+++ b/lang/pygtk/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,54 +8,85 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pygtk
-PKG_VERSION:=2.10.6
-PKG_RELEASE:=1
+PKG_VERSION:=2.12.1
+PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.10/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.12/
+PKG_MD5SUM:=a816346d750d61e3fa67a200e4292694
 PKG_FIXUP:=libtool
-PKG_MD5SUM:=d033b7617b9074357f687326b52b6296
 
 include $(INCLUDE_DIR)/package.mk
+-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
 
-EXTRA_CFLAGS:=-I$(STAGING_DIR)/usr/include/pycairo/ -I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/
+EXTRA_CFLAGS+= \
+	-I$(STAGING_DIR)/usr/lib/libintl/include/ \
+	-I$(STAGING_DIR)/usr/lib/libiconv/include/
+
+EXTRA_LDFLAGS+= \
+	-L$(STAGING_DIR)/usr/lib/libintl/lib \
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib
 
 define Package/python-gtk
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=GTK bindings to python
+  TITLE:=GTK bindings for python
   URL:=http://www.pygtk.org/
-  DEPENDS:=python-core +python-gobject +gtk2 +pycairo
+  DEPENDS:=+python-mini +python-gobject +gtk2 +pycairo @!LINUX_2_4
 endef
 
 define Package/python-gtk/description
-  API to GTK and glade library from python
-endef
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
-		if [ -x $(CONFIGURE_CMD) ]; then \
-		$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-			$(CONFIGURE_VARS) \
-			$(CONFIGURE_CMD) \
-			$(CONFIGURE_ARGS) ;\
-		fi \
-	)
+  API to GTK and glade library from python.
 endef
 
 define Build/Compile
-	cd $(PKG_BUILD_DIR) ; PYTHON_HOST=/usr/bin/python DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) all install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		SUBDIRS="codegen . gtk" \
+		all install DESTDIR="$(PKG_INSTALL_DIR)"
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)
-	cp -r $(PKG_INSTALL_DIR)/* $(1)
+	$(INSTALL_DIR) $(1)/usr/include/pygtk-2.0/pygtk
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/pygtk-2.0/pygtk/* \
+		$(1)/usr/include/pygtk-2.0/pygtk
+
+	$(INSTALL_DIR) $(1)/usr/share/pygtk/2.0/codegen
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/share/pygtk/2.0/codegen/*.py \
+		$(1)/usr/share/pygtk/2.0/codegen/
+
+	$(INSTALL_DIR) $(1)/usr/share/pygtk/2.0/defs/
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/share/pygtk/2.0/defs/* \
+		$(1)/usr/share/pygtk/2.0/defs
+
+	$(INSTALL_DIR) $(2)/bin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/* \
+		$(2)/bin
+
+	$(SED) 's,^\(datadir\|prefix\)=,\1=$(STAGING_DIR),g' $(2)/bin/pygtk-codegen-2.0
+
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+		$(1)/usr/lib/pkgconfig
+
+	$(SED) 's,^datadir=,datadir=$(STAGING_DIR),g' $(1)/usr/lib/pkgconfig/pygtk-2.0.pc
 endef
 
 define Package/python-gtk/install
-	mkdir -p $(1)
-	cp -r $(PKG_INSTALL_DIR)/* $(1)
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.so \
+		$(1)$(PYTHON_PKG_DIR)/gtk-2.0
+
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0/gtk
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/gtk/*.py* \
+		$(1)$(PYTHON_PKG_DIR)/gtk-2.0/gtk
 endef
 
 $(eval $(call BuildPackage,python-gtk))