libbonobo: Fix missing dep on orbit2-native and build with clang

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2016-10-18 22:38:20 -07:00
committed by Martin Jansa
parent 3fd61331a4
commit 558d935806
3 changed files with 28 additions and 1 deletions
@@ -3,7 +3,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
SECTION = "x11/gnome/libs"
DEPENDS = "glib-2.0 orbit2 intltool-native libxml2 dbus dbus-glib"
DEPENDS = "glib-2.0 orbit2-native orbit2 intltool-native libxml2 dbus dbus-glib"
inherit gnomebase gtk-doc lib_package
@@ -0,0 +1,26 @@
This checks whether the format string is a literal on the calling function. As bonobo_debug_print()
takes already a va_list, we specify the format on the functions that call it
The second number, which is 0 here, should then be the argument index of the variadic argument
Fixed warning with clang
| ../../libbonobo-2.32.1/bonobo/bonobo-debug.c:58:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
| vfprintf (_bonobo_debug_file, fmt, args);
| ^~~
| 1 error generated.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: libbonobo-2.32.1/bonobo/bonobo-debug.c
===================================================================
--- libbonobo-2.32.1.orig/bonobo/bonobo-debug.c
+++ libbonobo-2.32.1/bonobo/bonobo-debug.c
@@ -47,6 +47,7 @@ bonobo_debug_init(void)
_bonobo_debug_file = stderr;
}
+__attribute__((__format__ (printf, 2, 0)))
void
bonobo_debug_print (const char *name, char *fmt, ...)
{
@@ -2,6 +2,7 @@ require libbonobo.inc
SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \
file://do-not-use-srcdir-variable.patch \
file://fix-nonliteral-in-string.patch \
"
SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b"
SRC_URI[archive.sha256sum] = "9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b"