summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-04-06 11:06:21 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-04-06 11:06:21 +0000
commit62e66ef22dbba6d08ac8e35cc2eeeb7463020658 (patch)
tree65e1a84dab3023db5a209ab869c6d7adbdf90991
parent8b154d0d7a939626f4cadad7f05ce74b2ea15ad8 (diff)
downloadpoky-62e66ef22dbba6d08ac8e35cc2eeeb7463020658.tar.gz
gnome-vfs-dbus: dropped - we use gnome-vfs 2.16.3 now
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1447 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch11
-rw-r--r--meta/packages/gnome/gnome-vfs-dbus/gssapi.patch13
-rw-r--r--meta/packages/gnome/gnome-vfs-dbus/no-gtk-doc.patch24
-rw-r--r--meta/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch11
-rw-r--r--meta/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb91
-rwxr-xr-xmeta/packages/gnome/gnome-vfs-dbus_cvs.bb101
6 files changed, 0 insertions, 251 deletions
diff --git a/meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch b/meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch
deleted file mode 100644
index 3dbc130ddc..0000000000
--- a/meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000
2+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100
3@@ -154,7 +154,7 @@
4 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
5
6 if test x"$GCONFTOOL" = xno; then
7- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
8+ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf])
9 fi
10
11 AM_GCONF_SOURCE_2
diff --git a/meta/packages/gnome/gnome-vfs-dbus/gssapi.patch b/meta/packages/gnome/gnome-vfs-dbus/gssapi.patch
deleted file mode 100644
index bcf46176b2..0000000000
--- a/meta/packages/gnome/gnome-vfs-dbus/gssapi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1--- trunk/configure.in.old 2005-10-28 17:18:36.000000000 +0100
2+++ trunk/configure.in 2005-10-28 17:20:34.000000000 +0100
3@@ -444,6 +444,10 @@
4 ])
5 LIBS="$saved_LIBS"
6 CPPFLAGS="$saved_CPPFLAGS"
7+ if test "x$have_gssapi" != "xyes"; then
8+ GSSAPI_LIBS=
9+ GSSAPI_CFLAGS=
10+ fi
11 fi
12 AC_SUBST(GSSAPI_LIBS)
13 AC_SUBST(GSSAPI_CFLAGS)
diff --git a/meta/packages/gnome/gnome-vfs-dbus/no-gtk-doc.patch b/meta/packages/gnome/gnome-vfs-dbus/no-gtk-doc.patch
deleted file mode 100644
index 331889b639..0000000000
--- a/meta/packages/gnome/gnome-vfs-dbus/no-gtk-doc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1diff -urNd ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/doc/Makefile.am trunk/doc/Makefile.am
2--- ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/doc/Makefile.am 2005-10-28 15:48:43.000000000 +0100
3+++ trunk/doc/Makefile.am 2005-10-28 16:17:15.000000000 +0100
4@@ -81,7 +81,7 @@
5 GTKDOC_LIBS = $(LIBGNOMEVFS_LIBS) \
6 $(top_builddir)/libgnomevfs/libgnomevfs-2.la
7
8-include $(top_srcdir)/gtk-doc.make
9+#include $(top_srcdir)/gtk-doc.make
10
11 dist-hook-local:
12 # mkdir $(distdir)/TEXT; \
13diff -urNd ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/Makefile.am trunk/Makefile.am
14--- ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/Makefile.am 2005-10-28 15:49:03.000000000 +0100
15+++ trunk/Makefile.am 2005-10-28 16:17:07.000000000 +0100
16@@ -21,7 +21,7 @@
17 gnome-vfs-zip.in \
18 gnome-vfs-2.0.pc.in \
19 gnome-vfs-module-2.0.pc.in \
20- gtk-doc.make \
21+# gtk-doc.make \
22 intltool-extract.in \
23 intltool-merge.in \
24 intltool-update.in
diff --git a/meta/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch b/meta/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch
deleted file mode 100644
index a5a13f73c3..0000000000
--- a/meta/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- trunk/configure.in.old 2006-06-21 14:15:24.000000000 +0100
2+++ trunk/configure.in 2006-06-21 14:19:35.000000000 +0100
3@@ -127,7 +127,7 @@
4 AC_SUBST(GETTEXT_PACKAGE)
5 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Name of the gettext package])
6
7-ALL_LINGUAS="af am ar az be bg bn bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko li lt lv mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta th tr uk vi wa xh yi zh_CN zh_TW zu"
8+ALL_LINGUAS="af am az bg bn bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko li lt lv mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta th tr uk vi wa xh yi zh_CN zh_TW zu"
9 AM_GLIB_GNU_GETTEXT
10
11
diff --git a/meta/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/meta/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
deleted file mode 100644
index 8133be73e0..0000000000
--- a/meta/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
+++ /dev/null
@@ -1,91 +0,0 @@
1LICENSE = "GPL"
2SECTION = "x11/gnome"
3PR = "r1"
4PROVIDES = "gnome-vfs"
5RPROVIDES = "gnome-vfs"
6
7inherit gnome pkgconfig
8
9DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib"
10RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
11
12
13SRC_URI = "http://ftp.imendio.com/pub/extra/${PN}/${PN}-${PV}.tar.gz \
14 file://gssapi.patch;patch=1;pnum=1 \
15 file://gconftool-lossage.patch;patch=1;pnum=1"
16
17EXTRA_OECONF = "--with-ipc=dbus"
18
19FILES_${PN} += " ${libdir}/vfs"
20FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include"
21FILES_${PN}-doc += " ${datadir}/gtk-doc"
22
23GNOME_VFS_HEADERS = " \
24gnome-vfs-utils.h \
25gnome-vfs-application-registry.h \
26gnome-vfs-async-ops.h \
27gnome-vfs-ops.h \
28gnome-vfs-uri.h \
29gnome-vfs-standard-callbacks.h \
30gnome-vfs-module-callback.h \
31gnome-vfs-context.h \
32gnome-vfs-file-info.h \
33gnome-vfs-directory.h \
34gnome-vfs-mime-monitor.h \
35gnome-vfs-mime-handlers.h \
36gnome-vfs-result.h \
37gnome-vfs-job-limit.h \
38gnome-vfs-file-size.h \
39gnome-vfs-mime-utils.h \
40gnome-vfs-find-directory.h \
41gnome-vfs-init.h \
42gnome-vfs-handle.h \
43gnome-vfs.h \
44gnome-vfs-cancellation.h \
45gnome-vfs-xfer.h \
46gnome-vfs-monitor.h \
47gnome-vfs-types.h \
48gnome-vfs-volume-monitor.h \
49gnome-vfs-drive.h \
50gnome-vfs-volume.h \
51gnome-vfs-enum-types.h \
52gnome-vfs-address.h \
53gnome-vfs-dns-sd.h \
54gnome-vfs-mime-info-cache.h \
55gnome-vfs-resolve.h"
56
57GNOME_VFS_MODULE_HEADERS = " \
58gnome-vfs-mime-info.h \
59gnome-vfs-transform.h \
60gnome-vfs-ssl.h \
61gnome-vfs-inet-connection.h \
62gnome-vfs-socket.h \
63gnome-vfs-parse-ls.h \
64gnome-vfs-method.h \
65gnome-vfs-cancellable-ops.h \
66gnome-vfs-module.h \
67gnome-vfs-module-shared.h \
68gnome-vfs-module-callback-module-api.h \
69gnome-vfs-mime.h \
70gnome-vfs-socket-buffer.h"
71
72do_stage() {
73 oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
74 install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
75 for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done
76 install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs
77 for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done
78}
79
80do_install() {
81 oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
82}
83
84PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
85
86python populate_packages_prepend () {
87 print bb.data.getVar('FILES_gnome-vfs', d, 1)
88
89 plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
90 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
91}
diff --git a/meta/packages/gnome/gnome-vfs-dbus_cvs.bb b/meta/packages/gnome/gnome-vfs-dbus_cvs.bb
deleted file mode 100755
index 199804eaa3..0000000000
--- a/meta/packages/gnome/gnome-vfs-dbus_cvs.bb
+++ /dev/null
@@ -1,101 +0,0 @@
1SECTION = "x11/utils"
2DEPENDS = "gtk+ glib-2.0 gconf dbus libxml2 zlib bzip2 gnome-mime-data"
3DESCRIPTION = "Virtual file system library using DBUS for communication."
4LICENSE = "GPLv2"
5PROVIDES = "gnome-vfs"
6RPROVIDES_${PN} = "gnome-vfs"
7RPROVIDES_${PN}-dev = "gnome-vfs-dev"
8RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
9
10PV = "2.12.0+cvs${SRCDATE}"
11PR = "r8"
12
13SRC_URI = "svn://anonymous@developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=http \
14 file://no-gtk-doc.patch;patch=1 \
15 file://gconftool-lossage.patch;patch=1 \
16 file://gssapi.patch;patch=1 \
17 file://remove-old-translations.patch;patch=1"
18S = "${WORKDIR}/trunk"
19
20inherit pkgconfig autotools
21
22EXTRA_OECONF = "--with-ipc=dbus --disable-hal --disable-gtk-doc --disable-more-warnings --disable-howl --disable-openssl --disable-samba"
23
24FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services/dbus-vfs-daemon.service"
25FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include"
26FILES_${PN}-doc += " ${datadir}/gtk-doc"
27
28# These header lists have been copy-pasted from trunk/libgnomevfs/Makefile.am
29GNOME_VFS_PLATFORM_HEADERS = " \
30 gnome-vfs-file-size.h"
31
32GNOME_VFS_MODULE_HEADERS = " \
33 gnome-vfs-cancellable-ops.h \
34 gnome-vfs-inet-connection.h \
35 gnome-vfs-method.h \
36 gnome-vfs-mime.h \
37 gnome-vfs-mime-info.h \
38 gnome-vfs-module-callback-module-api.h \
39 gnome-vfs-module-shared.h \
40 gnome-vfs-module.h \
41 gnome-vfs-parse-ls.h \
42 gnome-vfs-ssl.h \
43 gnome-vfs-transform.h \
44 gnome-vfs-socket-buffer.h \
45 gnome-vfs-socket.h"
46
47GNOME_VFS_HEADERS = " \
48 gnome-vfs-application-registry.h \
49 gnome-vfs-address.h \
50 gnome-vfs-async-ops.h \
51 gnome-vfs-cancellation.h \
52 gnome-vfs-context.h \
53 gnome-vfs-directory.h \
54 gnome-vfs-dns-sd.h \
55 gnome-vfs-drive.h \
56 gnome-vfs-enum-types.h \
57 gnome-vfs-file-info.h \
58 gnome-vfs-file-size.h \
59 gnome-vfs-find-directory.h \
60 gnome-vfs-handle.h \
61 gnome-vfs-init.h \
62 gnome-vfs-job-limit.h \
63 gnome-vfs-mime-deprecated.h \
64 gnome-vfs-mime-handlers.h \
65 gnome-vfs-mime-info-cache.h \
66 gnome-vfs-mime-monitor.h \
67 gnome-vfs-mime-utils.h \
68 gnome-vfs-module-callback.h \
69 gnome-vfs-monitor.h \
70 gnome-vfs-ops.h \
71 gnome-vfs-resolve.h \
72 gnome-vfs-result.h \
73 gnome-vfs-standard-callbacks.h \
74 gnome-vfs-types.h \
75 gnome-vfs-uri.h \
76 gnome-vfs-utils.h \
77 gnome-vfs-volume-monitor.h \
78 gnome-vfs-volume.h \
79 gnome-vfs-xfer.h \
80 gnome-vfs.h"
81
82do_stage() {
83 oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
84 install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
85 for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done
86 install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs
87 for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done
88 install -d ${STAGING_INCDIR}/include/libgnomevfs
89 for i in ${GNOME_VFS_PLATFORM_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/include/libgnomevfs/; done
90}
91
92PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
93
94python populate_packages_prepend () {
95 print bb.data.getVar('FILES_gnome-vfs', d, 1)
96
97 plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
98 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s',
99'GNOME VFS plugin for %s')
100}
101