From 56435fd387764421844d5c295c70fad0c2dd14b6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 15 Nov 2011 09:14:22 +0100 Subject: [PATCH] librsvg: disable static, fix rundeps. --- srcpkgs/librsvg/librsvg-devel.template | 23 +++++------------------ srcpkgs/librsvg/template | 15 ++++----------- 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/srcpkgs/librsvg/librsvg-devel.template b/srcpkgs/librsvg/librsvg-devel.template index 9b3cadd3c95..9d5074e23e2 100644 --- a/srcpkgs/librsvg/librsvg-devel.template +++ b/srcpkgs/librsvg/librsvg-devel.template @@ -5,27 +5,14 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run pkg-config -Add_dependency run libgsf-devel +revision=1 + Add_dependency run libcroco-devel -Add_dependency run gtk+-devel -Add_dependency run gtk+3-devel Add_dependency run librsvg do_install() { - local gtk_abiver="2.10.0" - - install -d ${DESTDIR}//usr/lib/gtk-2.0/${gtk_abiver}/engines - install -d ${DESTDIR}/usr/lib/gdk-pixbuf-2.0/${gtk_abiver}/loaders - install -d ${DESTDIR}/usr/{bin,lib} - - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/lib/gtk-2.0/${gtk_abiver}/engines/*.a \ - ${DESTDIR}//usr/lib/gtk-2.0/${gtk_abiver}/engines - mv ${SRCPKGDESTDIR}/usr/lib/gdk-pixbuf-2.0/${gtk_abiver}/loaders/*.a \ - ${DESTDIR}/usr/lib/gdk-pixbuf-2.0/${gtk_abiver}/loaders + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/gtk-doc usr/share } diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index 7edece48cb5..05fc37ace82 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -1,10 +1,10 @@ # Template build file for 'librsvg'. pkgname=librsvg version=2.34.1 +revision=2 distfiles="${GNOME_SITE}/$pkgname/2.34/$pkgname-$version.tar.xz" build_style=gnu-configure -configure_args="--with-svgz" -revision=1 +configure_args="--with-croco --with-svgz --disable-static" short_desc="SVG library for GNOME" maintainer="Juan RP " checksum=4f2ab987eed2943b5a0ce3dde1672d2bc87123bee66d885dd7307eb7ede756db @@ -15,20 +15,13 @@ long_desc=" This package provides the librsvg library as well as some addons: a pixbuf loader and a theme engine for the GTK+ toolkit." -triggers="gtk-immodules gtk-pixbuf-loaders" +triggers="gtk-pixbuf-loaders" subpackages="$pkgname-devel" -Add_dependency run libgsf - +Add_dependency build coreutils Add_dependency build pkg-config Add_dependency build intltool Add_dependency build python ">=0" -Add_dependency build libgsf-devel Add_dependency build libcroco-devel Add_dependency build gtk+-devel Add_dependency build gtk+3-devel - -post_install() -{ - rm -rf ${DESTDIR}/usr/lib/mozilla -}