| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From e7233d98c114b03c7c8b96d1f41770452da14aa7 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de> |
| 3 | Date: Mon, 17 Oct 2011 00:59:01 +0200 |
| 4 | Subject: [PATCH] nautilus build fails for newer glib versions |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | build with glib-2.0 v2.30.0 run into errors for at least G_CONST_RETURN missing |
| 10 | |
| 11 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmx.de> |
| 12 | --- |
| 13 | configure.in | 2 +- |
| 14 | eel/Makefile.am | 1 - |
| 15 | 2 files changed, 1 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/configure.in b/configure.in |
| 18 | index 97e171e..859a097 100644 |
| 19 | --- a/configure.in |
| 20 | +++ b/configure.in |
| 21 | @@ -342,7 +342,7 @@ AC_SUBST(CORE_CFLAGS) |
| 22 | CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" |
| 23 | AC_SUBST(CORE_LIBS) |
| 24 | |
| 25 | -DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" |
| 26 | +DISABLE_DEPRECATED_CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED" |
| 27 | AC_SUBST(DISABLE_DEPRECATED_CFLAGS) |
| 28 | |
| 29 | dnl Multimedia keys |
| 30 | diff --git a/eel/Makefile.am b/eel/Makefile.am |
| 31 | index b1fe356..c1d56cd 100644 |
| 32 | --- a/eel/Makefile.am |
| 33 | +++ b/eel/Makefile.am |
| 34 | @@ -10,7 +10,6 @@ INCLUDES = \ |
| 35 | -DDATADIR=\""$(datadir)"\" \ |
| 36 | -DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \ |
| 37 | -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \ |
| 38 | - -DG_DISABLE_DEPRECATED \ |
| 39 | -DGDK_PIXBUF_DISABLE_DEPRECATED \ |
| 40 | -DGMENU_I_KNOW_THIS_IS_UNSTABLE \ |
| 41 | $(NULL) |
| 42 | -- |
| 43 | 1.7.4.4 |
| 44 | |