From 4ab266ed5e9dacb88ffe1b0ac22b102302a0ed1f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 7 Jun 2012 08:06:23 +0200 Subject: [PATCH] gtk+: forcefully depend on gdk-pixbuf linked to libpng15. --- srcpkgs/gtk+/gtk-update-icon-cache.template | 1 + srcpkgs/gtk+/template | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtk+/gtk-update-icon-cache.template b/srcpkgs/gtk+/gtk-update-icon-cache.template index d6c70566410..dc34e037e5a 100644 --- a/srcpkgs/gtk+/gtk-update-icon-cache.template +++ b/srcpkgs/gtk+/gtk-update-icon-cache.template @@ -6,6 +6,7 @@ long_desc="${long_desc} This package contains gtk-update-icon-cache, to update GTK+ icon caches." replaces="gtk+<=2.24.8_3 gtk+3<=3.2.2" +depends="gdk-pixbuf>=2.26.1_2" # libpng-1.5 do_install() { vmove usr/bin/gtk-update-icon-cache usr/bin diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template index 72e8f9279bf..5a4e0eb6276 100644 --- a/srcpkgs/gtk+/template +++ b/srcpkgs/gtk+/template @@ -1,12 +1,12 @@ # Template build file for 'gtk+'. pkgname=gtk+ version=2.24.10 -revision=3 +revision=4 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-$version.tar.xz" build_style=gnu-configure configure_args="--enable-cups --with-xinput" -depends="shared-mime-info gtk-update-icon-cache" -makedepends="pkg-config perl>=0 glib-devel libXcursor-devel libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel libXdamage-devel freetype-devel fontconfig-devel libpng-devel gdk-pixbuf-devel cairo-devel pango-devel>=1.28.0 atk-devel>=1.32.0 gobject-introspection cups-devel" +depends="gdk-pixbuf>=2.26.1_2 shared-mime-info gtk-update-icon-cache>=${version}_${revision}" +makedepends="pkg-config perl>=0 glib-devel libXcursor-devel libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel libXdamage-devel freetype-devel fontconfig-devel libpng-devel gdk-pixbuf-devel>=2.26.1_2 cairo-devel pango-devel>=1.28.0 atk-devel>=1.32.0 gobject-introspection cups-devel" short_desc="The GTK+ toolkit (v2)" maintainer="Juan RP " homepage="http://www.gtk.org"