From e96829a0244bff9c0b735fc6977751bcfdaaf434 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 17 Aug 2009 09:24:51 +0100
Subject: moblin-web-browser: Fix locked down patch

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 ...-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch | 35 ++++++++++++++++++++++
 ...-b55d523da7681febfabf9fc40dcd6fcee982b079.patch | 35 ----------------------
 .../moblin-web-browser/moblin-web-browser_git.bb   |  6 ++--
 3 files changed, 38 insertions(+), 38 deletions(-)
 create 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-b55d523da7681febfabf9fc40dcd6fcee982b079.patch

(limited to 'meta-moblin')

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
new file mode 100644
index 0000000000..e920b50eeb
--- /dev/null
+++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch
@@ -0,0 +1,35 @@
+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-b55d523da7681febfabf9fc40dcd6fcee982b079.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-b55d523da7681febfabf9fc40dcd6fcee982b079.patch
deleted file mode 100644
index a8675868a3..0000000000
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-b55d523da7681febfabf9fc40dcd6fcee982b079.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2009-06-10 15:01:55.000000000 +0100
-+++ git/configure.ac	2009-06-10 15:19:36.000000000 +0100
-@@ -36,6 +36,13 @@
- MOZIDLDIR=`${PKG_CONFIG} --variable=idldir libxul-unstable`"/unstable"
- 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-10 15:01:55.000000000 +0100
-+++ git/libmwbpages/Makefile.am	2009-06-10 15:20:12.000000000 +0100
-@@ -23,10 +23,10 @@
- mwb-start-page.lo : MwbIStartPage.h
- 
- MwbIStartPage.h : MwbIStartPage.idl
--	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
-+	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
- 
- MwbIStartPage.xpt : MwbIStartPage.idl
--	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
-+	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
- 
- xpt_DATA = MwbIStartPage.xpt
- xptdir = $(MOZHOME)/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
index 63b00640d0..cbc3e2dae0 100644
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
+++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)"
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
-           file://xpidl-b55d523da7681febfabf9fc40dcd6fcee982b079.patch;patch=1;rev=b55d523da7681febfabf9fc40dcd6fcee982b079 \
-           file://xpidl.patch;patch=1;notrev=b55d523da7681febfabf9fc40dcd6fcee982b079"
+           file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \
+           file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6"
 LICENSE = "LGPLv2.1"
 PV = "0.0+git${SRCPV}"
-PR = "r7"
+PR = "r8"
 
 DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk libunique mozilla-headless-services libccss nbtk mozilla-headless mutter-moblin"
 
-- 
cgit v1.2.3-54-g00ecf