From cfe12efb5ec9586dab6961f141d52b103bd8b1d1 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 22 Nov 2010 13:57:13 +0000 Subject: Meta: Recipe Reogranization This is the next stage of recipe reorganization, in this stage many recipes where moved to a new meta-demoapps layer since this is more appropriate for demo usage then the core. Additional some recipes were moved to meta-extras to indicate they may be depercated at a future time. A number of recipes were modified since dependencies need to be corrected. Signed-off-by: Saul Wold --- .../telepathy/empathy/no-gnome-doc.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch (limited to 'meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch') diff --git a/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch b/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch new file mode 100644 index 0000000000..13e7943da5 --- /dev/null +++ b/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch @@ -0,0 +1,39 @@ +--- + Makefile.am | 2 +- + configure.ac | 1 - + help/Makefile.am | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +--- empathy-0.23.4.orig/Makefile.am ++++ empathy-0.23.4/Makefile.am +@@ -1,6 +1,6 @@ +-SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help ++SUBDIRS = tools extensions po data libempathy libempathy-gtk src + + if HAVE_MEGAPHONE + SUBDIRS += megaphone + endif + +--- empathy-0.23.4.orig/configure.ac ++++ empathy-0.23.4/configure.ac +@@ -55,11 +55,10 @@ AM_PROG_LIBTOOL + AM_PROG_MKDIR_P + AM_PATH_GLIB_2_0 + AC_PATH_XTRA + IT_PROG_INTLTOOL([0.35.0]) + GTK_DOC_CHECK([1.3]) +-GNOME_DOC_INIT + IDT_COMPILE_WARNINGS + AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) + AC_PATH_PROG(GCONFTOOL, gconftool-2) + AM_GCONF_SOURCE_2 + GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` +--- empathy-0.23.4.orig/help/Makefile.am ++++ empathy-0.23.4/help/Makefile.am +@@ -1,6 +1,5 @@ +-include $(top_srcdir)/gnome-doc-utils.make + + DOC_MODULE = empathy + DOC_ENTITIES = legal.xml + DOC_FIGURES = \ + figures/empathy-main-window.png \ -- cgit v1.2.3-54-g00ecf