Update gtk2 package to 2.14.3.

SVN-Revision: 12846

diff --git a/XOrg/lib/gtk2/Makefile b/XOrg/lib/gtk2/Makefile
index 5f388afad7f1648d7faa83f4803586a18bb9b9d7..4f799fccb5ceb93df0a06f3c8f69a1708236ba9b 100644 (file)
--- a/XOrg/lib/gtk2/Makefile
+++ b/XOrg/lib/gtk2/Makefile
@@ -1,37 +1,44 @@
-# 
+#
 # Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gtk2
-PKG_VERSION:=2.12.11
-PKG_RELEASE:=2
+PKG_VERSION:=2.14.3
+PKG_RELEASE:=3
 
 PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@GNOME/gtk+/2.12
+PKG_SOURCE_URL:=@GNOME/gtk+/2.14
 PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-$(PKG_VERSION)
-PKG_MD5SUM:=f7aab88e856a813386f797aade5867ad
+PKG_MD5SUM:=359e44c8e47dfe04a09ac09b8e015e58
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+PKG_INSTALL:=1
+
+TARGET_CFLAGS+=\
+       -I$(STAGING_DIR)/usr/lib/libintl/include/
+
+EXTRA_LDFLAGS+=\
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+    -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
+    -L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
+       -L$(STAGING_DIR)/usr/lib/
 
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-               -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-               -L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
-               -L$(STAGING_DIR)/usr/lib/
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk-cups2)
 
 define Package/gtk2
   SECTION:=xorg-framework
   CATEGORY:=Xorg
   SUBMENU:=framework
   TITLE:=GTK+-2.0
-  DEPENDS:=+cairo +pango +libjpeg +atk +libtiff +pixman +libX11
+  DEPENDS:=+cairo +pango +libpng +libjpeg +atk +libtiff +libX11
 endef
 
 define Package/gtk2-cups
@@ -45,48 +52,68 @@ endef
 define Build/Configure
        $(call Build/Configure/Default, \
                --disable-glibtest \
+               --disable-gdiplus \
+               --without-libjasper \
                $(if $(CONFIG_PACKAGE_gtk2-cups),--enable-cups=auto,--disable-cups), \
                gio_can_sniff=no \
        )
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
-endef
-
 define Build/InstallDev
-       $(INSTALL_DIR)  $(1)/usr/{lib/pkgconfig,include}
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include}
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
        $(CP) $(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/
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{la,so*} \
+               $(1)/usr/lib/
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/gtk2/install
-       $(INSTALL_DIR) $(1)/etc/gtk-2.0/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/gtk-2.0/* $(1)/etc/gtk-2.0/
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/etc/gtk-2.0
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/etc/gtk-2.0/* \
+               $(1)/etc/gtk-2.0/
+
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \
+               $(1)/usr/lib/
+
        $(foreach d,engines immodules loaders, \
                $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/$(d); \
-               $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/$(d)/*.{so,a} \
+               $(INSTALL_DATA) \
+                       $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/$(d)/*.{so,a} \
                        $(1)/usr/lib/gtk-2.0/2.10.0/$(d)/;\
        )
        $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-{file,lpr}.{so,a} $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-{file,lpr}.{so,a} \
+               $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
 
        $(INSTALL_DIR) $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/bin/{gdk-pixbuf-query-loaders,gtk-query-immodules-2.0,gtk-update-icon-cache} \
+               $(1)/usr/bin/
+
        $(INSTALL_DIR) $(1)/usr/share/themes/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/themes/* $(1)/usr/share/themes/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/share/themes/* \
+               $(1)/usr/share/themes/
+
        $(INSTALL_DIR) $(1)/etc/init.d/
        $(INSTALL_BIN) ./files/gdk-pixbuf-query-loaders.init $(1)/etc/init.d/gdk-pixbuf-query-loaders
 endef
 
 define Package/gtk2-cups/install
        $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.{so,a} $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.{so,a} \
+               $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
 endef
 
 $(eval $(call BuildPackage,gtk2))

diff --git a/XOrg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch b/XOrg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch
new file mode 100644 (file)
index 0000000..db5a3bd
--- /dev/null
+++ b/XOrg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch
@@ -0,0 +1,40 @@
+diff -urN gtk+-2.14.3.orig/gdk/Makefile.in gtk+-2.14.3/gdk/Makefile.in
+--- gtk+-2.14.3.orig/gdk/Makefile.in   2008-10-03 23:14:22.000000000 +0200
++++ gtk+-2.14.3/gdk/Makefile.in        2008-10-03 23:19:30.000000000 +0200
+@@ -424,8 +424,8 @@
+       && DISPLAY=:$$XID && export DISPLAY
+ 
+ 
+-SUBDIRS = $(gdktarget) . tests
+-DIST_SUBDIRS = win32 x11 quartz directfb tests
++SUBDIRS = $(gdktarget) .
++DIST_SUBDIRS = x11 directfb
+ 
+ INCLUDES = \
+       -DG_LOG_DOMAIN=\"Gdk\"          \
+diff -urN gtk+-2.14.3.orig/gtk/Makefile.in gtk+-2.14.3/gtk/Makefile.in
+--- gtk+-2.14.3.orig/gtk/Makefile.in   2008-10-03 23:14:06.000000000 +0200
++++ gtk+-2.14.3/gtk/Makefile.in        2008-10-03 23:20:08.000000000 +0200
+@@ -465,8 +465,8 @@
+ @USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "open -a /Applications/Preview.app %f"
+ @USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f"
+ 
+-SUBDIRS = theme-bits . tests
+-DIST_SUBDIRS = theme-bits tests
++SUBDIRS = theme-bits .
++DIST_SUBDIRS = theme-bits
+ @HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr
+ 
+ @HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups
+diff -urN gtk+-2.14.3.orig/Makefile.in gtk+-2.14.3/Makefile.in
+--- gtk+-2.14.3.orig/Makefile.in       2008-10-03 23:13:54.000000000 +0200
++++ gtk+-2.14.3/Makefile.in    2008-10-03 23:18:13.000000000 +0200
+@@ -516,7 +516,7 @@
+       && DISPLAY=:$$XID && export DISPLAY
+ 
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+ 
+ # require automake 1.4