Disable -DG_DISABLE_DEPRECATED

f38
Tomas Bzatek 12 years ago
parent ebbd7452b2
commit 07b8829289

@ -0,0 +1,57 @@
diff -up gnome-vfs-2.24.4/daemon/Makefile.am.bak gnome-vfs-2.24.4/daemon/Makefile.am
--- gnome-vfs-2.24.4/daemon/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
+++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-03-27 17:01:25.000000000 +0100
@@ -8,7 +8,6 @@ INCLUDES= \
-D_LARGEFILE64_SOURCE \
-D_POSIX_PTHREAD_SEMANTICS \
-D_REENTRANT \
- -DG_DISABLE_DEPRECATED \
-DGNOME_VFS_PREFIX=\"$(prefix)\" \
-DGNOME_VFS_DATADIR=\"$(datadir)\" \
-DGNOME_VFS_LIBDIR=\"$(libdir)\" \
diff -up gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak gnome-vfs-2.24.4/libgnomevfs/Makefile.am
--- gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
+++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-03-27 17:01:37.000000000 +0100
@@ -19,7 +19,6 @@ INCLUDES = \
-D_LARGEFILE64_SOURCE \
-D_POSIX_PTHREAD_SEMANTICS \
-D_REENTRANT \
- -DG_DISABLE_DEPRECATED \
-DGNOME_VFS_PREFIX=\"$(prefix)\" \
-DGNOME_VFS_BINDIR=\"$(bindir)\" \
-DGNOME_VFS_DATADIR=\"$(datadir)\" \
diff -up gnome-vfs-2.24.4/modules/Makefile.am.bak gnome-vfs-2.24.4/modules/Makefile.am
--- gnome-vfs-2.24.4/modules/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
+++ gnome-vfs-2.24.4/modules/Makefile.am 2013-03-27 17:01:45.000000000 +0100
@@ -18,7 +18,6 @@ INCLUDES = \
-D_POSIX_PTHREAD_SEMANTICS \
-D_REENTRANT \
-DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \
- -DG_DISABLE_DEPRECATED \
-DGNOME_VFS_PREFIX=\"$(prefix)\" \
-DGNOME_VFS_DATADIR=\"$(datadir)\" \
-DGNOME_VFS_LIBDIR=\"$(libdir)\" \
diff -up gnome-vfs-2.24.4/programs/Makefile.am.bak gnome-vfs-2.24.4/programs/Makefile.am
--- gnome-vfs-2.24.4/programs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
+++ gnome-vfs-2.24.4/programs/Makefile.am 2013-03-27 17:01:56.000000000 +0100
@@ -4,8 +4,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(TEST_CFLAGS) \
- $(VFS_CFLAGS) \
- -DG_DISABLE_DEPRECATED
+ $(VFS_CFLAGS)
libraries = \
$(top_builddir)/libgnomevfs/libgnomevfs-2.la \
diff -up gnome-vfs-2.24.4/test/Makefile.am.bak gnome-vfs-2.24.4/test/Makefile.am
--- gnome-vfs-2.24.4/test/Makefile.am.bak 2013-03-27 17:01:11.000000000 +0100
+++ gnome-vfs-2.24.4/test/Makefile.am 2013-03-27 17:02:08.000000000 +0100
@@ -6,7 +6,6 @@ INCLUDES = \
-I$(top_builddir)/libgnomevfs \
$(TEST_CFLAGS) \
$(VFS_CFLAGS) \
- -DG_DISABLE_DEPRECATED \
-DMODULES_PATH=\"$(libdir)/vfs/modules\"
if OS_WIN32

@ -10,7 +10,7 @@
Summary: The GNOME virtual file-system libraries
Name: gnome-vfs2
Version: 2.24.4
Release: 11%{?dist}
Release: 12%{?dist}
License: LGPLv2+ and GPLv2+
# the daemon and the library are LGPLv2+
# the modules are LGPLv2+ and GPLv2+
@ -86,6 +86,9 @@ Patch405: 0001-Add-default-media-application-schema.patch
# from upstream
Patch7: gnome-vfs-2.24.5-file-method-chmod-flags.patch
# fix compilation against new glib2
Patch8: gnome-vfs-2.24.4-enable-deprecated.patch
%description
GNOME VFS is the GNOME virtual file system. It is the foundation of
@ -123,6 +126,7 @@ shares (SMB) to applications using GNOME VFS.
%patch6 -p1 -b .mailto-command
%patch7 -p1 -b .file-method-chmod-flags
%patch8 -p1 -b .enable-deprecated
# send to upstream
%patch101 -p1 -b .schema_about
@ -136,8 +140,11 @@ shares (SMB) to applications using GNOME VFS.
%patch405 -p1 -b .default-media
# for patch 10 and 4
autoheader
autoconf
libtoolize --force || :
aclocal || :
autoheader || :
automake --add-missing || :
autoconf || :
%build
if pkg-config openssl ; then
@ -224,6 +231,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
%changelog
* Wed Mar 27 2013 Tomas Bzatek <tbzatek@redhat.com> - 2.24.4-12
- Disable -DG_DISABLE_DEPRECATED
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.24.4-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

Loading…
Cancel
Save