[gentoo-commits] gentoo-x86 commit in sys-fs/udisks/files: udisks-2.x-pragma.patch

[gentoo-commits] gentoo-x86 commit in sys-fs/udisks/files: udisks-2.x-pragma.patch

[Samuli Suominen (ssuominen)]

ssuominen    12/08/03 08:32:35

  Added:                udisks-2.x-pragma.patch
  Log:
  Revert upstream -Wformat-nonliteral pragma patch when active GCC is < 4.6 wrt #428398 by Manuel Rüger
  
  (Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-fs/udisks/files/udisks-2.x-pragma.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udisks/files/udisks-2.x-pragma.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udisks/files/udisks-2.x-pragma.patch?rev=1.1&content-type=text/plain

Index: udisks-2.x-pragma.patch
===================================================================
This code is not compatible with <sys-devel/gcc-4.6.0 wrt http://bugs.gentoo.org/428398
Revert http://cgit.freedesktop.org/udisks/commit/udisks/udisksclient.c?id=b519b97a19060027cd8e1fc1e663dbc61f21f4e4

--- udisks/udisksclient.c
+++ udisks/udisksclient.c
@@ -2215,15 +2215,11 @@
           else if ((g_strcmp0 (id_type[n].version, version) == 0 && strlen (version) > 0) ||
                    (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"
               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
             }
         }
     }