diff --git a/srcpkgs/libgnomecanvas/libgnomecanvas-devel.template b/srcpkgs/libgnomecanvas/libgnomecanvas-devel.template index 51fd9e500b3..15ba2cfbb14 100644 --- a/srcpkgs/libgnomecanvas/libgnomecanvas-devel.template +++ b/srcpkgs/libgnomecanvas/libgnomecanvas-devel.template @@ -1,18 +1,16 @@ # Template file for 'libgnomecanvas-devel'. # -depends="gtk+-devel libart-devel libgnomecanvas" +depends="gtk+-devel libart-devel libgnomecanvas-${version}_${revision}" short_desc="${sourcepkg} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +noarch=yes - -do_install() -{ +do_install() { mkdir -p ${DESTDIR}/usr/{lib,share} 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 } diff --git a/srcpkgs/libgnomecanvas/libgnomecanvas.rshlibs b/srcpkgs/libgnomecanvas/libgnomecanvas.rshlibs index 77f51277516..0db473aa293 100644 --- a/srcpkgs/libgnomecanvas/libgnomecanvas.rshlibs +++ b/srcpkgs/libgnomecanvas/libgnomecanvas.rshlibs @@ -2,15 +2,10 @@ libgailutil.so.18 libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 libatk-1.0.so.0 -libgio-2.0.so.0 -libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 -libcairo.so.2 libart_lgpl_2.so.2 libpangoft2-1.0.so.0 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgobject-2.0.so.0 libglib-2.0.so.0 libm.so.6 diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template index 865b12c86e5..9b449b8d0e6 100644 --- a/srcpkgs/libgnomecanvas/template +++ b/srcpkgs/libgnomecanvas/template @@ -1,12 +1,14 @@ # Template file for 'libgnomecanvas' pkgname=libgnomecanvas version=2.30.3 -distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2" +revision=4 +subpackages="$pkgname-devel" build_style=gnu-configure -revision=3 +configure_args="--disable-static" makedepends="pkg-config intltool gtk+-devel libart-devel" short_desc="GNOME Canvas library" maintainer="Juan RP " +distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2" checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40 long_desc=" This is the canvas widget library for GNOME2. Libgnomecanvas was @@ -20,6 +22,3 @@ long_desc=" antialiased, alpha-compositing engine. Applications have a choice between the Xlib imaging model or a superset of the PostScript imaging model, depending on the level of graphic sophistication required." - -subpackages="$pkgname-devel" -