[oe-commits] Robert Schuster : osso-gnome-vfs2: Removed.

GIT User account git at amethyst.openembedded.net
Fri Mar 20 00:05:31 UTC 2009


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0ee4b03ea53b5aa82c939c0a63d37e3211ad8906
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0ee4b03ea53b5aa82c939c0a63d37e3211ad8906

Author: Robert Schuster <thebohemian at gmx.net>
Date:   Fri Mar 20 01:05:31 2009 +0100

osso-gnome-vfs2: Removed.
  - its basically the same as gnome-vfs and
    conflicts with it in staging

---

 .../osso-gnome-vfs2/gnome-vfs-no-kerberos.patch    |   51 --------------------
 recipes/maemo4/osso-gnome-vfs2_2.16.3.bb           |   51 --------------------
 2 files changed, 0 insertions(+), 102 deletions(-)

diff --git a/recipes/maemo4/osso-gnome-vfs2/gnome-vfs-no-kerberos.patch b/recipes/maemo4/osso-gnome-vfs2/gnome-vfs-no-kerberos.patch
deleted file mode 100644
index e25ecdd..0000000
--- a/recipes/maemo4/osso-gnome-vfs2/gnome-vfs-no-kerberos.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-removes kerberos completely to avoid conflicts with installed kerberos
---- configure.in.orig	2007-01-05 19:42:26.418541610 +0200
-+++ configure.in	2007-01-05 19:42:56.604261797 +0200
-@@ -436,47 +436,6 @@
- ])
- AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
- AC_SUBST(CDDA_LIBS)
--
--dnl GSSAPI
--dnl Check for Kerberos installation
--have_gssapi=no
--AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
--					   
--if test "x$KRB5_CONFIG" != "xnone"; then
--   GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
--   GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
--   
--   saved_CPPFLAGS="$CPPFLAGS"
--   saved_LIBS="$LIBS"
--   LIBS="$LIBS $GSSAPI_LIBS"
--   CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
--   # MIT and Heimdal put gssapi.h in different places
--   AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
--       AC_CHECK_FUNCS(gss_init_sec_context, [
--           AC_MSG_NOTICE([GSSAPI authentication support enabled])
--           AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
--           AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
--		 have_gssapi=yes
--	 
--       # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
--       AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
--          [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, 
--             [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
--		], [
--		    #ifdef HAVE_GSSAPI_GSSAPI_H
--		    #include <gssapi/gssapi.h>
--		    #else	   
--		    #include <gssapi.h>
--		    #endif
--		])
--	  ])
--     break
--   ])
--   LIBS="$saved_LIBS" 
--   CPPFLAGS="$saved_CPPFLAGS" 
--fi   
--AC_SUBST(GSSAPI_LIBS)
--AC_SUBST(GSSAPI_CFLAGS)
- 	   
- dnl ******************************
- dnl http-method (neon checks)
diff --git a/recipes/maemo4/osso-gnome-vfs2_2.16.3.bb b/recipes/maemo4/osso-gnome-vfs2_2.16.3.bb
deleted file mode 100644
index 4a0be7a..0000000
--- a/recipes/maemo4/osso-gnome-vfs2_2.16.3.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-LICENSE = "GPL"
-DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
-RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
-
-DESCRIPTION = "gnomevfs - osso variant"
-
-PR = "r0"
-
-inherit gnome
-
-SRC_URI = "\
-  http://repository.maemo.org/pool/maemo4.0/free/source/o/${PN}/${PN}_${PV}-1osso31.tar.gz \
-  file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0 \
-  "
-
-
-EXTRA_OECONF = " \
-	--disable-openssl \
-	--enable-gnutls \
-	--enable-avahi \
-	--with-samba-includes=${STAGING_INCDIR} \
-	--enable-more-warnings=no \
-	"
-
-do_configure_prepend() {
-	# remove Werror from VFS_CFLAGS
-	sed -i s:-Werror::g configure.in
-
-	# G_GNUC_FUNCTION is deprecated
-	sed -i -e s,-DG_DISABLE_DEPRECATED,-DSED_ROCKS_DUDE, */Makefile.am
-
-	touch gtk-doc.make
-}
-
-do_stage() {
-  autotools_stage_all
-}
-
-PACKAGES_DYNAMIC = "osso-gnome-vfs-plugin-*"
-
-python populate_packages_prepend () {
-	print bb.data.getVar('FILES_osso-gnome-vfs', d, 1)
-
-	plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
-	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'osso-gnome-vfs-plugin-%s', 'OSSO GNOME VFS plugin for %s')
-}
-
-FILES_${PN} += "${datadir}/dbus-1"
-FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug/lib*.so"
-FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include ${libdir}/gnome-vfs-2.0/modules/lib*.a ${libdir}/gnome-vfs-2.0/modules/lib*.la"
-FILES_${PN}-doc += " ${datadir}/gtk-doc"





More information about the Openembedded-commits mailing list