[packages] Update dependencies on gtk to match

git-svn-id: svn://svn.openwrt.org/openwrt/packages@11568 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/XOrg/app/xmms/Makefile b/XOrg/app/xmms/Makefile
index c469de6..b4b338d 100644 (file)
--- a/XOrg/app/xmms/Makefile
+++ b/XOrg/app/xmms/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -22,7 +22,7 @@ define Package/xmms
   SECTION:=xorg-app
   CATEGORY:=Xorg
   SUBMENU:=app
-  DEPENDS:=+xorg-server-essentials +alsa-lib +gtk-1.2.10 +libnotimpl
+  DEPENDS:=+xorg-server-essentials +alsa-lib +gtk1 +libnotimpl
   TITLE:=XMMS audio player
 endef
 
@@ -57,7 +57,7 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR=$(PKG_INSTALL_DIR) \
                LIBTOOL="libtool --tag=CC" \
-               all install 
+               all install
 endef
 
 define Package/xmms/install

diff --git a/XOrg/lib/imlib2/Makefile b/XOrg/lib/imlib2/Makefile
index bf6a9f5..915d051 100644 (file)
--- a/XOrg/lib/imlib2/Makefile
+++ b/XOrg/lib/imlib2/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -23,7 +23,7 @@ define Package/imlib2
   CATEGORY:=Xorg
   SUBMENU:=libraries
   TITLE:=Image library
-  DEPENDS:=+xorg-server-essentials +giflib +libtiff +libjpeg +gtk-1.2.10 +libnotimpl +libfreetype
+  DEPENDS:=+xorg-server-essentials +giflib +libtiff +libjpeg +gtk1 +libnotimpl +libfreetype
 endef
 
 CONFIGURE_ARGS+=--disable-gtktest LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
@@ -52,7 +52,7 @@ define Build/InstallDev
        $(CP) $(PKG_BUILD_DIR)/src/modules/loaders/.libs/*.so $(1)/usr/lib/imlib2/loaders/
        $(INSTALL_DIR) $(2)/bin
        mv $(1)/usr/bin/imlib2-config $(2)/bin/
-       $(SED)  "s,prefix.*,prefix=$(STAGING_DIR)/usr,g" $(2)/bin/imlib2-config 
+       $(SED)  "s,prefix.*,prefix=$(STAGING_DIR)/usr,g" $(2)/bin/imlib2-config
        $(SED)  "s,exec_prefix.*,exec_prefix=$(STAGING_DIR)/usr,g" $(2)/bin/imlib2-config
 endef
 

diff --git a/lang/pygtk/Makefile b/lang/pygtk/Makefile
index a75283a..04e90c1 100644 (file)
--- a/lang/pygtk/Makefile
+++ b/lang/pygtk/Makefile
@@ -26,7 +26,7 @@ define Package/python-gtk
   CATEGORY:=Languages
   TITLE:=GTK bindings to python
   URL:=http://www.pygtk.org/
-  DEPENDS:=python-core +python-gobject +gtk-2.10.14 +pycairo
+  DEPENDS:=python-core +python-gobject +gtk2 +pycairo
 endef
 
 define Package/python-gtk/description

diff --git a/libs/wnck/Makefile b/libs/wnck/Makefile
index 6cbc170..80f1dcb 100644 (file)
--- a/libs/wnck/Makefile
+++ b/libs/wnck/Makefile
@@ -25,7 +25,7 @@ define Package/libwnck
   CATEGORY:=Libraries
   TITLE:=Window Navigator Construction Kit
   URL:=http://ftp.gnome.org/
-  DEPENDS:=+gtk-2.10.14 +glib2 +libXext
+  DEPENDS:=+gtk2 +glib2 +libXext
 endef
 
 define Package/libwnck/description

diff --git a/multimedia/gst-plugins-base/Makefile b/multimedia/gst-plugins-base/Makefile
index 1f24ca7..6221b8e 100644 (file)
--- a/multimedia/gst-plugins-base/Makefile
+++ b/multimedia/gst-plugins-base/Makefile
@@ -25,7 +25,7 @@ define Package/gst-plugins-base
   CATEGORY:=Multimedia
   TITLE:=gst-plugins-base
   URL:=http://gst-plugins-base.freedesktop.org/
-  DEPENDS:=gstreamer +liboil +pango +gtk-2.10.14
+  DEPENDS:=gstreamer +liboil +pango +gtk2
 endef
 
 define Package/gst-plugins-base/description