diff --git a/srcpkgs/libglade/libglade-devel.template b/srcpkgs/libglade/libglade-devel.template index 20b9b2fac0..0d38cdfd3d 100644 --- a/srcpkgs/libglade/libglade-devel.template +++ b/srcpkgs/libglade/libglade-devel.template @@ -1,20 +1,16 @@ # Template file for 'libglade-devel'. # -depends="pkg-config python libxml2-devel gtk+-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel libglade" +noarch=yes +depends="libxml2-devel gtk+-devel ${sourcepkg}-${version}_${revision}" short_desc="${sourcepkg} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mkdir -p ${DESTDIR}/usr/share +do_install() { + mkdir -p ${DESTDIR}/usr/{lib,share} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/bin ${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/libglade/libglade.rshlibs b/srcpkgs/libglade/libglade.rshlibs index ef8ade3ec0..ed3740c9d2 100644 --- a/srcpkgs/libglade/libglade.rshlibs +++ b/srcpkgs/libglade/libglade.rshlibs @@ -2,14 +2,8 @@ libxml2.so.2 libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 libatk-1.0.so.0 -libgio-2.0.so.0 -libpangoft2-1.0.so.0 -libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 -libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgobject-2.0.so.0 libglib-2.0.so.0 libc.so.6 diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template index b1bdb3f907..7dea07c0eb 100644 --- a/srcpkgs/libglade/template +++ b/srcpkgs/libglade/template @@ -1,14 +1,15 @@ # Template build file for 'libglade'. pkgname=libglade version=2.6.4 -revision=7 -distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2" +revision=8 +subpackages="$pkgname-devel" build_style=gnu-configure -configure_args="--without-xml-catalog" -makedepends="pkg-config python libxml2-devel gtk+-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel" +configure_args="--disable-static --without-xml-catalog" +makedepends="pkg-config python libxml2-devel gtk+-devel" fulldepends="xmlcatmgr" short_desc="Runtime interpreter for GLADE GUI files" maintainer="Juan RP " +distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2" checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec long_desc=" Libglade is a library that performs a similar job to the C source @@ -22,18 +23,4 @@ long_desc=" connection." # Register DTDs with xmlcatmgr. -export xml_entries="system http://glade.gnome.org/glade-2.0.dtd -/usr/share/xml/libglade/glade-2.0.dtd" - -subpackages="$pkgname-devel" - - -post_install() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run post-install -} - -pre_remove() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run pre-remove -} +xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"