diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-04-23 20:35:27 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-27 14:59:49 +0100 |
| commit | fb4478e20e38d9b59b8b8d00c57827114cc4c637 (patch) | |
| tree | 53eec8474af7e5e52f2b994f6d894712eff28437 /meta/recipes-gnome/gtk+ | |
| parent | 4c74306a3ef192778c49d66f6d53c557166a4b0f (diff) | |
| download | openembedded-core-contrib-fb4478e20e38d9b59b8b8d00c57827114cc4c637.tar.gz | |
gtk+: Correct function prototype
This is turned on by default in gcc-5 so far
we have been getting by this issue but time to fix it
has now come
Change-Id: I012248731de0be7a9b7e232073746360fe6c83dd
(From OE-Core rev: 8d8db821d7bcf30079f5a71c255481b12ec00e17)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+')
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.24.27.bb | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch b/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch new file mode 100644 index 0000000000..96e1f5feac --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch @@ -0,0 +1,24 @@ +Fixes + +include/gtk-2.0/gtk/gtkitemfactory.h:47:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] + typedef void (*GtkItemFactoryCallback) (); + +gcc5 has -Wstrict-prototypes on by default for -Werror so this becomes a build failure for consumers +of this header e.g. matchbox-panel-2 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Index: gtk+-2.24.27/gtk/gtkitemfactory.h +=================================================================== +--- gtk+-2.24.27.orig/gtk/gtkitemfactory.h ++++ gtk+-2.24.27/gtk/gtkitemfactory.h +@@ -44,7 +44,7 @@ typedef void (*GtkPrintFunc) (gpoint + * (Note that if we are included from a C++ program () will mean + * (void) so an explicit cast will be needed.) + */ +-typedef void (*GtkItemFactoryCallback) (); ++typedef void (*GtkItemFactoryCallback) (void); + typedef void (*GtkItemFactoryCallback1) (gpointer callback_data, + guint callback_action, + GtkWidget *widget); diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.27.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.27.bb index b2693d5ce0..4f664e4c26 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.27.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.27.bb @@ -9,6 +9,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ file://hardcoded_libtool.patch \ file://toggle-font.diff;striplevel=0 \ file://doc-fixes.patch \ + file://strict-prototypes.patch \ " SRC_URI[md5sum] = "b1e890e15602c5bcb40d85b13fe046fd" |