diff --git a/srcpkgs/xfconf/depends b/srcpkgs/xfconf/depends index 49b1ae3a7cf..79732def7d3 100644 --- a/srcpkgs/xfconf/depends +++ b/srcpkgs/xfconf/depends @@ -1,2 +1,2 @@ -abi_depends=">=4.8.0" -api_depends=">=4.8.1" +abi_depends=">=4.9.1" +api_depends="${abi_depends}" diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template index 91cf60e9ced..d8b61676a9d 100644 --- a/srcpkgs/xfconf/template +++ b/srcpkgs/xfconf/template @@ -1,11 +1,13 @@ # Template file for 'xfconf' pkgname=xfconf -version=4.8.1 -distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$version.tar.bz2" +version=4.9.1 +homepage="http://xfce.org" +distfiles="http://archive.xfce.org/src/xfce/xfconf/4.9/$pkgname-$version.tar.bz2" build_style=gnu-configure short_desc="Xfce hierarchical (tree-like) configuration system" maintainer="Juan RP " -checksum=9860737539fab2b852e8c07c50c205a5fbe894b08bcb4488a70e3fd6c75993cb +license="GPL-2, LGPL-2.1" +checksum=306e09e1a5206a78384a425425997f9471a03a63fa2f77465ecbc7e4457b9608 long_desc=" Xfconf is a hierarchical (tree-like) configuration system where the immediate child nodes of the root are called channels. All settings @@ -18,7 +20,5 @@ Add_dependency build intltool Add_dependency build perl-ExtUtils-Depends Add_dependency build perl-ExtUtils-PkgConfig Add_dependency build perl-Glib -Add_dependency build glib-devel -Add_dependency build dbus-devel Add_dependency build dbus-glib-devel Add_dependency build libxfce4util-devel diff --git a/srcpkgs/xfconf/xfconf-devel.template b/srcpkgs/xfconf/xfconf-devel.template index a90bd66979e..60a52636495 100644 --- a/srcpkgs/xfconf/xfconf-devel.template +++ b/srcpkgs/xfconf/xfconf-devel.template @@ -5,16 +5,12 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run libxfce4util-devel Add_dependency run glib-devel -Add_dependency run xfconf +Add_dependency run dbus-glib-devel +Add_dependency run xfconf ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mkdir -p ${DESTDIR}/usr/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 +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/gtk-doc usr/share } diff --git a/srcpkgs/xfconf/xfconf-perl.template b/srcpkgs/xfconf/xfconf-perl.template index a155f098188..c239b441299 100644 --- a/srcpkgs/xfconf/xfconf-perl.template +++ b/srcpkgs/xfconf/xfconf-perl.template @@ -7,12 +7,9 @@ long_desc="${long_desc} Add_dependency run perl-Glib -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mkdir -p ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/lib/perl5 ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/man ${DESTDIR}/usr/share +do_install() { + vmove usr/lib/perl5 usr/lib + vmove usr/share/man usr/share find ${DESTDIR}/usr/lib/perl5 -type f \ -name perllocal.pod -o -name .packlist|xargs rm -f } diff --git a/srcpkgs/xfconf/xfconf.rshlibs b/srcpkgs/xfconf/xfconf.rshlibs index 2b3ea17db4a..b133037c4d1 100644 --- a/srcpkgs/xfconf/xfconf.rshlibs +++ b/srcpkgs/xfconf/xfconf.rshlibs @@ -1,9 +1,8 @@ -libxfce4util.so.4 libdbus-glib-1.so.2 libpthread.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libc.so.6 libdbus-1.so.3 -libgthread-2.0.so.0 librt.so.1 +libxfce4util.so.6