From 62e66ef22dbba6d08ac8e35cc2eeeb7463020658 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 6 Apr 2007 11:06:21 +0000 Subject: 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 --- .../gnome/gnome-vfs-dbus/gconftool-lossage.patch | 11 --- meta/packages/gnome/gnome-vfs-dbus/gssapi.patch | 13 --- .../packages/gnome/gnome-vfs-dbus/no-gtk-doc.patch | 24 ----- .../gnome-vfs-dbus/remove-old-translations.patch | 11 --- meta/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb | 91 ------------------- meta/packages/gnome/gnome-vfs-dbus_cvs.bb | 101 --------------------- 6 files changed, 251 deletions(-) delete mode 100644 meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch delete mode 100644 meta/packages/gnome/gnome-vfs-dbus/gssapi.patch delete mode 100644 meta/packages/gnome/gnome-vfs-dbus/no-gtk-doc.patch delete mode 100644 meta/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch delete mode 100644 meta/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb delete mode 100755 meta/packages/gnome/gnome-vfs-dbus_cvs.bb (limited to 'meta/packages/gnome') 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 @@ ---- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 -+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 -@@ -154,7 +154,7 @@ - AC_PATH_PROG(GCONFTOOL, gconftool-2, no) - - if test x"$GCONFTOOL" = xno; then -- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) -+ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) - fi - - 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 @@ ---- trunk/configure.in.old 2005-10-28 17:18:36.000000000 +0100 -+++ trunk/configure.in 2005-10-28 17:20:34.000000000 +0100 -@@ -444,6 +444,10 @@ - ]) - LIBS="$saved_LIBS" - CPPFLAGS="$saved_CPPFLAGS" -+ if test "x$have_gssapi" != "xyes"; then -+ GSSAPI_LIBS= -+ GSSAPI_CFLAGS= -+ fi - fi - AC_SUBST(GSSAPI_LIBS) - 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 @@ -diff -urNd ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/doc/Makefile.am trunk/doc/Makefile.am ---- ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/doc/Makefile.am 2005-10-28 15:48:43.000000000 +0100 -+++ trunk/doc/Makefile.am 2005-10-28 16:17:15.000000000 +0100 -@@ -81,7 +81,7 @@ - GTKDOC_LIBS = $(LIBGNOMEVFS_LIBS) \ - $(top_builddir)/libgnomevfs/libgnomevfs-2.la - --include $(top_srcdir)/gtk-doc.make -+#include $(top_srcdir)/gtk-doc.make - - dist-hook-local: - # mkdir $(distdir)/TEXT; \ -diff -urNd ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/Makefile.am trunk/Makefile.am ---- ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/Makefile.am 2005-10-28 15:49:03.000000000 +0100 -+++ trunk/Makefile.am 2005-10-28 16:17:07.000000000 +0100 -@@ -21,7 +21,7 @@ - gnome-vfs-zip.in \ - gnome-vfs-2.0.pc.in \ - gnome-vfs-module-2.0.pc.in \ -- gtk-doc.make \ -+# gtk-doc.make \ - intltool-extract.in \ - intltool-merge.in \ - 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 @@ ---- trunk/configure.in.old 2006-06-21 14:15:24.000000000 +0100 -+++ trunk/configure.in 2006-06-21 14:19:35.000000000 +0100 -@@ -127,7 +127,7 @@ - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Name of the gettext package]) - --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" -+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" - AM_GLIB_GNU_GETTEXT - - 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 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -PR = "r1" -PROVIDES = "gnome-vfs" -RPROVIDES = "gnome-vfs" - -inherit gnome pkgconfig - -DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib" -RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" - - -SRC_URI = "http://ftp.imendio.com/pub/extra/${PN}/${PN}-${PV}.tar.gz \ - file://gssapi.patch;patch=1;pnum=1 \ - file://gconftool-lossage.patch;patch=1;pnum=1" - -EXTRA_OECONF = "--with-ipc=dbus" - -FILES_${PN} += " ${libdir}/vfs" -FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include" -FILES_${PN}-doc += " ${datadir}/gtk-doc" - -GNOME_VFS_HEADERS = " \ -gnome-vfs-utils.h \ -gnome-vfs-application-registry.h \ -gnome-vfs-async-ops.h \ -gnome-vfs-ops.h \ -gnome-vfs-uri.h \ -gnome-vfs-standard-callbacks.h \ -gnome-vfs-module-callback.h \ -gnome-vfs-context.h \ -gnome-vfs-file-info.h \ -gnome-vfs-directory.h \ -gnome-vfs-mime-monitor.h \ -gnome-vfs-mime-handlers.h \ -gnome-vfs-result.h \ -gnome-vfs-job-limit.h \ -gnome-vfs-file-size.h \ -gnome-vfs-mime-utils.h \ -gnome-vfs-find-directory.h \ -gnome-vfs-init.h \ -gnome-vfs-handle.h \ -gnome-vfs.h \ -gnome-vfs-cancellation.h \ -gnome-vfs-xfer.h \ -gnome-vfs-monitor.h \ -gnome-vfs-types.h \ -gnome-vfs-volume-monitor.h \ -gnome-vfs-drive.h \ -gnome-vfs-volume.h \ -gnome-vfs-enum-types.h \ -gnome-vfs-address.h \ -gnome-vfs-dns-sd.h \ -gnome-vfs-mime-info-cache.h \ -gnome-vfs-resolve.h" - -GNOME_VFS_MODULE_HEADERS = " \ -gnome-vfs-mime-info.h \ -gnome-vfs-transform.h \ -gnome-vfs-ssl.h \ -gnome-vfs-inet-connection.h \ -gnome-vfs-socket.h \ -gnome-vfs-parse-ls.h \ -gnome-vfs-method.h \ -gnome-vfs-cancellable-ops.h \ -gnome-vfs-module.h \ -gnome-vfs-module-shared.h \ -gnome-vfs-module-callback-module-api.h \ -gnome-vfs-mime.h \ -gnome-vfs-socket-buffer.h" - -do_stage() { - oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs - for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done - install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs - for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done -} - -do_install() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install -} - -PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" - -python populate_packages_prepend () { - print bb.data.getVar('FILES_gnome-vfs', d, 1) - - plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) - do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') -} 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 @@ -SECTION = "x11/utils" -DEPENDS = "gtk+ glib-2.0 gconf dbus libxml2 zlib bzip2 gnome-mime-data" -DESCRIPTION = "Virtual file system library using DBUS for communication." -LICENSE = "GPLv2" -PROVIDES = "gnome-vfs" -RPROVIDES_${PN} = "gnome-vfs" -RPROVIDES_${PN}-dev = "gnome-vfs-dev" -RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info" - -PV = "2.12.0+cvs${SRCDATE}" -PR = "r8" - -SRC_URI = "svn://anonymous@developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=http \ - file://no-gtk-doc.patch;patch=1 \ - file://gconftool-lossage.patch;patch=1 \ - file://gssapi.patch;patch=1 \ - file://remove-old-translations.patch;patch=1" -S = "${WORKDIR}/trunk" - -inherit pkgconfig autotools - -EXTRA_OECONF = "--with-ipc=dbus --disable-hal --disable-gtk-doc --disable-more-warnings --disable-howl --disable-openssl --disable-samba" - -FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services/dbus-vfs-daemon.service" -FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include" -FILES_${PN}-doc += " ${datadir}/gtk-doc" - -# These header lists have been copy-pasted from trunk/libgnomevfs/Makefile.am -GNOME_VFS_PLATFORM_HEADERS = " \ - gnome-vfs-file-size.h" - -GNOME_VFS_MODULE_HEADERS = " \ - gnome-vfs-cancellable-ops.h \ - gnome-vfs-inet-connection.h \ - gnome-vfs-method.h \ - gnome-vfs-mime.h \ - gnome-vfs-mime-info.h \ - gnome-vfs-module-callback-module-api.h \ - gnome-vfs-module-shared.h \ - gnome-vfs-module.h \ - gnome-vfs-parse-ls.h \ - gnome-vfs-ssl.h \ - gnome-vfs-transform.h \ - gnome-vfs-socket-buffer.h \ - gnome-vfs-socket.h" - -GNOME_VFS_HEADERS = " \ - gnome-vfs-application-registry.h \ - gnome-vfs-address.h \ - gnome-vfs-async-ops.h \ - gnome-vfs-cancellation.h \ - gnome-vfs-context.h \ - gnome-vfs-directory.h \ - gnome-vfs-dns-sd.h \ - gnome-vfs-drive.h \ - gnome-vfs-enum-types.h \ - gnome-vfs-file-info.h \ - gnome-vfs-file-size.h \ - gnome-vfs-find-directory.h \ - gnome-vfs-handle.h \ - gnome-vfs-init.h \ - gnome-vfs-job-limit.h \ - gnome-vfs-mime-deprecated.h \ - gnome-vfs-mime-handlers.h \ - gnome-vfs-mime-info-cache.h \ - gnome-vfs-mime-monitor.h \ - gnome-vfs-mime-utils.h \ - gnome-vfs-module-callback.h \ - gnome-vfs-monitor.h \ - gnome-vfs-ops.h \ - gnome-vfs-resolve.h \ - gnome-vfs-result.h \ - gnome-vfs-standard-callbacks.h \ - gnome-vfs-types.h \ - gnome-vfs-uri.h \ - gnome-vfs-utils.h \ - gnome-vfs-volume-monitor.h \ - gnome-vfs-volume.h \ - gnome-vfs-xfer.h \ - gnome-vfs.h" - -do_stage() { - oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs - for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done - install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs - for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done - install -d ${STAGING_INCDIR}/include/libgnomevfs - for i in ${GNOME_VFS_PLATFORM_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/include/libgnomevfs/; done -} - -PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" - -python populate_packages_prepend () { - print bb.data.getVar('FILES_gnome-vfs', d, 1) - - plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) - do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', -'GNOME VFS plugin for %s') -} - -- cgit v1.2.3-54-g00ecf