From 684db6626c62f6649b6ccdf37d56a4a75404f772 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 19 Apr 2012 17:05:20 +0200 Subject: [PATCH] Thunar: update to 1.3.2. --- common/shlibs | 2 +- srcpkgs/Thunar/Thunar-devel.template | 25 ++++++++----------------- srcpkgs/Thunar/Thunar.rshlibs | 5 ++--- srcpkgs/Thunar/depends | 2 +- srcpkgs/Thunar/template | 21 ++++++++++----------- 5 files changed, 22 insertions(+), 33 deletions(-) diff --git a/common/shlibs b/common/shlibs index 04d56160d22..4478007c593 100644 --- a/common/shlibs +++ b/common/shlibs @@ -146,7 +146,7 @@ libxfce4kbd-private.so libxfcegui4 libxfcegui4-devel libxfce4menu-0.1.so libxfce4menu libxfce4menu-devel libxfconf-0.so.2 xfconf xfconf-devel libxfce4util.so.6 libxfce4util libxfce4util-devel -libxfce4panel-1.0.so.3 xfce4-panel xfce4-panel-devel +libxfce4panel-1.0.so.4 xfce4-panel xfce4-panel-devel libgstreamer-0.10.so.0 gstreamer gstreamer-devel libgstbase-0.10.so.0 gstreamer gstreamer-devel libgstdataprotocol-0.10.so.0 gstreamer gstreamer-devel diff --git a/srcpkgs/Thunar/Thunar-devel.template b/srcpkgs/Thunar/Thunar-devel.template index e0c468a8ef8..9a8e428349d 100644 --- a/srcpkgs/Thunar/Thunar-devel.template +++ b/srcpkgs/Thunar/Thunar-devel.template @@ -5,23 +5,14 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run exo-devel -Add_dependency run libgudev-devel -Add_dependency run libnotify-devel -Add_dependency run libxfce4util-devel -Add_dependency run libxfce4ui-devel +Add_dependency run glib-devel Add_dependency run gtk+-devel -Add_dependency run dbus-glib-devel -Add_dependency run libexif-devel -Add_dependency run pcre-devel -Add_dependency run xfce4-panel-devel -Add_dependency run Thunar +Add_dependency run Thunar ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/{lib,share} - - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/*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/Thunar/Thunar.rshlibs b/srcpkgs/Thunar/Thunar.rshlibs index a967fe39761..fb71c746110 100644 --- a/srcpkgs/Thunar/Thunar.rshlibs +++ b/srcpkgs/Thunar/Thunar.rshlibs @@ -5,7 +5,6 @@ libSM.so.6 libICE.so.6 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 @@ -16,10 +15,8 @@ libdbus-1.so.3 libpthread.so.0 libgio-2.0.so.0 libgobject-2.0.so.0 -libgthread-2.0.so.0 libglib-2.0.so.0 libc.so.6 -libxfce4panel-1.0.so.3 libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libfreetype.so.6 @@ -29,3 +26,5 @@ librt.so.1 libX11.so.6 libexif.so.12 libpcre.so.0 +libxfce4util.so.6 +libxfce4panel-1.0.so.4 diff --git a/srcpkgs/Thunar/depends b/srcpkgs/Thunar/depends index 638e6380c1f..27ebe44099a 100644 --- a/srcpkgs/Thunar/depends +++ b/srcpkgs/Thunar/depends @@ -1,2 +1,2 @@ -abi_depends=">=1.2.0" +abi_depends=">=1.3.2" api_depends="${abi_depends}" diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template index 437a101b123..1b9d0d5e992 100644 --- a/srcpkgs/Thunar/template +++ b/srcpkgs/Thunar/template @@ -1,16 +1,15 @@ # Template file for 'Thunar' pkgname=Thunar -version=1.2.2 -distfiles="http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-$version.tar.bz2" +version=1.3.2 +distfiles="http://archive.xfce.org/src/xfce/thunar/1.3/Thunar-$version.tar.bz2" build_style=gnu-configure configure_args="--enable-gio-unix --enable-dbus --enable-gudev --enable-exif --enable-pcre --enable-notifications" -revision=2 short_desc="Thunar File Manager" maintainer="Juan RP " homepage="http://thunar.xfce.org" license="GPL-2, LGPL-2.1" -checksum=56b07dddde423ae7854c5edd433948a912c27afe2a60689ffc50df3d981e90f6 +checksum=f1c65ab0bb7ade67fc006d5c023995ea92ebe445b0ac0dfeb675895e0a4640ac long_desc=" Thunar is a new modern file manager for the Xfce Desktop Environment. It has been designed from the ground up to be fast and easy-to-use. @@ -21,10 +20,10 @@ long_desc=" conf_files="/etc/xdg/Thunar/uca.xml" gtk_iconcache_dirs="/usr/share/icons/hicolor" subpackages="$pkgname-devel" +make_dirs="/etc/polkit-1/localauthority 0700 root root" Add_dependency build pkg-config Add_dependency build intltool -Add_dependency build exo-devel Add_dependency build libgudev-devel Add_dependency build libnotify-devel Add_dependency build libxfce4util-devel @@ -33,16 +32,16 @@ Add_dependency build gtk+-devel Add_dependency build dbus-glib-devel Add_dependency build libexif-devel Add_dependency build pcre-devel +Add_dependency build exo-devel Add_dependency build xfce4-panel-devel +Add_dependency build startup-notification-devel -Add_dependency full gvfs -Add_dependency full hicolor-icon-theme -Add_dependency full desktop-file-utils +Add_dependency run gvfs +Add_dependency run hicolor-icon-theme +Add_dependency run desktop-file-utils -post_install() -{ +post_install() { # install udisks permission file - install -dm700 ${DESTDIR}/etc/polkit-1/localauthority install -dm755 ${DESTDIR}/etc/polkit-1/localauthority/50-local.d install -m644 ${FILESDIR}/org.freedesktop.udisks.pkla \ ${DESTDIR}/etc/polkit-1/localauthority/50-local.d/