summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-10-17 23:54:23 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-21 12:15:02 +0200
commit51a3367e88224a3f50a792010c63d446f5bec220 (patch)
tree76480a3d1301bf5e2932d93b3fcc58e405f0bbb4 /meta-gnome/recipes-gnome
parent16c26e255d9395c467d4bf808ec402b683d35488 (diff)
downloadmeta-openembedded-51a3367e88224a3f50a792010c63d446f5bec220.tar.gz
gnome-vfs: Fix build error with new autotools
Don't use srcdir with tests Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome')
-rw-r--r--meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch61
-rw-r--r--meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch22
-rw-r--r--meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb1
3 files changed, 71 insertions, 13 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
index d8f7e4050..383329970 100644
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
@@ -13,11 +13,11 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
13 libgnomevfs/Makefile.am | 1 - 13 libgnomevfs/Makefile.am | 1 -
14 2 files changed, 0 insertions(+), 2 deletions(-) 14 2 files changed, 0 insertions(+), 2 deletions(-)
15 15
16diff --git a/daemon/Makefile.am b/daemon/Makefile.am 16Index: gnome-vfs-2.24.4/daemon/Makefile.am
17index ca57467..040484f 100644 17===================================================================
18--- a/daemon/Makefile.am 18--- gnome-vfs-2.24.4.orig/daemon/Makefile.am 2013-10-17 16:39:39.081024798 -0700
19+++ b/daemon/Makefile.am 19+++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-10-17 16:39:39.213024794 -0700
20@@ -8,7 +8,6 @@ INCLUDES= \ 20@@ -8,7 +8,6 @@
21 -D_LARGEFILE64_SOURCE \ 21 -D_LARGEFILE64_SOURCE \
22 -D_POSIX_PTHREAD_SEMANTICS \ 22 -D_POSIX_PTHREAD_SEMANTICS \
23 -D_REENTRANT \ 23 -D_REENTRANT \
@@ -25,11 +25,11 @@ index ca57467..040484f 100644
25 -DGNOME_VFS_PREFIX=\"$(prefix)\" \ 25 -DGNOME_VFS_PREFIX=\"$(prefix)\" \
26 -DGNOME_VFS_DATADIR=\"$(datadir)\" \ 26 -DGNOME_VFS_DATADIR=\"$(datadir)\" \
27 -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ 27 -DGNOME_VFS_LIBDIR=\"$(libdir)\" \
28diff --git a/libgnomevfs/Makefile.am b/libgnomevfs/Makefile.am 28Index: gnome-vfs-2.24.4/libgnomevfs/Makefile.am
29index 69a02e0..5d7d759 100644 29===================================================================
30--- a/libgnomevfs/Makefile.am 30--- gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.am 2013-10-17 16:39:39.081024798 -0700
31+++ b/libgnomevfs/Makefile.am 31+++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-10-17 16:39:39.213024794 -0700
32@@ -19,7 +19,6 @@ INCLUDES = \ 32@@ -19,7 +19,6 @@
33 -D_LARGEFILE64_SOURCE \ 33 -D_LARGEFILE64_SOURCE \
34 -D_POSIX_PTHREAD_SEMANTICS \ 34 -D_POSIX_PTHREAD_SEMANTICS \
35 -D_REENTRANT \ 35 -D_REENTRANT \
@@ -37,6 +37,41 @@ index 69a02e0..5d7d759 100644
37 -DGNOME_VFS_PREFIX=\"$(prefix)\" \ 37 -DGNOME_VFS_PREFIX=\"$(prefix)\" \
38 -DGNOME_VFS_BINDIR=\"$(bindir)\" \ 38 -DGNOME_VFS_BINDIR=\"$(bindir)\" \
39 -DGNOME_VFS_DATADIR=\"$(datadir)\" \ 39 -DGNOME_VFS_DATADIR=\"$(datadir)\" \
40-- 40Index: gnome-vfs-2.24.4/modules/Makefile.am
411.7.6.5 41===================================================================
42 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)\" \
52Index: 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 \
66Index: 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
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch
new file mode 100644
index 000000000..30ca29b10
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch
@@ -0,0 +1,22 @@
1Fixes errors with new autotools
2
3| automake: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/auto-test'
4| autoreconf: automake failed with exit status: 1
5| ERROR: autoreconf execution failed.
6
7Upstream-Status: Not Submitted
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Index: gnome-vfs-2.24.4/test/Makefile.am
11===================================================================
12--- gnome-vfs-2.24.4.orig/test/Makefile.am 2013-10-17 16:43:36.677017764 -0700
13+++ gnome-vfs-2.24.4/test/Makefile.am 2013-10-17 16:48:47.369008566 -0700
14@@ -64,7 +64,7 @@
15 test-async-cancel \
16 test-escape \
17 test-uri \
18- $(srcdir)/auto-test
19+ auto-test
20
21 libraries = \
22 $(top_builddir)/libgnomevfs/libgnomevfs-2.la \
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
index 78110b51b..d0b5e3da3 100644
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
@@ -24,6 +24,7 @@ SRC_URI += " \
24 file://gconftool-lossage.patch \ 24 file://gconftool-lossage.patch \
25 file://gnome-vfs-no-kerberos.patch;striplevel=0 \ 25 file://gnome-vfs-no-kerberos.patch;striplevel=0 \
26 file://0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch \ 26 file://0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch \
27 file://do-not-use-srcdir-variable.patch \
27" 28"
28 29
29SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e" 30SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 21:59:09 +0000