From 642bdb6b7b6f386c8bf4c3c77b3423d40a1b2291 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Jun 2014 11:27:07 +0200 Subject: [PATCH] gdk-pixbuf: update to 2.30.8; split xlib rendering into -xlib subpkg. --- common/shlibs | 2 +- srcpkgs/gdk-pixbuf-xlib | 1 + srcpkgs/gdk-pixbuf/template | 31 +++++++++++++++++-------------- 3 files changed, 19 insertions(+), 15 deletions(-) create mode 120000 srcpkgs/gdk-pixbuf-xlib diff --git a/common/shlibs b/common/shlibs index d0ee3d21791..643ebae3b4c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -94,7 +94,7 @@ libcairo-script-interpreter.so.2 cairo-1.8.6_1 libgdk-x11-2.0.so.0 gtk+-2.16.0_1 libgtk-x11-2.0.so.0 gtk+-2.16.0_1 libgdk_pixbuf-2.0.so.0 gdk-pixbuf-2.22.0_1 -libgdk_pixbuf_xlib-2.0.so.0 gdk-pixbuf-2.22.0_1 +libgdk_pixbuf_xlib-2.0.so.0 gdk-pixbuf-xlib-2.30.8_1 libgailutil.so.18 gtk+-2.16.0_1 libfreetype.so.6 freetype-2.3.9_1 libfontconfig.so.1 fontconfig-2.6.0_1 diff --git a/srcpkgs/gdk-pixbuf-xlib b/srcpkgs/gdk-pixbuf-xlib new file mode 120000 index 00000000000..fa20dc708aa --- /dev/null +++ b/srcpkgs/gdk-pixbuf-xlib @@ -0,0 +1 @@ +gdk-pixbuf \ No newline at end of file diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template index 58908876a05..be8075ac137 100644 --- a/srcpkgs/gdk-pixbuf/template +++ b/srcpkgs/gdk-pixbuf/template @@ -1,10 +1,10 @@ # Template build file for 'gdk-pixbuf'. pkgname=gdk-pixbuf -version=2.30.7 +version=2.30.8 revision=1 build_style=gnu-configure -configure_args="--without-libjasper --with-included-loaders=png --with-x11" -hostmakedepends="perl pkg-config glib-devel" +configure_args="--without-libjasper --with-included-loaders=png --with-x11 gio_can_sniff=yes" +hostmakedepends="libtool perl pkg-config glib-devel" makedepends="libglib-devel libpng-devel>=1.6 libjpeg-turbo-devel tiff-devel libX11-devel" triggers="gtk-pixbuf-loaders" short_desc="An Image loading library for The GTK+ toolkit (v2)" @@ -12,16 +12,7 @@ maintainer="Juan RP " homepage="http://www.gtk.org/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=0aafc365eab1083a53f15e4828333b968219ffcb1a995ac6289c0147c9ffad06 - -if [ "$CROSS_BUILD" ]; then - # needs glib-mkenums - hostmakedepends+=" libtool" - configure_args+=" gio_can_sniff=yes" - pre_configure() { - libtoolize -f - } -fi +checksum=4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be # Package build options build_options="gir" @@ -39,8 +30,20 @@ else configure_args+=" --disable-introspection" fi +pre_configure() { + libtoolize -f +} + +gdk-pixbuf-xlib_package() { + replaces="${sourcepkg}<2.30.8" + short_desc+=" - xlib rendering library" + pkg_install() { + vmove usr/lib/libgdk_pixbuf_xlib*.so.* + } +} + gdk-pixbuf-devel_package() { - depends="perl libpng-devel>=1.6 shared-mime-info ${sourcepkg}>=${version}_${revision}" + depends="libglib-devel libpng-devel>=1.6 ${sourcepkg}-xlib>=${version}_${revision} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove "usr/lib/*.so"