Allowing pcmanfm to work against shared-mime-info-0.70 , patch thanks to Samuli Suominen <ssuominen@gentoo.org> bug 288820

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 134 insertions, 2 deletions

diff --git a/x11-misc/pcmanfm/ChangeLog b/x11-misc/pcmanfm/ChangeLog
index 03c7af96a5fe..bb1d53ad1116 100644
--- a/x11-misc/pcmanfm/ChangeLog
+++ b/x11-misc/pcmanfm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/pcmanfm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/ChangeLog,v 1.6 2009/08/15 11:02:58 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/ChangeLog,v 1.7 2009/10/25 03:12:02 vostorga Exp $
+
+*pcmanfm-0.5.1-r1 (25 Oct 2009)
+
+  25 Oct 2009; Víctor Ostorga <vostorga@gentoo.org>
+  +pcmanfm-0.5.1-r1.ebuild,
+  +files/pcmanfm-0.5.1-shared-mime-info-0.70.patch:
+  Allowing pcmanfm to work against shared-mime-info-0.70 , patch thanks to
+  Samuli Suominen <ssuominen@gentoo.org> bug 288820
 
   15 Aug 2009; Mounir Lamouri <volkmar@gentoo.org> pcmanfm-0.5.1.ebuild:
   Keywording for ppc. Bug 271148
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index e5284d281842..5c4c4d091044 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,7 +1,9 @@
+AUX pcmanfm-0.5.1-shared-mime-info-0.70.patch 2119 RMD160 20f783266a4ca49cd0f5ac04f1f9e1dff5bb0d3d SHA1 645bab6344f4d97cb1961bc269b5fd6581f5de95 SHA256 18bef3bfe497f9c4ae196219cbe1e0dd4e64469e693673f5cc39f2d7ee474bf4
 AUX pcmanfm-find.desktop.patch 462 RMD160 6f2aafd1806551b0822604c7fbb476d5f3e72734 SHA1 cafa37ccf771890f2413f4960384884adc8948c8 SHA256 c6890d7ad4bd0a17e39db344d9263cae12ea6859955c33a57ec5d78918284a5b
 DIST pcmanfm-0.5.1.tar.bz2 691370 RMD160 56c53b10d7dd0b6e5e2de1d5559b652d8aba4274 SHA1 91916c6ed04eac5bce8ec2d775358b3b83d3ae9f SHA256 10bf0d469cd410db2c7808e1f6b7d1543ea28a35b2fa7ebdd3706590092b3584
 DIST pcmanfm-0.5.tar.gz 862798 RMD160 ec4b7b92f12d08dc21fa35b542fc4cd7c9b20bf1 SHA1 f792e2995518a8aa6c449f9aa764316e3e485caf SHA256 87ebb12f012dc948e3c049936a14d757ac304087f662c17fb94e6c27864fe622
+EBUILD pcmanfm-0.5.1-r1.ebuild 1652 RMD160 c6abdc78703ebdfed39779a7d44da333925975b0 SHA1 fa9fd821a508addd9b99d9d15c58186399ec03d1 SHA256 ea05a3b4156f894f780fe6bacbf4c43819297dae5a6112072ea06be00e3a84a0
 EBUILD pcmanfm-0.5.1.ebuild 1593 RMD160 88cc0ad42dc402367bf0668a44720af23688056a SHA1 db921788ec7dc3da5a2336d134666f551a812a8c SHA256 d723eaf1a71362ba615392023207f53c1fd2407047176ab5ffa42f86c4efdeb0
 EBUILD pcmanfm-0.5.ebuild 1732 RMD160 cad06c0f5ce6c664ef5ef8db8c0f74f325f60c15 SHA1 9f7b348b20209c033d9ba0c8a80b11609f15abed SHA256 8a8da6c6538df583bc5f4b7d00547d1269fa606c5573dbda2079904fc6171ed5
-MISC ChangeLog 1096 RMD160 569562300575a82fc6b619fadee93ccfecfd6378 SHA1 7cc4e11669bb6d33b0cd9fa3f54d9d5c6a450fa2 SHA256 6f78da7d1755404a5c45a2da88f0caeffb75a077c613796e31f2b94447659323
+MISC ChangeLog 1391 RMD160 271709c0d7968a73037e7746e22095fa09ba3f02 SHA1 500d9ebba40f022347dfdc42afc15291de3c50f4 SHA256 5d0c7f76aca3c5ee35a3077e6ef602c64cd3141b1420f2d5fe49de03faecc147
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
diff --git a/x11-misc/pcmanfm/files/pcmanfm-0.5.1-shared-mime-info-0.70.patch b/x11-misc/pcmanfm/files/pcmanfm-0.5.1-shared-mime-info-0.70.patch
new file mode 100644
index 000000000000..5a8029430e13
--- /dev/null
+++ b/x11-misc/pcmanfm/files/pcmanfm-0.5.1-shared-mime-info-0.70.patch
@@ -0,0 +1,58 @@
+diff -ur pcmanfm-0.5.1.orig/src/mime-type/mime-cache.c pcmanfm-0.5.1/src/mime-type/mime-cache.c
+--- pcmanfm-0.5.1.orig/src/mime-type/mime-cache.c	2009-04-20 20:41:30.000000000 +0300
++++ pcmanfm-0.5.1/src/mime-type/mime-cache.c	2009-10-24 20:39:51.000000000 +0300
+@@ -40,7 +40,13 @@
+ #include <fnmatch.h>
+ 
+ #define LIB_MAJOR_VERSION 1
+-#define LIB_MAX_MINOR_VERSION 1
++/* FIXME: since mime-cache 1.2, weight is splitted into three parts
++ * only lower 8 bit contains weight, and higher bits are flags and case-sensitivity.
++ * anyway, since we don't support weight at all, it'll be fixed later.
++ * We claimed that we support 1.2 to cheat pcmanfm as a temporary quick dirty fix
++ * for the broken file manager, but this should be correctly done in the future.
++ * Weight and case-sensitivity are not handled now. */
++#define LIB_MAX_MINOR_VERSION 2
+ #define LIB_MIN_MINOR_VERSION 0
+ 
+ /* handle byte order here */
+@@ -57,7 +63,6 @@
+ #define    GLOB_LIST    20
+ #define    MAGIC_LIST    24
+ #define    NAMESPACE_LIST    28
+-#define    HEADER_SIZE    32
+ 
+ MimeCache* mime_cache_new( const char* file_path )
+ {
+@@ -111,7 +116,7 @@
+     if ( fd < 0 )
+         return FALSE;
+ 
+-    if( fstat ( fd, &statbuf ) < 0 || statbuf.st_size < HEADER_SIZE )
++    if( fstat ( fd, &statbuf ) < 0 )
+     {
+         close( fd );
+         return FALSE;
+@@ -346,7 +351,6 @@
+         const char* node =nodes + i * 12;
+         guint32 ch = VAL32(node, 0);
+         _suffix_pos = suffix;
+-
+         if( G_LIKELY( ch ) )
+         {
+             if( ch == uchar )
+@@ -391,14 +395,12 @@
+ 
+     if( G_UNLIKELY( ! filename || ! *filename || 0 == n ) )
+         return NULL;
+-
+     if( cache->has_reverse_suffix )  /* since mime.cache ver: 1.1 */
+     {
+         const char *suffix, *leaf_node, *_suffix_pos = (const char*)-1;
+         fn_len = strlen( filename );
+         suffix = g_utf8_find_prev_char( filename, filename + fn_len );
+         leaf_node = lookup_reverse_suffix_nodes( cache->buffer, root, n, filename, suffix, &_suffix_pos );
+-
+         if( leaf_node )
+         {
+             mime_type = cache->buffer + VAL32( leaf_node, 4 );
diff --git a/x11-misc/pcmanfm/pcmanfm-0.5.1-r1.ebuild b/x11-misc/pcmanfm/pcmanfm-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..3f1e7f70535f
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-0.5.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.5.1-r1.ebuild,v 1.1 2009/10/25 03:12:02 vostorga Exp $
+
+EAPI="2"
+inherit autotools eutils fdo-mime
+
+DESCRIPTION="Extremely fast and lightweight tabbed file manager"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="hal"
+
+RDEPEND="virtual/fam
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-misc/shared-mime-info
+	x11-themes/gnome-icon-theme
+	x11-libs/startup-notification
+	hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	# Don't break Gnome & possibly other environments, bug 272318
+	epatch "${FILESDIR}"/pcmanfm-find.desktop.patch
+	epatch "${FILESDIR}"/${P}-shared-mime-info-0.70.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable hal)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	if has_version app-admin/fam ; then
+		elog "You are using fam as your file alteration monitor,"
+		elog "so you must have famd started before running pcmanfm."
+		elog
+		elog "To add famd to the default runlevel and start it, run:"
+		elog
+		elog "# rc-update add famd default"
+		elog "# /etc/init.d/famd start"
+		elog
+		elog "It is recommended you use gamin instead of fam."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}