mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-06 16:58:24 +00:00
Code Issues Projects Releases Wiki Activity

nautilus: fix compile errors by removing G_DISABLE_DEPRECATED

Browse Source 
* build tested
* reported gnome-bugzills [1]
* error messages:
| In file included from eel-alert-dialog.c:24:0:
| eel-i18n.h:31:16: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'char'
| eel-alert-dialog.c: In function 'eel_alert_dialog_class_init':
| eel-alert-dialog.c:114:43: warning: passing argument 2 of 'g_param_spec_int' makes pointer from integer without a cast
| /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/glib-2.0/gobject/gparamspecs.h:993:13: note: expected 'const gchar *' but argument is of type 'int'
| eel-alert-dialog.c:114:43: warning: passing argument 3 of 'g_param_spec_int' makes pointer from integer without a cast
| /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/glib-2.0/gobject/gparamspecs.h:993:13: note: expected 'const gchar *' but argument is of type 'int'
| eel-alert-dialog.c:123:35: warning: passing argument 2 of 'g_param_spec_enum' makes pointer from integer without a cast
| /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/glib-2.0/gobject/gparamspecs.h:1040:13: note: expected 'const gchar *' but argument is of type 'int'
| eel-alert-dialog.c:123:35: warning: passing argument 3 of 'g_param_spec_enum' makes pointer from integer without a cast
| /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/glib-2.0/gobject/gparamspecs.h:1040:13: note: expected 'const gchar *' but argument is of type 'int'
| eel-alert-dialog.c:132:35: warning: passing argument 2 of 'g_param_spec_enum' makes pointer from integer without a cast
| /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/glib-2.0/gobject/gparamspecs.h:1040:13: note: expected 'const gchar *' but argument is of type 'int'
| eel-alert-dialog.c:132:35: warning: passing argument 3 of 'g_param_spec_enum' makes pointer from integer without a cast
| /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/glib-2.0/gobject/gparamspecs.h:1040:13: note: expected 'const gchar *' but argument is of type 'int'
| eel-alert-dialog.c: In function 'eel_alert_dialog_init':
| eel-alert-dialog.c:193:2: warning: passing argument 1 of 'gtk_expander_new_with_mnemonic' makes pointer from integer without a cast
| /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gtk-2.0/gtk/gtkexpander.h:66:12: note: expected 'const gchar *' but argument is of type 'int'

and

| In file included from nautilus-file.h:31:0,
|                  from nautilus-bookmark.c:28:
| ../libnautilus-private/nautilus-icon-info.h:75:16: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'char'
| ../libnautilus-private/nautilus-icon-info.h:76:16: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'char'
| make[2]: *** [nautilus-bookmark.lo] Error 1

[1] https://bugzilla.gnome.org/show_bug.cgi?id=661949

Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Andreas Müller
2011-10-17 07:51:07 +00:00
committed by Koen Kooi
parent ce4f274e3d
commit 38c82da419
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch Normal file
View File

@@ -0,0 +1,44 @@
From e7233d98c114b03c7c8b96d1f41770452da14aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de>
Date: Mon, 17 Oct 2011 00:59:01 +0200
Subject: [PATCH] nautilus build fails for newer glib versions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
build with glib-2.0 v2.30.0 run into errors for at least G_CONST_RETURN missing
Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
---
configure.in | 2 +-
eel/Makefile.am | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
index 97e171e..859a097 100644
--- a/configure.in
+++ b/configure.in
@@ -342,7 +342,7 @@ AC_SUBST(CORE_CFLAGS)
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
AC_SUBST(CORE_LIBS)
-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
+DISABLE_DEPRECATED_CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED"
AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
dnl Multimedia keys
diff --git a/eel/Makefile.am b/eel/Makefile.am
index b1fe356..c1d56cd 100644
--- a/eel/Makefile.am
+++ b/eel/Makefile.am
@@ -10,7 +10,6 @@ INCLUDES = \
-DDATADIR=\""$(datadir)"\" \
-DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \
-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
- -DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
$(NULL)
--
1.7.4.4

3
meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
View File

@@ -6,7 +6,7 @@ LICENSE="GPLv2 && LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=7c0048536e43642a1f3a724c2909872b \
file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
PR = "r4"
PR = "r5"
DEPENDS = "libunique gvfs librsvg libexif esound gnome-desktop orbit2-native"
# optional: tracker
@@ -18,6 +18,7 @@ SRC_URI[archive.sha256sum] = "2d4ff28c7a7aa5d40eb2468149954a564c257a305183773057
SRC_URI += "file://idl-sysroot.patch \
file://no-try-run-strftime.diff \
file://no-G_DISABLE_DEPRECATED.patch \
"