commit f9573e86880f11cafa676556ace7efbd129b293c
Author: Marcin Krol <[email protected]>
Date: Mon Apr 1 22:03:55 2013 +0000
- fix building with glib >= 2.30
gnome-vfs2-glib.patch | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++
gnome-vfs2.spec | 4 +-
2 files changed, 117 insertions(+), 1 deletion(-)
---
diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index bd1c633..2f4eb04 100644
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -6,7 +6,7 @@ Summary: GNOME - virtual file system
Summary(pl.UTF-8): GNOME - wirtualny system plików
Name: gnome-vfs2
Version: 2.24.4
-Release: 11
+Release: 12
License: LGPL v2+
Group: Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2
@@ -17,6 +17,7 @@ Patch1: %{name}-fstab_edit_crash.patch
Patch2: %{name}-default_cdda_handler.patch
Patch3: %{name}-headers-define.patch
Patch4: %{name}-ac-libs.patch
+Patch5: %{name}-glib.patch
URL: http://www.gnome.org/
BuildRequires: GConf2-devel >= 2.22.0
BuildRequires: ORBit2-devel >= 1:2.14.9
@@ -126,6 +127,7 @@ Dokumentacja API gnome-vfs.
%patch2 -p1
%patch3 -p0
%patch4 -p1
+%patch5 -p1
%build
# force rebuild
diff --git a/gnome-vfs2-glib.patch b/gnome-vfs2-glib.patch
new file mode 100644
index 0000000..977d325
--- /dev/null
+++ b/gnome-vfs2-glib.patch
@@ -0,0 +1,114 @@
+diff -ur gnome-vfs-2.24.4.orig/daemon/Makefile.am
gnome-vfs-2.24.4/daemon/Makefile.am
+--- gnome-vfs-2.24.4.orig/daemon/Makefile.am 2010-02-09 12:16:14.000000000
+0000
++++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-04-01 21:44:19.908635060
+0000
+@@ -8,7 +8,6 @@
+ -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 -ur gnome-vfs-2.24.4.orig/daemon/Makefile.in
gnome-vfs-2.24.4/daemon/Makefile.in
+--- gnome-vfs-2.24.4.orig/daemon/Makefile.in 2010-09-28 09:35:22.000000000
+0000
++++ gnome-vfs-2.24.4/daemon/Makefile.in 2013-04-01 21:44:23.239634462
+0000
+@@ -337,7 +337,6 @@
+ -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 -ur gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.am
gnome-vfs-2.24.4/libgnomevfs/Makefile.am
+--- gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.am 2010-02-09
12:16:14.000000000 +0000
++++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-04-01 21:44:11.708635665
+0000
+@@ -19,7 +19,6 @@
+ -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 -ur gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.in
gnome-vfs-2.24.4/libgnomevfs/Makefile.in
+--- gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.in 2010-09-28
09:35:22.000000000 +0000
++++ gnome-vfs-2.24.4/libgnomevfs/Makefile.in 2013-04-01 21:44:15.144634687
+0000
+@@ -430,7 +430,6 @@
+ -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 -ur gnome-vfs-2.24.4.orig/modules/Makefile.am
gnome-vfs-2.24.4/modules/Makefile.am
+--- gnome-vfs-2.24.4.orig/modules/Makefile.am 2010-02-09 12:16:14.000000000
+0000
++++ gnome-vfs-2.24.4/modules/Makefile.am 2013-04-01 21:44:04.397572624
+0000
+@@ -18,7 +18,6 @@
+ -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 -ur gnome-vfs-2.24.4.orig/modules/Makefile.in
gnome-vfs-2.24.4/modules/Makefile.in
+--- gnome-vfs-2.24.4.orig/modules/Makefile.in 2010-09-28 09:35:22.000000000
+0000
++++ gnome-vfs-2.24.4/modules/Makefile.in 2013-04-01 21:44:08.293635263
+0000
+@@ -468,7 +468,6 @@
+ -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 -ur gnome-vfs-2.24.4.orig/programs/Makefile.am
gnome-vfs-2.24.4/programs/Makefile.am
+--- gnome-vfs-2.24.4.orig/programs/Makefile.am 2010-02-09 12:16:14.000000000
+0000
++++ gnome-vfs-2.24.4/programs/Makefile.am 2013-04-01 21:44:29.118635602
+0000
+@@ -4,8 +4,7 @@
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(TEST_CFLAGS) \
+- $(VFS_CFLAGS) \
+- -DG_DISABLE_DEPRECATED
++ $(VFS_CFLAGS)
+
+ libraries = \
+ $(top_builddir)/libgnomevfs/libgnomevfs-2.la \
+diff -ur gnome-vfs-2.24.4.orig/programs/Makefile.in
gnome-vfs-2.24.4/programs/Makefile.in
+--- gnome-vfs-2.24.4.orig/programs/Makefile.in 2010-09-28 09:35:22.000000000
+0000
++++ gnome-vfs-2.24.4/programs/Makefile.in 2013-04-01 21:44:33.720635592
+0000
+@@ -344,8 +344,7 @@
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(TEST_CFLAGS) \
+- $(VFS_CFLAGS) \
+- -DG_DISABLE_DEPRECATED
++ $(VFS_CFLAGS)
+
+ libraries = \
+ $(top_builddir)/libgnomevfs/libgnomevfs-2.la \
+diff -ur gnome-vfs-2.24.4.orig/test/Makefile.am
gnome-vfs-2.24.4/test/Makefile.am
+--- gnome-vfs-2.24.4.orig/test/Makefile.am 2010-02-09 12:16:14.000000000
+0000
++++ gnome-vfs-2.24.4/test/Makefile.am 2013-04-01 21:43:52.417571921 +0000
+@@ -6,7 +6,6 @@
+ -I$(top_builddir)/libgnomevfs \
+ $(TEST_CFLAGS) \
+ $(VFS_CFLAGS) \
+- -DG_DISABLE_DEPRECATED \
+ -DMODULES_PATH=\"$(libdir)/vfs/modules\"
+
+ if OS_WIN32
+diff -ur gnome-vfs-2.24.4.orig/test/Makefile.in
gnome-vfs-2.24.4/test/Makefile.in
+--- gnome-vfs-2.24.4.orig/test/Makefile.in 2010-09-28 09:35:23.000000000
+0000
++++ gnome-vfs-2.24.4/test/Makefile.in 2013-04-01 21:43:58.717572815 +0000
+@@ -471,7 +471,6 @@
+ -I$(top_builddir)/libgnomevfs \
+ $(TEST_CFLAGS) \
+ $(VFS_CFLAGS) \
+- -DG_DISABLE_DEPRECATED \
+ -DMODULES_PATH=\"$(libdir)/vfs/modules\"
+
+ @OS_WIN32_FALSE@platform_only_programs = test-dns-sd test-symlinks
test-parse-ls-lga
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-vfs2.git/commitdiff/f9573e86880f11cafa676556ace7efbd129b293c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
