summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome
diff options
context:
space:
mode:
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.patch77
-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/gconftool-lossage.patch13
-rw-r--r--meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch53
-rw-r--r--meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb58
5 files changed, 0 insertions, 223 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
deleted file mode 100644
index 383329970..000000000
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
+++ /dev/null
@@ -1,77 +0,0 @@
1From 536e9b57cada4a9f92e073fdf01cdf1def435b6b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Tue, 7 May 2013 14:56:06 +0200
4Subject: [PATCH] multiple Makefile.am: remove -DG_DISABLE_DEPRECATED to fix
5 build with glib-2.36
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Signed-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
16Index: 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)\" \
28Index: 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)\" \
40Index: 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)\" \
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
deleted file mode 100644
index 30ca29b10..000000000
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
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/gconftool-lossage.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch
deleted file mode 100644
index 0f52136e3..000000000
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3--- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000
4+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100
5@@ -154,7 +154,7 @@
6 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
7
8 if test x"$GCONFTOOL" = xno; then
9- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
10+ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf])
11 fi
12
13 AM_GCONF_SOURCE_2
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
deleted file mode 100644
index dabec32c6..000000000
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3removes kerberos completely to avoid conflicts with installed kerberos
4--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200
5+++ configure.in 2007-01-05 19:42:56.604261797 +0200
6@@ -436,47 +436,6 @@
7 ])
8 AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
9 AC_SUBST(CDDA_LIBS)
10-
11-dnl GSSAPI
12-dnl Check for Kerberos installation
13-have_gssapi=no
14-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
15-
16-if test "x$KRB5_CONFIG" != "xnone"; then
17- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
18- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
19-
20- saved_CPPFLAGS="$CPPFLAGS"
21- saved_LIBS="$LIBS"
22- LIBS="$LIBS $GSSAPI_LIBS"
23- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
24- # MIT and Heimdal put gssapi.h in different places
25- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
26- AC_CHECK_FUNCS(gss_init_sec_context, [
27- AC_MSG_NOTICE([GSSAPI authentication support enabled])
28- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
29- AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
30- have_gssapi=yes
31-
32- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
33- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
34- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name,
35- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
36- ], [
37- #ifdef HAVE_GSSAPI_GSSAPI_H
38- #include <gssapi/gssapi.h>
39- #else
40- #include <gssapi.h>
41- #endif
42- ])
43- ])
44- break
45- ])
46- LIBS="$saved_LIBS"
47- CPPFLAGS="$saved_CPPFLAGS"
48-fi
49-AC_SUBST(GSSAPI_LIBS)
50-AC_SUBST(GSSAPI_CFLAGS)
51
52 dnl ******************************
53 dnl http-method (neon checks)
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
deleted file mode 100644
index 3ec646697..000000000
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
+++ /dev/null
@@ -1,58 +0,0 @@
1SUMMARY = "a userspace virtual filesystem"
2HOMEPAGE = "http://www.gnome.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "GPLv2+ & LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://libgnomevfs/gnome-vfs.h;endline=25;md5=17071e69707a8f42887d88413f2623cb \
8 file://programs/gnomevfs-ls.c;endline=23;md5=678a2e8bedaef5818ccabe633840196b \
9 file://daemon/vfs-daemon.c;endline=21;md5=5f2c61553fb16abb07fc9498ca03fe1f \
10 file://modules/cdda-cddb.h;endline=22;md5=20ed324ca64907c366ecd7f22b8e0c54"
11
12DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib intltool-native gnome-common-native"
13RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
14# Some legacy packages will require gnome-mime-data to be installed, but use of
15# it is deprecated.
16PR = "r3"
17
18inherit gnome
19
20# This is to provide compatibility with the gnome-vfs DBus fork
21RPROVIDES_${PN} = "gnome-vfs-plugin-dbus"
22
23SRC_URI += " \
24 file://gconftool-lossage.patch \
25 file://gnome-vfs-no-kerberos.patch;striplevel=0 \
26 file://0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch \
27 file://do-not-use-srcdir-variable.patch \
28"
29
30SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e"
31SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa"
32GNOME_COMPRESS_TYPE="bz2"
33
34PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
35PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
36PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin"
37
38EXTRA_OECONF = " --disable-hal \
39 --disable-openssl \
40 --disable-samba \
41 ac_cv_lib_acl_acl_get_file=no \
42 ac_cv_lib_sec_acl=no \
43 gvfs_cv_HAVE_SOLARIS_ACLS=no \
44 gvfs_cv_HAVE_POSIX_ACLS=no \
45"
46
47FILES_${PN} += "${libdir}/vfs ${datadir}/dbus-1/services"
48FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug"
49FILES_${PN}-dev += "${libdir}/gnome-vfs-2.0/include/* ${libdir}/gnome-vfs-2.0/modules/*.la"
50FILES_${PN}-staticdev += "${libdir}/gnome-vfs-2.0/modules/*.a"
51FILES_${PN}-doc += "${datadir}/gtk-doc"
52
53PACKAGES_DYNAMIC += "^gnome-vfs-plugin-.*"
54
55python populate_packages_prepend () {
56 plugindir = d.expand('${libdir}/gnome-vfs-2.0/modules/')
57 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
58}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-11 23:22:27 +0000