diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-23 15:33:00 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-23 15:33:00 +0000 |
commit | 580f791b6a47122f4934ad22bf2759bff6a64f32 (patch) | |
tree | 176cd6f3e0c4e0017a49d37f0acc9794c097780a /xfce-base | |
parent | Remove libxfce4mcs (diff) | |
download | gentoo-2-580f791b6a47122f4934ad22bf2759bff6a64f32.tar.gz gentoo-2-580f791b6a47122f4934ad22bf2759bff6a64f32.tar.bz2 gentoo-2-580f791b6a47122f4934ad22bf2759bff6a64f32.zip |
old
(Portage version: 2.2_rc39/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base')
-rw-r--r-- | xfce-base/thunar/Manifest | 4 | ||||
-rw-r--r-- | xfce-base/thunar/files/thunar-0.9.0-fix-defuncts.patch | 31 | ||||
-rw-r--r-- | xfce-base/thunar/files/thunar-0.9.0-missing-audio-cds-for-volman.patch | 84 | ||||
-rw-r--r-- | xfce-base/thunar/thunar-0.9.3.ebuild | 83 |
4 files changed, 0 insertions, 202 deletions
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest index e8c905ea9ab2..74f883bc1c38 100644 --- a/xfce-base/thunar/Manifest +++ b/xfce-base/thunar/Manifest @@ -1,8 +1,4 @@ -AUX thunar-0.9.0-fix-defuncts.patch 1111 RMD160 68f2fbf8326d43de8b201946969ccccc36bf2b20 SHA1 cf27e3d03f087b00cccabe294a927ab0ec2d9bc5 SHA256 3b5808b8dc77a0dbdd18412258d1758162afc0ecf41ac31272299cf32c4c0774 -AUX thunar-0.9.0-missing-audio-cds-for-volman.patch 4220 RMD160 5fa9ff9156fca9df5d3a2908a8d60ddbc31a319d SHA1 678127d7f7ef14a08cf8390b43fac1db72b5e1cb SHA256 4d3696a3a7e06e34d7e8ec040ca4cc58d76d6575e4a01a8877cce1094caad989 -DIST Thunar-0.9.3.tar.bz2 6502363 RMD160 cc5c17a2841d5778e4832cc21e620ac351c9c57b SHA1 bb43fbe5ac3af1204517ed88da1cc3e87c5ec688 SHA256 8820d847d908ae96f9f27fae63ea7ebab91d3fc6c8e1a975157978f89c285e8d DIST Thunar-1.0.1.tar.bz2 8802672 RMD160 203690b9eb05ca8e5248bb026f98b8e3e6881f2c SHA1 2fcd3a7b0e27b01f059dffc8ffdac94e2b2aa064 SHA256 7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d -EBUILD thunar-0.9.3.ebuild 2064 RMD160 529b1d54ebb16444f6848a0e94f009eb79d95a5d SHA1 6b3cd6268d72cd1250a18f3ce5fe78b1852832e3 SHA256 ba82bbd1ea87528baa2cf80cd5306ac0a46a9cc1a7e5771b00a267fb603447c3 EBUILD thunar-1.0.1.ebuild 1852 RMD160 d05d3772211305f45f3a8525afa80c4f2ffcdfb2 SHA1 b5e3781facea9bd57f4139d235e8860be3efc236 SHA256 2de64c30f6627ae290d0cd348d13990bfaf8cc0d0aa4771085a32d60f2e1ea4b MISC ChangeLog 10646 RMD160 633f446b75bf64d456e3c0fe5d622acabcf54f01 SHA1 a2442bd6c5cc9bf7f897fb558411e91b9a9c6bdc SHA256 7f9f7949cea918f356a280eef73e9443907750fd8b7e40582da85279ebf32872 MISC metadata.xml 234 RMD160 5cf371faf236f472c7d98a92d7103c5a96c4d95a SHA1 f028da2a6c812a70d5a6c159a450899a5c8f29a2 SHA256 acb3aa4d6a184bbefb0ae06cbb0ed0416ecd1b87d01cae543365cfc0e330d8cb diff --git a/xfce-base/thunar/files/thunar-0.9.0-fix-defuncts.patch b/xfce-base/thunar/files/thunar-0.9.0-fix-defuncts.patch deleted file mode 100644 index 4353c7490ffe..000000000000 --- a/xfce-base/thunar/files/thunar-0.9.0-fix-defuncts.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: thunar-vfs/thunar-vfs-exec.c -=================================================================== ---- thunar-vfs/thunar-vfs-exec.c (revision 26428) -+++ thunar-vfs/thunar-vfs-exec.c (working copy) -@@ -324,8 +324,10 @@ - if (startup_data->watch_id != 0) - g_source_remove (startup_data->watch_id); - -- /* close the PID */ -- g_spawn_close_pid (startup_data->pid); -+ /* make sure we don't leave zombies (see bug #2983 for details) */ -+ g_child_watch_add_full (G_PRIORITY_LOW, startup_data->pid, -+ (GChildWatchFunc) g_spawn_close_pid, -+ NULL, NULL); - - /* release the startup data */ - _thunar_vfs_slice_free (TvsnStartupData, startup_data); -@@ -513,7 +515,13 @@ - startup_data->pid = pid; - } - } -+ else if (G_LIKELY (succeed)) -+ { -+ /* make sure we don't leave zombies (see bug #2983 for details) */ -+ g_child_watch_add_full (G_PRIORITY_LOW, pid, (GChildWatchFunc) g_spawn_close_pid, NULL, NULL); - -+ } -+ - /* release the sn display */ - if (G_LIKELY (sn_display != NULL)) - sn_display_unref (sn_display); diff --git a/xfce-base/thunar/files/thunar-0.9.0-missing-audio-cds-for-volman.patch b/xfce-base/thunar/files/thunar-0.9.0-missing-audio-cds-for-volman.patch deleted file mode 100644 index d2fa9e7ffbe4..000000000000 --- a/xfce-base/thunar/files/thunar-0.9.0-missing-audio-cds-for-volman.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ur Thunar-0.9.0.orig/thunar-vfs/thunar-vfs-volume-hal.c Thunar-0.9.0/thunar-vfs/thunar-vfs-volume-hal.c ---- Thunar-0.9.0.orig/thunar-vfs/thunar-vfs-volume-hal.c 2007-12-02 15:46:33.000000000 +0200 -+++ Thunar-0.9.0/thunar-vfs/thunar-vfs-volume-hal.c 2007-12-03 18:45:48.000000000 +0200 -@@ -1007,9 +1007,7 @@ - hv = libhal_volume_from_udi (context, udi); - - /* HAL might want us to ignore this volume for some reason */ -- if (G_UNLIKELY (hv != NULL -- && (libhal_volume_should_ignore (hv) -- || libhal_volume_get_fsusage (hv) != LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM))) -+ if (G_UNLIKELY (hv != NULL && libhal_volume_should_ignore (hv))) - { - libhal_volume_free (hv); - return; -@@ -1020,38 +1018,42 @@ - - if (G_LIKELY (hv != NULL)) - { -- /* determine the UDI of the drive to which this volume belongs */ -- drive_udi = libhal_volume_get_storage_device_udi (hv); -- if (G_LIKELY (drive_udi != NULL)) -+ /* check if we have a mountable file system here */ -+ if (libhal_volume_get_fsusage (hv) == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM) - { -- /* determine the drive for the volume */ -- hd = libhal_drive_from_udi (context, drive_udi); -- if (G_LIKELY (hd != NULL)) -+ /* determine the UDI of the drive to which this volume belongs */ -+ drive_udi = libhal_volume_get_storage_device_udi (hv); -+ if (G_LIKELY (drive_udi != NULL)) - { -- /* check if we already have a volume object for the UDI */ -- volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi); -- if (G_LIKELY (volume_hal == NULL)) -+ /* determine the drive for the volume */ -+ hd = libhal_drive_from_udi (context, drive_udi); -+ if (G_LIKELY (hd != NULL)) - { -- /* otherwise, we allocate a new volume object */ -- volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL); -- volume_hal->udi = g_strdup (udi); -- } -- -- /* update the volume object with the new data from the HAL volume/drive */ -- thunar_vfs_volume_hal_update (volume_hal, context, hv, hd); -+ /* check if we already have a volume object for the UDI */ -+ volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi); -+ if (G_LIKELY (volume_hal == NULL)) -+ { -+ /* otherwise, we allocate a new volume object */ -+ volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL); -+ volume_hal->udi = g_strdup (udi); -+ } -+ -+ /* update the volume object with the new data from the HAL volume/drive */ -+ thunar_vfs_volume_hal_update (volume_hal, context, hv, hd); -+ -+ /* add the volume object to our list if we allocated a new one */ -+ if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL) -+ { -+ /* add the volume to the volume manager */ -+ thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal)); -+ -+ /* release the reference on the volume */ -+ g_object_unref (G_OBJECT (volume_hal)); -+ } - -- /* add the volume object to our list if we allocated a new one */ -- if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL) -- { -- /* add the volume to the volume manager */ -- thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal)); -- -- /* release the reference on the volume */ -- g_object_unref (G_OBJECT (volume_hal)); -+ /* release the HAL drive */ -+ libhal_drive_free (hd); - } -- -- /* release the HAL drive */ -- libhal_drive_free (hd); - } - } - diff --git a/xfce-base/thunar/thunar-0.9.3.ebuild b/xfce-base/thunar/thunar-0.9.3.ebuild deleted file mode 100644 index b3f179bd85a7..000000000000 --- a/xfce-base/thunar/thunar-0.9.3.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.9.3.ebuild,v 1.10 2009/05/21 20:10:05 angelos Exp $ - -EAPI=2 - -inherit eutils virtualx xfce44 flag-o-matic - -MY_P=${P/t/T} -S=${WORKDIR}/${MY_P} - -XFCE_VERSION=4.4.3 -xfce44 - -DESCRIPTION="File manager" -HOMEPAGE="http://thunar.xfce.org" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -LICENSE="GPL-2 LGPL-2" -IUSE="doc dbus debug exif gnome hal pcre startup-notification +trash-plugin" - -RDEPEND=">=dev-lang/perl-5.6 - x11-libs/libSM - >=x11-libs/gtk+-2.6 - >=dev-libs/glib-2.6 - >=xfce-extra/exo-0.3.4[hal?] - >=x11-misc/shared-mime-info-0.20 - >=dev-util/desktop-file-utils-0.14 - >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} - virtual/fam - dbus? ( dev-libs/dbus-glib ) - hal? ( dev-libs/dbus-glib - sys-apps/hal ) - >=media-libs/freetype-2 - gnome? ( gnome-base/gconf ) - exif? ( >=media-libs/libexif-0.6 ) - >=media-libs/jpeg-6b - startup-notification? ( x11-libs/startup-notification ) - pcre? ( >=dev-libs/libpcre-6 ) - trash-plugin? ( dev-libs/dbus-glib - >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} ) - gnome-base/librsvg" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - doc? ( dev-util/gtk-doc )" - -DOCS="AUTHORS ChangeLog HACKING FAQ THANKS TODO README NEWS" - -pkg_setup() { - XFCE_CONFIG+=" $(use_enable exif) $(use_enable gnome gnome-thumbnailers) - $(use_enable dbus) $(use_enable pcre)" - - if use hal; then - XFCE_CONFIG+=" --enable-dbus --with-volume-manager=hal" - else - XFCE_CONFIG+=" --with-volume-manager=none" - fi - - if use trash-plugin; then - XFCE_CONFIG+=" --enable-dbus" - else - XFCE_CONFIG+=" --disable-tpa-plugin" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.9.0-missing-audio-cds-for-volman.patch \ - "${FILESDIR}"/${PN}-0.9.0-fix-defuncts.patch -} - -# xfce44 is not EAPI 2 aware yet -src_configure() { :; } - -src_compile() { - append-flags -Wno-error - xfce44_src_compile -} - -src_test() { - Xemake check || die "emake check failed." -} - -xfce44_extra_package |