Magellan Linux

Annotation of /trunk/gnome-vfs/patches/gnome-vfs-2.24.4-allow-deprecated.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2191 - (hide annotations) (download)
Mon Jun 10 08:31:05 2013 UTC (10 years, 11 months ago) by niro
File size: 2476 byte(s)
-added patch to fix a ftbfs with newer glib2
1 niro 2191 diff -up gnome-vfs-2.24.4/daemon/Makefile.am.bak gnome-vfs-2.24.4/daemon/Makefile.am
2     --- gnome-vfs-2.24.4/daemon/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
3     +++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-03-27 17:01:25.000000000 +0100
4     @@ -8,7 +8,6 @@ INCLUDES= \
5     -D_LARGEFILE64_SOURCE \
6     -D_POSIX_PTHREAD_SEMANTICS \
7     -D_REENTRANT \
8     - -DG_DISABLE_DEPRECATED \
9     -DGNOME_VFS_PREFIX=\"$(prefix)\" \
10     -DGNOME_VFS_DATADIR=\"$(datadir)\" \
11     -DGNOME_VFS_LIBDIR=\"$(libdir)\" \
12     diff -up gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak gnome-vfs-2.24.4/libgnomevfs/Makefile.am
13     --- gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
14     +++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-03-27 17:01:37.000000000 +0100
15     @@ -19,7 +19,6 @@ INCLUDES = \
16     -D_LARGEFILE64_SOURCE \
17     -D_POSIX_PTHREAD_SEMANTICS \
18     -D_REENTRANT \
19     - -DG_DISABLE_DEPRECATED \
20     -DGNOME_VFS_PREFIX=\"$(prefix)\" \
21     -DGNOME_VFS_BINDIR=\"$(bindir)\" \
22     -DGNOME_VFS_DATADIR=\"$(datadir)\" \
23     diff -up gnome-vfs-2.24.4/modules/Makefile.am.bak gnome-vfs-2.24.4/modules/Makefile.am
24     --- gnome-vfs-2.24.4/modules/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
25     +++ gnome-vfs-2.24.4/modules/Makefile.am 2013-03-27 17:01:45.000000000 +0100
26     @@ -18,7 +18,6 @@ INCLUDES = \
27     -D_POSIX_PTHREAD_SEMANTICS \
28     -D_REENTRANT \
29     -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \
30     - -DG_DISABLE_DEPRECATED \
31     -DGNOME_VFS_PREFIX=\"$(prefix)\" \
32     -DGNOME_VFS_DATADIR=\"$(datadir)\" \
33     -DGNOME_VFS_LIBDIR=\"$(libdir)\" \
34     diff -up gnome-vfs-2.24.4/programs/Makefile.am.bak gnome-vfs-2.24.4/programs/Makefile.am
35     --- gnome-vfs-2.24.4/programs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
36     +++ gnome-vfs-2.24.4/programs/Makefile.am 2013-03-27 17:01:56.000000000 +0100
37     @@ -4,8 +4,7 @@ INCLUDES = \
38     -I$(top_srcdir) \
39     -I$(top_builddir) \
40     $(TEST_CFLAGS) \
41     - $(VFS_CFLAGS) \
42     - -DG_DISABLE_DEPRECATED
43     + $(VFS_CFLAGS)
44    
45     libraries = \
46     $(top_builddir)/libgnomevfs/libgnomevfs-2.la \
47     diff -up gnome-vfs-2.24.4/test/Makefile.am.bak gnome-vfs-2.24.4/test/Makefile.am
48     --- gnome-vfs-2.24.4/test/Makefile.am.bak 2013-03-27 17:01:11.000000000 +0100
49     +++ gnome-vfs-2.24.4/test/Makefile.am 2013-03-27 17:02:08.000000000 +0100
50     @@ -6,7 +6,6 @@ INCLUDES = \
51     -I$(top_builddir)/libgnomevfs \
52     $(TEST_CFLAGS) \
53     $(VFS_CFLAGS) \
54     - -DG_DISABLE_DEPRECATED \
55     -DMODULES_PATH=\"$(libdir)/vfs/modules\"
56    
57     if OS_WIN32