mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

moblin-web-browser: Update against latest SCM changes

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2009-06-23 18:25:28 +01:00
parent 03cd4f4b51
commit 579e850615
3 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-b55d523da7681febfabf9fc40dcd6fcee982b079.patch
+35
View File
@@ -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
meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch
+11 -11
View File
@@ -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
meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
+3 -2
View File
@@ -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"