CVS commit: pkgsrc/sysutils/brasero

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Jan 10 21:18:21 UTC 2020

Modified Files:
        pkgsrc/sysutils/brasero: distinfo
Added Files:
        pkgsrc/sysutils/brasero/patches:
            patch-libbrasero-media_brasero-media-private.h
            patch-libbrasero-media_brasero-media.c
            patch-libbrasero-utils_brasero-misc.c
            patch-libbrasero-utils_brasero-misc.h

Log Message:
Improve format string handling to allow building with clang.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/brasero/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/brasero/patches/patch-libbrasero-media_brasero-media-private.h \
    pkgsrc/sysutils/brasero/patches/patch-libbrasero-media_brasero-media.c \
    pkgsrc/sysutils/brasero/patches/patch-libbrasero-utils_brasero-misc.c \
    pkgsrc/sysutils/brasero/patches/patch-libbrasero-utils_brasero-misc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/brasero/distinfo
diff -u pkgsrc/sysutils/brasero/distinfo:1.13 pkgsrc/sysutils/brasero/distinfo:1.14
--- pkgsrc/sysutils/brasero/distinfo:1.13       Fri Oct 18 12:31:02 2019
+++ pkgsrc/sysutils/brasero/distinfo    Fri Jan 10 21:18:21 2020
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.13 2019/10/18 12:31:02 nia Exp $
+$NetBSD: distinfo,v 1.14 2020/01/10 21:18:21 joerg Exp $
 
 SHA1 (brasero-3.12.2.tar.xz) = 2f3677c2aafa1c6a832befe45e0aeb25f9f95089
 RMD160 (brasero-3.12.2.tar.xz) = bc96ca61aa631bf018f4b9aff3ffeafae5db6e03
 SHA512 (brasero-3.12.2.tar.xz) = 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f
 Size (brasero-3.12.2.tar.xz) = 3742120 bytes
+SHA1 (patch-libbrasero-media_brasero-media-private.h) = 826f8fc133b41537a50ede47430f82d97ed64c7c
+SHA1 (patch-libbrasero-media_brasero-media.c) = 6d48e1bfe73e42d3b361d11d74f35ce9bd4a0ef8
+SHA1 (patch-libbrasero-utils_brasero-misc.c) = 8cb529726eb8ad71eed8377da17d2ac612fa1589
+SHA1 (patch-libbrasero-utils_brasero-misc.h) = 7b61f69fa37f80af6841c76ffdc88a55daead594

Added files:

Index: pkgsrc/sysutils/brasero/patches/patch-libbrasero-media_brasero-media-private.h
diff -u /dev/null pkgsrc/sysutils/brasero/patches/patch-libbrasero-media_brasero-media-private.h:1.1
--- /dev/null   Fri Jan 10 21:18:21 2020
+++ pkgsrc/sysutils/brasero/patches/patch-libbrasero-media_brasero-media-private.h      Fri Jan 10 21:18:21 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-libbrasero-media_brasero-media-private.h,v 1.1 2020/01/10 21:18:21 joerg Exp $
+
+--- libbrasero-media/brasero-media-private.h.orig      2020-01-08 23:19:51.813099961 +0000
++++ libbrasero-media/brasero-media-private.h
+@@ -64,7 +64,7 @@ brasero_media_to_string (BraseroMedia me
+ void
+ brasero_media_message (const gchar *location,
+                      const gchar *format,
+-                     ...);
++                     ...) G_GNUC_PRINTF(2,3);
+ 
+ G_END_DECLS
+ 
Index: pkgsrc/sysutils/brasero/patches/patch-libbrasero-media_brasero-media.c
diff -u /dev/null pkgsrc/sysutils/brasero/patches/patch-libbrasero-media_brasero-media.c:1.1
--- /dev/null   Fri Jan 10 21:18:21 2020
+++ pkgsrc/sysutils/brasero/patches/patch-libbrasero-media_brasero-media.c      Fri Jan 10 21:18:21 2020
@@ -0,0 +1,25 @@
+$NetBSD: patch-libbrasero-media_brasero-media.c,v 1.1 2020/01/10 21:18:21 joerg Exp $
+
+Format string is prefixed.
+
+--- libbrasero-media/brasero-media.c.orig      2020-01-08 23:19:00.665788197 +0000
++++ libbrasero-media/brasero-media.c
+@@ -482,6 +482,9 @@ brasero_media_get_option_group (void)
+       return group;
+ }
+ 
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
++
+ void
+ brasero_media_message (const gchar *location,
+                      const gchar *format,
+@@ -504,6 +507,8 @@ brasero_media_message (const gchar *loca
+       g_free (format_real);
+ }
+ 
++#pragma GCC diagnostic pop
++
+ #include <gtk/gtk.h>
+ 
+ #include "brasero-medium-monitor.h"
Index: pkgsrc/sysutils/brasero/patches/patch-libbrasero-utils_brasero-misc.c
diff -u /dev/null pkgsrc/sysutils/brasero/patches/patch-libbrasero-utils_brasero-misc.c:1.1
--- /dev/null   Fri Jan 10 21:18:21 2020
+++ pkgsrc/sysutils/brasero/patches/patch-libbrasero-utils_brasero-misc.c       Fri Jan 10 21:18:21 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-libbrasero-utils_brasero-misc.c,v 1.1 2020/01/10 21:18:21 joerg Exp $
+
+Format string is prefixed.
+
+--- libbrasero-utils/brasero-misc.c.orig       2020-01-08 23:06:39.255722394 +0000
++++ libbrasero-utils/brasero-misc.c
+@@ -96,6 +96,9 @@ brasero_utils_get_option_group (void)
+       return group;
+ }
+ 
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
++
+ void
+ brasero_utils_debug_message (const gchar *location,
+                            const gchar *format,
+@@ -117,6 +120,7 @@ brasero_utils_debug_message (const gchar
+ 
+       g_free (format_real);
+ }
++#pragma GCC diagnostic pop
+ 
+ static gboolean
+ brasero_utils_clear_strings_cb (gchar *string,
Index: pkgsrc/sysutils/brasero/patches/patch-libbrasero-utils_brasero-misc.h
diff -u /dev/null pkgsrc/sysutils/brasero/patches/patch-libbrasero-utils_brasero-misc.h:1.1
--- /dev/null   Fri Jan 10 21:18:21 2020
+++ pkgsrc/sysutils/brasero/patches/patch-libbrasero-utils_brasero-misc.h       Fri Jan 10 21:18:21 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-libbrasero-utils_brasero-misc.h,v 1.1 2020/01/10 21:18:21 joerg Exp $
+
+--- libbrasero-utils/brasero-misc.h.orig       2020-01-08 23:07:33.551904733 +0000
++++ libbrasero-utils/brasero-misc.h
+@@ -55,7 +55,7 @@ brasero_utils_set_use_debug (gboolean ac
+ void
+ brasero_utils_debug_message (const gchar *location,
+                            const gchar *format,
+-                           ...);
++                           ...) G_GNUC_PRINTF(2,3);
+ 
+ #define BRASERO_UTILS_LOG(format, ...)                                                \
+       brasero_utils_debug_message (G_STRLOC,                                  \