diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-09-18 13:22:46 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-09-18 13:22:46 +0000 |
| commit | 6d04121ca8048029471b17e770ebf41f5449d38f (patch) | |
| tree | 5745caf1dd19087aed5a6758614d33d8e8b571e5 /dev-libs/totem-pl-parser | |
| parent | Stable for x86, wrt bug #435240 (diff) | |
| download | gentoo-2-6d04121ca8048029471b17e770ebf41f5449d38f.tar.gz gentoo-2-6d04121ca8048029471b17e770ebf41f5449d38f.tar.bz2 gentoo-2-6d04121ca8048029471b17e770ebf41f5449d38f.zip | |
Fix build error with <glib-2.33 (bug #435408, thanks to Marien Zwart).
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/totem-pl-parser')
3 files changed, 27 insertions, 2 deletions
diff --git a/dev-libs/totem-pl-parser/ChangeLog b/dev-libs/totem-pl-parser/ChangeLog index a6fcf2e808cd..8a9750e42bc5 100644 --- a/dev-libs/totem-pl-parser/ChangeLog +++ b/dev-libs/totem-pl-parser/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/totem-pl-parser # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.116 2012/09/18 10:14:05 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.117 2012/09/18 13:22:46 tetromino Exp $ + + 18 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + totem-pl-parser-3.4.3.ebuild, + +files/totem-pl-parser-3.4.3-no-g_clear_pointer.patch: + Fix build error with <glib-2.33 (bug #435408, thanks to Marien Zwart). *totem-pl-parser-3.4.3 (18 Sep 2012) diff --git a/dev-libs/totem-pl-parser/files/totem-pl-parser-3.4.3-no-g_clear_pointer.patch b/dev-libs/totem-pl-parser/files/totem-pl-parser-3.4.3-no-g_clear_pointer.patch new file mode 100644 index 000000000000..e8f6af70e219 --- /dev/null +++ b/dev-libs/totem-pl-parser/files/totem-pl-parser-3.4.3-no-g_clear_pointer.patch @@ -0,0 +1,17 @@ +diff --git a/plparse/totem-pl-parser.c b/plparse/totem-pl-parser.c +index aeaf3ea..dd00037 100644 +--- a/plparse/totem-pl-parser.c ++++ b/plparse/totem-pl-parser.c +@@ -1835,8 +1835,10 @@ totem_pl_parser_parse_internal (TotemPlParser *parser, + + /* Not a directory on http though */ + if (g_strcmp0 (mimetype, "inode/directory") == 0 && +- g_file_has_uri_scheme (file, "http")) +- g_clear_pointer (&mimetype, g_free); ++ g_file_has_uri_scheme (file, "http")) { ++ g_free (mimetype); ++ mimetype = NULL; ++ } + + DEBUG(file, g_print ("_get_mime_type_for_name for '%s' returned '%s'\n", uri, mimetype)); + if (mimetype == NULL || strcmp (UNKNOWN_TYPE, mimetype) == 0 diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild index ea17b40852bb..ecb7c5df1b66 100644 --- a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild +++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild,v 1.1 2012/09/18 10:14:05 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild,v 1.2 2012/09/18 13:22:46 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -47,6 +47,9 @@ pkg_setup() { } src_prepare() { + # Avoid glib-2.34 dependency for now, bug #435408 + epatch "${FILESDIR}/${P}-no-g_clear_pointer.patch" + gnome2_src_prepare # Disable tests requiring network access, bug #346127 |