From b2f192faabe412adce79534e22efe9fb69ee40e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jul 2006 10:10:31 +0000 Subject: Rename /openembedded/ -> /meta/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 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 ++++++++++ 4 files changed, 59 insertions(+) create mode 100644 meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch create mode 100644 meta/packages/gnome/gnome-vfs-dbus/gssapi.patch create mode 100644 meta/packages/gnome/gnome-vfs-dbus/no-gtk-doc.patch create mode 100644 meta/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch (limited to 'meta/packages/gnome/gnome-vfs-dbus') diff --git a/meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch b/meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch new file mode 100644 index 000000000..3dbc130dd --- /dev/null +++ b/meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..bcf46176b --- /dev/null +++ b/meta/packages/gnome/gnome-vfs-dbus/gssapi.patch @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000..331889b63 --- /dev/null +++ b/meta/packages/gnome/gnome-vfs-dbus/no-gtk-doc.patch @@ -0,0 +1,24 @@ +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 new file mode 100644 index 000000000..a5a13f73c --- /dev/null +++ b/meta/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch @@ -0,0 +1,11 @@ +--- 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 + + -- cgit v1.2.3