From 908908ee89ed28b2a034ce48b4cc089b3dfe766c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 19 Apr 2012 16:43:20 +0200 Subject: [PATCH] exo: update to 0.7.3; dropped python bindings. --- srcpkgs/exo-python | 1 - srcpkgs/exo/depends | 2 +- srcpkgs/exo/exo-devel.template | 19 +++++++------------ srcpkgs/exo/exo-python.rshlibs | 23 ----------------------- srcpkgs/exo/exo-python.template | 18 ------------------ srcpkgs/exo/exo.rshlibs | 7 +++---- srcpkgs/exo/template | 30 ++++++++++-------------------- 7 files changed, 21 insertions(+), 79 deletions(-) delete mode 120000 srcpkgs/exo-python delete mode 100644 srcpkgs/exo/exo-python.rshlibs delete mode 100644 srcpkgs/exo/exo-python.template diff --git a/srcpkgs/exo-python b/srcpkgs/exo-python deleted file mode 120000 index c2066056c2a..00000000000 --- a/srcpkgs/exo-python +++ /dev/null @@ -1 +0,0 @@ -exo \ No newline at end of file diff --git a/srcpkgs/exo/depends b/srcpkgs/exo/depends index 828d0975681..b3f4f752a0c 100644 --- a/srcpkgs/exo/depends +++ b/srcpkgs/exo/depends @@ -1,2 +1,2 @@ -abi_depends=">=0.5.4" +abi_depends=">=0.7.3" api_depends="${abi_depends}" diff --git a/srcpkgs/exo/exo-devel.template b/srcpkgs/exo/exo-devel.template index d0ba2cbcf5b..02b5556c818 100644 --- a/srcpkgs/exo/exo-devel.template +++ b/srcpkgs/exo/exo-devel.template @@ -1,6 +1,5 @@ # Template file for 'exo-devel'. # -revision=2 short_desc="${short_desc} - development files" long_desc="${long_desc} @@ -8,16 +7,12 @@ long_desc="${long_desc} Add_dependency run gtk+-devel Add_dependency run libxfce4util-devel -Add_dependency run exo +Add_dependency run exo ">=${version}" -do_install() -{ - install -d ${DESTDIR}/usr/{bin,lib} ${DESTDIR}/usr/share/man/man1 - - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/{pygtk*,*doc} ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/bin/exo-csource ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/share/man/man1/exo-csource.1 \ - ${DESTDIR}/usr/share/man/man1 +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/bin/exo-csource usr/bin + vmove usr/share/man/man1/exo-csource.1 usr/share/man/man1 + vmove "usr/share/*doc" usr/share } diff --git a/srcpkgs/exo/exo-python.rshlibs b/srcpkgs/exo/exo-python.rshlibs deleted file mode 100644 index 0b76cc6ee13..00000000000 --- a/srcpkgs/exo/exo-python.rshlibs +++ /dev/null @@ -1,23 +0,0 @@ -libexo-1.so.0 -libSM.so.6 -libICE.so.6 -libX11.so.6 -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 -libgmodule-2.0.so.0 -libgthread-2.0.so.0 -librt.so.1 -libxfce4util.so.4 -libglib-2.0.so.0 -libpthread.so.0 -libc.so.6 diff --git a/srcpkgs/exo/exo-python.template b/srcpkgs/exo/exo-python.template deleted file mode 100644 index e8e065d4c63..00000000000 --- a/srcpkgs/exo/exo-python.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'exo-python'. -# -short_desc="${short_desc} - python bindings" -long_desc="${long_desc} - - This package contains the bindings for the Python language." - -revision=3 -pycompile_module="exo-0.6 pyexo" - -Add_dependency run pygtk - -do_install() -{ - install -d ${DESTDIR}/usr/lib - - mv ${SRCPKGDESTDIR}/usr/lib/python* ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/exo/exo.rshlibs b/srcpkgs/exo/exo.rshlibs index 2d56bc34ad8..e450c84797a 100644 --- a/srcpkgs/exo/exo.rshlibs +++ b/srcpkgs/exo/exo.rshlibs @@ -1,7 +1,6 @@ libgtk-x11-2.0.so.0 libgio-2.0.so.0 libgobject-2.0.so.0 -libxfce4util.so.4 libglib-2.0.so.0 libpthread.so.0 libc.so.6 @@ -9,14 +8,14 @@ libgdk-x11-2.0.so.0 libatk-1.0.so.0 libgdk_pixbuf-2.0.so.0 libpango-1.0.so.0 -libgthread-2.0.so.0 libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libcairo.so.2 libfreetype.so.6 libfontconfig.so.1 -libgmodule-2.0.so.0 -librt.so.1 libSM.so.6 libICE.so.6 libX11.so.6 +libxfce4util.so.6 +libm.so.6 +libxfce4ui-1.so.0 diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template index 403f3cc72d7..5f744830d90 100644 --- a/srcpkgs/exo/template +++ b/srcpkgs/exo/template @@ -1,38 +1,28 @@ # Template file for 'exo' pkgname=exo -version=0.6.2 -distfiles="http://archive.xfce.org/src/xfce/exo/0.6/exo-$version.tar.bz2" +version=0.7.3 +homepage="http://xfce.org" +distfiles="http://archive.xfce.org/src/xfce/exo/0.7/exo-$version.tar.bz2" build_style=gnu-configure configure_args="--disable-static" -revision=2 short_desc="Application library for the Xfce desktop environment" maintainer="Juan RP " -checksum=f49cf6a85546f47a1dddb58ce9a5f9364384a6f173cba99deb879e027c811f39 +license="GPL-2, LGPL-2.1" +checksum=df5dd5b6e5d8da95cb570000f7e72621f71da42e747dca6fbdae889d6d7ddd89 long_desc=" Extension library for Xfce, targeted at application development." conf_files="/etc/xdg/xfce4/helpers.rc" gtk_iconcache_dirs="/usr/share/icons/hicolor" -subpackages="exo-devel exo-python" +subpackages="exo-devel" Add_dependency build pkg-config Add_dependency build intltool -Add_dependency build atk-devel -Add_dependency build glib-devel -Add_dependency build gdk-pixbuf-devel -Add_dependency build pango-devel -Add_dependency build glibc-devel -Add_dependency build libSM-devel -Add_dependency build libICE-devel -Add_dependency build libX11-devel -Add_dependency build cairo-devel -Add_dependency build libpng-devel -Add_dependency build freetype-devel -Add_dependency build fontconfig-devel Add_dependency build gtk+-devel Add_dependency build libxfce4util-devel -Add_dependency build pygtk-devel +Add_dependency build libxfce4ui-devel Add_dependency full perl-URI -Add_dependency full hicolor-icon-theme -Add_dependency full desktop-file-utils + +Add_dependency run hicolor-icon-theme +Add_dependency run desktop-file-utils