diff options
| -rw-r--r-- | meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch | 44 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb | 3 |
2 files changed, 46 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch new file mode 100644 index 0000000000..43a6152d83 --- /dev/null +++ b/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch @@ -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 + diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb index 334679ca57..f34cbbe1c3 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb @@ -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 \ " |