From b48b7b4109868a8c0ddda090992e936e821c7ea6 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 17 Aug 2016 15:04:38 -0500 Subject: Squashed 'import-layers/meta-openembedded/' content from commit 247b126 Change-Id: I40827e9ce5fba63f1cca2a0be44976ae8383b4c0 git-subtree-dir: import-layers/meta-openembedded git-subtree-split: 247b1267bbe95719cd4877d2d3cfbaf2a2f4865a Signed-off-by: Patrick Williams --- .../nautilus/no-G_DISABLE_DEPRECATED.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch (limited to 'import-layers/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch') diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch new file mode 100644 index 000000000..43a6152d8 --- /dev/null +++ b/import-layers/meta-openembedded/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?= +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 +--- + 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 + -- cgit v1.2.1