From: Samuli Suominen Date: Wed, 2 May 2007 12:34:51 +0000 (+0000) Subject: Apply patch from upstream to fix bug 173795, adding quotes to UCA browse. Thanks... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b92ab94581db26a745c179d5b6d090e963efbd7;p=gentoo.git Apply patch from upstream to fix bug 173795, adding quotes to UCA browse. Thanks to Alexander Skwar for reporting. Package-Manager: portage-2.1.2.5 --- diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog index 46cb35f14b5a..a1af25409025 100644 --- a/xfce-base/thunar/ChangeLog +++ b/xfce-base/thunar/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for xfce-base/thunar # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.28 2007/03/15 13:29:34 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.29 2007/05/02 12:34:51 drac Exp $ + +*thunar-0.8.0-r3 (02 May 2007) + + 02 May 2007; Samuli Suominen + +files/thunar-0.8.0-uca.patch, +thunar-0.8.0-r3.ebuild: + Apply patch from upstream to fix bug 173795, adding quotes to UCA browse. + Thanks to Alexander Skwar for reporting. 15 Mar 2007; Markus Rothe thunar-0.8.0-r2.ebuild: Stable on ppc64; bug #169987 diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest index 5b2f2c1760e0..f44ca3feb478 100644 --- a/xfce-base/thunar/Manifest +++ b/xfce-base/thunar/Manifest @@ -1,19 +1,24 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX thunar-0.8.0-jpeg.patch 6167 RMD160 2bd5d0db89ea0050877822ce87c7eef36407b34d SHA1 a2feee6d64d10b08ab3209b8b22223ea5967ef52 SHA256 8a7f426322f84a73d3d6c0ed9d89323e88ae46b0b844a14747d120e0787252a1 MD5 a465124a9e6e0c0187997d8805b7bd6f files/thunar-0.8.0-jpeg.patch 6167 RMD160 2bd5d0db89ea0050877822ce87c7eef36407b34d files/thunar-0.8.0-jpeg.patch 6167 SHA256 8a7f426322f84a73d3d6c0ed9d89323e88ae46b0b844a14747d120e0787252a1 files/thunar-0.8.0-jpeg.patch 6167 +AUX thunar-0.8.0-uca.patch 823 RMD160 81234758fd29477e83b14bd6bb4758d64612f08d SHA1 b216e9b62e2fc53e75d50cc5c1028fc4fac69f57 SHA256 134c39d89efdc9a2bc61fbd9821815542d0796a2bc59a300c3b541dcf23b1f4b +MD5 996b82b502cc39fd2a247b218c7dbea5 files/thunar-0.8.0-uca.patch 823 +RMD160 81234758fd29477e83b14bd6bb4758d64612f08d files/thunar-0.8.0-uca.patch 823 +SHA256 134c39d89efdc9a2bc61fbd9821815542d0796a2bc59a300c3b541dcf23b1f4b files/thunar-0.8.0-uca.patch 823 DIST Thunar-0.8.0.tar.bz2 6205993 RMD160 95d29cca64c102b7d8bdcc0592f6fcab7198148b SHA1 1adcba7b86d9219b0bd7eb8c16d5719aa8393d98 SHA256 460484f8397a0e0e4115d1629d2ae027b5052dc2c564d4a4629a3557e4a055f9 EBUILD thunar-0.8.0-r2.ebuild 2157 RMD160 38463dedfb4e2a48e582f7db7fdac3204e7c02f4 SHA1 134316f33f6f70987f519a3530958838b3c4f53b SHA256 c46d752c699a9aa23abedf297278c57e1b9a72ccf61811bb4ad1ce408d1fb2f9 MD5 e9c3988bf46782c9bc5ee6940bb0e918 thunar-0.8.0-r2.ebuild 2157 RMD160 38463dedfb4e2a48e582f7db7fdac3204e7c02f4 thunar-0.8.0-r2.ebuild 2157 SHA256 c46d752c699a9aa23abedf297278c57e1b9a72ccf61811bb4ad1ce408d1fb2f9 thunar-0.8.0-r2.ebuild 2157 -MISC ChangeLog 4400 RMD160 77c9eac00fe0688e87e09469f32a1d3a4f6b3707 SHA1 46eb2c4319949a1000314687b7958894765bfd90 SHA256 89b7b7f3a25c525cb63998b9df997a065fca69cd71201593ae3b4b155a054eeb -MD5 9e5ee793413330be88481593b6f316c2 ChangeLog 4400 -RMD160 77c9eac00fe0688e87e09469f32a1d3a4f6b3707 ChangeLog 4400 -SHA256 89b7b7f3a25c525cb63998b9df997a065fca69cd71201593ae3b4b155a054eeb ChangeLog 4400 +EBUILD thunar-0.8.0-r3.ebuild 2200 RMD160 f687007d6669fc2501559213354382536ea13efd SHA1 a7e545c4259db8ba99e8cd41cb90c5f729b973cd SHA256 781b96ccb1dc1dc576c0740a43551e50a0ed7b87b643715947b4bd4795f09bd1 +MD5 f1836ee5845126c17e652741a8a5f2fb thunar-0.8.0-r3.ebuild 2200 +RMD160 f687007d6669fc2501559213354382536ea13efd thunar-0.8.0-r3.ebuild 2200 +SHA256 781b96ccb1dc1dc576c0740a43551e50a0ed7b87b643715947b4bd4795f09bd1 thunar-0.8.0-r3.ebuild 2200 +MISC ChangeLog 4656 RMD160 0d27d2b53da3646ae45c5318f41c0cc6507a126b SHA1 623d559c703ad3a1b3b047336332e9d52c63b1d9 SHA256 cc131c50a566b2254b0cf57ae396368e1800667485745b62517cd16a47d98f69 +MD5 8fc18f745ab19d5aed728576ac8b63ec ChangeLog 4656 +RMD160 0d27d2b53da3646ae45c5318f41c0cc6507a126b ChangeLog 4656 +SHA256 cc131c50a566b2254b0cf57ae396368e1800667485745b62517cd16a47d98f69 ChangeLog 4656 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157 @@ -21,10 +26,6 @@ SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata MD5 74e9028d343ebeba2b70ba51d274d7a5 files/digest-thunar-0.8.0-r2 244 RMD160 bd56683dc3e760f2695e8074cc355370154722d7 files/digest-thunar-0.8.0-r2 244 SHA256 002305cb4a3dcc120b84a79088f3fb013fcd2cf5262fa6e5c1fb80a40d1583f2 files/digest-thunar-0.8.0-r2 244 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFF/F488bi6rjpTunYRAveLAKCqtpLknGqNUljjR9lI6ZSb3+kCvACg09Ms -JBpQ5Oq95c3XuSngRYqBPLw= -=6x+J ------END PGP SIGNATURE----- +MD5 74e9028d343ebeba2b70ba51d274d7a5 files/digest-thunar-0.8.0-r3 244 +RMD160 bd56683dc3e760f2695e8074cc355370154722d7 files/digest-thunar-0.8.0-r3 244 +SHA256 002305cb4a3dcc120b84a79088f3fb013fcd2cf5262fa6e5c1fb80a40d1583f2 files/digest-thunar-0.8.0-r3 244 diff --git a/xfce-base/thunar/files/digest-thunar-0.8.0-r3 b/xfce-base/thunar/files/digest-thunar-0.8.0-r3 new file mode 100644 index 000000000000..36154971d4f9 --- /dev/null +++ b/xfce-base/thunar/files/digest-thunar-0.8.0-r3 @@ -0,0 +1,3 @@ +MD5 9f7b0945d6a235391049f6818fb4d188 Thunar-0.8.0.tar.bz2 6205993 +RMD160 95d29cca64c102b7d8bdcc0592f6fcab7198148b Thunar-0.8.0.tar.bz2 6205993 +SHA256 460484f8397a0e0e4115d1629d2ae027b5052dc2c564d4a4629a3557e4a055f9 Thunar-0.8.0.tar.bz2 6205993 diff --git a/xfce-base/thunar/files/thunar-0.8.0-uca.patch b/xfce-base/thunar/files/thunar-0.8.0-uca.patch new file mode 100644 index 000000000000..53d3dbc18852 --- /dev/null +++ b/xfce-base/thunar/files/thunar-0.8.0-uca.patch @@ -0,0 +1,19 @@ +Index: plugins/thunar-uca/thunar-uca-editor.c +=================================================================== +--- plugins/thunar-uca/thunar-uca-editor.c (revision 25631) ++++ plugins/thunar-uca/thunar-uca-editor.c (working copy) +@@ -582,7 +582,13 @@ + if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT) + { + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser)); +- s = g_strconcat (filename, " %f", NULL); ++ ++ /* quote the command when the filename contains spaces */ ++ if (G_LIKELY (strchr (filename, ' ') == NULL)) ++ s = g_strconcat (filename, " %f", NULL); ++ else ++ s = g_strconcat ("'", filename, "' %f", NULL); ++ + gtk_entry_set_text (GTK_ENTRY (uca_editor->command_entry), s); + g_free (filename); + g_free (s); diff --git a/xfce-base/thunar/thunar-0.8.0-r3.ebuild b/xfce-base/thunar/thunar-0.8.0-r3.ebuild new file mode 100644 index 000000000000..d677fa54de1c --- /dev/null +++ b/xfce-base/thunar/thunar-0.8.0-r3.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.8.0-r3.ebuild,v 1.1 2007/05/02 12:34:51 drac Exp $ + +inherit eutils virtualx xfce44 + +MY_P="${P/t/T}" +S="${WORKDIR}/${MY_P}" + +xfce44 + +DESCRIPTION="File manager" +HOMEPAGE="http://thunar.xfce.org" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="doc dbus debug exif gnome hal plugins pcre startup-notification" + +RDEPEND=">=dev-lang/perl-5.6 + x11-libs/libSM + >=x11-libs/gtk+-2.6 + >=dev-libs/glib-2.6 + >=xfce-extra/exo-0.3.2 + >=x11-misc/shared-mime-info-0.15 + >=dev-util/desktop-file-utils-0.10 + >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} + virtual/fam + dbus? ( || ( dev-libs/dbus-glib =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 ) + plugins? ( dbus? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} ) ) + gnome-base/librsvg" +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool + doc? ( dev-util/gtk-doc )" + +XFCE_CONFIG="${XFCE_CONFIG} $(use_enable exif) $(use_enable gnome gnome-thumbnailers) \ + $(use_enable dbus) $(use_enable pcre)" + +pkg_setup() { + if use hal; then + XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=hal" + else + XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=none" + fi + + if use plugins && ! use dbus ; then + XFCE_CONFIG="${XFCE_CONFIG} --disable-tpa-plugin" + ewarn "Plugins requires ${PN} with dbus support. Enable dbus use flag" + ewarn "and re-emerge this ebuild if you want this feature." + epause 3 + fi + + if use hal && ! use dbus ; then + ewarn "HAL requires ${PN} with dbus support. Enable dbus use flag" + ewarn "and re-emerge this ebuild if you want this feature." + die "re-emerge with USE dbus" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-jpeg.patch + epatch "${FILESDIR}"/${P}-uca.patch +} + +src_test() { + Xemake check || "emake check failed." +} + +DOCS="AUTHORS ChangeLog HACKING FAQ THANKS TODO README NEWS" + +xfce44_extra_package