diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-08-17 09:24:51 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-08-17 09:24:51 +0100 |
| commit | e96829a0244bff9c0b735fc6977751bcfdaaf434 (patch) | |
| tree | 43fd4a1f8f2997e651830e960c6b0ae6d4734959 /meta-moblin/packages/moblin-web-browser | |
| parent | bd1123228b97e0f83a76c9676db0a2e6dbbfee54 (diff) | |
| download | poky-e96829a0244bff9c0b735fc6977751bcfdaaf434.tar.gz | |
moblin-web-browser: Fix locked down patch
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin/packages/moblin-web-browser')
| -rw-r--r-- | meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch (renamed from meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-b55d523da7681febfabf9fc40dcd6fcee982b079.patch) | 22 | ||||
| -rw-r--r-- | meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb | 6 |
2 files changed, 14 insertions, 14 deletions
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-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch index a8675868a3..e920b50eeb 100644 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-b55d523da7681febfabf9fc40dcd6fcee982b079.patch +++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | Index: git/configure.ac | 1 | Index: git/configure.ac |
| 2 | =================================================================== | 2 | =================================================================== |
| 3 | --- git.orig/configure.ac 2009-06-10 15:01:55.000000000 +0100 | 3 | --- git.orig/configure.ac 2009-06-23 17:46:31.000000000 +0100 |
| 4 | +++ git/configure.ac 2009-06-10 15:19:36.000000000 +0100 | 4 | +++ git/configure.ac 2009-06-23 17:46:48.000000000 +0100 |
| 5 | @@ -36,6 +36,13 @@ | 5 | @@ -44,6 +44,13 @@ |
| 6 | MOZIDLDIR=`${PKG_CONFIG} --variable=idldir libxul-unstable`"/unstable" | 6 | MOZIDLDIR=`${PKG_CONFIG} --variable=idldir libxul`"" |
| 7 | AC_SUBST([MOZIDLDIR]) | 7 | AC_SUBST([MOZIDLDIR]) |
| 8 | 8 | ||
| 9 | +IDLPREFIX= | 9 | +IDLPREFIX= |
| @@ -18,18 +18,18 @@ Index: git/configure.ac | |||
| 18 | AC_OUTPUT([ | 18 | AC_OUTPUT([ |
| 19 | Index: git/libmwbpages/Makefile.am | 19 | Index: git/libmwbpages/Makefile.am |
| 20 | =================================================================== | 20 | =================================================================== |
| 21 | --- git.orig/libmwbpages/Makefile.am 2009-06-10 15:01:55.000000000 +0100 | 21 | --- git.orig/libmwbpages/Makefile.am 2009-06-23 17:46:31.000000000 +0100 |
| 22 | +++ git/libmwbpages/Makefile.am 2009-06-10 15:20:12.000000000 +0100 | 22 | +++ git/libmwbpages/Makefile.am 2009-06-23 17:47:46.000000000 +0100 |
| 23 | @@ -23,10 +23,10 @@ | 23 | @@ -27,10 +27,10 @@ |
| 24 | mwb-start-page.lo : MwbIStartPage.h | 24 | mwb-gettext.lo : MwbIGettext.h |
| 25 | 25 | ||
| 26 | MwbIStartPage.h : MwbIStartPage.idl | 26 | .idl.h : |
| 27 | - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $< | 27 | - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $< |
| 28 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $< | 28 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $< |
| 29 | 29 | ||
| 30 | MwbIStartPage.xpt : MwbIStartPage.idl | 30 | .idl.xpt : |
| 31 | - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $< | 31 | - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $< |
| 32 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $< | 32 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $< |
| 33 | 33 | ||
| 34 | xpt_DATA = MwbIStartPage.xpt | 34 | dist_xpt_DATA = MwbIStartPage.xpt MwbIGettext.xpt |
| 35 | xptdir = $(MOZHOME)/components | 35 | 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 @@ | |||
| 1 | DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)" | 1 | DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)" |
| 2 | SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \ | 2 | SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \ |
| 3 | file://xpidl-b55d523da7681febfabf9fc40dcd6fcee982b079.patch;patch=1;rev=b55d523da7681febfabf9fc40dcd6fcee982b079 \ | 3 | file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \ |
| 4 | file://xpidl.patch;patch=1;notrev=b55d523da7681febfabf9fc40dcd6fcee982b079" | 4 | file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6" |
| 5 | LICENSE = "LGPLv2.1" | 5 | LICENSE = "LGPLv2.1" |
| 6 | PV = "0.0+git${SRCPV}" | 6 | PV = "0.0+git${SRCPV}" |
| 7 | PR = "r7" | 7 | PR = "r8" |
| 8 | 8 | ||
| 9 | DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk libunique mozilla-headless-services libccss nbtk mozilla-headless mutter-moblin" | 9 | DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk libunique mozilla-headless-services libccss nbtk mozilla-headless mutter-moblin" |
| 10 | 10 | ||
