diff options
| -rw-r--r-- | dev-libs/glib/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/glib/files/digest-glib-2.12.5-r1 | 3 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch | 46 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.12.5-r1.ebuild | 84 |
4 files changed, 140 insertions, 1 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index fd5ed5926ca5..10e13fe83fa3 100644 --- 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/files/digest-glib-2.12.5-r1 b/dev-libs/glib/files/digest-glib-2.12.5-r1 new file mode 100644 index 000000000000..96ab444c5273 --- /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 index 000000000000..4fbb56bdd695 --- /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 index 000000000000..0e09100b0986 --- /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 +} |