diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-23 18:25:28 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-23 18:25:28 +0100 |
| commit | 579e8506155a05ddffab00de8bd0e751a9c4c885 (patch) | |
| tree | 7cb7d4148f313c0710446298cb060babfb26e9a7 /meta-moblin | |
| parent | 03cd4f4b519fb8c68063b171f565410827f3a96b (diff) | |
| download | openembedded-core-579e8506155a05ddffab00de8bd0e751a9c4c885.tar.gz openembedded-core-579e8506155a05ddffab00de8bd0e751a9c4c885.tar.bz2 openembedded-core-579e8506155a05ddffab00de8bd0e751a9c4c885.zip | |
moblin-web-browser: Update against latest SCM changes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin')
3 files changed, 49 insertions, 13 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-b55d523da7681febfabf9fc40dcd6fcee982b079.patch new file mode 100644 index 0000000000..a8675868a3 --- /dev/null +++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-b55d523da7681febfabf9fc40dcd6fcee982b079.patch @@ -0,0 +1,35 @@ +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/xpidl.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch index a8675868a3..e920b50eeb 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,9 +1,9 @@ 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" +--- 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= @@ -18,18 +18,18 @@ Index: git/configure.ac 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 +--- 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 - MwbIStartPage.h : MwbIStartPage.idl + .idl.h : - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $< + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $< - MwbIStartPage.xpt : MwbIStartPage.idl + .idl.xpt : - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $< + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $< - xpt_DATA = MwbIStartPage.xpt + dist_xpt_DATA = MwbIStartPage.xpt MwbIGettext.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 bb7e2ff0d7..3b84542c05 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,9 +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.patch;patch=1" + file://xpidl-b55d523da7681febfabf9fc40dcd6fcee982b079.patch;patch=1;rev=b55d523da7681febfabf9fc40dcd6fcee982b079 \ + file://xpidl.patch;patch=1;notrev=b55d523da7681febfabf9fc40dcd6fcee982b079" LICENSE = "LGPLv2.1" PV = "0.0+git${SRCPV}" -PR = "r2" +PR = "r3" DEPENDS = "clutter clutter-mozembed clutter-gtk libunique mozilla-headless-services libccss nbtk mozilla-headless" |