| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | From 536e9b57cada4a9f92e073fdf01cdf1def435b6b Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
| 3 | Date: Tue, 7 May 2013 14:56:06 +0200 |
| 4 | Subject: [PATCH] multiple Makefile.am: remove -DG_DISABLE_DEPRECATED to fix |
| 5 | build with glib-2.36 |
| 6 | MIME-Version: 1.0 |
| 7 | Content-Type: text/plain; charset=UTF-8 |
| 8 | Content-Transfer-Encoding: 8bit |
| 9 | |
| 10 | Signed-off-by: Andreas MΓΌller <schnitzeltony@googlemail.com> |
| 11 | --- |
| 12 | daemon/Makefile.am | 1 - |
| 13 | libgnomevfs/Makefile.am | 1 - |
| 14 | 2 files changed, 0 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | Index: gnome-vfs-2.24.4/daemon/Makefile.am |
| 17 | =================================================================== |
| 18 | --- gnome-vfs-2.24.4.orig/daemon/Makefile.am 2013-10-17 16:39:39.081024798 -0700 |
| 19 | +++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-10-17 16:39:39.213024794 -0700 |
| 20 | @@ -8,7 +8,6 @@ |
| 21 | -D_LARGEFILE64_SOURCE \ |
| 22 | -D_POSIX_PTHREAD_SEMANTICS \ |
| 23 | -D_REENTRANT \ |
| 24 | - -DG_DISABLE_DEPRECATED \ |
| 25 | -DGNOME_VFS_PREFIX=\"$(prefix)\" \ |
| 26 | -DGNOME_VFS_DATADIR=\"$(datadir)\" \ |
| 27 | -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ |
| 28 | Index: gnome-vfs-2.24.4/libgnomevfs/Makefile.am |
| 29 | =================================================================== |
| 30 | --- gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.am 2013-10-17 16:39:39.081024798 -0700 |
| 31 | +++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-10-17 16:39:39.213024794 -0700 |
| 32 | @@ -19,7 +19,6 @@ |
| 33 | -D_LARGEFILE64_SOURCE \ |
| 34 | -D_POSIX_PTHREAD_SEMANTICS \ |
| 35 | -D_REENTRANT \ |
| 36 | - -DG_DISABLE_DEPRECATED \ |
| 37 | -DGNOME_VFS_PREFIX=\"$(prefix)\" \ |
| 38 | -DGNOME_VFS_BINDIR=\"$(bindir)\" \ |
| 39 | -DGNOME_VFS_DATADIR=\"$(datadir)\" \ |
| 40 | Index: gnome-vfs-2.24.4/modules/Makefile.am |
| 41 | =================================================================== |
| 42 | --- gnome-vfs-2.24.4.orig/modules/Makefile.am 2013-10-17 16:39:39.081024798 -0700 |
| 43 | +++ gnome-vfs-2.24.4/modules/Makefile.am 2013-10-17 16:39:39.213024794 -0700 |
| 44 | @@ -18,7 +18,6 @@ |
| 45 | -D_POSIX_PTHREAD_SEMANTICS \ |
| 46 | -D_REENTRANT \ |
| 47 | -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \ |
| 48 | - -DG_DISABLE_DEPRECATED \ |
| 49 | -DGNOME_VFS_PREFIX=\"$(prefix)\" \ |
| 50 | -DGNOME_VFS_DATADIR=\"$(datadir)\" \ |
| 51 | -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ |
| 52 | Index: gnome-vfs-2.24.4/programs/Makefile.am |
| 53 | =================================================================== |
| 54 | --- gnome-vfs-2.24.4.orig/programs/Makefile.am 2013-10-17 16:39:39.081024798 -0700 |
| 55 | +++ gnome-vfs-2.24.4/programs/Makefile.am 2013-10-17 16:39:39.213024794 -0700 |
| 56 | @@ -4,8 +4,7 @@ |
| 57 | -I$(top_srcdir) \ |
| 58 | -I$(top_builddir) \ |
| 59 | $(TEST_CFLAGS) \ |
| 60 | - $(VFS_CFLAGS) \ |
| 61 | - -DG_DISABLE_DEPRECATED |
| 62 | + $(VFS_CFLAGS) |
| 63 | |
| 64 | libraries = \ |
| 65 | $(top_builddir)/libgnomevfs/libgnomevfs-2.la \ |
| 66 | Index: gnome-vfs-2.24.4/test/Makefile.am |
| 67 | =================================================================== |
| 68 | --- gnome-vfs-2.24.4.orig/test/Makefile.am 2010-02-09 04:16:14.000000000 -0800 |
| 69 | +++ gnome-vfs-2.24.4/test/Makefile.am 2013-10-17 16:42:49.109019172 -0700 |
| 70 | @@ -6,7 +6,6 @@ |
| 71 | -I$(top_builddir)/libgnomevfs \ |
| 72 | $(TEST_CFLAGS) \ |
| 73 | $(VFS_CFLAGS) \ |
| 74 | - -DG_DISABLE_DEPRECATED \ |
| 75 | -DMODULES_PATH=\"$(libdir)/vfs/modules\" |
| 76 | |
| 77 | if OS_WIN32 |