diff --git a/srcpkgs/xfce4-panel/depends b/srcpkgs/xfce4-panel/depends index e0b7882515c..171cfd569d0 100644 --- a/srcpkgs/xfce4-panel/depends +++ b/srcpkgs/xfce4-panel/depends @@ -1,2 +1,2 @@ -abi_depends=">=4.7.4" +abi_depends=">=4.9.2" api_depends="${abi_depends}" diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template index 67844cf977c..8adc32e33e1 100644 --- a/srcpkgs/xfce4-panel/template +++ b/srcpkgs/xfce4-panel/template @@ -1,15 +1,14 @@ # Template:wq file for 'xfce4-panel' pkgname=xfce4-panel -version=4.8.5 -distfiles="http://archive.xfce.org/src/xfce/${pkgname}/4.8/$pkgname-$version.tar.bz2" +version=4.9.2 +distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.9/$pkgname-$version.tar.bz2" build_style=gnu-configure configure_args="--disable-static" -revision=2 short_desc="Next generation panel for Xfce" maintainer="Juan RP " homepage="http://www.xfce.org/" license="GPL-2" -checksum=df8379a18d337481b847cf232eec907a927287917788e7b730deef4a535deada +checksum=868f15f2c4e3ffb3f2be0d9275637e356e97f81f7267959cd1d1eaaac131a8ff long_desc=" This package includes the panel for the Xfce desktop environment." @@ -18,7 +17,6 @@ subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool -Add_dependency build exo-devel Add_dependency build libxfce4util-devel Add_dependency build libxfce4ui-devel Add_dependency build gtk+-devel @@ -26,7 +24,7 @@ Add_dependency build xfconf-devel Add_dependency build dbus-glib-devel Add_dependency build libwnck2-devel ">=2.30.6_1" Add_dependency build garcon-devel -Add_dependency build libXext-devel +Add_dependency build exo-devel -Add_dependency full hicolor-icon-theme -Add_dependency full desktop-file-utils +Add_dependency run hicolor-icon-theme +Add_dependency run desktop-file-utils diff --git a/srcpkgs/xfce4-panel/xfce4-panel-devel.template b/srcpkgs/xfce4-panel/xfce4-panel-devel.template index 1200b741028..5de49880c1c 100644 --- a/srcpkgs/xfce4-panel/xfce4-panel-devel.template +++ b/srcpkgs/xfce4-panel/xfce4-panel-devel.template @@ -5,24 +5,15 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run pkg-config -Add_dependency run intltool -Add_dependency run exo-devel -Add_dependency run libxfce4util-devel -Add_dependency run libxfce4ui-devel +Add_dependency run glib-devel Add_dependency run gtk+-devel -Add_dependency run xfconf-devel -Add_dependency run dbus-glib-devel -Add_dependency run libwnck2-devel -Add_dependency run garcon-devel -Add_dependency run libXext-devel -Add_dependency run xfce4-panel +Add_dependency run libxfce4util-devel +Add_dependency run xfce4-panel ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mkdir -p ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share +noarch=yes + +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/gtk-doc usr/share } diff --git a/srcpkgs/xfce4-panel/xfce4-panel.rshlibs b/srcpkgs/xfce4-panel/xfce4-panel.rshlibs index 0b0d7d5da9d..ab17eb85eb4 100644 --- a/srcpkgs/xfce4-panel/xfce4-panel.rshlibs +++ b/srcpkgs/xfce4-panel/xfce4-panel.rshlibs @@ -1,7 +1,6 @@ libexo-1.so.0 libxfce4ui-1.so.0 libgtk-x11-2.0.so.0 -libxfce4util.so.4 libgdk-x11-2.0.so.0 libatk-1.0.so.0 libgdk_pixbuf-2.0.so.0 @@ -29,3 +28,4 @@ libwnck-1.so.22 libSM.so.6 libICE.so.6 libXext.so.6 +libxfce4util.so.6