diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-12-17 23:13:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-12-17 23:13:49 +0000 |
| commit | 3eef765fd6d0dad5e9caaabafda8ca223b8a670d (patch) | |
| tree | 24f1fd0a913ab4117335931e7d695ea4c85d8d4f /sys-fs/udisks/files | |
| parent | Port from obsolete libxfcegui4 to libxfce4ui. You can follow http://bugzilla.... (diff) | |
| download | gentoo-2-3eef765fd6d0dad5e9caaabafda8ca223b8a670d.tar.gz gentoo-2-3eef765fd6d0dad5e9caaabafda8ca223b8a670d.tar.bz2 gentoo-2-3eef765fd6d0dad5e9caaabafda8ca223b8a670d.zip | |
Version bump.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-fs/udisks/files')
| -rw-r--r-- | sys-fs/udisks/files/udisks-2.0.1-pragma.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/sys-fs/udisks/files/udisks-2.0.1-pragma.patch b/sys-fs/udisks/files/udisks-2.0.1-pragma.patch new file mode 100644 index 000000000000..bebbb9f91b24 --- /dev/null +++ b/sys-fs/udisks/files/udisks-2.0.1-pragma.patch @@ -0,0 +1,53 @@ +From 02c041674cbcbee75e7fe70095f37c35837f4901 Mon Sep 17 00:00:00 2001 +From: David Zeuthen <zeuthen@gmail.com> +Date: Sat, 13 Oct 2012 09:58:48 +0000 +Subject: Only use #pragma GCC diagnostic on GCC >= 4.6 + +https://bugs.freedesktop.org/show_bug.cgi?id=52614 + +Signed-off-by: David Zeuthen <zeuthen@gmail.com> +--- +diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c +index 22c20b8..4a5a4b0 100644 +--- a/udisks/udisksclient.c ++++ b/udisks/udisksclient.c +@@ -25,6 +25,11 @@ + #include "udiskserror.h" + #include "udisks-generated.h" + ++/* For __GNUC_PREREQ usage below */ ++#ifdef __GNUC__ ++# include <features.h> ++#endif ++ + /** + * SECTION:udisksclient + * @title: UDisksClient +@@ -1922,14 +1927,22 @@ udisks_client_get_id_for_display (UDisksClient *client, + (g_strcmp0 (id_type[n].version, "*") == 0 && strlen (version) > 0)) + { + /* we know better than the compiler here */ +-#pragma GCC diagnostic push +-#pragma GCC diagnostic ignored "-Wformat-nonliteral" ++#ifdef __GNUC_PREREQ ++# if __GNUC_PREREQ(4,6) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wformat-nonliteral" ++# endif ++#endif + if (long_string) + ret = g_strdup_printf (g_dpgettext2 (GETTEXT_PACKAGE, "fs-type", id_type[n].long_name), version); + else + ret = g_strdup_printf (g_dpgettext2 (GETTEXT_PACKAGE, "fs-type", id_type[n].short_name), version); + goto out; +-#pragma GCC diagnostic pop ++#ifdef __GNUC_PREREQ ++# if __GNUC_PREREQ(4,6) ++# pragma GCC diagnostic pop ++# endif ++#endif + } + } + } +-- +cgit v0.9.0.2-2-gbebe |