summaryrefslogtreecommitdiffstats
path: root/meta-moblin
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-12-10 17:16:56 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-12-10 17:17:42 +0000
commite5a21c4dd986afeaf4307f17a2834f3a60fdf348 (patch)
tree928088023b607fda4273782bf56beb34eed55d81 /meta-moblin
parent57bf2cf3b6df82181a82a1dce391780c34b56f68 (diff)
downloadpoky-e5a21c4dd986afeaf4307f17a2834f3a60fdf348.tar.gz
moblin-web-browser: Update patch
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin')
-rw-r--r--meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch28
-rw-r--r--meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb2
2 files changed, 15 insertions, 15 deletions
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
index 73abea2c12..196136f722 100644
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch
+++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch
@@ -1,10 +1,10 @@
1Index: git/configure.ac 1Index: git/configure.ac
2=================================================================== 2===================================================================
3--- git.orig/configure.ac 2009-08-12 15:12:47.000000000 +0100 3--- git.orig/configure.ac 2009-12-10 17:14:58.000000000 +0000
4+++ git/configure.ac 2009-08-12 15:13:47.000000000 +0100 4+++ git/configure.ac 2009-12-10 17:15:01.000000000 +0000
5@@ -54,6 +54,13 @@ 5@@ -63,6 +63,13 @@
6 PKG_CHECK_MODULES(CLUTTER_MOZEMBED, clutter-mozembed-0.10) 6 NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk"
7 PKG_CHECK_MODULES(GTK, gtk+-2.0) 7 AC_SUBST(NBTKDATADIR)
8 8
9+IDLPREFIX= 9+IDLPREFIX=
10+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}) 10+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})
@@ -18,18 +18,18 @@ Index: git/configure.ac
18 clutter-1.0 18 clutter-1.0
19Index: git/libmwbpages/Makefile.am 19Index: git/libmwbpages/Makefile.am
20=================================================================== 20===================================================================
21--- git.orig/libmwbpages/Makefile.am 2009-08-12 15:12:47.000000000 +0100 21--- git.orig/libmwbpages/Makefile.am 2009-12-10 17:15:08.000000000 +0000
22+++ git/libmwbpages/Makefile.am 2009-08-12 15:12:47.000000000 +0100 22+++ git/libmwbpages/Makefile.am 2009-12-10 17:15:15.000000000 +0000
23@@ -31,10 +31,10 @@ 23@@ -28,10 +28,10 @@
24 mwb-gettext.lo : MwbIGettext.h 24 mwb-pages-service.lo : MwbIPagesService.h
25 25
26 .idl.h : 26 .idl.h :
27- $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $< 27- $(AM_V_GEN)$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
28+ xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $< 28+ xpidl -I $(MOZIDLDIR) -m header $<
29 29
30 .idl.xpt : 30 .idl.xpt :
31- $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $< 31- $(AM_V_GEN)$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
32+ xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $< 32+ xpidl -I $(MOZIDLDIR) -m typelib $<
33 33
34 dist_xpt_DATA = MwbISettings.xpt MwbIStartPage.xpt MwbIGettext.xpt 34 xpt_DATA = MwbIPagesService.xpt
35 xptdir = $(pkgdatadir)/components 35 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
index cd7a9f53c5..a6a643856c 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
@@ -4,7 +4,7 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
4 file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6" 4 file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6"
5LICENSE = "LGPLv2.1" 5LICENSE = "LGPLv2.1"
6PV = "0.0+git${SRCPV}" 6PV = "0.0+git${SRCPV}"
7PR = "r9" 7PR = "r10"
8 8
9DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk libunique mozilla-headless-services libccss nbtk mozilla-headless mutter-moblin" 9DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk libunique mozilla-headless-services libccss nbtk mozilla-headless mutter-moblin"
10 10