From 89ba390e5560a6ace3a003bcc524d7f788e4cf33 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Jan 2007 00:10:45 +0000 Subject: gnome-vfs-dbus: the -dbus branch has been merged upstream, so remove the old forked code. gnome-vfs_2.16.x has no orbit deps left --- packages/gnome/gnome-vfs-dbus/.mtn2git_empty | 0 .../gnome/gnome-vfs-dbus/dbus-api-change.patch | 78 --------------- .../gnome/gnome-vfs-dbus/gconftool-lossage.patch | 11 --- .../gnome/gnome-vfs-dbus/glib-after-nameser.patch | 18 ---- packages/gnome/gnome-vfs-dbus/gssapi.patch | 18 ---- packages/gnome/gnome-vfs-dbus/werror_compile.patch | 11 --- packages/gnome/gnome-vfs-dbus_2.8.4.4.bb | 91 ----------------- packages/gnome/gnome-vfs-dbus_svn.bb | 110 --------------------- 8 files changed, 337 deletions(-) delete mode 100644 packages/gnome/gnome-vfs-dbus/.mtn2git_empty delete mode 100644 packages/gnome/gnome-vfs-dbus/dbus-api-change.patch delete mode 100644 packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch delete mode 100644 packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch delete mode 100644 packages/gnome/gnome-vfs-dbus/gssapi.patch delete mode 100644 packages/gnome/gnome-vfs-dbus/werror_compile.patch delete mode 100644 packages/gnome/gnome-vfs-dbus_2.8.4.4.bb delete mode 100644 packages/gnome/gnome-vfs-dbus_svn.bb (limited to 'packages/gnome') diff --git a/packages/gnome/gnome-vfs-dbus/.mtn2git_empty b/packages/gnome/gnome-vfs-dbus/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch b/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch deleted file mode 100644 index 38480c21e1..0000000000 --- a/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- trunk/dbus-daemon/vfs-daemon.c.orig 2006-08-09 10:43:26.000000000 +0100 -+++ trunk/dbus-daemon/vfs-daemon.c 2006-08-09 10:45:59.000000000 +0100 -@@ -91,7 +91,7 @@ - g_warning ("Failed to acquire vfs-daemon service: %s", error.message); - dbus_error_free (&error); - -- dbus_connection_disconnect (conn); -+ dbus_connection_close (conn); - dbus_connection_unref (conn); - conn = NULL; - -@@ -101,7 +101,7 @@ - if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) { - g_printerr ("VFS daemon already running, exiting.\n"); - -- dbus_connection_disconnect (conn); -+ dbus_connection_close (conn); - dbus_connection_unref (conn); - conn = NULL; - -@@ -111,7 +111,7 @@ - if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - g_printerr ("Not primary owner of the service, exiting.\n"); - -- dbus_connection_disconnect (conn); -+ dbus_connection_close (conn); - dbus_connection_unref (conn); - conn = NULL; - -@@ -124,7 +124,7 @@ - NULL)) { - g_printerr ("Failed to register object with D-BUS.\n"); - -- dbus_connection_disconnect (conn); -+ dbus_connection_close (conn); - dbus_connection_unref (conn); - conn = NULL; - -@@ -152,7 +152,7 @@ - return; - } - -- dbus_connection_disconnect (conn); -+ dbus_connection_close (conn); - dbus_connection_unref (conn); - } - ---- trunk/dbus-daemon/daemon-connection.c.orig 2006-08-09 10:43:32.000000000 +0100 -+++ trunk/dbus-daemon/daemon-connection.c 2006-08-09 10:46:26.000000000 +0100 -@@ -321,7 +321,7 @@ - d(g_print ("Last unref\n")); - - if (dbus_connection_get_is_connected (conn->conn)) { -- dbus_connection_disconnect (conn->conn); -+ dbus_connection_close (conn->conn); - } - dbus_connection_unref (conn->conn); - ---- trunk/dbus-daemon/dbus-method.c.orig 2006-08-09 10:43:38.000000000 +0100 -+++ trunk/dbus-daemon/dbus-method.c 2006-08-09 10:46:57.000000000 +0100 -@@ -220,7 +220,7 @@ - if (!dbus_connection_add_filter (dbus_conn, message_handler, - NULL, NULL)) { - g_warning ("Failed to add filter to the connection."); -- dbus_connection_disconnect (dbus_conn); -+ dbus_connection_close (dbus_conn); - dbus_connection_unref (dbus_conn); - - dbus_conn = NULL; -@@ -1666,7 +1666,7 @@ - vfs_module_shutdown (GnomeVFSMethod* method) - { - if (dbus_conn) { -- dbus_connection_disconnect (dbus_conn); -+ dbus_connection_close (dbus_conn); - dbus_connection_unref (dbus_conn); - - dbus_conn = NULL; diff --git a/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch b/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch deleted file mode 100644 index 3dbc130ddc..0000000000 --- a/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/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch b/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch deleted file mode 100644 index 87bf7c3939..0000000000 --- a/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- trunk/libgnomevfs/gnome-vfs-resolve.c.orig 2006-02-08 19:18:43.000000000 +0100 -+++ trunk/libgnomevfs/gnome-vfs-resolve.c 2006-02-08 19:21:42.000000000 +0100 -@@ -23,7 +23,6 @@ - - #include - #include --#include - #ifndef G_OS_WIN32 - /* Keep above the network includes for FreeBSD. */ - #include -@@ -48,6 +47,7 @@ - #define RELOAD_TIMEVAL 2 - #endif - -+#include - #include - - #include diff --git a/packages/gnome/gnome-vfs-dbus/gssapi.patch b/packages/gnome/gnome-vfs-dbus/gssapi.patch deleted file mode 100644 index a4fcd605f2..0000000000 --- a/packages/gnome/gnome-vfs-dbus/gssapi.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- gnome-vfs-dbus-2.8.4.4/configure.in~gssapi -+++ gnome-vfs-dbus-2.8.4.4/configure.in -@@ -456,6 +456,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/packages/gnome/gnome-vfs-dbus/werror_compile.patch b/packages/gnome/gnome-vfs-dbus/werror_compile.patch deleted file mode 100644 index f2eba7d712..0000000000 --- a/packages/gnome/gnome-vfs-dbus/werror_compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-vfs-dbus-2.8.4.4/configure.in.old 2006-01-26 11:56:09.000000000 +0100 -+++ gnome-vfs-dbus-2.8.4.4/configure.in 2006-01-26 11:45:02.000000000 +0100 -@@ -279,7 +279,7 @@ - - if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - echo "enable compile warnings = $set_more_warnings" -- VFS_CFLAGS="-Wall -Werror \ -+ VFS_CFLAGS="-Wall \ - -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ - -Wnested-externs -Wpointer-arith" - diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb deleted file mode 100644 index 5717115ebc..0000000000 --- a/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 samba-3.0.14a" -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/packages/gnome/gnome-vfs-dbus_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb deleted file mode 100644 index 7a48fb6ca3..0000000000 --- a/packages/gnome/gnome-vfs-dbus_svn.bb +++ /dev/null @@ -1,110 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -PR = "r1" -PROVIDES = "gnome-vfs" -RPROVIDES = "gnome-vfs" - -PV = "2.8.4.4+svn${SRCDATE}" - -inherit gnome pkgconfig - -DEPENDS = "gtk-doc-native libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba-3.0.14a" -RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" - - -SRC_URI = "svn://developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=http \ - file://gssapi.patch;patch=1;pnum=1 \ - file://gconftool-lossage.patch;patch=1;pnum=1 \ - file://glib-after-nameser.patch;patch=1;pnum=1 \ - file://gtk-doc.m4 \ - file://gtk-doc.make \ - file://werror_compile.patch;patch=1;pnum=1 \ - file://dbus-api-change.patch;patch=1" - -EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc" -S = "${WORKDIR}/trunk" - -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-mime-deprecated.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_configure_prepend() { - mkdir -p m4 - install ${WORKDIR}/gtk-doc.m4 ./m4/ - install ${WORKDIR}/gtk-doc.make ./ -} - -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:-Werror::' -} - -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') -} -- cgit v1.2.3