From c0c657bd92911788b96d9670620eabf024453752 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 30 Sep 2010 22:15:13 +0100
Subject: Split meta-extras and meta-moblin out of the main repository

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 ...-78ddd155cc297811720e4c4835d468ac6c4d9666.patch | 35 ----------------------
 ...-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch | 35 ----------------------
 ...-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch | 35 ----------------------
 .../moblin-web-browser/xpidl.patch                 | 35 ----------------------
 .../moblin-web-browser/moblin-web-browser_git.bb   | 24 ---------------
 5 files changed, 164 deletions(-)
 delete mode 100644 meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch
 delete mode 100644 meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch
 delete mode 100644 meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch
 delete mode 100644 meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch
 delete mode 100644 meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb

(limited to 'meta-moblin/packages/moblin-web-browser')

diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch
deleted file mode 100644
index d4785eadd..000000000
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2010-01-13 14:57:52.000000000 +0000
-+++ git/configure.ac	2010-01-13 15:01:35.000000000 +0000
-@@ -57,6 +57,13 @@
- NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk"
- AC_SUBST(NBTKDATADIR)
- 
-+IDLPREFIX=
-+AC_ARG_WITH(idl-prefix, AC_HELP_STRING([--with-idl-prefix=DIR],[prefix to add to access to the idl files]), with_idl_prefix=${withval})
-+if test x"${with_idl_prefix}" != x ; then
-+   IDLPREFIX=${with_idl_prefix}
-+fi
-+AC_SUBST([IDLPREFIX])
-+
- if test "x$build_browser" = "xyes"; then
-    PKG_CHECK_MODULES(MWB,
-          clutter-1.0
-Index: git/libmwbpages/Makefile.am
-===================================================================
---- git.orig/libmwbpages/Makefile.am	2010-01-13 14:57:52.000000000 +0000
-+++ git/libmwbpages/Makefile.am	2010-01-13 15:02:20.000000000 +0000
-@@ -26,10 +26,10 @@
- mwb-pages-service.lo : MwbIPagesService.h
- 
- .idl.h :
--	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
-+	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
- 
- .idl.xpt :
--	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
-+	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
- 
- xpt_DATA = MwbIPagesService.xpt
- xptdir = $(pkgdatadir)/components
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch
deleted file mode 100644
index d4785eadd..000000000
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2010-01-13 14:57:52.000000000 +0000
-+++ git/configure.ac	2010-01-13 15:01:35.000000000 +0000
-@@ -57,6 +57,13 @@
- NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk"
- AC_SUBST(NBTKDATADIR)
- 
-+IDLPREFIX=
-+AC_ARG_WITH(idl-prefix, AC_HELP_STRING([--with-idl-prefix=DIR],[prefix to add to access to the idl files]), with_idl_prefix=${withval})
-+if test x"${with_idl_prefix}" != x ; then
-+   IDLPREFIX=${with_idl_prefix}
-+fi
-+AC_SUBST([IDLPREFIX])
-+
- if test "x$build_browser" = "xyes"; then
-    PKG_CHECK_MODULES(MWB,
-          clutter-1.0
-Index: git/libmwbpages/Makefile.am
-===================================================================
---- git.orig/libmwbpages/Makefile.am	2010-01-13 14:57:52.000000000 +0000
-+++ git/libmwbpages/Makefile.am	2010-01-13 15:02:20.000000000 +0000
-@@ -26,10 +26,10 @@
- mwb-pages-service.lo : MwbIPagesService.h
- 
- .idl.h :
--	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
-+	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
- 
- .idl.xpt :
--	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
-+	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
- 
- xpt_DATA = MwbIPagesService.xpt
- xptdir = $(pkgdatadir)/components
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch
deleted file mode 100644
index e920b50ee..000000000
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2009-06-23 17:46:31.000000000 +0100
-+++ git/configure.ac	2009-06-23 17:46:48.000000000 +0100
-@@ -44,6 +44,13 @@
- MOZIDLDIR=`${PKG_CONFIG} --variable=idldir libxul`""
- AC_SUBST([MOZIDLDIR])
- 
-+IDLPREFIX=
-+AC_ARG_WITH(idl-prefix, AC_HELP_STRING([--with-idl-prefix=DIR],[prefix to add to access to the idl files]), with_idl_prefix=${withval})
-+if test x"${with_idl_prefix}" != x ; then
-+    IDLPREFIX=${with_idl_prefix}
-+fi
-+AC_SUBST([IDLPREFIX])
-+
- AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool)
- 
- AC_OUTPUT([
-Index: git/libmwbpages/Makefile.am
-===================================================================
---- git.orig/libmwbpages/Makefile.am	2009-06-23 17:46:31.000000000 +0100
-+++ git/libmwbpages/Makefile.am	2009-06-23 17:47:46.000000000 +0100
-@@ -27,10 +27,10 @@
- mwb-gettext.lo : MwbIGettext.h
- 
- .idl.h :
--	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
-+	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
- 
- .idl.xpt :
--	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
-+	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
- 
- dist_xpt_DATA = MwbIStartPage.xpt MwbIGettext.xpt
- xptdir = $(MOZHOME)/components
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch
deleted file mode 100644
index 86aeae424..000000000
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2009-12-10 17:14:58.000000000 +0000
-+++ git/configure.ac	2009-12-10 17:15:01.000000000 +0000
-@@ -63,6 +63,13 @@
- NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk"
- AC_SUBST(NBTKDATADIR)
- 
-+IDLPREFIX=
-+AC_ARG_WITH(idl-prefix, AC_HELP_STRING([--with-idl-prefix=DIR],[prefix to add to access to the idl files]), with_idl_prefix=${withval})
-+if test x"${with_idl_prefix}" != x ; then
-+   IDLPREFIX=${with_idl_prefix}
-+fi
-+AC_SUBST([IDLPREFIX])
-+
- if test "x$build_browser" = "xyes"; then
-    PKG_CHECK_MODULES(MWB,
-          clutter-1.0
-Index: git/libmwbpages/Makefile.am
-===================================================================
---- git.orig/libmwbpages/Makefile.am	2009-12-10 17:15:08.000000000 +0000
-+++ git/libmwbpages/Makefile.am	2009-12-10 17:15:15.000000000 +0000
-@@ -28,10 +28,10 @@
- mwb-pages-service.lo : MwbIPagesService.h
- 
- .idl.h :
--	$(AM_V_GEN)$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
-+	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
- 
- .idl.xpt :
--	$(AM_V_GEN)$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
-+	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
- 
- xpt_DATA = MwbIPagesService.xpt
- xptdir = $(pkgdatadir)/components
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
deleted file mode 100644
index 53c8a3531..000000000
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git;branch=${MOBLINBROWSERBRANCH} \
-           file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666 \
-           file://xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch;patch=1;rev=78ddd155cc297811720e4c4835d468ac6c4d9666;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \
-           file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666"
-LICENSE = "LGPLv2.1"
-PV = "0.0+git${SRCPV}"
-PR = "r11"
-
-DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk-0.10 libunique mozilla-headless-services libccss nbtk mozilla-headless mutter-moblin"
-
-S = "${WORKDIR}/git"
-
-MOBLINBROWSERBRANCH ?= "master"
-
-EXTRA_OECONF = "--with-idl-prefix=${STAGING_DIR_TARGET}/"
-
-FILES_${PN} += "${datadir}/moblin-web-browser/chrome/* ${libdir}/xulrunner-*/chrome/* ${datadir}/dbus-1/services/*"
-FILES_${PN} += "${datadir}/moblin-web-browser/components/* ${libdir}/xulrunner-*/components/*"
-FILES_${PN}-dbg += "${datadir}/moblin-web-browser/components/.debug/* ${libdir}/xulrunner-*/components/.debug/*"
-
-
-
-inherit autotools
-- 
cgit v1.2.3