Fix file association from MIME types, bug 158646

Package-Manager: portage-2.1.2_rc3-r8

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index fd5ed5926ca5dbae048f2d9c286010c0ea54aef9..10e13fe83fa3c95487774d22df11d41a1fa0f86b 100644 (file)
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.231 2006/12/19 18:43:10 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.232 2006/12/20 17:28:47 leio Exp $
+
+*glib-2.12.5-r1 (20 Dec 2006)
+
+  20 Dec 2006; Mart Raudsepp <leio@gentoo.org>
+  +files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch, +glib-2.12.5-r1.ebuild:
+  Fix file association from MIME types, bug 158646
 
 *glib-2.12.5 (19 Dec 2006)
 

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 830954a55ca48c199aee2b2c58306d436329ebd0..e969230ed1b15194824d4a89dee94cd77e9601ef 100644 (file)
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -29,6 +29,10 @@ AUX glib-2.12.4-tests_pthread.patch 1307 RMD160 c964b4f034fad9c859e4892b2acade6e
 MD5 78770d17a16d7be420e8c72a9727da02 files/glib-2.12.4-tests_pthread.patch 1307
 RMD160 c964b4f034fad9c859e4892b2acade6e9f456c1d files/glib-2.12.4-tests_pthread.patch 1307
 SHA256 26dbdcd8f56b355c402019c6aa5886c9b50c7cdd6ef554241a4fd0cdf690f677 files/glib-2.12.4-tests_pthread.patch 1307
+AUX glib-2.12.5-gkeyfile-gnomevfs-mime.patch 1697 RMD160 07c015fdf63c46789fa08cb3f414e375efdce773 SHA1 688a4e98ec474c998e1197bc5654dedbf81e8af2 SHA256 681ab4c6d6c298072fd4de0a7de3731715fc38d4b3dd667efc21b56f9a679217
+MD5 1c5e4044f0e99ab879d1da4a80e4b10c files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch 1697
+RMD160 07c015fdf63c46789fa08cb3f414e375efdce773 files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch 1697
+SHA256 681ab4c6d6c298072fd4de0a7de3731715fc38d4b3dd667efc21b56f9a679217 files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch 1697
 AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
 MD5 7fec226893c96f1126810906e2fb3e5b files/glib-2.6.3-testglib-ssp.patch 344
 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 files/glib-2.6.3-testglib-ssp.patch 344
@@ -60,6 +64,10 @@ EBUILD glib-2.12.4-r1.ebuild 2309 RMD160 6dc21efb0cfcea9e8a983fd0334477d6f17c89e
 MD5 489a6e1d5d1c493cc25d059aa4605b68 glib-2.12.4-r1.ebuild 2309
 RMD160 6dc21efb0cfcea9e8a983fd0334477d6f17c89e9 glib-2.12.4-r1.ebuild 2309
 SHA256 5a1f909e21d128753b14d1b81ade5245515db99e2f216af7991bd4e334f61cf8 glib-2.12.4-r1.ebuild 2309
+EBUILD glib-2.12.5-r1.ebuild 2306 RMD160 b9bc4fcb3912f3976ffece565a5f0cef6352f1fb SHA1 ce39fb4a21dd7188f1a338a57552ccde0a5b9002 SHA256 d9645f8aeb8fa4a78c3dbf995f01778e21d6787b986319a35ee9fa0a673fcee0
+MD5 2477d313612fd2ed0d2badb24b17716d glib-2.12.5-r1.ebuild 2306
+RMD160 b9bc4fcb3912f3976ffece565a5f0cef6352f1fb glib-2.12.5-r1.ebuild 2306
+SHA256 d9645f8aeb8fa4a78c3dbf995f01778e21d6787b986319a35ee9fa0a673fcee0 glib-2.12.5-r1.ebuild 2306
 EBUILD glib-2.12.5.ebuild 2121 RMD160 b80a3e9e3aaeb082b259953a0337ae7c889cfc5b SHA1 fcebde2770e40245f58954756ae160ce87c55ae5 SHA256 56ec67312ae739b339110dfce7d3be6e455761dcdb6a2901754bb02f99735d17
 MD5 d2b43efed471f661a9b38806a450fc05 glib-2.12.5.ebuild 2121
 RMD160 b80a3e9e3aaeb082b259953a0337ae7c889cfc5b glib-2.12.5.ebuild 2121
@@ -76,10 +84,10 @@ EBUILD glib-2.8.6.ebuild 1595 RMD160 eac1d46e7a3853788c6454357acdb1496395e85f SH
 MD5 54af78d77d485d67e6ed85c88ac7a2ce glib-2.8.6.ebuild 1595
 RMD160 eac1d46e7a3853788c6454357acdb1496395e85f glib-2.8.6.ebuild 1595
 SHA256 ce7e945b7757aadb7fee653a5ccf51f5f2f8844b8d1b470efd9788d1836fa3db glib-2.8.6.ebuild 1595
-MISC ChangeLog 27403 RMD160 0f2d5f6e07894e22520c0e0410e018d7548254f7 SHA1 0f0404c25e721806468af3edc3f2ce8ccb6c9c76 SHA256 b801372ea738829cadbc489c379a8eb9ed531111164a22b951371272149a5336
-MD5 e40db368536ea12719df1bf5d504f2bf ChangeLog 27403
-RMD160 0f2d5f6e07894e22520c0e0410e018d7548254f7 ChangeLog 27403
-SHA256 b801372ea738829cadbc489c379a8eb9ed531111164a22b951371272149a5336 ChangeLog 27403
+MISC ChangeLog 27604 RMD160 f91bed3b7ed13d994f0c793c33d1580fae1c397b SHA1 9fd9d07015af2f3a4a9b66a127dd263eebd78e81 SHA256 08f00e33323f4fa8ee29872f5ecd7425c9dd467ff3f79e600bbfb67781019ec9
+MD5 db522fd44d4e0897315c307e5ef126f7 ChangeLog 27604
+RMD160 f91bed3b7ed13d994f0c793c33d1580fae1c397b ChangeLog 27604
+SHA256 08f00e33323f4fa8ee29872f5ecd7425c9dd467ff3f79e600bbfb67781019ec9 ChangeLog 27604
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -99,6 +107,9 @@ SHA256 515021fa1093a388a691b5b8da0a6b7af19751778bde6a27be8986f56de93e3d files/di
 MD5 61eb43b77ca8577f57a62af6264168aa files/digest-glib-2.12.5 241
 RMD160 5e64d92ae4bdbfafb00ac9c97372ef9a0b744f3f files/digest-glib-2.12.5 241
 SHA256 e4756816faed92295a340d7312cc231c097984f7540d4c16043fbc9f4d2a8417 files/digest-glib-2.12.5 241
+MD5 61eb43b77ca8577f57a62af6264168aa files/digest-glib-2.12.5-r1 241
+RMD160 5e64d92ae4bdbfafb00ac9c97372ef9a0b744f3f files/digest-glib-2.12.5-r1 241
+SHA256 e4756816faed92295a340d7312cc231c097984f7540d4c16043fbc9f4d2a8417 files/digest-glib-2.12.5-r1 241
 MD5 fb587bb370ae7240e73de5e1a6edcca9 files/digest-glib-2.8.4 238
 RMD160 2cbd0b0ff439a75e4dcc32f265c612509505d176 files/digest-glib-2.8.4 238
 SHA256 7476e17946496973deac34edaf9781c82e206c9e9d0557ccdfd17bbee3e2361b files/digest-glib-2.8.4 238
@@ -111,7 +122,7 @@ SHA256 30e7d4f7ac387cfa98e6c775cf1888a204523c609bc32d90ff24b7ff0900efc3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFiDLKwUpWvClEHQoRAv++AJ4/F4u0sIUlMoIB8MT9r23LecYWGQCfTcUD
-2fjAcnk4QVWxAOe755SwK+E=
-=fjZi
+iD8DBQFFiXLVkeYb6olFHJcRAtBoAJ45P+R6oFUE+rXLilvmeVpKWyMNowCfVh+H
+o89tw1itU0paGdmbHXOVblA=
+=jAZv
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/glib/files/digest-glib-2.12.5-r1 b/dev-libs/glib/files/digest-glib-2.12.5-r1
new file mode 100644 (file)
index 0000000..96ab444
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.12.5-r1
@@ -0,0 +1,3 @@
+MD5 08f51fd565805289879819964bb8192b glib-2.12.5.tar.bz2 2900298
+RMD160 b306fbfb4573a30e288476ad44a3c30e47914f6a glib-2.12.5.tar.bz2 2900298
+SHA256 ab8575a302c597f8ed72921c3f20033bab0f84f0325f08f9b9347e28333c8644 glib-2.12.5.tar.bz2 2900298

diff --git a/dev-libs/glib/files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch b/dev-libs/glib/files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch
new file mode 100644 (file)
index 0000000..4fbb56b
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch
@@ -0,0 +1,46 @@
+cvs diff -D'20061219 21:07 UTC' -D'20061219 21:10 UTC'
+Changes to tests/gkeyfile-test.c not included here
+The ones that are are the same in glib-2.12 branch and will be part of glib-2.12.6
+
+http://bugzilla.gnome.org/show_bug.cgi?id=343191
+Index: ChangeLog
+===================================================================
+RCS file: /cvs/gnome/glib/ChangeLog,v
+retrieving revision 1.2472
+retrieving revision 1.2473
+diff -u -B -r1.2472 -r1.2473
+--- ChangeLog  19 Dec 2006 15:28:17 -0000      1.2472
++++ ChangeLog  19 Dec 2006 21:08:31 -0000      1.2473
+@@ -1,3 +1,11 @@
++2006-12-19  Matthias Clasen  <mclasen@redhat.com>
++
++      * glib/gkeyfile.c (g_key_file_is_key_name): Accept
++      '/', '+' and '.' in key names, since gnome-vfs uses
++      mime types as keys in some cache.
++
++      * tests/keyfile-test.c: Tests for the above.
++
+ 2006-12-18  Matthias Clasen  <mclasen@redhat.com>
+ 
+       * configure.in: Fix the broken poll test.  (#387260,
+Index: glib/gkeyfile.c
+===================================================================
+RCS file: /cvs/gnome/glib/glib/gkeyfile.c,v
+retrieving revision 1.50
+retrieving revision 1.51
+diff -u -B -r1.50 -r1.51
+--- glib/gkeyfile.c    18 Dec 2006 14:13:33 -0000      1.50
++++ glib/gkeyfile.c    19 Dec 2006 21:08:31 -0000      1.51
+@@ -3234,7 +3234,11 @@
+     return FALSE;
+ 
+   p = q = (gchar *) name;
+-  while (*q && (g_unichar_isalnum (g_utf8_get_char (q)) || *q == '-'))
++  /* We accept a little more than the desktop entry spec says,
++   * since gnome-vfs uses mime-types as keys in its cache.
++   */
++  while (*q && (g_unichar_isalnum (g_utf8_get_char (q)) || 
++                *q == '-' || *q == '_' || *q == '/' || *q == '+' || *q == '.')) 
+     q = g_utf8_next_char (q);
+   
+   if (*q == '[')

diff --git a/dev-libs/glib/glib-2.12.5-r1.ebuild b/dev-libs/glib/glib-2.12.5-r1.ebuild
new file mode 100644 (file)
index 0000000..0e09100
--- /dev/null
+++ b/dev-libs/glib/glib-2.12.5-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.5-r1.ebuild,v 1.1 2006/12/20 17:28:47 leio Exp $
+
+inherit gnome.org libtool eutils flag-o-matic debug
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug doc hardened"
+
+RDEPEND="virtual/libc
+       virtual/libiconv"
+DEPEND="${RDEPEND}
+       >=dev-util/pkgconfig-0.14
+       >=sys-devel/gettext-0.11
+       doc?    (
+                               >=dev-util/gtk-doc-1.4
+                               ~app-text/docbook-xml-dtd-4.1.2
+                       )"
+
+
+src_unpack() {
+       unpack "${A}"
+       cd "${S}"
+
+       # Fix GKeyFile having been made too strict for gnome-vfs mime cache usage
+       # patch included in upcoming 2.12.6 upstream version
+       epatch "${FILESDIR}/${P}-gkeyfile-gnomevfs-mime.patch"
+
+       if use ppc64 && use hardened ; then
+               replace-flags -O[2-3] -O1
+               epatch "${FILESDIR}"/glib-2.6.3-testglib-ssp.patch
+       fi
+
+       if use ia64 ; then
+               # Only apply for < 4.1
+               local major=$(gcc-major-version)
+               local minor=$(gcc-minor-version)
+               if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+                       epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+               fi
+       fi
+}
+
+src_compile() {
+       epunt_cxx
+       elibtoolize
+
+       local myconf
+
+       # Building with --disable-debug highly unrecommended.  It will build glib in
+       # an unusable form as it disables some commonly used API.  Please do not
+       # convert this to the use_enable form, as it results in a broken build.
+       # -- compnerd (3/27/06)
+       use debug && myconf="--enable-debug"
+
+       # always build static libs, see #153807
+       econf \
+               $(use_enable doc gtk-doc) \
+               ${myconf} \
+               --with-threads=posix \
+               --enable-static || die "configure failed"
+
+       emake || die "make failed"
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "Installation failed"
+
+       # Do not install charset.alias even if generated, leave it tol libiconv
+       rm -f ${D}/usr/lib/charset.alias
+
+       # Consider invalid UTF-8 filenames as locale-specific.
+       # TODO :: Eventually get rid of G_BROKEN_FILENAMES
+       dodir /etc/env.d
+       echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
+       echo "G_FILENAME_ENCODING=UTF-8" >> ${D}/etc/env.d/50glib2
+
+       dodoc AUTHORS ChangeLog* NEWS* README
+}