diff options
Diffstat (limited to 'meta/recipes-gnome')
-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 @@ | |||
1 | Fixes | ||
2 | |||
3 | include/gtk-2.0/gtk/gtkitemfactory.h:47:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] | ||
4 | typedef void (*GtkItemFactoryCallback) (); | ||
5 | |||
6 | gcc5 has -Wstrict-prototypes on by default for -Werror so this becomes a build failure for consumers | ||
7 | of this header e.g. matchbox-panel-2 | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | Index: gtk+-2.24.27/gtk/gtkitemfactory.h | ||
13 | =================================================================== | ||
14 | --- gtk+-2.24.27.orig/gtk/gtkitemfactory.h | ||
15 | +++ gtk+-2.24.27/gtk/gtkitemfactory.h | ||
16 | @@ -44,7 +44,7 @@ typedef void (*GtkPrintFunc) (gpoint | ||
17 | * (Note that if we are included from a C++ program () will mean | ||
18 | * (void) so an explicit cast will be needed.) | ||
19 | */ | ||
20 | -typedef void (*GtkItemFactoryCallback) (); | ||
21 | +typedef void (*GtkItemFactoryCallback) (void); | ||
22 | typedef void (*GtkItemFactoryCallback1) (gpointer callback_data, | ||
23 | guint callback_action, | ||
24 | 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 \ | |||
9 | file://hardcoded_libtool.patch \ | 9 | file://hardcoded_libtool.patch \ |
10 | file://toggle-font.diff;striplevel=0 \ | 10 | file://toggle-font.diff;striplevel=0 \ |
11 | file://doc-fixes.patch \ | 11 | file://doc-fixes.patch \ |
12 | file://strict-prototypes.patch \ | ||
12 | " | 13 | " |
13 | 14 | ||
14 | SRC_URI[md5sum] = "b1e890e15602c5bcb40d85b13fe046fd" | 15 | SRC_URI[md5sum] = "b1e890e15602c5bcb40d85b13fe046fd" |